From deb4e07ce5e3d87f48dd942dfd414425c9524a04 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Wed, 11 Sep 2024 13:43:13 +0200 Subject: [PATCH 01/43] change package path for Java and resources from de.tum.in.www1.artemis to de.tum.cit.aet.artemis --- build.gradle | 4 +- docs/dev/guidelines/criteria-builder.rst | 2 +- .../FileUpload_UtilService_Factory.puml | 4 +- docs/dev/setup/server.rst | 4 +- gradle/war.gradle | 2 +- .../aet}/artemis/ApplicationWebXml.java | 2 +- .../www1 => cit/aet}/artemis/ArtemisApp.java | 6 +- .../artemis/aop/logging/LoggingAspect.java | 8 +- .../config/ApplicationConfiguration.java | 2 +- .../artemis/config/AsyncConfiguration.java | 6 +- .../BuildAgentWithoutCoreCondition.java | 6 +- .../artemis/config/CacheConfiguration.java | 16 +- ...ditionalMetricsExclusionConfiguration.java | 2 +- .../aet}/artemis/config/Constants.java | 12 +- .../CustomMetricsExtensionConfiguration.java | 6 +- .../artemis/config/DatabaseConfiguration.java | 8 +- .../config/DateTimeFormatConfiguration.java | 4 +- ...EurekaClientRestTemplateConfiguration.java | 6 +- .../config/GuidedTourConfiguration.java | 10 +- .../artemis/config/JacksonConfiguration.java | 4 +- .../config/LiquibaseConfiguration.java | 6 +- .../config/LoggingAspectConfiguration.java | 6 +- .../artemis/config/LoggingConfiguration.java | 6 +- .../aet}/artemis/config/MetricsBean.java | 32 +-- .../ProgrammingLanguageConfiguration.java | 8 +- .../config/PropertiesConfigurationGuard.java | 4 +- .../config/PublicResourcesConfiguration.java | 4 +- .../config/RestTemplateConfiguration.java | 12 +- .../artemis/config/SAML2Configuration.java | 2 +- .../aet}/artemis/config/SAML2Properties.java | 4 +- .../artemis/config/SecurityConfiguration.java | 22 +- .../artemis/config/SentryConfiguration.java | 4 +- .../artemis/config/StartupDelayConfig.java | 2 +- .../config/StaticCodeAnalysisConfigurer.java | 10 +- .../config/TaskSchedulingConfiguration.java | 4 +- .../artemis/config/TheiaConfiguration.java | 6 +- .../artemis/config/TomcatConfiguration.java | 4 +- .../aet}/artemis/config/WebConfigurer.java | 6 +- .../config/audit/AuditEventConverter.java | 6 +- .../artemis/config/audit/package-info.java | 4 + .../auth/AthenaAuthorizationInterceptor.java | 2 +- .../auth/PyrisAuthorizationInterceptor.java | 2 +- .../connector/GitLabApiConfiguration.java | 2 +- .../connector/JenkinsServerConfiguration.java | 2 +- .../config/icl/BuildAgentConfiguration.java | 8 +- .../config/icl/JGitServletConfiguration.java | 6 +- .../artemis/config/icl/ssh/HashUtils.java | 2 +- .../icl/ssh/MultipleHostKeyProvider.java | 2 +- .../config/icl/ssh/SshConfiguration.java | 10 +- .../artemis/config/icl/ssh/SshConstants.java | 6 +- .../artemis/config/icl/ssh/SshGitCommand.java | 10 +- .../config/lti/CustomLti13Configurer.java | 10 +- ...edStateAuthorizationRequestRepository.java | 2 +- ...imisticAuthorizationRequestRepository.java | 2 +- .../config/migration/DatabaseMigration.java | 2 +- .../config/migration/MigrationEntry.java | 2 +- .../MigrationIntegrityException.java | 2 +- .../config/migration/MigrationRegistry.java | 6 +- .../config/migration/MigrationService.java | 8 +- .../artemis/config/migration/entries/.gitkeep | 0 .../MigrationEntry20240614_140000.java | 14 +- .../aet}/artemis/config/package-info.java | 2 +- .../WebsocketBrokerHealthIndicator.java | 6 +- .../websocket/WebsocketConfiguration.java | 40 ++-- .../WebsocketSecurityConfiguration.java | 6 +- .../config/websocket/package-info.java | 2 +- .../domain/AbstractAuditingEntity.java | 2 +- .../aet}/artemis/domain/AssessmentNote.java | 2 +- .../aet}/artemis/domain/Attachment.java | 6 +- .../aet}/artemis/domain/Authority.java | 4 +- .../artemis/domain/AuxiliaryRepository.java | 2 +- .../aet}/artemis/domain/BaseExercise.java | 14 +- .../aet}/artemis/domain/Bonus.java | 2 +- .../aet}/artemis/domain/BonusStrategy.java | 10 +- .../aet}/artemis/domain/BuildJob.java | 8 +- .../aet}/artemis/domain/BuildLogEntry.java | 2 +- .../aet}/artemis/domain/BuildPlan.java | 2 +- .../aet}/artemis/domain/BuildRunState.java | 2 +- .../aet}/artemis/domain/Commit.java | 2 +- .../aet}/artemis/domain/Complaint.java | 8 +- .../artemis/domain/ComplaintResponse.java | 6 +- .../aet}/artemis/domain/ConductAgreement.java | 2 +- .../artemis/domain/ConductAgreementId.java | 2 +- ...versationNotificationRecipientSummary.java | 2 +- .../aet}/artemis/domain/Course.java | 34 +-- .../domain/CourseExamExportErrorCause.java | 2 +- .../artemis/domain/CourseExamExportState.java | 2 +- .../aet}/artemis/domain/DataExport.java | 4 +- .../aet}/artemis/domain/DomainObject.java | 4 +- .../artemis/domain/ExampleSubmission.java | 4 +- .../aet}/artemis/domain/Exercise.java | 40 ++-- .../aet}/artemis/domain/Feedback.java | 18 +- .../www1 => cit/aet}/artemis/domain/File.java | 2 +- .../aet}/artemis/domain/FileType.java | 2 +- .../artemis/domain/FileUploadExercise.java | 6 +- .../artemis/domain/FileUploadSubmission.java | 6 +- .../aet}/artemis/domain/GradeStep.java | 2 +- .../aet}/artemis/domain/GradeType.java | 2 +- .../aet}/artemis/domain/GradingCriterion.java | 2 +- .../artemis/domain/GradingInstruction.java | 2 +- .../aet}/artemis/domain/GradingScale.java | 4 +- .../artemis/domain/GuidedTourSetting.java | 2 +- .../aet}/artemis/domain/IBonusStrategy.java | 6 +- .../aet}/artemis/domain/LearningObject.java | 4 +- .../aet}/artemis/domain/Lecture.java | 6 +- .../aet}/artemis/domain/LongFeedbackText.java | 4 +- .../domain/LtiPlatformConfiguration.java | 2 +- .../artemis/domain/MigrationChangelog.java | 2 +- .../artemis/domain/NotificationSetting.java | 2 +- .../domain/OnlineCourseConfiguration.java | 2 +- .../aet}/artemis/domain/Organization.java | 2 +- .../artemis/domain/PersistentAuditEvent.java | 2 +- .../artemis/domain/PlagiarismCheckState.java | 2 +- .../artemis/domain/ProgrammingExercise.java | 40 ++-- .../ProgrammingExerciseBuildConfig.java | 6 +- .../domain/ProgrammingExerciseTestCase.java | 16 +- .../artemis/domain/ProgrammingSubmission.java | 8 +- .../aet}/artemis/domain/Rating.java | 2 +- .../aet}/artemis/domain/Repository.java | 6 +- .../aet}/artemis/domain/Result.java | 32 +-- .../domain/StaticCodeAnalysisCategory.java | 6 +- .../StaticCodeAnalysisDefaultCategory.java | 6 +- .../aet}/artemis/domain/Submission.java | 12 +- .../artemis/domain/SubmissionVersion.java | 2 +- .../www1 => cit/aet}/artemis/domain/Team.java | 4 +- .../artemis/domain/TeamAssignmentConfig.java | 4 +- .../aet}/artemis/domain/TempIdObject.java | 2 +- .../aet}/artemis/domain/TextBlock.java | 2 +- .../aet}/artemis/domain/TextBlockType.java | 2 +- .../aet}/artemis/domain/TextEmbedding.java | 2 +- .../aet}/artemis/domain/TextExercise.java | 6 +- .../aet}/artemis/domain/TextSubmission.java | 6 +- .../www1 => cit/aet}/artemis/domain/User.java | 28 +-- .../aet}/artemis/domain/UserGroup.java | 2 +- .../aet}/artemis/domain/VcsRepositoryUri.java | 2 +- .../domain/analytics/TextAssessmentEvent.java | 10 +- .../dashboard/ExerciseMapEntry.java | 2 +- .../dashboard/ExerciseRatingCount.java | 2 +- .../assessment/dashboard/ResultCount.java | 2 +- .../domain/competency/BaseCompetency.java | 4 +- .../artemis/domain/competency/Competency.java | 2 +- .../domain/competency/CompetencyJol.java | 6 +- .../domain/competency/CompetencyProgress.java | 6 +- .../domain/competency/CompetencyRelation.java | 4 +- .../domain/competency/CompetencyTaxonomy.java | 2 +- .../domain/competency/CourseCompetency.java | 10 +- .../domain/competency/KnowledgeArea.java | 4 +- .../domain/competency/LearningPath.java | 8 +- .../domain/competency/Prerequisite.java | 2 +- .../domain/competency/RelationType.java | 2 +- .../artemis/domain/competency/Source.java | 4 +- .../competency/StandardizedCompetency.java | 2 +- .../domain/enumeration/AeolusTarget.java | 2 +- .../domain/enumeration/AssessmentType.java | 2 +- .../domain/enumeration/AttachmentType.java | 2 +- .../domain/enumeration/BuildPlanType.java | 2 +- .../domain/enumeration/BuildStatus.java | 2 +- .../domain/enumeration/CategoryState.java | 2 +- .../CompetencyProgressConfidenceReason.java | 4 +- .../domain/enumeration/ComplaintType.java | 2 +- ...CourseInformationSharingConfiguration.java | 2 +- .../domain/enumeration/DataExportState.java | 2 +- .../enumeration/DefaultChannelType.java | 2 +- .../domain/enumeration/DiagramType.java | 2 +- .../domain/enumeration/DifficultyLevel.java | 2 +- .../domain/enumeration/DisplayPriority.java | 2 +- .../domain/enumeration/ExerciseLifecycle.java | 12 +- .../domain/enumeration/ExerciseMode.java | 2 +- .../domain/enumeration/ExerciseType.java | 14 +- .../domain/enumeration/FeedbackType.java | 4 +- .../artemis/domain/enumeration/GraphType.java | 2 +- .../enumeration/GroupNotificationType.java | 2 +- .../enumeration/IExerciseLifecycle.java | 8 +- .../enumeration/IncludedInOverallScore.java | 2 +- .../enumeration/InitializationState.java | 2 +- .../artemis/domain/enumeration/Language.java | 2 +- .../domain/enumeration/LegalDocumentType.java | 2 +- .../enumeration/NotificationPriority.java | 2 +- .../domain/enumeration/NotificationType.java | 2 +- .../enumeration/ParticipationLifecycle.java | 2 +- .../enumeration/ProgrammingLanguage.java | 2 +- .../domain/enumeration/ProjectType.java | 2 +- .../domain/enumeration/QuizAction.java | 2 +- .../artemis/domain/enumeration/QuizMode.java | 2 +- .../domain/enumeration/RepositoryType.java | 2 +- .../domain/enumeration/ScoringType.java | 2 +- .../domain/enumeration/SortingOrder.java | 2 +- .../artemis/domain/enumeration/SpanType.java | 2 +- .../enumeration/StaticCodeAnalysisTool.java | 2 +- .../domain/enumeration/StatisticsView.java | 2 +- .../domain/enumeration/SubmissionType.java | 2 +- .../enumeration/SystemNotificationType.java | 2 +- .../enumeration/TeamImportStrategyType.java | 2 +- .../enumeration/TextAssessmentEventType.java | 2 +- .../enumeration/TutorParticipationStatus.java | 2 +- .../TutorialGroupSessionStatus.java | 4 +- .../domain/enumeration/Visibility.java | 8 +- .../artemis/domain/enumeration/Weekday.java | 2 +- .../TutorialGroupRegistrationType.java | 2 +- .../aet}/artemis/domain/exam/Exam.java | 10 +- .../aet}/artemis/domain/exam/ExamSession.java | 4 +- .../aet}/artemis/domain/exam/ExamUser.java | 6 +- .../artemis/domain/exam/ExerciseGroup.java | 6 +- .../aet}/artemis/domain/exam/StudentExam.java | 10 +- .../domain/exam/SuspiciousExamSessions.java | 2 +- .../domain/exam/SuspiciousSessionReason.java | 2 +- .../SuspiciousSessionsAnalysisOptions.java | 2 +- .../exam/event/ExamAttendanceCheckEvent.java | 4 +- .../domain/exam/event/ExamLiveEvent.java | 8 +- .../exam/event/ExamWideAnnouncementEvent.java | 4 +- .../event/ProblemStatementUpdateEvent.java | 4 +- .../exam/event/WorkingTimeUpdateEvent.java | 4 +- .../aet}/artemis/domain/hestia/CodeHint.java | 2 +- .../domain/hestia/CoverageFileReport.java | 4 +- .../artemis/domain/hestia/CoverageReport.java | 6 +- .../artemis/domain/hestia/ExerciseHint.java | 8 +- .../domain/hestia/ExerciseHintActivation.java | 6 +- .../ProgrammingExerciseGitDiffEntry.java | 4 +- .../ProgrammingExerciseGitDiffReport.java | 6 +- .../ProgrammingExerciseSolutionEntry.java | 6 +- .../hestia/ProgrammingExerciseTask.java | 8 +- .../ProgrammingExerciseTestCaseType.java | 2 +- .../hestia/TestwiseCoverageReportEntry.java | 6 +- .../artemis/domain/iris/IrisTemplate.java | 4 +- .../iris/message/IrisJsonMessageContent.java | 2 +- .../domain/iris/message/IrisMessage.java | 6 +- .../iris/message/IrisMessageContent.java | 4 +- .../iris/message/IrisMessageSender.java | 2 +- .../iris/message/IrisTextMessageContent.java | 2 +- .../domain/iris/session/IrisChatSession.java | 4 +- .../iris/session/IrisCourseChatSession.java | 6 +- .../iris/session/IrisExerciseChatSession.java | 6 +- .../iris/session/IrisHestiaSession.java | 4 +- .../domain/iris/session/IrisSession.java | 6 +- .../iris/settings/IrisChatSubSettings.java | 4 +- .../IrisCompetencyGenerationSubSettings.java | 4 +- .../iris/settings/IrisCourseSettings.java | 4 +- .../iris/settings/IrisExerciseSettings.java | 4 +- .../iris/settings/IrisGlobalSettings.java | 2 +- .../iris/settings/IrisHestiaSubSettings.java | 4 +- .../IrisLectureIngestionSubSettings.java | 2 +- .../iris/settings/IrisModelListConverter.java | 2 +- .../domain/iris/settings/IrisSettings.java | 6 +- .../iris/settings/IrisSettingsType.java | 2 +- .../domain/iris/settings/IrisSubSettings.java | 6 +- .../iris/settings/IrisSubSettingsType.java | 2 +- ...aderboardAnsweredMoreFeedbackRequests.java | 2 +- .../tutor/TutorLeaderboardAssessments.java | 2 +- .../TutorLeaderboardComplaintResponses.java | 2 +- .../tutor/TutorLeaderboardComplaints.java | 2 +- .../TutorLeaderboardMoreFeedbackRequests.java | 2 +- .../domain/lecture/AttachmentUnit.java | 4 +- .../artemis/domain/lecture/ExerciseUnit.java | 6 +- .../artemis/domain/lecture/LectureUnit.java | 12 +- .../domain/lecture/LectureUnitCompletion.java | 4 +- .../artemis/domain/lecture/OnlineUnit.java | 2 +- .../aet}/artemis/domain/lecture/Slide.java | 4 +- .../aet}/artemis/domain/lecture/TextUnit.java | 2 +- .../artemis/domain/lecture/VideoUnit.java | 2 +- .../aet}/artemis/domain/lti/Claims.java | 2 +- .../artemis/domain/lti/Lti13AgsClaim.java | 2 +- .../domain/lti/Lti13ClientRegistration.java | 4 +- .../domain/lti/Lti13DeepLinkingResponse.java | 2 +- .../domain/lti/Lti13LaunchRequest.java | 2 +- .../lti/Lti13PlatformConfiguration.java | 2 +- .../domain/lti/LtiAuthenticationResponse.java | 2 +- .../artemis/domain/lti/LtiResourceLaunch.java | 10 +- .../aet}/artemis/domain/lti/Scopes.java | 2 +- .../aet}/artemis/domain/metis/AnswerPost.java | 4 +- .../domain/metis/ConversationParticipant.java | 10 +- .../ConversationParticipantSettingsView.java | 2 +- .../domain/metis/ConversationType.java | 2 +- .../domain/metis/CourseWideContext.java | 2 +- .../metis/CreatedConversationMessage.java | 6 +- .../aet}/artemis/domain/metis/Post.java | 14 +- .../artemis/domain/metis/PostConstraints.java | 4 +- .../metis/PostContextConstraintValidator.java | 2 +- .../domain/metis/PostSortCriterion.java | 2 +- .../aet}/artemis/domain/metis/Posting.java | 8 +- .../aet}/artemis/domain/metis/Reaction.java | 6 +- .../metis/ReactionConstraintValidator.java | 2 +- .../domain/metis/ReactionConstraints.java | 4 +- .../aet}/artemis/domain/metis/UserRole.java | 2 +- .../domain/metis/conversation/Channel.java | 16 +- .../metis/conversation/ChannelSubType.java | 2 +- .../metis/conversation/Conversation.java | 12 +- .../conversation/ConversationSettings.java | 2 +- .../conversation/ConversationSummary.java | 2 +- .../conversation/GeneralConversationInfo.java | 2 +- .../domain/metis/conversation/GroupChat.java | 14 +- .../metis/conversation/OneToOneChat.java | 12 +- .../conversation/UserConversationInfo.java | 4 +- .../metrics/ExerciseTypeMetricsEntry.java | 4 +- .../domain/modeling/ApollonDiagram.java | 6 +- .../artemis/domain/modeling/ModelCluster.java | 4 +- .../artemis/domain/modeling/ModelElement.java | 2 +- .../domain/modeling/ModelingExercise.java | 10 +- .../domain/modeling/ModelingSubmission.java | 8 +- .../domain/modeling/SimilarElementCount.java | 4 +- .../ConversationNotification.java | 8 +- .../ConversationNotificationFactory.java | 10 +- .../notification/GroupNotification.java | 10 +- .../GroupNotificationFactory.java | 80 +++---- .../domain/notification/Notification.java | 8 +- .../notification/NotificationConstants.java | 110 ++++----- .../NotificationPlaceholderCreator.java | 4 +- .../notification/NotificationTarget.java | 2 +- .../NotificationTargetFactory.java | 22 +- .../notification/SingleUserNotification.java | 4 +- .../SingleUserNotificationFactory.java | 156 ++++++------- .../notification/SystemNotification.java | 4 +- .../TutorialGroupNotification.java | 10 +- .../TutorialGroupNotificationFactory.java | 18 +- .../cit/aet/artemis/domain/package-info.java | 4 + ...tBaseProgrammingExerciseParticipation.java | 8 +- .../IdToPresentationScoreSum.java | 2 +- .../domain/participation/Participant.java | 4 +- .../domain/participation/Participation.java | 16 +- .../participation/ParticipationInterface.java | 10 +- .../ParticipationVCSAccessToken.java | 6 +- .../ProgrammingExerciseParticipation.java | 8 +- ...ogrammingExerciseStudentParticipation.java | 10 +- ...utionProgrammingExerciseParticipation.java | 4 +- .../participation/StudentParticipation.java | 10 +- ...plateProgrammingExerciseParticipation.java | 4 +- .../participation/TutorParticipation.java | 12 +- .../domain/plagiarism/PlagiarismCase.java | 12 +- .../plagiarism/PlagiarismComparison.java | 8 +- .../plagiarism/PlagiarismDetectionConfig.java | 4 +- .../domain/plagiarism/PlagiarismMatch.java | 6 +- .../domain/plagiarism/PlagiarismResult.java | 10 +- .../domain/plagiarism/PlagiarismStatus.java | 2 +- .../plagiarism/PlagiarismSubmission.java | 14 +- .../PlagiarismSubmissionElement.java | 4 +- .../domain/plagiarism/PlagiarismVerdict.java | 2 +- .../modeling/ModelingPlagiarismResult.java | 4 +- .../modeling/ModelingSubmissionElement.java | 6 +- .../plagiarism/text/TextPlagiarismResult.java | 8 +- .../text/TextSubmissionElement.java | 10 +- .../PushNotificationDeviceConfiguration.java | 4 +- ...PushNotificationDeviceConfigurationId.java | 4 +- .../PushNotificationDeviceType.java | 2 +- .../domain/quiz/AbstractQuizSubmission.java | 8 +- .../artemis/domain/quiz/AnswerCounter.java | 2 +- .../artemis/domain/quiz/AnswerOption.java | 6 +- .../domain/quiz/DragAndDropMapping.java | 6 +- .../domain/quiz/DragAndDropQuestion.java | 20 +- .../quiz/DragAndDropQuestionStatistic.java | 2 +- .../quiz/DragAndDropSubmittedAnswer.java | 6 +- .../aet}/artemis/domain/quiz/DragItem.java | 14 +- .../artemis/domain/quiz/DropLocation.java | 6 +- .../domain/quiz/DropLocationCounter.java | 2 +- .../domain/quiz/MultipleChoiceQuestion.java | 14 +- .../quiz/MultipleChoiceQuestionStatistic.java | 2 +- .../quiz/MultipleChoiceSubmittedAnswer.java | 6 +- .../artemis/domain/quiz/PointCounter.java | 2 +- .../aet}/artemis/domain/quiz/QuizBatch.java | 8 +- .../domain/quiz/QuizConfiguration.java | 2 +- .../artemis/domain/quiz/QuizExercise.java | 22 +- .../aet}/artemis/domain/quiz/QuizGroup.java | 4 +- .../domain/quiz/QuizPointStatistic.java | 2 +- .../aet}/artemis/domain/quiz/QuizPool.java | 8 +- .../artemis/domain/quiz/QuizQuestion.java | 10 +- .../domain/quiz/QuizQuestionComponent.java | 2 +- .../domain/quiz/QuizQuestionStatistic.java | 2 +- .../quiz/QuizQuestionStatisticComponent.java | 2 +- .../artemis/domain/quiz/QuizStatistic.java | 4 +- .../domain/quiz/QuizStatisticCounter.java | 4 +- .../artemis/domain/quiz/QuizSubmission.java | 2 +- .../domain/quiz/QuizSubmittedAnswerCount.java | 2 +- .../domain/quiz/ShortAnswerMapping.java | 6 +- .../domain/quiz/ShortAnswerQuestion.java | 12 +- .../quiz/ShortAnswerQuestionStatistic.java | 2 +- .../domain/quiz/ShortAnswerSolution.java | 6 +- .../artemis/domain/quiz/ShortAnswerSpot.java | 6 +- .../domain/quiz/ShortAnswerSpotCounter.java | 2 +- .../quiz/ShortAnswerSubmittedAnswer.java | 6 +- .../domain/quiz/ShortAnswerSubmittedText.java | 8 +- .../artemis/domain/quiz/SubmittedAnswer.java | 6 +- .../domain/quiz/compare/DnDMapping.java | 2 +- .../domain/quiz/compare/SAMapping.java | 2 +- .../domain/quiz/scoring/ScoringStrategy.java | 6 +- ...coringStrategyDragAndDropAllOrNothing.java | 14 +- ...egyDragAndDropProportionalWithPenalty.java | 14 +- ...DragAndDropProportionalWithoutPenalty.java | 14 +- ...ingStrategyMultipleChoiceAllOrNothing.java | 12 +- ...MultipleChoiceProportionalWithPenalty.java | 12 +- ...tipleChoiceProportionalWithoutPenalty.java | 12 +- ...coringStrategyShortAnswerAllOrNothing.java | 10 +- ...egyShortAnswerProportionalWithPenalty.java | 10 +- ...ShortAnswerProportionalWithoutPenalty.java | 10 +- .../ScoringStrategyShortAnswerUtil.java | 12 +- .../artemis/domain/science/ScienceEvent.java | 4 +- .../domain/science/ScienceEventType.java | 2 +- .../domain/science/ScienceSetting.java | 6 +- .../domain/scores/ParticipantScore.java | 12 +- .../artemis/domain/scores/StudentScore.java | 6 +- .../aet}/artemis/domain/scores/TeamScore.java | 6 +- .../aet}/artemis/domain/settings/ide/Ide.java | 4 +- .../domain/settings/ide/UserIdeMapping.java | 6 +- .../statistics/BuildLogStatisticsEntry.java | 6 +- .../CourseStatisticsAverageScore.java | 4 +- .../domain/statistics/ScoreDistribution.java | 2 +- .../domain/statistics/StatisticsEntry.java | 2 +- .../statistics/tutor/effort/TutorEffort.java | 2 +- .../LockRepositoryPolicy.java | 6 +- .../SubmissionPenaltyPolicy.java | 6 +- .../submissionpolicy/SubmissionPolicy.java | 6 +- .../domain/tutorialgroups/TutorialGroup.java | 14 +- .../TutorialGroupFreePeriod.java | 4 +- .../TutorialGroupRegistration.java | 8 +- .../tutorialgroups/TutorialGroupSchedule.java | 4 +- .../tutorialgroups/TutorialGroupSession.java | 6 +- .../TutorialGroupsConfiguration.java | 6 +- .../aet}/artemis/domain/view/QuizView.java | 2 +- .../AccountRegistrationBlockedException.java | 6 +- .../exception/ArtemisMailException.java | 2 +- ...ntinuousIntegrationBuildPlanException.java | 2 +- .../ContinuousIntegrationException.java | 2 +- .../artemis/exception/EmptyFileException.java | 2 +- .../exception/FilePathParsingException.java | 2 +- .../aet}/artemis/exception/GitException.java | 2 +- .../artemis/exception/GitLabCIException.java | 2 +- .../artemis/exception/JenkinsException.java | 2 +- .../artemis/exception/LocalCIException.java | 2 +- .../LtiEmailAlreadyInUseException.java | 2 +- .../exception/NetworkingException.java | 2 +- .../artemis/exception/QuizJoinException.java | 2 +- .../exception/QuizSubmissionException.java | 2 +- .../UsernameAlreadyUsedException.java | 2 +- .../exception/VersionControlException.java | 4 +- .../localvc/LocalVCAuthException.java | 2 +- .../localvc/LocalVCForbiddenException.java | 2 +- .../localvc/LocalVCInternalException.java | 4 +- .../localvc/LocalVCOperationException.java | 2 +- .../management/SecurityMetersService.java | 4 +- .../repository/ApollonDiagramRepository.java | 8 +- .../repository/AttachmentRepository.java | 8 +- .../repository/AttachmentUnitRepository.java | 12 +- .../repository/AuthorityRepository.java | 6 +- .../AuxiliaryRepositoryRepository.java | 8 +- .../artemis/repository/BonusRepository.java | 8 +- .../repository/BuildJobRepository.java | 24 +- .../repository/BuildLogEntryRepository.java | 8 +- .../BuildLogStatisticsEntryRepository.java | 18 +- .../repository/BuildPlanRepository.java | 8 +- .../CompetencyProgressRepository.java | 14 +- .../CompetencyRelationRepository.java | 14 +- .../repository/CompetencyRepository.java | 10 +- .../repository/ComplaintRepository.java | 68 +++--- .../ComplaintResponseRepository.java | 16 +- .../ConductAgreementRepository.java | 10 +- .../CourseCompetencyRepository.java | 18 +- .../artemis/repository/CourseRepository.java | 32 +-- .../CustomAuditEventRepository.java | 8 +- .../repository/DataExportRepository.java | 8 +- .../DragAndDropMappingRepository.java | 8 +- .../repository/DragItemRepository.java | 8 +- .../repository/ExamLiveEventRepository.java | 8 +- .../artemis/repository/ExamRepository.java | 18 +- .../repository/ExamSessionRepository.java | 8 +- .../repository/ExamUserRepository.java | 12 +- .../ExampleSubmissionRepository.java | 12 +- .../repository/ExerciseGroupRepository.java | 8 +- .../repository/ExerciseRepository.java | 32 +-- .../repository/ExerciseUnitRepository.java | 8 +- .../repository/FeedbackRepository.java | 16 +- .../FileUploadExerciseRepository.java | 8 +- .../FileUploadSubmissionRepository.java | 8 +- .../repository/GradeStepRepository.java | 8 +- .../GradingCriterionRepository.java | 8 +- .../GradingInstructionRepository.java | 8 +- .../repository/GradingScaleRepository.java | 18 +- .../GroupNotificationRepository.java | 8 +- .../GuidedTourSettingsRepository.java | 8 +- .../repository/LdapUserRepository.java | 4 +- .../repository/LearningPathRepository.java | 8 +- .../artemis/repository/LectureRepository.java | 12 +- .../LectureUnitCompletionRepository.java | 12 +- .../repository/LectureUnitRepository.java | 8 +- .../LongFeedbackTextRepository.java | 6 +- .../Lti13ResourceLaunchRepository.java | 10 +- .../LtiPlatformConfigurationRepository.java | 10 +- .../repository/MigrationChangeRepository.java | 7 + .../repository/ModelClusterRepository.java | 8 +- .../repository/ModelElementRepository.java | 8 +- .../ModelingExerciseRepository.java | 10 +- .../ModelingSubmissionRepository.java | 8 +- .../repository/NotificationRepository.java | 24 +- .../NotificationSettingRepository.java | 10 +- .../OnlineCourseConfigurationRepository.java | 8 +- .../repository/OnlineUnitRepository.java | 8 +- .../repository/OrganizationRepository.java | 10 +- .../ParticipantScoreRepository.java | 24 +- .../repository/ParticipationRepository.java | 12 +- ...ParticipationVCSAccessTokenRepository.java | 8 +- .../PersistenceAuditEventRepository.java | 6 +- .../repository/PrerequisiteRepository.java | 8 +- ...grammingExerciseBuildConfigRepository.java | 10 +- .../ProgrammingExerciseRepository.java | 58 ++--- ...xerciseStudentParticipationRepository.java | 14 +- ...ProgrammingExerciseTestCaseRepository.java | 14 +- .../ProgrammingSubmissionRepository.java | 18 +- ...ficationDeviceConfigurationRepository.java | 14 +- .../repository/QuizBatchRepository.java | 10 +- .../repository/QuizExerciseRepository.java | 8 +- .../repository/QuizGroupRepository.java | 8 +- .../QuizPointStatisticRepository.java | 8 +- .../repository/QuizPoolRepository.java | 8 +- .../repository/QuizQuestionRepository.java | 10 +- .../QuizQuestionStatisticRepository.java | 8 +- .../repository/QuizSubmissionRepository.java | 8 +- .../artemis/repository/RatingRepository.java | 12 +- .../artemis/repository/ResultRepository.java | 56 ++--- .../ShortAnswerMappingRepository.java | 8 +- .../SingleUserNotificationRepository.java | 8 +- .../artemis/repository/SlideRepository.java | 8 +- ...ammingExerciseParticipationRepository.java | 22 +- .../artemis/repository/SourceRepository.java | 8 +- .../StaticCodeAnalysisCategoryRepository.java | 8 +- .../repository/StatisticsRepository.java | 94 ++++---- .../repository/StudentExamRepository.java | 24 +- .../StudentParticipationRepository.java | 124 +++++----- .../repository/StudentScoreRepository.java | 16 +- .../SubmissionPolicyRepository.java | 8 +- .../repository/SubmissionRepository.java | 52 ++--- .../SubmissionVersionRepository.java | 8 +- .../repository/SubmittedAnswerRepository.java | 14 +- .../SystemNotificationRepository.java | 8 +- .../artemis/repository/TeamRepository.java | 16 +- .../repository/TeamScoreRepository.java | 18 +- ...ammingExerciseParticipationRepository.java | 20 +- .../TextAssessmentEventRepository.java | 8 +- .../repository/TextBlockRepository.java | 8 +- .../repository/TextExerciseRepository.java | 8 +- .../repository/TextSubmissionRepository.java | 8 +- .../repository/TextUnitRepository.java | 8 +- .../TutorParticipationRepository.java | 14 +- .../artemis/repository/UserRepository.java | 76 +++--- .../repository/VideoUnitRepository.java | 8 +- .../repository/base/ArtemisJpaRepository.java | 2 +- .../base/DynamicSpecificationRepository.java | 4 +- .../artemis/repository/base/FetchOptions.java | 2 +- .../repository/base/RepositoryImpl.java | 6 +- .../competency/CompetencyJolRepository.java | 14 +- .../competency/KnowledgeAreaRepository.java | 10 +- .../StandardizedCompetencyRepository.java | 8 +- .../repository/hestia/CodeHintRepository.java | 8 +- .../hestia/CoverageFileReportRepository.java | 8 +- .../hestia/CoverageReportRepository.java | 16 +- .../ExerciseHintActivationRepository.java | 6 +- .../hestia/ExerciseHintRepository.java | 10 +- ...ammingExerciseGitDiffReportRepository.java | 8 +- ...ammingExerciseSolutionEntryRepository.java | 8 +- .../ProgrammingExerciseTaskRepository.java | 8 +- ...TestwiseCoverageReportEntryRepository.java | 8 +- .../iris/IrisCourseChatSessionRepository.java | 10 +- .../IrisExerciseChatSessionRepository.java | 10 +- .../iris/IrisHestiaSessionRepository.java | 6 +- .../iris/IrisMessageRepository.java | 10 +- .../iris/IrisSessionRepository.java | 8 +- .../iris/IrisSettingsRepository.java | 12 +- .../iris/IrisSubSettingsRepository.java | 6 +- .../iris/IrisTemplateRepository.java | 11 + .../metis/AnswerPostRepository.java | 8 +- .../metis/ConversationMessageRepository.java | 32 +-- .../ConversationParticipantRepository.java | 8 +- .../metis/CustomPostRepository.java | 4 +- .../metis/CustomPostRepositoryImpl.java | 6 +- .../repository/metis/PostRepository.java | 10 +- .../repository/metis/ReactionRepository.java | 8 +- .../metis/conversation/ChannelRepository.java | 8 +- .../ConversationNotificationRepository.java | 8 +- .../conversation/ConversationRepository.java | 16 +- .../conversation/GroupChatRepository.java | 8 +- .../conversation/OneToOneChatRepository.java | 10 +- .../metrics/CompetencyMetricsRepository.java | 28 +-- .../metrics/ExerciseMetricsRepository.java | 32 +-- .../metrics/LectureUnitMetricsRepository.java | 12 +- .../aet/artemis/repository/package-info.java | 4 + .../plagiarism/PlagiarismCaseRepository.java | 8 +- .../PlagiarismComparisonRepository.java | 10 +- .../PlagiarismResultRepository.java | 8 +- .../PlagiarismSubmissionRepository.java | 10 +- .../science/ScienceEventRepository.java | 10 +- .../science/ScienceSettingRepository.java | 8 +- .../repository/settings/IdeRepository.java | 8 +- .../settings/UserIdeMappingRepository.java | 10 +- .../repository/specs/MessageSpecs.java | 26 +-- .../artemis/repository/specs/UserSpecs.java | 10 +- .../TutorialGroupFreePeriodRepository.java | 10 +- .../TutorialGroupNotificationRepository.java | 8 +- .../TutorialGroupRegistrationRepository.java | 16 +- .../TutorialGroupRepository.java | 12 +- .../TutorialGroupScheduleRepository.java | 10 +- .../TutorialGroupSessionRepository.java | 16 +- ...TutorialGroupsConfigurationRepository.java | 8 +- .../ArtemisAuthenticationProvider.java | 2 +- .../ArtemisAuthenticationProviderImpl.java | 8 +- ...ArtemisInternalAuthenticationProvider.java | 10 +- .../security/DomainUserDetailsService.java | 8 +- .../artemis/security/OAuth2JWKSService.java | 4 +- .../aet}/artemis/security/Role.java | 2 +- .../aet}/artemis/security/SecurityUtils.java | 14 +- .../security/SpringSecurityAuditorAware.java | 6 +- .../security/UserNotActivatedException.java | 2 +- .../security/annotations/AnnotationUtils.java | 2 +- .../security/annotations/EnforceAdmin.java | 2 +- .../annotations/EnforceAtLeastEditor.java | 2 +- .../annotations/EnforceAtLeastInstructor.java | 2 +- .../annotations/EnforceAtLeastStudent.java | 2 +- .../annotations/EnforceAtLeastTutor.java | 2 +- .../security/annotations/EnforceNothing.java | 2 +- .../EnforceRoleInResourceAspect.java | 12 +- .../security/annotations/ManualConfig.java | 2 +- .../EnforceAtLeastEditorInCourse.java | 4 +- .../EnforceAtLeastInstructorInCourse.java | 4 +- .../EnforceAtLeastStudentInCourse.java | 4 +- .../EnforceAtLeastTutorInCourse.java | 4 +- .../EnforceRoleInCourse.java | 4 +- .../EnforceRoleInCourseAspect.java | 10 +- .../EnforceAtLeastEditorInExercise.java | 4 +- .../EnforceAtLeastInstructorInExercise.java | 4 +- .../EnforceAtLeastStudentInExercise.java | 4 +- .../EnforceAtLeastTutorInExercise.java | 4 +- .../EnforceRoleInExercise.java | 4 +- .../EnforceRoleInExerciseAspect.java | 10 +- .../artemis/security/jwt/JWTConfigurer.java | 2 +- .../security/jwt/JWTCookieService.java | 6 +- .../aet}/artemis/security/jwt/JWTFilter.java | 2 +- .../artemis/security/jwt/TokenProvider.java | 6 +- .../security/lti/Lti13TokenRetriever.java | 4 +- .../aet}/artemis/security/package-info.java | 2 +- .../AbstractQuizSubmissionService.java | 12 +- .../aet}/artemis/service/AccountService.java | 10 +- .../service/AssessmentDashboardService.java | 28 +-- .../artemis/service/AssessmentService.java | 54 ++--- .../service/AttachmentUnitService.java | 28 +-- .../artemis/service/AuditEventService.java | 8 +- .../service/AuthorizationCheckService.java | 40 ++-- .../aet}/artemis/service/BonusService.java | 22 +- .../artemis/service/BuildLogEntryService.java | 16 +- .../service/ComplaintResponseService.java | 34 +-- .../artemis/service/ComplaintService.java | 46 ++-- .../service/ConductAgreementService.java | 12 +- .../service/ConsistencyCheckService.java | 14 +- .../CourseScoreCalculationService.java | 52 ++--- .../aet}/artemis/service/CourseService.java | 126 +++++----- ...ragAndDropQuizAnswerConversionService.java | 12 +- .../artemis/service/EmailSummaryService.java | 20 +- .../service/ExampleSubmissionService.java | 34 +-- .../artemis/service/ExerciseDateService.java | 16 +- .../service/ExerciseDeletionService.java | 46 ++-- .../service/ExerciseImportService.java | 22 +- .../service/ExerciseLifecycleService.java | 16 +- .../service/ExerciseScoresChartService.java | 28 +-- .../aet}/artemis/service/ExerciseService.java | 92 ++++---- .../service/ExerciseSpecificationService.java | 34 +-- .../aet}/artemis/service/FeedbackService.java | 10 +- .../aet}/artemis/service/FilePathService.java | 10 +- .../aet}/artemis/service/FileService.java | 12 +- .../FileUploadExerciseImportService.java | 18 +- .../service/FileUploadExerciseService.java | 16 +- .../service/FileUploadSubmissionService.java | 46 ++-- .../artemis/service/GradingScaleService.java | 20 +- .../service/HazelcastPathSerializer.java | 6 +- .../artemis/service/InternalUrlService.java | 6 +- .../service/LearningObjectService.java | 28 +-- .../artemis/service/LectureImportService.java | 32 +-- .../aet}/artemis/service/LectureService.java | 36 +-- .../service/LectureUnitProcessingService.java | 20 +- .../artemis/service/LectureUnitService.java | 38 +-- .../artemis/service/LegalDocumentService.java | 18 +- .../ModelingExerciseImportService.java | 30 +-- .../service/ModelingExerciseService.java | 24 +- .../service/ModelingSubmissionService.java | 50 ++-- .../OnlineCourseConfigurationService.java | 18 +- .../artemis/service/OrganizationService.java | 12 +- .../service/ParticipantScoreService.java | 46 ++-- ...articipationAuthorizationCheckService.java | 28 +-- .../ParticipationLifecycleService.java | 10 +- .../artemis/service/ParticipationService.java | 76 +++--- .../ParticipationVcsAccessTokenService.java | 16 +- .../aet}/artemis/service/PlantUmlService.java | 4 +- .../PresentationPointsCalculationService.java | 12 +- .../aet}/artemis/service/ProfileService.java | 8 +- .../aet}/artemis/service/RatingService.java | 16 +- .../service/ResourceLoaderService.java | 6 +- .../aet}/artemis/service/ResultService.java | 80 +++---- .../artemis/service/SlideSplitterService.java | 12 +- .../service/StaticCodeAnalysisService.java | 16 +- .../artemis/service/StatisticsService.java | 48 ++-- .../service/SubmissionPolicyService.java | 44 ++-- .../artemis/service/SubmissionService.java | 72 +++--- .../service/SubmissionVersionService.java | 20 +- .../service/SystemNotificationService.java | 12 +- .../aet}/artemis/service/TeamService.java | 40 ++-- .../service/TextAssessmentService.java | 34 +-- .../artemis/service/TextBlockService.java | 10 +- .../service/TextExerciseFeedbackService.java | 30 +-- .../service/TextExerciseImportService.java | 42 ++-- .../artemis/service/TextExerciseService.java | 18 +- .../service/TextSubmissionService.java | 40 ++-- .../aet}/artemis/service/TimeService.java | 4 +- .../service/TitleCacheEvictionService.java | 20 +- .../artemis/service/TutorEffortService.java | 10 +- .../service/TutorLeaderboardService.java | 30 +-- .../service/TutorParticipationService.java | 32 +-- .../aet}/artemis/service/UriService.java | 8 +- .../service/WebsocketMessagingService.java | 4 +- .../aet}/artemis/service/ZipFileService.java | 4 +- .../service/archival/ArchivalReportEntry.java | 4 +- .../service/compass/CompassService.java | 36 +-- .../service/compass/assessment/Context.java | 2 +- .../compass/controller/FeedbackSelector.java | 14 +- .../controller/ModelClusterFactory.java | 26 +-- .../compass/strategy/NameSimilarity.java | 2 +- .../service/compass/umlmodel/Similarity.java | 2 +- .../compass/umlmodel/UMLContainerElement.java | 4 +- .../service/compass/umlmodel/UMLDiagram.java | 2 +- .../service/compass/umlmodel/UMLElement.java | 4 +- .../umlmodel/activity/UMLActivity.java | 8 +- .../umlmodel/activity/UMLActivityDiagram.java | 6 +- .../umlmodel/activity/UMLActivityElement.java | 4 +- .../umlmodel/activity/UMLActivityNode.java | 8 +- .../umlmodel/activity/UMLControlFlow.java | 6 +- .../compass/umlmodel/bpmn/BPMNAnnotation.java | 8 +- .../umlmodel/bpmn/BPMNCallActivity.java | 8 +- .../compass/umlmodel/bpmn/BPMNDataObject.java | 8 +- .../compass/umlmodel/bpmn/BPMNDataStore.java | 8 +- .../compass/umlmodel/bpmn/BPMNDiagram.java | 6 +- .../compass/umlmodel/bpmn/BPMNEndEvent.java | 8 +- .../compass/umlmodel/bpmn/BPMNFlow.java | 8 +- .../compass/umlmodel/bpmn/BPMNGateway.java | 8 +- .../compass/umlmodel/bpmn/BPMNGroup.java | 10 +- .../umlmodel/bpmn/BPMNIntermediateEvent.java | 8 +- .../compass/umlmodel/bpmn/BPMNPool.java | 10 +- .../compass/umlmodel/bpmn/BPMNStartEvent.java | 8 +- .../compass/umlmodel/bpmn/BPMNSubprocess.java | 8 +- .../compass/umlmodel/bpmn/BPMNSwimlane.java | 10 +- .../compass/umlmodel/bpmn/BPMNTask.java | 8 +- .../umlmodel/bpmn/BPMNTransaction.java | 8 +- .../umlmodel/classdiagram/UMLAttribute.java | 10 +- .../umlmodel/classdiagram/UMLClass.java | 10 +- .../classdiagram/UMLClassDiagram.java | 6 +- .../umlmodel/classdiagram/UMLMethod.java | 10 +- .../umlmodel/classdiagram/UMLPackage.java | 10 +- .../classdiagram/UMLRelationship.java | 14 +- .../umlmodel/communication/Direction.java | 5 + .../UMLCommunicationDiagram.java | 8 +- .../communication/UMLCommunicationLink.java | 10 +- .../umlmodel/communication/UMLMessage.java | 4 +- .../umlmodel/component/UMLComponent.java | 14 +- .../component/UMLComponentDiagram.java | 6 +- .../component/UMLComponentInterface.java | 12 +- .../component/UMLComponentRelationship.java | 8 +- .../umlmodel/deployment/UMLArtifact.java | 12 +- .../deployment/UMLDeploymentComponent.java | 4 +- .../deployment/UMLDeploymentDiagram.java | 12 +- .../deployment/UMLDeploymentInterface.java | 4 +- .../compass/umlmodel/deployment/UMLNode.java | 14 +- .../compass/umlmodel/flowchart/Flowchart.java | 6 +- .../umlmodel/flowchart/FlowchartDecision.java | 8 +- .../umlmodel/flowchart/FlowchartFlowline.java | 6 +- .../flowchart/FlowchartFunctionCall.java | 8 +- .../flowchart/FlowchartInputOutput.java | 8 +- .../umlmodel/flowchart/FlowchartProcess.java | 8 +- .../umlmodel/flowchart/FlowchartTerminal.java | 8 +- .../compass/umlmodel/object/UMLObject.java | 8 +- .../umlmodel/object/UMLObjectAttribute.java | 4 +- .../umlmodel/object/UMLObjectDiagram.java | 6 +- .../umlmodel/object/UMLObjectLink.java | 6 +- .../umlmodel/object/UMLObjectMethod.java | 4 +- .../umlmodel/parsers/UMLModelParser.java | 14 +- .../parsers/v2/ActivityDiagramParser.java | 26 +-- .../parsers/v2/ClassDiagramParser.java | 44 ++-- .../v2/CommunicationDiagramParser.java | 22 +- .../parsers/v2/ComponentDiagramParser.java | 28 +-- .../parsers/v2/DeploymentDiagramParser.java | 24 +- .../umlmodel/parsers/v2/FlowchartParser.java | 30 +-- .../parsers/v2/ObjectDiagramParser.java | 32 +-- .../umlmodel/parsers/v2/PetriNetParser.java | 24 +- .../umlmodel/parsers/v2/SyntaxTreeParser.java | 24 +- .../umlmodel/parsers/v2/UMLModelV2Parser.java | 12 +- .../parsers/v2/UseCaseDiagramParser.java | 30 +-- .../parsers/v3/ActivityDiagramParser.java | 26 +-- .../parsers/v3/BPMNDiagramParser.java | 52 ++--- .../parsers/v3/ClassDiagramParser.java | 44 ++-- .../v3/CommunicationDiagramParser.java | 22 +- .../parsers/v3/ComponentDiagramParser.java | 28 +-- .../parsers/v3/DeploymentDiagramParser.java | 24 +- .../umlmodel/parsers/v3/FlowchartParser.java | 30 +-- .../parsers/v3/ObjectDiagramParser.java | 32 +-- .../umlmodel/parsers/v3/PetriNetParser.java | 24 +- .../umlmodel/parsers/v3/SyntaxTreeParser.java | 24 +- .../umlmodel/parsers/v3/UMLModelV3Parser.java | 12 +- .../parsers/v3/UseCaseDiagramParser.java | 30 +-- .../compass/umlmodel/petrinet/PetriNet.java | 6 +- .../umlmodel/petrinet/PetriNetArc.java | 8 +- .../umlmodel/petrinet/PetriNetPlace.java | 8 +- .../umlmodel/petrinet/PetriNetTransition.java | 8 +- .../umlmodel/syntaxtree/SyntaxTree.java | 6 +- .../umlmodel/syntaxtree/SyntaxTreeLink.java | 6 +- .../syntaxtree/SyntaxTreeNonterminal.java | 8 +- .../syntaxtree/SyntaxTreeTerminal.java | 8 +- .../compass/umlmodel/usecase/UMLActor.java | 8 +- .../umlmodel/usecase/UMLSystemBoundary.java | 10 +- .../compass/umlmodel/usecase/UMLUseCase.java | 12 +- .../usecase/UMLUseCaseAssociation.java | 10 +- .../umlmodel/usecase/UMLUseCaseDiagram.java | 6 +- .../compass/utils/CompassConfiguration.java | 2 +- .../service/compass/utils/JSONMapping.java | 2 +- .../compass/utils/SimilarityUtils.java | 4 +- .../competency/CompetencyJolService.java | 24 +- .../competency/CompetencyProgressService.java | 50 ++-- .../competency/CompetencyRelationService.java | 16 +- .../service/competency/CompetencyService.java | 32 +-- .../competency/CourseCompetencyService.java | 52 ++--- .../competency/KnowledgeAreaService.java | 12 +- .../competency/PrerequisiteService.java | 32 +-- .../StandardizedCompetencyService.java | 32 +-- .../connectors/AbstractGitService.java | 8 +- .../BuildScriptGenerationService.java | 4 +- .../BuildScriptProviderService.java | 14 +- .../service/connectors/ConnectorHealth.java | 2 +- .../GenericBuildScriptGenerationService.java | 6 +- .../service/connectors/GitService.java | 40 ++-- .../connectors/HazelcastHealthIndicator.java | 6 +- .../service/connectors/SAML2Service.java | 22 +- .../service/connectors/aeolus/Action.java | 2 +- .../connectors/aeolus/ActionDeserializer.java | 2 +- .../aeolus/AeolusBuildPlanService.java | 24 +- .../AeolusBuildScriptGenerationService.java | 12 +- .../connectors/aeolus/AeolusRepository.java | 2 +- .../connectors/aeolus/AeolusResult.java | 2 +- .../aeolus/AeolusTemplateService.java | 18 +- .../connectors/aeolus/DockerConfig.java | 2 +- .../connectors/aeolus/PlatformAction.java | 2 +- .../connectors/aeolus/ScriptAction.java | 2 +- .../service/connectors/aeolus/Windfile.java | 2 +- .../connectors/aeolus/WindfileMetadata.java | 2 +- .../dto/AeolusGenerationResponseDTO.java | 2 +- .../apollon/ApollonConversionService.java | 4 +- .../apollon/ApollonHealthIndicator.java | 4 +- .../apollon/dto/ApollonModelDTO.java | 2 +- .../connectors/athena/AthenaConnector.java | 6 +- .../athena/AthenaDTOConverterService.java | 52 ++--- .../athena/AthenaFeedbackSendingService.java | 16 +- .../AthenaFeedbackSuggestionsService.java | 28 +-- .../athena/AthenaHealthIndicator.java | 4 +- .../athena/AthenaModuleService.java | 14 +- .../athena/AthenaRepositoryExportService.java | 24 +- .../AthenaSubmissionSelectionService.java | 8 +- .../AthenaSubmissionSendingService.java | 14 +- .../ci/AbstractBuildPlanCreator.java | 8 +- ...actContinuousIntegrationResultService.java | 30 +-- .../AbstractContinuousIntegrationService.java | 2 +- .../service/connectors/ci/CIPermission.java | 2 +- .../ci/CIUserManagementService.java | 8 +- .../ContinuousIntegrationResultService.java | 16 +- ...nuousIntegrationServerHealthIndicator.java | 4 +- .../ci/ContinuousIntegrationService.java | 20 +- .../ContinuousIntegrationTriggerService.java | 8 +- .../ContinuousIntegrationUpdateService.java | 2 +- .../ci/notification/BuildLogParseUtils.java | 4 +- .../ci/notification/dto/CommitDTO.java | 2 +- .../ci/notification/dto/TestCaseDTO.java | 6 +- .../dto/TestCaseDetailMessageDTO.java | 2 +- .../ci/notification/dto/TestResultsDTO.java | 14 +- .../ci/notification/dto/TestSuiteDTO.java | 6 +- .../dto/TestwiseCoverageReportDTO.java | 2 +- ...bstractGitLabAuthorizationInterceptor.java | 2 +- .../GitLabAuthorizationInterceptor.java | 2 +- .../connectors/gitlab/GitLabException.java | 4 +- ...bPersonalAccessTokenManagementService.java | 10 +- .../connectors/gitlab/GitLabService.java | 42 ++-- .../GitLabUserDoesNotExistException.java | 2 +- .../gitlab/GitLabUserManagementService.java | 18 +- .../gitlab/GitlabInfoContributor.java | 4 +- .../gitlab/dto/GitLabCommitDTO.java | 2 +- ...LabPersonalAccessTokenListResponseDTO.java | 2 +- .../GitLabPersonalAccessTokenRequestDTO.java | 2 +- .../GitLabPersonalAccessTokenResponseDTO.java | 2 +- .../gitlab/dto/GitLabProjectDTO.java | 2 +- .../gitlab/dto/GitLabPushNotificationDTO.java | 2 +- .../gitlab/dto/GitLabRepositoryDTO.java | 2 +- .../GitLabCIAuthorizationInterceptor.java | 4 +- .../gitlabci/GitLabCIBuildPlanService.java | 14 +- .../gitlabci/GitLabCIInfoContributor.java | 4 +- ...abCIProgrammingLanguageFeatureService.java | 16 +- .../gitlabci/GitLabCIResultService.java | 34 +-- .../connectors/gitlabci/GitLabCIService.java | 40 ++-- .../gitlabci/GitLabCITriggerService.java | 18 +- .../GitLabCIUserManagementService.java | 10 +- .../JenkinsAuthorizationInterceptor.java | 2 +- .../connectors/jenkins/JenkinsEndpoints.java | 4 +- .../jenkins/JenkinsInfoContributor.java | 4 +- .../jenkins/JenkinsInternalUrlService.java | 4 +- ...kinsProgrammingLanguageFeatureService.java | 38 +-- .../jenkins/JenkinsResultService.java | 34 +-- .../connectors/jenkins/JenkinsService.java | 40 ++-- .../jenkins/JenkinsTriggerService.java | 8 +- .../jenkins/JenkinsUserManagementService.java | 26 +-- .../jenkins/JenkinsXmlConfigBuilder.java | 8 +- .../jenkins/JenkinsXmlFileUtils.java | 2 +- .../build_plan/JenkinsBuildPlanCreator.java | 18 +- .../JenkinsBuildPlanLinkInfoContributor.java | 4 +- .../build_plan/JenkinsBuildPlanService.java | 58 ++--- .../build_plan/JenkinsBuildPlanUtils.java | 2 +- .../JenkinsPipelineScriptCreator.java | 22 +- .../jenkins/dto/JenkinsUserDTO.java | 2 +- .../jenkins/jobs/JenkinsJobPermission.java | 2 +- .../jobs/JenkinsJobPermissionsService.java | 2 +- .../jobs/JenkinsJobPermissionsUtils.java | 2 +- .../jenkins/jobs/JenkinsJobService.java | 6 +- .../ldap/LdapAuthenticationProvider.java | 26 +-- .../LocalCIBuildConfigurationService.java | 18 +- .../localci/LocalCIInfoContributor.java | 6 +- .../LocalCIPriorityQueueComparator.java | 4 +- ...alCIProgrammingLanguageFeatureService.java | 42 ++-- .../localci/LocalCIQueueWebsocketService.java | 8 +- .../LocalCIResultProcessingService.java | 50 ++-- .../localci/LocalCIResultService.java | 30 +-- .../connectors/localci/LocalCIService.java | 36 +-- .../localci/LocalCITriggerService.java | 60 ++--- .../localci/SharedQueueManagementService.java | 20 +- .../buildagent/BuildAgentDockerService.java | 10 +- .../buildagent/BuildAgentSshKeyService.java | 4 +- .../buildagent/BuildJobContainerService.java | 14 +- .../buildagent/BuildJobExecutionService.java | 40 ++-- .../buildagent/BuildJobGitService.java | 12 +- .../buildagent/BuildJobManagementService.java | 12 +- .../localci/buildagent/BuildLogsMap.java | 6 +- .../SharedQueueProcessingService.java | 20 +- .../buildagent/TestResultXmlParser.java | 4 +- .../localci/dto/BuildAgentInformation.java | 2 +- .../connectors/localci/dto/BuildConfig.java | 6 +- .../localci/dto/BuildJobQueueItem.java | 6 +- .../connectors/localci/dto/BuildResult.java | 14 +- .../localci/dto/DockerImageBuild.java | 2 +- .../connectors/localci/dto/JobTimingInfo.java | 2 +- .../localci/dto/RepositoryInfo.java | 4 +- .../localci/dto/ResultBuildJob.java | 2 +- .../localci/dto/ResultQueueItem.java | 4 +- .../localci/scaparser/ReportParser.java | 18 +- .../scaparser/exception/ParserException.java | 2 +- .../exception/UnsupportedToolException.java | 2 +- .../scaparser/strategy/CheckstyleParser.java | 8 +- .../scaparser/strategy/PMDCPDParser.java | 8 +- .../localci/scaparser/strategy/PMDParser.java | 8 +- .../scaparser/strategy/ParserPolicy.java | 6 +- .../scaparser/strategy/ParserStrategy.java | 4 +- .../scaparser/strategy/SpotbugsParser.java | 8 +- .../localci/scaparser/utils/FileUtils.java | 2 +- .../localci/scaparser/utils/ReportUtils.java | 8 +- .../localvc/LocalVCFetchFilter.java | 10 +- .../localvc/LocalVCInfoContributor.java | 6 +- ...CPersonalAccessTokenManagementService.java | 4 +- .../localvc/LocalVCPostPushHook.java | 6 +- .../localvc/LocalVCPrePushHook.java | 6 +- .../connectors/localvc/LocalVCPushFilter.java | 10 +- .../localvc/LocalVCRepositoryUri.java | 6 +- .../connectors/localvc/LocalVCService.java | 38 +-- .../localvc/LocalVCServletService.java | 66 +++--- .../ExternalPasswordResetInfoContributor.java | 6 +- .../service/connectors/lti/Lti13Service.java | 48 ++-- .../connectors/lti/LtiDeepLinkingService.java | 14 +- .../lti/LtiDynamicRegistrationService.java | 14 +- .../connectors/lti/LtiNewResultService.java | 4 +- .../service/connectors/lti/LtiService.java | 28 +-- .../pyris/PyrisConnectorException.java | 2 +- .../pyris/PyrisConnectorService.java | 14 +- .../connectors/pyris/PyrisDTOService.java | 32 +-- .../pyris/PyrisHealthIndicator.java | 6 +- .../connectors/pyris/PyrisJobService.java | 14 +- .../pyris/PyrisPipelineService.java | 44 ++-- .../pyris/PyrisStatusUpdateService.java | 30 +-- .../connectors/pyris/PyrisWebhookService.java | 24 +- .../pyris/dto/PyrisErrorResponseDTO.java | 2 +- .../pyris/dto/PyrisHealthStatusDTO.java | 2 +- .../connectors/pyris/dto/PyrisModelDTO.java | 2 +- .../pyris/dto/PyrisPipelineExecutionDTO.java | 4 +- .../PyrisPipelineExecutionSettingsDTO.java | 2 +- ...PyrisChatPipelineExecutionBaseDataDTO.java | 10 +- .../dto/chat/PyrisChatStatusUpdateDTO.java | 4 +- .../PyrisCourseChatPipelineExecutionDTO.java | 16 +- ...PyrisExerciseChatPipelineExecutionDTO.java | 16 +- .../PyrisCompetencyExtractionInputDTO.java | 2 +- ...petencyExtractionPipelineExecutionDTO.java | 6 +- .../PyrisCompetencyRecommendationDTO.java | 4 +- .../PyrisCompetencyStatusUpdateDTO.java | 4 +- .../pyris/dto/data/PyrisBuildLogEntryDTO.java | 2 +- .../pyris/dto/data/PyrisCompetencyDTO.java | 8 +- .../pyris/dto/data/PyrisCourseDTO.java | 4 +- .../pyris/dto/data/PyrisExamDTO.java | 6 +- ...yrisExerciseWithStudentSubmissionsDTO.java | 16 +- .../dto/data/PyrisExtendedCourseDTO.java | 8 +- .../pyris/dto/data/PyrisFeedbackDTO.java | 2 +- .../dto/data/PyrisImageMessageContentDTO.java | 2 +- .../dto/data/PyrisJsonMessageContentDTO.java | 2 +- .../pyris/dto/data/PyrisLectureDTO.java | 2 +- .../pyris/dto/data/PyrisLectureUnitDTO.java | 2 +- .../dto/data/PyrisMessageContentBaseDTO.java | 2 +- .../pyris/dto/data/PyrisMessageDTO.java | 12 +- .../dto/data/PyrisProgrammingExerciseDTO.java | 4 +- .../pyris/dto/data/PyrisResultDTO.java | 2 +- .../dto/data/PyrisStudentSubmissionDTO.java | 2 +- .../pyris/dto/data/PyrisSubmissionDTO.java | 2 +- .../dto/data/PyrisTextMessageContentDTO.java | 2 +- .../pyris/dto/data/PyrisUserDTO.java | 4 +- .../PyrisLectureIngestionStatusUpdateDTO.java | 4 +- .../PyrisLectureUnitWebhookDTO.java | 2 +- ...isWebhookLectureIngestionExecutionDTO.java | 6 +- .../pyris/dto/status/PyrisStageDTO.java | 2 +- .../pyris/dto/status/PyrisStageState.java | 2 +- .../pyris/job/CompetencyExtractionJob.java | 4 +- .../connectors/pyris/job/CourseChatJob.java | 4 +- .../connectors/pyris/job/ExerciseChatJob.java | 6 +- .../pyris/job/IngestionWebhookJob.java | 6 +- .../connectors/pyris/job/PyrisJob.java | 8 +- .../vcs/AbstractVersionControlService.java | 28 +-- .../vcs/VcsTokenManagementService.java | 4 +- .../vcs/VcsTokenRenewalService.java | 10 +- .../vcs/VcsUserManagementService.java | 8 +- .../VersionControlRepositoryPermission.java | 2 +- .../VersionControlServerHealthIndicator.java | 4 +- .../connectors/vcs/VersionControlService.java | 18 +- .../AbstractBuildResultNotificationDTO.java | 8 +- .../service/dto/AuditingEntityDTO.java | 2 +- .../service/dto/BuildJobDTOInterface.java | 2 +- .../service/dto/BuildJobResultCountDTO.java | 4 +- .../service/dto/BuildJobsStatisticsDTO.java | 4 +- .../artemis/service/dto/ComplaintAction.java | 2 +- .../service/dto/ComplaintRequestDTO.java | 4 +- .../dto/ComplaintResponseUpdateDTO.java | 2 +- .../service/dto/ConsistencyErrorDTO.java | 4 +- .../CoverageReportAndSubmissionDateDTO.java | 4 +- .../service/dto/FinishedBuildJobDTO.java | 18 +- .../service/dto/GradingCriterionDTO.java | 4 +- .../service/dto/GradingInstructionDTO.java | 4 +- .../service/dto/MaxAndReachablePoints.java | 2 +- .../service/dto/PasswordChangeDTO.java | 2 +- ...mmingSubmissionIdAndSubmissionDateDTO.java | 2 +- .../service/dto/ResponsibleUserDTO.java | 2 +- .../service/dto/StaticCodeAnalysisIssue.java | 2 +- .../dto/StaticCodeAnalysisReportDTO.java | 4 +- .../aet}/artemis/service/dto/StudentDTO.java | 4 +- .../service/dto/TeamSearchUserDTO.java | 6 +- .../artemis/service/dto/TestCaseBaseDTO.java | 2 +- .../aet}/artemis/service/dto/UserDTO.java | 16 +- .../service/dto/UserInitializationDTO.java | 2 +- .../service/dto/UserPublicInfoDTO.java | 6 +- .../aet}/artemis/service/dto/UserRoleDTO.java | 4 +- .../service/dto/athena/ExerciseBaseDTO.java | 2 +- .../service/dto/athena/FeedbackBaseDTO.java | 2 +- .../dto/athena/ModelingExerciseDTO.java | 6 +- .../dto/athena/ModelingFeedbackDTO.java | 4 +- .../dto/athena/ModelingSubmissionDTO.java | 4 +- .../dto/athena/ProgrammingExerciseDTO.java | 8 +- .../dto/athena/ProgrammingFeedbackDTO.java | 4 +- .../dto/athena/ProgrammingSubmissionDTO.java | 6 +- .../service/dto/athena/SubmissionBaseDTO.java | 2 +- .../service/dto/athena/TextExerciseDTO.java | 6 +- .../service/dto/athena/TextFeedbackDTO.java | 6 +- .../service/dto/athena/TextSubmissionDTO.java | 4 +- .../aet/artemis/service/dto/package-info.java | 4 + .../service/exam/ExamAccessService.java | 36 +-- .../artemis/service/exam/ExamDateService.java | 22 +- .../service/exam/ExamDeletionService.java | 46 ++-- .../service/exam/ExamImportService.java | 64 ++--- .../service/exam/ExamLiveEventsService.java | 30 +-- .../exam/ExamQuizQuestionsGenerator.java | 4 +- .../artemis/service/exam/ExamQuizService.java | 32 +-- .../service/exam/ExamRegistrationService.java | 46 ++-- .../artemis/service/exam/ExamService.java | 158 ++++++------- .../service/exam/ExamSessionService.java | 30 +-- .../service/exam/ExamSubmissionService.java | 32 +-- .../artemis/service/exam/ExamUserService.java | 22 +- .../artemis/service/exam/ImageExtractor.java | 6 +- .../exam/StudentExamAccessService.java | 26 +-- .../service/exam/StudentExamService.java | 94 ++++---- .../export/CourseExamExportService.java | 38 +-- .../DataExportCommunicationDataService.java | 24 +- .../export/DataExportCreationService.java | 28 +-- .../export/DataExportExamCreationService.java | 26 +-- .../DataExportExerciseCreationService.java | 62 ++--- ...DataExportQuizExerciseCreationService.java | 36 +-- .../export/DataExportScienceEventService.java | 10 +- .../service/export/DataExportService.java | 28 +-- .../service/export/DataExportUtil.java | 4 +- .../ExerciseWithSubmissionsExportService.java | 14 +- ...dExerciseWithSubmissionsExportService.java | 12 +- .../FileUploadSubmissionExportService.java | 16 +- ...gExerciseWithSubmissionsExportService.java | 12 +- .../ModelingSubmissionExportService.java | 16 +- .../ProgrammingExerciseExportService.java | 54 ++--- ...zExerciseWithSubmissionsExportService.java | 16 +- .../export/SubmissionExportService.java | 28 +-- ...tExerciseWithSubmissionsExportService.java | 12 +- .../export/TextSubmissionExportService.java | 16 +- .../aet}/artemis/service/feature/Feature.java | 2 +- .../service/feature/FeatureToggle.java | 2 +- .../service/feature/FeatureToggleAspect.java | 6 +- .../feature/FeatureToggleInfoContributor.java | 4 +- .../service/feature/FeatureToggleService.java | 6 +- .../service/hestia/CodeHintService.java | 24 +- .../service/hestia/ExerciseHintService.java | 34 +-- ...ogrammingExerciseGitDiffReportService.java | 42 ++-- .../ProgrammingExerciseTaskService.java | 16 +- .../hestia/TestwiseCoverageService.java | 32 +-- .../behavioral/BehavioralBlackboard.java | 8 +- ...ioralSolutionEntryGenerationException.java | 2 +- .../behavioral/BehavioralTestCaseService.java | 44 ++-- .../hestia/behavioral/GroupedFile.java | 8 +- ...ddUncoveredLinesAsPotentialCodeBlocks.java | 8 +- .../BehavioralKnowledgeSource.java | 6 +- .../knowledgesource/CombineChangeBlocks.java | 6 +- .../CreateCommonChangeBlocks.java | 8 +- .../CreateSolutionEntries.java | 8 +- .../DropRemovedGitDiffEntries.java | 8 +- .../knowledgesource/ExtractChangedLines.java | 8 +- .../knowledgesource/ExtractCoveredLines.java | 8 +- .../knowledgesource/FindCommonLines.java | 6 +- ...dCoverageEntriesByFilePathAndTestCase.java | 12 +- .../knowledgesource/InsertFileContents.java | 8 +- .../structural/StructuralAttribute.java | 2 +- .../hestia/structural/StructuralClass.java | 2 +- .../structural/StructuralClassElements.java | 2 +- .../structural/StructuralConstructor.java | 2 +- .../hestia/structural/StructuralElement.java | 2 +- .../hestia/structural/StructuralMethod.java | 2 +- ...turalSolutionEntryGenerationException.java | 2 +- .../structural/StructuralTestCaseService.java | 22 +- .../service/icl/ArtemisGitServletService.java | 16 +- .../icl/GitPublickeyAuthenticatorService.java | 14 +- .../icl/SshGitCommandFactoryService.java | 8 +- .../icl/SshGitLocationResolverService.java | 22 +- .../iris/IrisCompetencyGenerationService.java | 22 +- .../iris/IrisDefaultTemplateService.java | 8 +- .../service/iris/IrisMessageService.java | 10 +- .../service/iris/IrisRateLimitService.java | 10 +- .../service/iris/IrisSessionService.java | 30 +-- .../iris/dto/IrisChatWebsocketDTO.java | 8 +- .../dto/IrisCombinedChatSubSettingsDTO.java | 4 +- ...nedCompetencyGenerationSubSettingsDTO.java | 4 +- .../dto/IrisCombinedHestiaSubSettingsDTO.java | 4 +- ...ombinedLectureIngestionSubSettingsDTO.java | 2 +- .../iris/dto/IrisCombinedSettingsDTO.java | 2 +- .../service/iris/exception/IrisException.java | 6 +- .../exception/IrisForbiddenException.java | 2 +- .../IrisInternalPyrisErrorException.java | 2 +- .../IrisRateLimitExceededException.java | 4 +- .../AbstractIrisChatSessionService.java | 6 +- .../IrisButtonBasedFeatureInterface.java | 4 +- .../IrisChatBasedFeatureInterface.java | 6 +- .../session/IrisCourseChatSessionService.java | 42 ++-- .../IrisExerciseChatSessionService.java | 50 ++-- .../session/IrisHestiaSessionService.java | 24 +- .../IrisRateLimitedFeatureInterface.java | 8 + .../iris/session/IrisSubFeatureInterface.java | 6 +- .../iris/settings/IrisSettingsService.java | 52 ++--- .../iris/settings/IrisSubSettingsService.java | 30 +-- .../websocket/IrisChatWebsocketService.java | 12 +- .../iris/websocket/IrisWebsocketService.java | 4 +- .../aet}/artemis/service/ldap/LdapConfig.java | 2 +- .../artemis/service/ldap/LdapUserDto.java | 6 +- .../artemis/service/ldap/LdapUserService.java | 12 +- .../LearningPathNavigationService.java | 24 +- .../learningpath/LearningPathNgxService.java | 24 +- .../LearningPathRecommendationService.java | 38 +-- .../learningpath/LearningPathService.java | 66 +++--- .../linkpreview/LinkPreviewService.java | 14 +- .../service/linkpreview/ogparser/Content.java | 2 +- .../linkpreview/ogparser/OgParser.java | 6 +- .../linkpreview/ogparser/OpenGraph.java | 2 +- .../ogparser/htmlparser/OgMetaElement.java | 2 +- .../htmlparser/OgMetaElementHtmlParser.java | 2 +- .../service/listeners/ResultListener.java | 14 +- ...DistributedInstanceMessageSendService.java | 2 +- .../InstanceMessageReceiveService.java | 36 +-- .../messaging/InstanceMessageSendService.java | 2 +- .../MainInstanceMessageSendService.java | 4 +- .../service/messaging/MessageTopic.java | 2 +- .../service/metis/AnswerMessageService.java | 56 ++--- .../metis/ConversationMessagingService.java | 76 +++--- .../artemis/service/metis/PostingService.java | 50 ++-- .../service/metis/ReactionService.java | 40 ++-- .../metis/conversation/ChannelService.java | 32 +-- .../conversation/ConversationDTOService.java | 44 ++-- .../conversation/ConversationService.java | 52 ++--- .../metis/conversation/GroupChatService.java | 22 +- .../conversation/OneToOneChatService.java | 18 +- .../auth/ChannelAuthorizationService.java | 24 +- .../ConversationAuthorizationService.java | 12 +- .../auth/GroupChatAuthorizationService.java | 24 +- .../OneToOneChatAuthorizationService.java | 22 +- .../errors/ChannelNameDuplicateException.java | 8 +- .../PostSimilarityComparisonStrategy.java | 4 +- ...TitleJaccardSimilarityCompareStrategy.java | 6 +- .../metrics/LearningMetricsService.java | 38 +-- .../ConversationNotificationService.java | 40 ++-- .../GeneralInstantNotificationService.java | 22 +- .../GroupNotificationScheduleService.java | 12 +- .../GroupNotificationService.java | 76 +++--- .../InstantNotificationService.java | 6 +- .../notifications/MailSendingService.java | 6 +- .../service/notifications/MailService.java | 30 +-- ...ificationSettingsCommunicationChannel.java | 2 +- .../NotificationSettingsService.java | 104 ++++----- .../SingleUserNotificationService.java | 128 +++++----- .../TutorialGroupNotificationService.java | 26 +-- .../ApplePushNotificationService.java | 8 +- .../FirebasePushNotificationService.java | 8 +- .../FirebaseRelayNotificationRequests.java | 2 +- .../PushNotificationService.java | 20 +- .../RelayNotificationRequest.java | 2 +- .../cit/aet/artemis/service/package-info.java | 4 + ...sPlagiarismControlPostContentProvider.java | 4 +- .../ContinuousPlagiarismControlService.java | 38 +-- .../ModelingPlagiarismDetectionService.java | 30 +-- .../PlagiarismAnswerPostService.java | 42 ++-- .../plagiarism/PlagiarismCaseService.java | 30 +-- .../PlagiarismDetectionConfigHelper.java | 6 +- .../PlagiarismDetectionService.java | 20 +- .../plagiarism/PlagiarismPostService.java | 46 ++-- .../service/plagiarism/PlagiarismService.java | 30 +-- .../PlagiarismWebsocketService.java | 8 +- ...portedForPlagiarismDetectionException.java | 4 +- ...ProgrammingPlagiarismDetectionService.java | 40 ++-- .../TextPlagiarismDetectionService.java | 26 +-- .../cache/PlagiarismCacheService.java | 6 +- .../AuxiliaryRepositoryService.java | 20 +- .../programming/CommitHistoryService.java | 18 +- .../DefaultTemplateUpgradeService.java | 6 +- .../JavaTemplateUpgradeService.java | 20 +- .../ProgrammingAssessmentService.java | 56 ++--- ...mingExerciseCodeReviewFeedbackService.java | 32 +-- ...ammingExerciseFeedbackCreationService.java | 50 ++-- .../ProgrammingExerciseGradingService.java | 96 ++++---- ...ProgrammingExerciseImportBasicService.java | 56 ++--- ...grammingExerciseImportFromFileService.java | 34 +-- .../ProgrammingExerciseImportService.java | 46 ++-- ...ogrammingExerciseParticipationService.java | 60 ++--- .../ProgrammingExerciseRepositoryService.java | 40 ++-- .../ProgrammingExerciseService.java | 122 +++++----- .../ProgrammingExerciseTestCaseService.java | 28 +-- .../ProgrammingLanguageFeature.java | 6 +- .../ProgrammingLanguageFeatureService.java | 4 +- .../ProgrammingMessagingService.java | 48 ++-- .../ProgrammingSubmissionService.java | 104 ++++----- .../ProgrammingTriggerService.java | 56 ++--- .../programming/RepositoryAccessService.java | 24 +- .../RepositoryParticipationService.java | 22 +- .../programming/RepositoryService.java | 32 +-- .../TemplateUpgradePolicyService.java | 6 +- .../programming/TemplateUpgradeService.java | 4 +- .../service/quiz/QuizBatchService.java | 26 +-- .../quiz/QuizExerciseImportService.java | 48 ++-- .../service/quiz/QuizExerciseService.java | 58 ++--- .../service/quiz/QuizMessagingService.java | 16 +- .../artemis/service/quiz/QuizPoolService.java | 28 +-- .../service/quiz/QuizResultService.java | 32 +-- .../service/quiz/QuizScheduleService.java | 28 +-- .../artemis/service/quiz/QuizService.java | 34 +-- .../service/quiz/QuizStatisticService.java | 30 +-- .../service/quiz/QuizSubmissionService.java | 52 ++--- .../scheduled/AthenaScheduleService.java | 18 +- ...aticProgrammingExerciseCleanupService.java | 22 +- .../scheduled/DataExportScheduleService.java | 22 +- .../scheduled/IExerciseScheduleService.java | 4 +- .../ModelingExerciseScheduleService.java | 24 +- .../NotificationScheduleService.java | 22 +- .../ParticipantScoreScheduleService.java | 46 ++-- .../ProgrammingExerciseScheduleService.java | 62 ++--- ...tionDeviceConfigurationCleanupService.java | 6 +- .../service/scheduled/ScheduleService.java | 22 +- .../scheduled/UserScheduleService.java | 12 +- .../WeeklyEmailSummaryScheduleService.java | 12 +- .../service/science/ScienceEventService.java | 10 +- .../service/team/TeamImportStrategy.java | 8 +- .../team/strategies/CreateOnlyStrategy.java | 12 +- .../strategies/PurgeExistingStrategy.java | 12 +- .../service/telemetry/TelemetryService.java | 6 +- .../service/theia/TheiaInfoContributor.java | 6 +- ...TutorialGroupChannelManagementService.java | 24 +- .../TutorialGroupFreePeriodService.java | 16 +- .../TutorialGroupScheduleService.java | 28 +-- .../tutorialgroups/TutorialGroupService.java | 46 ++-- .../TutorialGroupsConfigurationService.java | 20 +- .../service/user/AuthorityService.java | 20 +- .../artemis/service/user/PasswordService.java | 6 +- .../service/user/UserCreationService.java | 36 +-- .../user/UserManagementInfoContributor.java | 6 +- .../artemis/service/user/UserService.java | 80 +++---- .../service/util/CommonsMultipartFile.java | 2 +- .../ExamExerciseStartPreparationStatus.java | 2 +- .../service/util/HttpRequestUtils.java | 2 +- .../artemis/service/util/RoundingUtil.java | 4 +- .../artemis/service/util/TimeLogUtil.java | 2 +- .../aet}/artemis/service/util/TimeUtil.java | 2 +- .../aet}/artemis/service/util/Tuple.java | 2 +- .../aet}/artemis/service/util/UrlUtils.java | 2 +- .../JavaClassDiff.java | 2 +- .../JavaClassDiffSerializer.java | 2 +- .../OracleGenerator.java | 4 +- .../SerializerUtil.java | 2 +- .../InetSocketAddressValidator.java | 2 +- .../TeamAssignmentConfigValidator.java | 6 +- .../TeamAssignmentConfigConstraints.java | 6 +- .../artemis/web/filter/ApiVersionFilter.java | 2 +- .../web/filter/CachingHttpHeadersFilter.java | 2 +- .../artemis/web/filter/Lti13LaunchFilter.java | 14 +- .../aet}/artemis/web/filter/SpaWebFilter.java | 2 +- .../web/rest/AbstractSubmissionResource.java | 22 +- .../artemis/web/rest/AccountResource.java | 36 +-- .../web/rest/AeolusTemplateResource.java | 14 +- .../AndroidAppSiteAssociationResource.java | 6 +- .../web/rest/ApollonConversionResource.java | 8 +- .../web/rest/ApollonDiagramResource.java | 26 +-- .../rest/AppleAppSiteAssociationResource.java | 6 +- .../artemis/web/rest/AssessmentResource.java | 42 ++-- .../aet}/artemis/web/rest/AthenaResource.java | 58 ++--- .../artemis/web/rest/AttachmentResource.java | 36 +-- .../aet}/artemis/web/rest/BonusResource.java | 46 ++-- .../artemis/web/rest/ComplaintResource.java | 68 +++--- .../web/rest/ComplaintResponseResource.java | 26 +-- .../web/rest/ConsistencyCheckResource.java | 18 +- .../aet}/artemis/web/rest/CourseResource.java | 126 +++++----- .../web/rest/CustomMetricsExtension.java | 4 +- .../artemis/web/rest/DataExportResource.java | 24 +- .../artemis/web/rest/ExamLockResource.java | 8 +- .../aet}/artemis/web/rest/ExamResource.java | 130 +++++------ .../artemis/web/rest/ExamUserResource.java | 32 +-- .../web/rest/ExampleSubmissionResource.java | 40 ++-- .../web/rest/ExerciseGroupResource.java | 38 +-- .../artemis/web/rest/ExerciseResource.java | 84 +++---- .../web/rest/ExerciseScoresChartResource.java | 26 +-- .../aet}/artemis/web/rest/FileResource.java | 80 +++---- .../rest/FileUploadAssessmentResource.java | 44 ++-- .../web/rest/FileUploadExerciseResource.java | 76 +++--- .../rest/FileUploadSubmissionResource.java | 62 ++--- .../web/rest/GitDiffReportParserService.java | 6 +- .../artemis/web/rest/GradeStepResource.java | 44 ++-- .../web/rest/GradingScaleResource.java | 34 +-- .../web/rest/GuidedTourSettingsResource.java | 12 +- .../web/rest/LearningPathResource.java | 66 +++--- .../artemis/web/rest/LectureResource.java | 54 ++--- .../web/rest/LongFeedbackTextResource.java | 18 +- .../aet}/artemis/web/rest/LtiResource.java | 20 +- .../artemis/web/rest/MetricsResource.java | 12 +- .../web/rest/ModelingAssessmentResource.java | 48 ++-- .../web/rest/ModelingExerciseResource.java | 88 +++---- .../web/rest/ModelingSubmissionResource.java | 56 ++--- .../web/rest/NotificationResource.java | 28 +-- .../rest/NotificationSettingsResource.java | 22 +- .../web/rest/OrganizationResource.java | 10 +- .../web/rest/ParticipantScoreResource.java | 26 +-- .../web/rest/ParticipationResource.java | 120 +++++----- .../artemis/web/rest/PlantUmlResource.java | 10 +- .../web/rest/QuizExerciseResource.java | 104 ++++----- .../web/rest/QuizParticipationResource.java | 32 +-- .../artemis/web/rest/QuizPoolResource.java | 22 +- .../web/rest/QuizSubmissionResource.java | 48 ++-- .../aet}/artemis/web/rest/RatingResource.java | 34 +-- .../aet}/artemis/web/rest/ResultResource.java | 64 ++--- .../web/rest/StaticCodeAnalysisResource.java | 26 +-- .../artemis/web/rest/StatisticsResource.java | 30 +-- .../artemis/web/rest/StudentExamResource.java | 88 +++---- .../web/rest/SubmissionPolicyResource.java | 28 +-- .../artemis/web/rest/SubmissionResource.java | 60 ++--- .../web/rest/SystemNotificationResource.java | 12 +- .../aet}/artemis/web/rest/TeamResource.java | 64 ++--- .../web/rest/TextAssessmentEventResource.java | 30 +-- .../web/rest/TextAssessmentResource.java | 76 +++--- .../web/rest/TextExerciseResource.java | 124 +++++----- .../web/rest/TextSubmissionResource.java | 52 ++--- .../artemis/web/rest/TutorEffortResource.java | 26 +-- .../web/rest/TutorParticipationResource.java | 30 +-- .../aet}/artemis/web/rest/UserResource.java | 22 +- .../admin/AdminBuildJobQueueResource.java | 24 +- .../web/rest/admin/AdminCourseResource.java | 34 +-- .../rest/admin/AdminDataExportResource.java | 10 +- .../web/rest/admin/AdminExamResource.java | 10 +- .../web/rest/admin/AdminExerciseResource.java | 10 +- .../web/rest/admin/AdminImprintResource.java | 12 +- .../admin/AdminLtiConfigurationResource.java | 16 +- .../admin/AdminModelingExerciseResource.java | 16 +- .../rest/admin/AdminOrganizationResource.java | 24 +- .../admin/AdminPrivacyStatementResource.java | 12 +- .../AdminStandardizedCompetencyResource.java | 26 +-- .../rest/admin/AdminStatisticsResource.java | 14 +- .../AdminSystemNotificationResource.java | 18 +- .../AdminTextAssessmentEventResource.java | 10 +- .../web/rest/admin/AdminUserResource.java | 36 +-- .../artemis/web/rest/admin/AuditResource.java | 8 +- .../web/rest/admin/FeatureToggleResource.java | 10 +- .../artemis/web/rest/admin/LogResource.java | 8 +- .../admin/iris/AdminIrisSettingsResource.java | 8 +- .../rest/competency/CompetencyResource.java | 44 ++-- .../competency/CourseCompetencyResource.java | 66 +++--- .../rest/competency/PrerequisiteResource.java | 46 ++-- .../StandardizedCompetencyResource.java | 26 +-- .../web/rest/dto/AssessmentUpdateBaseDTO.java | 6 +- .../web/rest/dto/AssessmentUpdateDTO.java | 6 +- .../artemis/web/rest/dto/BonusExampleDTO.java | 2 +- .../artemis/web/rest/dto/BonusResultDTO.java | 6 +- .../web/rest/dto/BonusSourceResultDTO.java | 4 +- .../web/rest/dto/BuildLogStatisticsDTO.java | 2 +- .../dto/BuildPlanCheckoutDirectoriesDTO.java | 2 +- .../web/rest/dto/CheckoutDirectoriesDTO.java | 2 +- .../artemis/web/rest/dto/CommitInfoDTO.java | 2 +- .../rest/dto/CourseCompetencyProgressDTO.java | 2 +- .../web/rest/dto/CourseContentCount.java | 2 +- .../web/rest/dto/CourseForDashboardDTO.java | 4 +- .../web/rest/dto/CourseForImportDTO.java | 4 +- .../dto/CourseManagementDetailViewDTO.java | 2 +- ...nagementOverviewExerciseStatisticsDTO.java | 2 +- ...CourseManagementOverviewStatisticsDTO.java | 2 +- .../dto/CourseManagementStatisticsDTO.java | 4 +- .../artemis/web/rest/dto/CourseScoresDTO.java | 4 +- .../artemis/web/rest/dto/CourseWithIdDTO.java | 2 +- .../web/rest/dto/CoursesForDashboardDTO.java | 4 +- .../artemis/web/rest/dto/DataExportDTO.java | 4 +- .../artemis/web/rest/dto/DueDateStat.java | 2 +- .../web/rest/dto/ExamChecklistDTO.java | 2 +- .../web/rest/dto/ExamInformationDTO.java | 2 +- .../artemis/web/rest/dto/ExamScoresDTO.java | 4 +- .../artemis/web/rest/dto/ExamSessionDTO.java | 4 +- .../rest/dto/ExamUserAttendanceCheckDTO.java | 2 +- .../artemis/web/rest/dto/ExamUserDTO.java | 2 +- .../web/rest/dto/ExamUsersNotFoundDTO.java | 2 +- .../web/rest/dto/ExamWithIdAndCourseDTO.java | 2 +- .../artemis/web/rest/dto/ExerciseDTO.java | 6 +- .../web/rest/dto/ExerciseDetailsDTO.java | 10 +- ...ExerciseForPlagiarismCasesOverviewDTO.java | 2 +- .../dto/ExerciseGroupWithIdAndExamDTO.java | 2 +- .../dto/ExerciseManagementStatisticsDTO.java | 2 +- .../ExerciseScoresAggregatedInformation.java | 2 +- .../web/rest/dto/ExerciseScoresDTO.java | 6 +- .../aet}/artemis/web/rest/dto/FileMove.java | 2 +- .../web/rest/dto/FileUploadAssessmentDTO.java | 4 +- .../aet}/artemis/web/rest/dto/GradeDTO.java | 4 +- .../artemis/web/rest/dto/GradeStepsDTO.java | 6 +- .../aet}/artemis/web/rest/dto/ImageDTO.java | 2 +- .../aet}/artemis/web/rest/dto/ImprintDTO.java | 6 +- .../rest/dto/LectureUnitInformationDTO.java | 2 +- .../web/rest/dto/LectureUnitSplitDTO.java | 2 +- .../artemis/web/rest/dto/LegalDocument.java | 6 +- .../artemis/web/rest/dto/LinkPreviewDTO.java | 2 +- .../web/rest/dto/ModelingAssessmentDTO.java | 4 +- .../artemis/web/rest/dto/OnlineCourseDTO.java | 2 +- .../web/rest/dto/OnlineResourceDTO.java | 2 +- .../web/rest/dto/OrganizationCountDTO.java | 2 +- .../web/rest/dto/ParticipationDTO.java | 12 +- .../web/rest/dto/ParticipationResultDTO.java | 2 +- .../dto/ParticipationWithExerciseDTO.java | 4 +- .../web/rest/dto/PostContextFilterDTO.java | 6 +- .../web/rest/dto/PrivacyStatementDTO.java | 6 +- .../ProgrammingExerciseGitDiffEntryDTO.java | 4 +- .../ProgrammingExerciseGitDiffReportDTO.java | 4 +- ...ogrammingExerciseGradingStatisticsDTO.java | 4 +- .../ProgrammingExerciseResetOptionsDTO.java | 2 +- .../dto/ProgrammingExerciseTestCaseDTO.java | 4 +- .../web/rest/dto/QuizBatchJoinDTO.java | 2 +- .../rest/dto/RepositoryExportOptionsDTO.java | 2 +- .../web/rest/dto/RepositoryStatusDTO.java | 2 +- .../web/rest/dto/RepositoryStatusDTOType.java | 2 +- .../web/rest/dto/RequestDataExportDTO.java | 4 +- .../aet}/artemis/web/rest/dto/ResultDTO.java | 14 +- ...esultWithPointsPerGradingCriterionDTO.java | 6 +- .../web/rest/dto/SearchResultPageDTO.java | 4 +- .../web/rest/dto/StatsForDashboardDTO.java | 2 +- .../web/rest/dto/StudentExamWithGradeDTO.java | 10 +- .../StudentExamWithIdAndExamAndUserDTO.java | 2 +- .../artemis/web/rest/dto/SubmissionDTO.java | 8 +- .../rest/dto/SubmissionExportOptionsDTO.java | 2 +- .../web/rest/dto/SubmissionVersionDTO.java | 4 +- .../rest/dto/SubmissionWithComplaintDTO.java | 6 +- .../dto/SubmissionWithParticipationDTO.java | 4 +- .../rest/dto/SuspiciousExamSessionsDTO.java | 2 +- .../web/rest/dto/TextAssessmentDTO.java | 6 +- .../web/rest/dto/TextAssessmentUpdateDTO.java | 8 +- .../web/rest/dto/TutorLeaderboardDTO.java | 2 +- .../rest/dto/TutorialGroupFreePeriodDTO.java | 2 +- .../web/rest/dto/UserWithIdAndLoginDTO.java | 2 +- .../competency/CompetencyGraphEdgeDTO.java | 6 +- .../competency/CompetencyGraphNodeDTO.java | 4 +- .../CompetencyImportResponseDTO.java | 6 +- .../rest/dto/competency/CompetencyJolDTO.java | 4 +- .../dto/competency/CompetencyJolPairDTO.java | 4 +- .../dto/competency/CompetencyNameDTO.java | 8 +- .../CompetencyProgressForLearningPathDTO.java | 2 +- .../dto/competency/CompetencyRelationDTO.java | 6 +- .../CompetencyWithTailRelationDTO.java | 6 +- .../LearningPathCompetencyGraphDTO.java | 2 +- .../dto/competency/LearningPathHealthDTO.java | 2 +- .../LearningPathInformationDTO.java | 6 +- .../competency/LearningPathNavigationDTO.java | 2 +- .../LearningPathNavigationObjectDTO.java | 8 +- .../LearningPathNavigationOverviewDTO.java | 2 +- .../competency/LinkedCourseCompetencyDTO.java | 4 +- .../dto/competency/NgxLearningPathDTO.java | 2 +- .../ExamAttendanceCheckEventDTO.java | 6 +- .../dto/examevent/ExamLiveEventBaseDTO.java | 4 +- .../ExamWideAnnouncementEventDTO.java | 4 +- .../ProblemStatementUpdateEventDTO.java | 4 +- .../examevent/WorkingTimeUpdateEventDTO.java | 4 +- .../rest/dto/feedback/FeedbackDetailDTO.java | 2 +- ...tureUnitForLearningPathNodeDetailsDTO.java | 4 +- ...mpetencyExerciseMasteryCalculationDTO.java | 4 +- .../dto/metrics/CompetencyInformationDTO.java | 4 +- .../dto/metrics/CompetencyProgressDTO.java | 2 +- .../metrics/CompetencyStudentMetricsDTO.java | 4 +- .../dto/metrics/ExerciseInformationDTO.java | 12 +- .../metrics/ExerciseStudentMetricsDTO.java | 2 +- .../metrics/LectureUnitInformationDTO.java | 4 +- .../metrics/LectureUnitStudentMetricsDTO.java | 2 +- .../rest/dto/metrics/MapEntryLongLong.java | 2 +- .../dto/metrics/ResourceTimestampDTO.java | 2 +- .../web/rest/dto/metrics/ScoreDTO.java | 2 +- .../rest/dto/metrics/StudentMetricsDTO.java | 2 +- .../CompetencyPageableSearchDTO.java | 4 +- .../FinishedBuildJobPageableSearchDTO.java | 4 +- .../dto/pageablesearch/PageableSearchDTO.java | 6 +- .../SearchTermPageableSearchDTO.java | 4 +- .../pageablesearch/UserPageableSearchDTO.java | 2 +- .../dto/plagiarism/PlagiarismCaseInfoDTO.java | 4 +- .../PlagiarismComparisonStatusDTO.java | 4 +- .../dto/plagiarism/PlagiarismResultDTO.java | 8 +- .../dto/plagiarism/PlagiarismVerdictDTO.java | 4 +- .../web/rest/dto/science/ScienceEventDTO.java | 4 +- .../artemis/web/rest/dto/score/ScoreDTO.java | 4 +- .../web/rest/dto/score/StudentScoreSum.java | 2 +- .../web/rest/dto/score/StudentScoresDTO.java | 2 +- .../web/rest/dto/score/TeamScoreSum.java | 2 +- .../web/rest/dto/settings/ide/IdeDTO.java | 4 +- .../rest/dto/settings/ide/IdeMappingDTO.java | 6 +- .../KnowledgeAreaRequestDTO.java | 4 +- .../KnowledgeAreaResultDTO.java | 4 +- .../dto/standardizedCompetency/SourceDTO.java | 4 +- .../StandardizedCompetencyCatalogDTO.java | 10 +- .../StandardizedCompetencyRequestDTO.java | 6 +- .../StandardizedCompetencyResultDTO.java | 6 +- .../rest/dto/user/UserNameAndLoginDTO.java | 4 +- .../errors/AccessForbiddenAlertException.java | 2 +- .../rest/errors/AccessForbiddenException.java | 2 +- .../rest/errors/BadRequestAlertException.java | 2 +- .../rest/errors/CaptchaRequiredException.java | 2 +- .../ComplaintResponseLockedException.java | 6 +- .../web/rest/errors/ConflictException.java | 2 +- .../errors/EmailAlreadyUsedException.java | 2 +- .../rest/errors/EntityNotFoundException.java | 2 +- .../web/rest/errors/ErrorConstants.java | 2 +- .../errors/ExamConfigurationException.java | 4 +- .../web/rest/errors/ExceptionTranslator.java | 6 +- .../artemis/web/rest/errors/FieldErrorVM.java | 2 +- .../web/rest/errors/HttpStatusException.java | 2 +- .../InternalServerErrorAlertException.java | 2 +- .../errors/InternalServerErrorException.java | 2 +- .../errors/LoginAlreadyUsedException.java | 2 +- ...PasswordViolatesRequirementsException.java | 2 +- .../errors/ServiceUnavailableException.java | 2 +- .../StudentsAlreadyAssignedException.java | 8 +- .../StudentsAppearMultipleTimesException.java | 6 +- .../errors/StudentsNotFoundException.java | 4 +- .../artemis/web/rest/errors/package-info.java | 2 +- .../web/rest/hestia/CodeHintResource.java | 26 +-- .../rest/hestia/CoverageReportResource.java | 12 +- .../web/rest/hestia/ExerciseHintResource.java | 38 +-- ...grammingExerciseGitDiffReportResource.java | 42 ++-- ...grammingExerciseSolutionEntryResource.java | 44 ++-- .../ProgrammingExerciseTaskResource.java | 20 +- .../iris/IrisCourseChatSessionResource.java | 24 +- .../iris/IrisExerciseChatSessionResource.java | 28 +-- .../web/rest/iris/IrisMessageResource.java | 22 +- .../web/rest/iris/IrisModelsResource.java | 12 +- .../artemis/web/rest/iris/IrisResource.java | 10 +- .../web/rest/iris/IrisSettingsResource.java | 28 +-- .../artemis/web/rest/iris/IrisStatusDTO.java | 4 +- .../rest/lecture/AttachmentUnitResource.java | 40 ++-- .../rest/lecture/ExerciseUnitResource.java | 20 +- .../web/rest/lecture/LectureUnitResource.java | 40 ++-- .../web/rest/lecture/OnlineUnitResource.java | 28 +-- .../web/rest/lecture/TextUnitResource.java | 24 +- .../web/rest/lecture/VideoUnitResource.java | 24 +- .../rest/localci/BuildJobQueueResource.java | 32 +-- .../web/rest/localci/BuildLogResource.java | 8 +- .../web/rest/localci/BuildPlanResource.java | 20 +- .../web/rest/metis/AnswerMessageResource.java | 12 +- .../metis/ConversationMessageResource.java | 28 +-- .../web/rest/metis/ReactionResource.java | 10 +- .../metis/conversation/ChannelResource.java | 50 ++-- .../ConversationManagementResource.java | 8 +- .../conversation/ConversationResource.java | 40 ++-- .../metis/conversation/GroupChatResource.java | 36 +-- .../conversation/OneToOneChatResource.java | 26 +-- .../metis/conversation/dtos/ChannelDTO.java | 6 +- .../dtos/ChannelIdAndNameDTO.java | 2 +- .../conversation/dtos/ConversationDTO.java | 4 +- .../dtos/ConversationUserDTO.java | 6 +- .../metis/conversation/dtos/GroupChatDTO.java | 4 +- .../conversation/dtos/OneToOneChatDTO.java | 4 +- .../rest/ogparser/LinkPreviewResource.java | 10 +- .../web/rest/open/PublicAccountResource.java | 38 +-- .../rest/open/PublicBuildPlanResource.java | 14 +- .../web/rest/open/PublicImprintResource.java | 12 +- .../web/rest/open/PublicLtiResource.java | 8 +- .../rest/open/PublicOAuth2JWKSResource.java | 8 +- .../open/PublicPrivacyStatementResource.java | 12 +- .../PublicProgrammingSubmissionResource.java | 38 +-- .../open/PublicPyrisStatusUpdateResource.java | 28 +-- .../web/rest/open/PublicResultResource.java | 36 +-- .../PublicSystemNotificationResource.java | 10 +- .../web/rest/open/PublicTimeResource.java | 6 +- .../web/rest/open/PublicUserJwtResource.java | 18 +- .../aet/artemis/web/rest/package-info.java | 4 + .../PlagiarismAnswerPostResource.java | 12 +- .../plagiarism/PlagiarismCaseResource.java | 36 +-- .../plagiarism/PlagiarismPostResource.java | 20 +- .../rest/plagiarism/PlagiarismResource.java | 42 ++-- .../PlagiarismResultResponseBuilder.java | 12 +- .../plagiarism/PlagiarismResultStats.java | 2 +- .../ProgrammingAssessmentResource.java | 50 ++-- ...ogrammingExerciseExportImportResource.java | 88 +++---- .../ProgrammingExerciseGradingResource.java | 30 +-- .../ProgrammingExerciseLockResource.java | 6 +- ...grammingExerciseParticipationResource.java | 62 ++--- ...ProgrammingExercisePlagiarismResource.java | 36 +-- .../ProgrammingExerciseResource.java | 112 ++++----- .../ProgrammingExerciseResourceErrorKeys.java | 2 +- .../ProgrammingExerciseTestCaseResource.java | 30 +-- .../ProgrammingSubmissionResource.java | 74 +++--- .../PushNotificationRegisterBody.java | 6 + .../PushNotificationRegisterDTO.java | 2 +- .../PushNotificationResource.java | 20 +- .../PushNotificationUnregisterRequest.java | 4 +- .../web/rest/repository/FileSubmission.java | 2 +- .../rest/repository/FileSubmissionError.java | 2 +- .../rest/repository/RepositoryActionType.java | 2 +- ...grammingExerciseParticipationResource.java | 72 +++--- .../rest/repository/RepositoryResource.java | 52 ++--- .../repository/TestRepositoryResource.java | 44 ++-- .../repository/util/RepositoryExecutor.java | 2 +- .../web/rest/science/ScienceResource.java | 14 +- .../rest/science/ScienceSettingsResource.java | 18 +- .../settings/ide/IdeSettingsResource.java | 24 +- .../theia/TheiaConfigurationResource.java | 10 +- .../TutorialGroupFreePeriodResource.java | 30 +-- .../tutorialgroups/TutorialGroupResource.java | 62 ++--- .../TutorialGroupSessionResource.java | 44 ++-- .../TutorialGroupsConfigurationResource.java | 28 +-- .../ScheduleOverlapsWithSessionException.java | 10 +- .../SessionOverlapsWithSessionException.java | 10 +- .../aet}/artemis/web/rest/util/DateUtil.java | 2 +- .../artemis/web/rest/util/HeaderUtil.java | 2 +- .../aet}/artemis/web/rest/util/PageUtil.java | 6 +- .../artemis/web/rest/util/ResponseUtil.java | 4 +- .../artemis/web/rest/util/StringUtil.java | 2 +- .../artemis/web/rest/vm/KeyAndPasswordVM.java | 2 +- .../aet}/artemis/web/rest/vm/LoggerVM.java | 2 +- .../aet}/artemis/web/rest/vm/LoginVM.java | 10 +- .../artemis/web/rest/vm/ManagedUserVM.java | 8 +- .../artemis/web/rest/vm/package-info.java | 2 +- .../web/websocket/ResultWebsocketService.java | 32 +-- .../artemis/web/websocket/WebsocketError.java | 2 +- .../websocket/dto/OnlineTeamStudentDTO.java | 2 +- .../ProgrammingExerciseTestCaseStateDTO.java | 2 +- .../web/websocket/dto/SubmissionPatch.java | 4 +- .../websocket/dto/SubmissionPatchPayload.java | 2 +- .../websocket/dto/SubmissionSyncPayload.java | 6 +- .../websocket/dto/TeamAssignmentPayload.java | 8 +- .../dto/metis/ConversationWebsocketDTO.java | 4 +- .../websocket/dto/metis/MetisCrudAction.java | 2 +- .../web/websocket/dto/metis/PostDTO.java | 6 +- .../web/websocket/dto/package-info.java | 2 +- .../LocalCIWebsocketMessagingService.java | 10 +- .../artemis/web/websocket/package-info.java | 2 +- .../BuildTriggerWebsocketError.java | 4 +- .../ParticipationTeamWebsocketService.java | 42 ++-- .../websocket/team/TeamWebsocketService.java | 16 +- .../artemis/config/audit/package-info.java | 4 - .../in/www1/artemis/domain/package-info.java | 4 - .../repository/MigrationChangeRepository.java | 7 - .../iris/IrisTemplateRepository.java | 11 - .../www1/artemis/repository/package-info.java | 4 - .../umlmodel/communication/Direction.java | 5 - .../artemis/service/dto/package-info.java | 4 - .../IrisRateLimitedFeatureInterface.java | 8 - .../in/www1/artemis/service/package-info.java | 4 - .../www1/artemis/web/rest/package-info.java | 4 - .../PushNotificationRegisterBody.java | 6 - src/main/resources/config/application-dev.yml | 2 +- src/main/resources/config/application.yml | 2 +- src/main/resources/logback-spring.xml | 2 +- .../http/server/HttpServerText.properties | 30 --- .../course-dashboard.service.ts | 20 +- .../AbstractArtemisIntegrationTest.java | 84 +++---- .../aet}/artemis/AbstractAthenaTest.java | 4 +- ...ringIntegrationGitlabCIGitlabSamlTest.java | 36 +-- ...tractSpringIntegrationIndependentTest.java | 32 +-- ...actSpringIntegrationJenkinsGitlabTest.java | 56 ++--- ...ctSpringIntegrationLocalCILocalVCTest.java | 56 ++--- .../artemis/BuildPlanIntegrationTest.java | 20 +- .../aet}/artemis/ClientForwardTest.java | 10 +- .../ContentVersionIntegrationTest.java | 4 +- .../aet}/artemis/DatabaseQueryCountTest.java | 16 +- .../aet}/artemis/FileIntegrationTest.java | 32 +-- .../GuidedTourSettingResourceTest.java | 8 +- .../ImprintResourceIntegrationTest.java | 6 +- .../InetSocketAddressValidatorTest.java | 4 +- .../artemis/LogResourceIntegrationTest.java | 4 +- .../LongFeedbackResourceIntegrationTest.java | 16 +- .../artemis/Lti13LaunchIntegrationTest.java | 4 +- .../LtiDeepLinkingIntegrationTest.java | 10 +- .../aet}/artemis/LtiIntegrationTest.java | 6 +- .../aet}/artemis/LtiQuizIntegrationTest.java | 30 +-- .../ManagementResourceIntegrationTest.java | 26 +-- .../aet}/artemis/MetricsIntegrationTest.java | 22 +- .../artemis/OAuth2JWKSIntegrationTest.java | 12 +- ...ivacyStatementResourceIntegrationTest.java | 6 +- .../artemis/StatisticsIntegrationTest.java | 50 ++-- .../aet}/artemis/StringUtilTest.java | 6 +- .../aet}/artemis/StudentScoreUtilService.java | 12 +- .../AbstractArchitectureTest.java | 4 +- .../architecture/ArchitectureTest.java | 16 +- ...EnforceRoleInResourceArchitectureTest.java | 6 +- .../FeedbackArchitectureTest.java | 8 +- .../RepositoryArchitectureTest.java | 16 +- .../ResourceArchitectureTest.java | 4 +- .../architecture/ServiceArchitectureTest.java | 20 +- .../AbstractEnforceRoleInResourceTest.java | 10 +- .../aspects/EnforceRoleInCourseTest.java | 2 +- .../aspects/EnforceRoleInExerciseTest.java | 6 +- .../EnforceRoleInCourseResource.java | 16 +- .../EnforceRoleInExerciseResource.java | 16 +- .../AssessmentComplaintIntegrationTest.java | 76 +++--- ...ssessmentTeamComplaintIntegrationTest.java | 52 ++--- .../ComplaintResponseIntegrationTest.java | 42 ++-- .../assessment/ComplaintUtilService.java | 30 +-- .../ExampleSubmissionIntegrationTest.java | 52 ++--- .../ExerciseScoresChartIntegrationTest.java | 28 +-- .../assessment/GradeStepIntegrationTest.java | 38 +-- .../assessment/GradingScaleFactory.java | 10 +- .../GradingScaleIntegrationTest.java | 24 +- .../assessment/GradingScaleUtilService.java | 14 +- .../ParticipantScoreIntegrationTest.java | 50 ++-- .../RatingResourceIntegrationTest.java | 26 +-- .../ResultServiceIntegrationTest.java | 102 ++++---- .../TutorEffortIntegrationTest.java | 24 +- ...utorLeaderboardServiceIntegrationTest.java | 20 +- .../TutorParticipationIntegrationTest.java | 48 ++-- ...rParticipationResourceIntegrationTest.java | 20 +- .../AuthenticationIntegrationTestHelper.java | 2 +- ...InternalAuthenticationIntegrationTest.java | 44 ++-- .../LdapAuthenticationIntegrationTest.java | 32 +-- .../UserAccountLocalVcsIntegrationTest.java | 6 +- .../UserJenkinsGitlabIntegrationTest.java | 28 +-- .../UserSaml2IntegrationTest.java | 14 +- .../AuthorizationArchitectureTest.java | 20 +- ...tionGeneralAndIndependentEndpointTest.java | 4 +- ...AuthorizationGitlabCISamlEndpointTest.java | 4 +- ...uthorizationJenkinsGitlabEndpointTest.java | 4 +- ...thorizationLocalCILocalVCEndpointTest.java | 4 +- .../AuthorizationTestService.java | 20 +- .../aet}/artemis/bonus/BonusFactory.java | 8 +- .../artemis/bonus/BonusIntegrationTest.java | 38 +-- ...CompetencyPrerequisiteIntegrationTest.java | 60 ++--- .../competency/CompetencyIntegrationTest.java | 12 +- .../CompetencyJolIntegrationTest.java | 14 +- .../CompetencyProgressUtilService.java | 10 +- .../competency/CompetencyUtilService.java | 30 +-- .../CourseCompetencyIntegrationTest.java | 108 ++++----- .../LearningPathIntegrationTest.java | 86 +++---- .../competency/LearningPathUtilService.java | 20 +- .../PrerequisiteIntegrationTest.java | 12 +- .../competency/PrerequisiteUtilService.java | 8 +- ...StandardizedCompetencyIntegrationTest.java | 36 +-- .../StandardizedCompetencyUtilService.java | 18 +- .../config/HibernatePropertiesConfig.java | 2 +- .../aet}/artemis/config/MetricsBeanTest.java | 46 ++-- .../ProgrammingLanguageConfigurationTest.java | 6 +- .../config/TheiaConfigurationTest.java | 6 +- .../TopicSubscriptionInterceptorTest.java | 12 +- .../connector/AeolusRequestMockProvider.java | 4 +- .../connector/AthenaRequestMockProvider.java | 2 +- .../connector/GitlabRequestMockProvider.java | 64 ++--- .../connector/IrisRequestMockProvider.java | 12 +- .../connector/JenkinsRequestMockProvider.java | 16 +- .../apollon/ApollonRequestMockProvider.java | 2 +- ...eolusBuildScriptGenerationServiceTest.java | 26 +-- .../artemis/connectors/AeolusServiceTest.java | 42 ++-- .../AeolusTemplateResourceTest.java | 12 +- .../aet}/artemis/connectors/AeolusTest.java | 16 +- .../ApollonConversionServiceTest.java | 8 +- .../ApollonHealthIndicatorTest.java | 8 +- .../artemis/connectors/Lti13ServiceTest.java | 52 ++--- .../LtiDynamicRegistrationServiceTest.java | 18 +- .../connectors/LtiNewResultServiceTest.java | 14 +- .../artemis/connectors/LtiServiceTest.java | 28 +-- .../aet}/artemis/course/CourseFactory.java | 12 +- .../artemis/course/CourseTestService.java | 218 +++++++++--------- .../artemis/course/CourseUtilService.java | 144 ++++++------ .../DataExportResourceIntegrationTest.java | 16 +- .../aet}/artemis/domain/CourseTest.java | 4 +- .../aet}/artemis/domain/ExerciseTest.java | 30 +-- .../aet}/artemis/domain/FeedbackTest.java | 4 +- .../artemis/domain/GuidedTourSettingTest.java | 2 +- .../aet}/artemis/domain/ObjectMethodTest.java | 34 +-- .../domain/ObjectMethodTestExclusions.java | 6 +- .../aet}/artemis/domain/ResultTest.java | 18 +- .../domain/ShortAnswerQuestionTest.java | 8 +- .../domain/ShortAnswerSubmittedTextTest.java | 8 +- .../domain/enumeration/ExerciseTypeTest.java | 14 +- .../GroupNotificationFactoryTest.java | 150 ++++++------ ...tificationPlaceholderArchitectureTest.java | 4 +- .../NotificationPlaceholderSignatureTest.java | 8 +- .../SingleUserNotificationFactoryTest.java | 132 +++++------ .../TutorialGroupNotificationFactoryTest.java | 20 +- .../ResultListenerIntegrationTest.java | 46 ++-- .../aet}/artemis/exam/ExamFactory.java | 22 +- .../artemis/exam/ExamIntegrationTest.java | 112 ++++----- .../ExamParticipationIntegrationTest.java | 114 ++++----- .../exam/ExamRegistrationIntegrationTest.java | 34 +-- .../exam/ExamSessionIntegrationTest.java | 16 +- .../aet}/artemis/exam/ExamStartTest.java | 66 +++--- .../artemis/exam/ExamUserIntegrationTest.java | 28 +-- .../aet}/artemis/exam/ExamUtilService.java | 108 ++++----- ...ciseGroupIntegrationJenkinsGitlabTest.java | 38 +-- .../exam/ProgrammingExamIntegrationTest.java | 38 +-- .../artemis/exam/QuizPoolIntegrationTest.java | 26 +-- .../exam/StudentExamIntegrationTest.java | 166 ++++++------- .../artemis/exam/TestExamIntegrationTest.java | 28 +-- .../AthenaExerciseIntegrationTest.java | 34 +-- .../AthenaResourceIntegrationTest.java | 66 +++--- .../artemis/exercise/ExerciseFactory.java | 22 +- .../exercise/ExerciseIntegrationTest.java | 74 +++--- .../artemis/exercise/ExerciseUtilService.java | 88 +++---- .../exercise/GradingCriterionUtil.java | 8 +- .../FileUploadAssessmentIntegrationTest.java | 64 ++--- .../fileupload/FileUploadExerciseFactory.java | 10 +- .../FileUploadExerciseIntegrationTest.java | 62 ++--- .../FileUploadExerciseUtilService.java | 40 ++-- .../FileUploadSubmissionIntegrationTest.java | 44 ++-- .../ApollonConversionIntegrationTest.java | 10 +- ...ApollonDiagramResourceIntegrationTest.java | 14 +- .../ModelingAssessmentIntegrationTest.java | 96 ++++---- .../modeling/ModelingComparisonTest.java | 14 +- .../modeling/ModelingExerciseFactory.java | 20 +- .../ModelingExerciseIntegrationTest.java | 88 +++---- .../modeling/ModelingExerciseUtilService.java | 60 ++--- .../ModelingSubmissionIntegrationTest.java | 80 +++---- .../controller/FeedbackSelectorTest.java | 10 +- .../controller/ModelClusterFactoryTest.java | 16 +- .../controller/UMLModelParserTest.java | 54 ++--- .../umlmodel/AbstractUMLDiagramTest.java | 26 +-- .../compass/umlmodel/UMLDiagramTest.java | 10 +- .../activity/UMLActivityDiagramTest.java | 18 +- .../activity/UMLActivityDiagrams.java | 2 +- .../activity/UMLActivityNodeTest.java | 10 +- .../umlmodel/activity/UMLActivityTest.java | 6 +- .../umlmodel/activity/UMLControlFlowTest.java | 8 +- .../umlmodel/bpmn/BPMNDiagramTest.java | 42 ++-- .../compass/umlmodel/bpmn/BPMNDiagrams.java | 2 +- .../classdiagram/UMLAttributeTest.java | 10 +- .../classdiagram/UMLClassDiagramTest.java | 18 +- .../classdiagram/UMLClassDiagrams.java | 2 +- .../umlmodel/classdiagram/UMLClassTest.java | 20 +- .../umlmodel/classdiagram/UMLMethodTest.java | 10 +- .../umlmodel/classdiagram/UMLPackageTest.java | 6 +- .../classdiagram/UMLRelationshipTest.java | 20 +- .../UMLCommunicationDiagramTest.java | 14 +- .../UMLCommunicationDiagrams.java | 2 +- .../component/UMLComponentDiagramTest.java | 22 +- .../component/UMLComponentDiagrams.java | 2 +- .../deployment/UMLDeploymentDiagramTest.java | 16 +- .../deployment/UMLDeploymentDiagrams.java | 2 +- .../umlmodel/flowchart/FlowchartTest.java | 34 +-- .../umlmodel/flowchart/FlowchartUtil.java | 2 +- .../umlmodel/object/UMLObjectDiagramTest.java | 14 +- .../umlmodel/object/UMLObjectDiagrams.java | 2 +- .../umlmodel/petrinet/PetriNetTest.java | 28 +-- .../compass/umlmodel/petrinet/PetriNets.java | 2 +- .../umlmodel/syntaxtree/SyntaxTreeTest.java | 16 +- .../umlmodel/syntaxtree/SyntaxTrees.java | 2 +- .../usecase/UMLUseCaseDiagramTest.java | 16 +- .../umlmodel/usecase/UMLUseCaseDiagrams.java | 2 +- .../exercise/programming/ArgumentSources.java | 10 +- .../AuxiliaryRepositoryServiceTest.java | 18 +- ...encyCheckGitlabJenkinsIntegrationTest.java | 6 +- .../ContinuousIntegrationTestService.java | 20 +- .../CourseGitlabJenkinsIntegrationTest.java | 14 +- .../exercise/programming/GitServiceTest.java | 16 +- .../programming/GitlabServiceTest.java | 24 +- .../exercise/programming/MockDelegate.java | 18 +- .../programming/PlantUmlIntegrationTest.java | 4 +- .../ProgrammingAssessmentIntegrationTest.java | 76 +++--- .../ProgrammingExerciseBuildPlanTest.java | 10 +- .../ProgrammingExerciseFactory.java | 56 ++--- ...ProgrammingExerciseGitIntegrationTest.java | 20 +- ...gExerciseGitlabJenkinsIntegrationTest.java | 44 ++-- ...ProgrammingExerciseGradingServiceTest.java | 74 +++--- ...gExerciseIntegrationJenkinsGitlabTest.java | 12 +- ...rammingExerciseIntegrationTestService.java | 130 +++++------ ...ExerciseLocalVCLocalCIIntegrationTest.java | 36 +-- ...gExerciseParticipationIntegrationTest.java | 38 +-- ...grammingExerciseRepositoryServiceTest.java | 18 +- ...gExerciseResultJenkinsIntegrationTest.java | 16 +- .../ProgrammingExerciseResultTestService.java | 76 +++--- ...rogrammingExerciseScheduleServiceTest.java | 52 ++--- ...rammingExerciseServiceIntegrationTest.java | 32 +-- .../ProgrammingExerciseServiceTest.java | 14 +- ...ammingExerciseTemplateIntegrationTest.java | 18 +- .../programming/ProgrammingExerciseTest.java | 46 ++-- ...rogrammingExerciseTestCaseServiceTest.java | 32 +-- .../ProgrammingExerciseTestService.java | 192 +++++++-------- .../ProgrammingExerciseUtilService.java | 112 ++++----- ...AndResultGitlabJenkinsIntegrationTest.java | 42 ++-- ...issionAndResultIntegrationTestService.java | 24 +- .../ProgrammingSubmissionConstants.java | 2 +- .../ProgrammingSubmissionIntegrationTest.java | 70 +++--- .../RepositoryIntegrationTest.java | 88 +++---- ...seParticipationJenkinsIntegrationTest.java | 18 +- .../StaticCodeAnalysisIntegrationTest.java | 34 +-- .../SubmissionPolicyIntegrationTest.java | 38 +-- ...TestRepositoryResourceIntegrationTest.java | 30 +-- .../exercise/quiz/QuizComparisonTest.java | 50 ++-- .../exercise/quiz/QuizExerciseFactory.java | 58 ++--- .../quiz/QuizExerciseIntegrationTest.java | 92 ++++---- .../quiz/QuizExerciseUtilService.java | 78 +++---- .../quiz/QuizSubmissionIntegrationTest.java | 74 +++--- .../exercise/text/TextComparisonTest.java | 12 +- .../exercise/text/TextExerciseFactory.java | 24 +- .../text/TextExerciseUtilService.java | 76 +++--- .../hestia/CodeHintIntegrationTest.java | 22 +- .../artemis/hestia/CodeHintServiceTest.java | 38 +-- .../hestia/ExerciseHintIntegrationTest.java | 46 ++-- .../hestia/ExerciseHintServiceTest.java | 58 ++--- .../artemis/hestia/HestiaDatabaseTest.java | 32 +-- ...gExerciseGitDiffReportIntegrationTest.java | 20 +- ...mmingExerciseGitDiffReportServiceTest.java | 26 +-- ...gExerciseSolutionEntryIntegrationTest.java | 24 +- ...rogrammingExerciseTaskIntegrationTest.java | 28 +-- .../ProgrammingExerciseTaskServiceTest.java | 32 +-- .../hestia/StructuralTestCaseServiceTest.java | 30 +-- .../TestwiseCoverageIntegrationTest.java | 34 +-- .../TestwiseCoverageReportServiceTest.java | 36 +-- .../hestia/TestwiseCoverageTestUtil.java | 6 +- ...coveredLinesAsPotentialCodeBlocksTest.java | 8 +- .../BehavioralTestCaseServiceTest.java | 52 ++--- .../behavioral/CombineChangeBlocksTest.java | 12 +- .../CreateCommonChangeBlocksTest.java | 8 +- .../behavioral/CreateSolutionEntriesTest.java | 12 +- .../DropRemovedGitDiffEntriesTest.java | 12 +- .../behavioral/ExtractChangedLinesTest.java | 10 +- .../behavioral/ExtractCoveredLinesTest.java | 10 +- .../behavioral/FindCommonLinesTest.java | 8 +- ...erageEntriesByFilePathAndTestCaseTest.java | 20 +- .../behavioral/InsertFileContentsTest.java | 10 +- .../iris/AbstractIrisIntegrationTest.java | 24 +- .../iris/IrisChatMessageIntegrationTest.java | 48 ++-- .../artemis/iris/IrisChatWebsocketTest.java | 18 +- ...isCompetencyGenerationIntegrationTest.java | 18 +- ...risExerciseChatSessionIntegrationTest.java | 14 +- .../IrisSessionActivationIntegrationTest.java | 18 +- .../iris/PyrisConnectorServiceTest.java | 10 +- .../iris/PyrisLectureIngestionTest.java | 32 +-- .../settings/IrisSettingsIntegrationTest.java | 28 +-- ...udentLearningAnalyticsIntegrationTest.java | 10 +- .../AttachmentResourceIntegrationTest.java | 18 +- .../AttachmentUnitIntegrationTest.java | 28 +-- .../AttachmentUnitsIntegrationTest.java | 18 +- .../lecture/ExerciseUnitIntegrationTest.java | 34 +-- .../aet}/artemis/lecture/LectureFactory.java | 14 +- .../lecture/LectureIntegrationTest.java | 44 ++-- .../lecture/LectureUnitIntegrationTest.java | 30 +-- .../lecture/LectureUnitServiceTest.java | 18 +- .../artemis/lecture/LectureUtilService.java | 68 +++--- .../lecture/OnlineUnitIntegrationTest.java | 20 +- .../lecture/TextUnitIntegrationTest.java | 18 +- .../lecture/VideoUnitIntegrationTest.java | 18 +- ...AbstractLocalCILocalVCIntegrationTest.java | 34 +-- .../BuildAgentConfigurationTest.java | 4 +- .../BuildAgentDockerServiceTest.java | 18 +- ...AgentSshAuthenticationIntegrationTest.java | 10 +- .../artemis/localvcci/BuildResultTest.java | 6 +- .../localvcci/LocalCIIntegrationTest.java | 36 +-- .../LocalCIResourceIntegrationTest.java | 38 +-- .../localvcci/LocalCIResultServiceTest.java | 8 +- .../artemis/localvcci/LocalCIServiceTest.java | 46 ++-- .../localvcci/LocalVCInfoContributorTest.java | 8 +- .../localvcci/LocalVCIntegrationTest.java | 12 +- .../LocalVCLocalCIIntegrationTest.java | 42 ++-- ...VCLocalCIParticipationIntegrationTest.java | 20 +- .../localvcci/LocalVCLocalCITestService.java | 38 +-- .../artemis/localvcci/LocalVCServiceTest.java | 18 +- .../localvcci/LocalVCSshIntegrationTest.java | 12 +- .../MultipleHostKeyProviderTest.java | 6 +- .../SharedQueueManagementServiceTest.java | 8 +- .../TestBuildAgentConfiguration.java | 8 +- .../management/SecurityMetersServiceTest.java | 2 +- .../metis/AbstractConversationTest.java | 48 ++-- .../metis/AnswerMessageIntegrationTest.java | 38 +-- .../artemis/metis/ChannelIntegrationTest.java | 38 +-- .../metis/ConversationIntegrationTest.java | 42 ++-- .../metis/GroupChatIntegrationTest.java | 12 +- .../artemis/metis/MessageIntegrationTest.java | 48 ++-- .../metis/OneToOneChatIntegrationTest.java | 12 +- .../artemis/metis/PostingServiceUnitTest.java | 16 +- .../metis/ReactionIntegrationTest.java | 30 +-- .../LinkPreviewIntegrationTest.java | 6 +- .../linkpreview/mockFiles/github_home.txt | 0 .../mockFiles/github_pull_request_6615.txt | 0 .../mockFiles/github_pull_request_6618.txt | 0 .../metis/linkpreview/mockFiles/google.txt | 0 ...eJaccardSimilarityCompareStrategyTest.java | 6 +- .../migration/MigrationIntegrityTest.java | 10 +- .../migration/MigrationServiceTest.java | 22 +- .../TestChangeEntry20211214_231800.java | 4 +- .../TestChangeEntry20211215_231800.java | 4 +- .../TestChangeEntry20211216_231800.java | 4 +- .../GroupNotificationServiceTest.java | 108 ++++----- .../notification/NotificationFactory.java | 14 +- .../NotificationResourceIntegrationTest.java | 28 +-- .../NotificationScheduleServiceTest.java | 40 ++-- ...cationSettingsResourceIntegrationTest.java | 18 +- .../NotificationSettingsServiceTest.java | 52 ++--- .../NotificationTargetFactoryTest.java | 52 ++--- .../PushNotificationResourceTest.java | 22 +- .../SingleUserNotificationServiceTest.java | 156 ++++++------- .../SystemNotificationIntegrationTest.java | 8 +- .../organization/OrganizationFactory.java | 4 +- .../OrganizationIntegrationTest.java | 18 +- .../organization/OrganizationUtilService.java | 6 +- .../participation/ParticipationFactory.java | 54 ++--- .../ParticipationIntegrationTest.java | 114 ++++----- ...articipationSubmissionIntegrationTest.java | 16 +- .../ParticipationUtilService.java | 104 ++++----- .../SubmissionExportIntegrationTest.java | 34 +-- .../SubmissionIntegrationTest.java | 34 +-- ...ontinuousPlagiarismControlServiceTest.java | 56 ++--- .../PlagiarismAnswerPostIntegrationTest.java | 18 +- .../PlagiarismCaseIntegrationTest.java | 48 ++-- .../PlagiarismCheckIntegrationTest.java | 8 +- .../PlagiarismDetectionConfigHelperTest.java | 14 +- .../PlagiarismDetectionServiceTest.java | 30 +-- .../plagiarism/PlagiarismIntegrationTest.java | 44 ++-- .../PlagiarismPostIntegrationTest.java | 34 +-- .../plagiarism/PlagiarismUtilService.java | 42 ++-- .../artemis/post/ConversationFactory.java | 14 +- .../artemis/post/ConversationUtilService.java | 68 +++--- .../ParticipationTestRepository.java | 6 +- ...iseStudentParticipationTestRepository.java | 6 +- .../ProgrammingExerciseTestRepository.java | 6 +- .../ProgrammingSubmissionTestRepository.java | 12 +- .../repository/StatisticsRepositoryTest.java | 18 +- .../repository/UserRepositoryTest.java | 14 +- .../repository/UserTestRepository.java | 6 +- .../science/ScienceIntegrationTest.java | 14 +- .../ScienceSettingsIntegrationTest.java | 10 +- .../artemis/science/ScienceUtilService.java | 8 +- .../security/Lti13LaunchFilterTest.java | 14 +- .../security/OAuth2JWKSServiceTest.java | 4 +- .../security/SecurityUtilsUnitTest.java | 2 +- .../artemis/security/jwt/JWTFilterTest.java | 6 +- .../jwt/TokenProviderSecurityMetersTest.java | 6 +- .../security/jwt/TokenProviderTest.java | 6 +- .../security/lti/Lti13TokenRetrieverTest.java | 6 +- .../service/AssessmentServiceTest.java | 58 ++--- .../AuthorizationCheckServiceTest.java | 28 +-- .../service/BuildLogEntryServiceTest.java | 8 +- .../service/ComplaintResponseServiceTest.java | 38 +-- .../service/ConductAgreementServiceTest.java | 8 +- .../service/ConsistencyCheckTestService.java | 22 +- .../CourseScoreCalculationServiceTest.java | 48 ++-- .../artemis/service/CourseServiceTest.java | 32 +-- .../DataExportCreationServiceTest.java | 78 +++---- .../service/EmailSummaryServiceTest.java | 26 +-- .../service/ExerciseDateServiceTest.java | 42 ++-- .../service/ExerciseLifecycleServiceTest.java | 10 +- .../service/FeatureToggleServiceTest.java | 8 +- .../artemis/service/FeedbackServiceTest.java | 14 +- .../artemis/service/FilePathServiceTest.java | 6 +- .../aet}/artemis/service/FileServiceTest.java | 4 +- .../artemis/service/GitlabCIServiceTest.java | 44 ++-- .../service/GradingScaleServiceTest.java | 30 +-- .../JenkinsAuthorizationInterceptorTest.java | 6 +- .../JenkinsInternalUriServiceTest.java | 8 +- .../JenkinsJobPermissionServiceTest.java | 10 +- .../service/JenkinsJobServiceTest.java | 14 +- .../artemis/service/JenkinsServiceTest.java | 38 +-- .../service/LearningObjectServiceTest.java | 26 +-- .../service/LearningPathServiceTest.java | 62 ++--- .../service/LectureImportServiceTest.java | 22 +- .../artemis/service/LectureServiceTest.java | 28 +-- .../OnlineCourseConfigurationServiceTest.java | 12 +- ...cipationAuthorizationCheckServiceTest.java | 26 +-- .../ParticipationLifecycleServiceTest.java | 22 +- .../service/ParticipationServiceTest.java | 48 ++-- ...ParticipationTeamWebsocketServiceTest.java | 32 +-- ...sentationPointsCalculationServiceTest.java | 30 +-- .../service/RepositoryAccessServiceTest.java | 38 +-- .../service/ResourceLoaderServiceTest.java | 4 +- .../artemis/service/ResultServiceTest.java | 38 +-- .../service/SubmissionServiceTest.java | 66 +++--- .../service/TeamWebsocketServiceTest.java | 34 +-- .../artemis/service/TextBlockServiceTest.java | 6 +- .../TitleCacheEvictionServiceTest.java | 36 +-- .../aet}/artemis/service/UriServiceTest.java | 14 +- ...WeeklyEmailSummaryScheduleServiceTest.java | 4 +- .../artemis/service/ZipFileServiceTest.java | 4 +- .../AthenaFeedbackSendingServiceTest.java | 48 ++-- .../AthenaFeedbackSuggestionsServiceTest.java | 30 +-- .../athena/AthenaHealthIndicatorTest.java | 4 +- .../AthenaRepositoryExportServiceTest.java | 26 +-- .../AthenaSubmissionSelectionServiceTest.java | 26 +-- .../AthenaSubmissionSendingServiceTest.java | 30 +-- ...sonalAccessTokenManagementServiceTest.java | 12 +- .../JenkinsPipelineScriptCreatorTest.java | 22 +- .../jobs/JenkinsJobPermissionsUtilsTest.java | 4 +- .../buildagent/TestResultXmlParserTest.java | 4 +- .../lti/LtiDeepLinkingServiceTest.java | 20 +- .../vcs/VcsTokenRenewalServiceTest.java | 6 +- .../service/exam/ExamAccessServiceTest.java | 42 ++-- .../service/exam/ExamQuizServiceTest.java | 48 ++-- .../artemis/service/exam/ExamServiceTest.java | 40 ++-- .../exam/ExamSubmissionServiceTest.java | 44 ++-- .../exam/StudentExamAccessServiceTest.java | 26 +-- .../export/CourseExamExportServiceTest.java | 16 +- .../ConversationNotificationServiceTest.java | 38 +-- ...GeneralInstantNotificationServiceTest.java | 18 +- .../notifications/MailServiceTest.java | 18 +- .../TutorialGroupNotificationServiceTest.java | 42 ++-- ...leFirebasePushNotificationServiceTest.java | 18 +- ...ngExerciseFeedbackCreationServiceTest.java | 52 ++--- .../DataExportScheduleServiceTest.java | 16 +- ...DeviceConfigurationCleanupServiceTest.java | 14 +- .../service/util/HttpRequestUtilsTest.java | 2 +- .../artemis/service/util/TimeUtilTest.java | 4 +- .../ide/IdePreferencesIntegrationTest.java | 20 +- .../StaticCodeAnalysisParserUnitTest.java | 6 +- .../aet}/artemis/team/TeamFactory.java | 14 +- .../team/TeamImportIntegrationTest.java | 18 +- .../artemis/team/TeamIntegrationTest.java | 44 ++-- .../aet}/artemis/team/TeamUtilService.java | 18 +- .../telemetry/TelemetryServiceTest.java | 6 +- .../text/AssessmentEventIntegrationTest.java | 26 +-- .../text/TextAssessmentIntegrationTest.java | 96 ++++---- .../text/TextEmbeddingIntegrationTest.java | 4 +- .../text/TextExerciseIntegrationTest.java | 108 ++++----- .../text/TextSubmissionIntegrationTest.java | 68 +++--- .../theia/TheiaInfoContributorTest.java | 8 +- .../AbstractTutorialGroupIntegrationTest.java | 58 ++--- .../tutorialgroups/TutorialGroupFactory.java | 6 +- ...utorialGroupFreePeriodIntegrationTest.java | 16 +- .../TutorialGroupIntegrationTest.java | 34 +-- .../TutorialGroupScheduleIntegrationTest.java | 8 +- .../TutorialGroupSessionIntegrationTest.java | 14 +- .../TutorialGroupUtilService.java | 36 +-- ...ialGroupsConfigurationIntegrationTest.java | 18 +- .../aet}/artemis/uri/RepositoryUriTest.java | 8 +- .../user/AccountResourceIntegrationTest.java | 26 +-- ...ountResourceWithGitLabIntegrationTest.java | 10 +- .../aet}/artemis/user/UserFactory.java | 8 +- .../aet}/artemis/user/UserTestService.java | 58 ++--- .../aet}/artemis/user/UserUtilService.java | 18 +- .../aet}/artemis/util/ConfigUtil.java | 2 +- .../util/ExamPrepareExercisesTestUtil.java | 8 +- .../util/ExerciseIntegrationTestService.java | 10 +- .../util/FixMissingServletPathProcessor.java | 4 +- .../aet}/artemis/util/GitUtilService.java | 24 +- .../artemis/util/HestiaUtilTestService.java | 30 +-- .../util/HibernateQueryInterceptor.java | 2 +- ...alidExamExerciseDatesArgumentProvider.java | 4 +- .../util/InvalidExerciseConfiguration.java | 4 +- .../aet}/artemis/util/LocalRepository.java | 4 +- .../util/PageableSearchUtilService.java | 10 +- .../aet}/artemis/util/QueryCountAssert.java | 2 +- .../aet}/artemis/util/RequestUtilService.java | 4 +- .../util/SensitiveInformationUtil.java | 12 +- .../aet}/artemis/util/TestConstants.java | 2 +- .../aet}/artemis/util/TestResourceUtils.java | 2 +- .../aet}/artemis/util/TestUriParamsUtil.java | 2 +- .../aet}/artemis/util/ThrowingProducer.java | 2 +- .../aet}/artemis/util/Verifiable.java | 2 +- .../artemis/util/ZipFileTestUtilService.java | 2 +- .../artemis/util/classpath/ClassNode.java | 2 +- .../artemis/util/classpath/ClassPathNode.java | 2 +- .../artemis/util/classpath/ClassPathUtil.java | 2 +- .../artemis/util/classpath/PackageNode.java | 2 +- .../aet}/artemis/util/classpath/RootNode.java | 2 +- .../junit_extensions/AwaitilityExtension.java | 2 +- .../ParallelLoggingExtension.java | 4 +- .../ParallelConsoleAppender.java | 12 +- .../ThreadIdConverter.java | 2 +- ...AndroidAppSiteAssociationResourceTest.java | 4 +- .../AppleAppSiteAssociationResourceTest.java | 4 +- .../PlagiarismResultResponseBuilderTest.java | 10 +- .../spec/service/profile.service.spec.ts | 2 +- .../org.junit.jupiter.api.extension.Extension | 4 +- src/test/resources/config/application.yml | 2 +- .../umlmodel/activity/activityModel1.json | 0 .../umlmodel/activity/activityModel1v3.json | 0 .../umlmodel/activity/activityModel2.json | 0 .../umlmodel/activity/activityModel2v3.json | 0 .../umlmodel/activity/activityModel3.json | 0 .../umlmodel/activity/activityModel3v3.json | 0 .../compass/umlmodel/bpmn/bpmnModel1.json | 0 .../compass/umlmodel/bpmn/bpmnModel2.json | 0 .../compass/umlmodel/bpmn/bpmnModel3.json | 0 .../umlmodel/classdiagram/classModel1.json | 0 .../umlmodel/classdiagram/classModel1v3.json | 0 .../umlmodel/classdiagram/classModel2.json | 0 .../umlmodel/classdiagram/classModel2v3.json | 0 .../communication/communicationModel1.json | 0 .../communication/communicationModel1v3.json | 0 .../communication/communicationModel2.json | 0 .../communication/communicationModel2v3.json | 0 .../umlmodel/component/componentModel1.json | 0 .../umlmodel/component/componentModel1v3.json | 0 .../umlmodel/component/componentModel2.json | 0 .../umlmodel/component/componentModel2v3.json | 0 .../umlmodel/component/componentModel3.json | 0 .../umlmodel/component/componentModel3v3.json | 0 .../umlmodel/deployment/deploymentModel1.json | 0 .../deployment/deploymentModel1v3.json | 0 .../umlmodel/deployment/deploymentModel2.json | 0 .../deployment/deploymentModel2v3.json | 0 .../umlmodel/deployment/deploymentModel3.json | 0 .../deployment/deploymentModel3v3.json | 0 .../umlmodel/flowchart/flowchartModel1a.json | 0 .../flowchart/flowchartModel1av3.json | 0 .../umlmodel/flowchart/flowchartModel1b.json | 0 .../flowchart/flowchartModel1bv3.json | 0 .../umlmodel/flowchart/flowchartModel2.json | 0 .../umlmodel/flowchart/flowchartModel2v3.json | 0 .../compass/umlmodel/object/objectModel1.json | 0 .../umlmodel/object/objectModel1v3.json | 0 .../compass/umlmodel/object/objectModel2.json | 0 .../umlmodel/object/objectModel2v3.json | 0 .../umlmodel/petrinet/petriNetModel1a.json | 0 .../umlmodel/petrinet/petriNetModel1av3.json | 0 .../umlmodel/petrinet/petriNetModel1b.json | 0 .../umlmodel/petrinet/petriNetModel1bv3.json | 0 .../umlmodel/petrinet/petriNetModel2.json | 0 .../umlmodel/petrinet/petriNetModel2v3.json | 0 .../syntaxtree/syntaxTreeModel1a.json | 0 .../syntaxtree/syntaxTreeModel1av3.json | 0 .../syntaxtree/syntaxTreeModel1b.json | 0 .../syntaxtree/syntaxTreeModel1bv3.json | 0 .../umlmodel/syntaxtree/syntaxTreeModel2.json | 0 .../syntaxtree/syntaxTreeModel2v3.json | 0 .../umlmodel/usecase/useCaseModel1.json | 0 .../umlmodel/usecase/useCaseModel1v3.json | 0 .../umlmodel/usecase/useCaseModel2.json | 0 .../umlmodel/usecase/useCaseModel2v3.json | 0 .../programming/gitlabPushEventRequest.json | 0 .../gitlabPushEventRequestWithoutCommit.json | 0 ...itlabPushEventRequestWrongCommitOrder.json | 0 src/test/resources/logback.xml | 6 +- .../expected/invalid_name.txt | 2 +- .../expected/invalid_xml.txt | 2 +- .../build.gradle | 2 +- 2262 files changed, 18230 insertions(+), 18260 deletions(-) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/ApplicationWebXml.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/ArtemisApp.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/aop/logging/LoggingAspect.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/ApplicationConfiguration.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/AsyncConfiguration.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/BuildAgentWithoutCoreCondition.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/CacheConfiguration.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/ConditionalMetricsExclusionConfiguration.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/Constants.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/CustomMetricsExtensionConfiguration.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/DatabaseConfiguration.java (71%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/DateTimeFormatConfiguration.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/EurekaClientRestTemplateConfiguration.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/GuidedTourConfiguration.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/JacksonConfiguration.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/LiquibaseConfiguration.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/LoggingAspectConfiguration.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/LoggingConfiguration.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/MetricsBean.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/ProgrammingLanguageConfiguration.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/PropertiesConfigurationGuard.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/PublicResourcesConfiguration.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/RestTemplateConfiguration.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/SAML2Configuration.java (99%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/SAML2Properties.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/SecurityConfiguration.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/SentryConfiguration.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/StartupDelayConfig.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/StaticCodeAnalysisConfigurer.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/TaskSchedulingConfiguration.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/TheiaConfiguration.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/TomcatConfiguration.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/WebConfigurer.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/audit/AuditEventConverter.java (95%) create mode 100644 src/main/java/de/tum/cit/aet/artemis/config/audit/package-info.java rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/auth/AthenaAuthorizationInterceptor.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/auth/PyrisAuthorizationInterceptor.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/connector/GitLabApiConfiguration.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/connector/JenkinsServerConfiguration.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/icl/BuildAgentConfiguration.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/icl/JGitServletConfiguration.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/icl/ssh/HashUtils.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/icl/ssh/MultipleHostKeyProvider.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/icl/ssh/SshConfiguration.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/icl/ssh/SshConstants.java (73%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/icl/ssh/SshGitCommand.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/lti/CustomLti13Configurer.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/lti/DistributedStateAuthorizationRequestRepository.java (99%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/lti/StateBasedOptimisticAuthorizationRequestRepository.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/migration/DatabaseMigration.java (99%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/migration/MigrationEntry.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/migration/MigrationIntegrityException.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/migration/MigrationRegistry.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/migration/MigrationService.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/migration/entries/.gitkeep (100%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/migration/entries/MigrationEntry20240614_140000.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/package-info.java (55%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/websocket/WebsocketBrokerHealthIndicator.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/websocket/WebsocketConfiguration.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/websocket/WebsocketSecurityConfiguration.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/config/websocket/package-info.java (50%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/AbstractAuditingEntity.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/AssessmentNote.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/Attachment.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/Authority.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/AuxiliaryRepository.java (99%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/BaseExercise.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/Bonus.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/BonusStrategy.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/BuildJob.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/BuildLogEntry.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/BuildPlan.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/BuildRunState.java (58%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/Commit.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/Complaint.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/ComplaintResponse.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/ConductAgreement.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/ConductAgreementId.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/ConversationNotificationRecipientSummary.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/Course.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/CourseExamExportErrorCause.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/CourseExamExportState.java (73%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/DataExport.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/DomainObject.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/ExampleSubmission.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/Exercise.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/Feedback.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/File.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/FileType.java (52%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/FileUploadExercise.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/FileUploadSubmission.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/GradeStep.java (99%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/GradeType.java (56%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/GradingCriterion.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/GradingInstruction.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/GradingScale.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/GuidedTourSetting.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/IBonusStrategy.java (66%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/LearningObject.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/Lecture.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/LongFeedbackText.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/LtiPlatformConfiguration.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/MigrationChangelog.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/NotificationSetting.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/OnlineCourseConfiguration.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/Organization.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/PersistentAuditEvent.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/PlagiarismCheckState.java (61%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/ProgrammingExercise.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/ProgrammingExerciseBuildConfig.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/ProgrammingExerciseTestCase.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/ProgrammingSubmission.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/Rating.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/Repository.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/Result.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/StaticCodeAnalysisCategory.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/StaticCodeAnalysisDefaultCategory.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/Submission.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/SubmissionVersion.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/Team.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/TeamAssignmentConfig.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/TempIdObject.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/TextBlock.java (99%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/TextBlockType.java (57%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/TextEmbedding.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/TextExercise.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/TextSubmission.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/User.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/UserGroup.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/VcsRepositoryUri.java (99%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/analytics/TextAssessmentEvent.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/assessment/dashboard/ExerciseMapEntry.java (76%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/assessment/dashboard/ExerciseRatingCount.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/assessment/dashboard/ResultCount.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/competency/BaseCompetency.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/competency/Competency.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/competency/CompetencyJol.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/competency/CompetencyProgress.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/competency/CompetencyRelation.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/competency/CompetencyTaxonomy.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/competency/CourseCompetency.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/competency/KnowledgeArea.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/competency/LearningPath.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/competency/Prerequisite.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/competency/RelationType.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/competency/Source.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/competency/StandardizedCompetency.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/AeolusTarget.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/AssessmentType.java (71%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/AttachmentType.java (63%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/BuildPlanType.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/BuildStatus.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/CategoryState.java (73%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/CompetencyProgressConfidenceReason.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/ComplaintType.java (54%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/CourseInformationSharingConfiguration.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/DataExportState.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/DefaultChannelType.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/DiagramType.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/DifficultyLevel.java (66%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/DisplayPriority.java (78%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/ExerciseLifecycle.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/ExerciseMode.java (64%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/ExerciseType.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/FeedbackType.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/GraphType.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/GroupNotificationType.java (71%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/IExerciseLifecycle.java (51%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/IncludedInOverallScore.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/InitializationState.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/Language.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/LegalDocumentType.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/NotificationPriority.java (68%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/NotificationType.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/ParticipationLifecycle.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/ProgrammingLanguage.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/ProjectType.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/QuizAction.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/QuizMode.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/RepositoryType.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/ScoringType.java (73%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/SortingOrder.java (52%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/SpanType.java (54%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/StaticCodeAnalysisTool.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/StatisticsView.java (54%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/SubmissionType.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/SystemNotificationType.java (68%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/TeamImportStrategyType.java (70%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/TextAssessmentEventType.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/TutorParticipationStatus.java (75%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/TutorialGroupSessionStatus.java (69%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/Visibility.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/Weekday.java (68%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/tutorialgroups/TutorialGroupRegistrationType.java (60%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/exam/Exam.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/exam/ExamSession.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/exam/ExamUser.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/exam/ExerciseGroup.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/exam/StudentExam.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/exam/SuspiciousExamSessions.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/exam/SuspiciousSessionReason.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/exam/SuspiciousSessionsAnalysisOptions.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/exam/event/ExamAttendanceCheckEvent.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/exam/event/ExamLiveEvent.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/exam/event/ExamWideAnnouncementEvent.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/exam/event/ProblemStatementUpdateEvent.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/exam/event/WorkingTimeUpdateEvent.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/hestia/CodeHint.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/hestia/CoverageFileReport.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/hestia/CoverageReport.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/hestia/ExerciseHint.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/hestia/ExerciseHintActivation.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/hestia/ProgrammingExerciseGitDiffEntry.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/hestia/ProgrammingExerciseGitDiffReport.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/hestia/ProgrammingExerciseSolutionEntry.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/hestia/ProgrammingExerciseTask.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/hestia/ProgrammingExerciseTestCaseType.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/hestia/TestwiseCoverageReportEntry.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/iris/IrisTemplate.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/iris/message/IrisJsonMessageContent.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/iris/message/IrisMessage.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/iris/message/IrisMessageContent.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/iris/message/IrisMessageSender.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/iris/message/IrisTextMessageContent.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/iris/session/IrisChatSession.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/iris/session/IrisCourseChatSession.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/iris/session/IrisExerciseChatSession.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/iris/session/IrisHestiaSession.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/iris/session/IrisSession.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/iris/settings/IrisChatSubSettings.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/iris/settings/IrisCompetencyGenerationSubSettings.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/iris/settings/IrisCourseSettings.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/iris/settings/IrisExerciseSettings.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/iris/settings/IrisGlobalSettings.java (99%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/iris/settings/IrisHestiaSubSettings.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/iris/settings/IrisLectureIngestionSubSettings.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/iris/settings/IrisModelListConverter.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/iris/settings/IrisSettings.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/iris/settings/IrisSettingsType.java (54%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/iris/settings/IrisSubSettings.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/iris/settings/IrisSubSettingsType.java (64%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/leaderboard/tutor/TutorLeaderboardAnsweredMoreFeedbackRequests.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/leaderboard/tutor/TutorLeaderboardAssessments.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/leaderboard/tutor/TutorLeaderboardComplaintResponses.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/leaderboard/tutor/TutorLeaderboardComplaints.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/leaderboard/tutor/TutorLeaderboardMoreFeedbackRequests.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/lecture/AttachmentUnit.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/lecture/ExerciseUnit.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/lecture/LectureUnit.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/lecture/LectureUnitCompletion.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/lecture/OnlineUnit.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/lecture/Slide.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/lecture/TextUnit.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/lecture/VideoUnit.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/lti/Claims.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/lti/Lti13AgsClaim.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/lti/Lti13ClientRegistration.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/lti/Lti13DeepLinkingResponse.java (99%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/lti/Lti13LaunchRequest.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/lti/Lti13PlatformConfiguration.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/lti/LtiAuthenticationResponse.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/lti/LtiResourceLaunch.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/lti/Scopes.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/metis/AnswerPost.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/metis/ConversationParticipant.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/metis/ConversationParticipantSettingsView.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/metis/ConversationType.java (54%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/metis/CourseWideContext.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/metis/CreatedConversationMessage.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/metis/Post.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/metis/PostConstraints.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/metis/PostContextConstraintValidator.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/metis/PostSortCriterion.java (62%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/metis/Posting.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/metis/Reaction.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/metis/ReactionConstraintValidator.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/metis/ReactionConstraints.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/metis/UserRole.java (54%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/metis/conversation/Channel.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/metis/conversation/ChannelSubType.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/metis/conversation/Conversation.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/metis/conversation/ConversationSettings.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/metis/conversation/ConversationSummary.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/metis/conversation/GeneralConversationInfo.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/metis/conversation/GroupChat.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/metis/conversation/OneToOneChat.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/metis/conversation/UserConversationInfo.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/metrics/ExerciseTypeMetricsEntry.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/modeling/ApollonDiagram.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/modeling/ModelCluster.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/modeling/ModelElement.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/modeling/ModelingExercise.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/modeling/ModelingSubmission.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/modeling/SimilarElementCount.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/notification/ConversationNotification.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/notification/ConversationNotificationFactory.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/notification/GroupNotification.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/notification/GroupNotificationFactory.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/notification/Notification.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/notification/NotificationConstants.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/notification/NotificationPlaceholderCreator.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/notification/NotificationTarget.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/notification/NotificationTargetFactory.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/notification/SingleUserNotification.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/notification/SingleUserNotificationFactory.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/notification/SystemNotification.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/notification/TutorialGroupNotification.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/notification/TutorialGroupNotificationFactory.java (85%) create mode 100644 src/main/java/de/tum/cit/aet/artemis/domain/package-info.java rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/participation/AbstractBaseProgrammingExerciseParticipation.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/participation/IdToPresentationScoreSum.java (63%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/participation/Participant.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/participation/Participation.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/participation/ParticipationInterface.java (74%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/participation/ParticipationVCSAccessToken.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/participation/ProgrammingExerciseParticipation.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/participation/ProgrammingExerciseStudentParticipation.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/participation/SolutionProgrammingExerciseParticipation.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/participation/StudentParticipation.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/participation/TemplateProgrammingExerciseParticipation.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/participation/TutorParticipation.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/plagiarism/PlagiarismCase.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/plagiarism/PlagiarismComparison.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/plagiarism/PlagiarismDetectionConfig.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/plagiarism/PlagiarismMatch.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/plagiarism/PlagiarismResult.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/plagiarism/PlagiarismStatus.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/plagiarism/PlagiarismSubmission.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/plagiarism/PlagiarismSubmissionElement.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/plagiarism/PlagiarismVerdict.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/plagiarism/modeling/ModelingPlagiarismResult.java (64%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/plagiarism/modeling/ModelingSubmissionElement.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/plagiarism/text/TextPlagiarismResult.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/plagiarism/text/TextSubmissionElement.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/push_notification/PushNotificationDeviceConfiguration.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/push_notification/PushNotificationDeviceConfigurationId.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/push_notification/PushNotificationDeviceType.java (70%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/AbstractQuizSubmission.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/AnswerCounter.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/AnswerOption.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/DragAndDropMapping.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/DragAndDropQuestion.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/DragAndDropQuestionStatistic.java (99%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/DragAndDropSubmittedAnswer.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/DragItem.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/DropLocation.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/DropLocationCounter.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/MultipleChoiceQuestion.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/MultipleChoiceQuestionStatistic.java (99%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/MultipleChoiceSubmittedAnswer.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/PointCounter.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/QuizBatch.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/QuizConfiguration.java (99%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/QuizExercise.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/QuizGroup.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/QuizPointStatistic.java (99%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/QuizPool.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/QuizQuestion.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/QuizQuestionComponent.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/QuizQuestionStatistic.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/QuizQuestionStatisticComponent.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/QuizStatistic.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/QuizStatisticCounter.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/QuizSubmission.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/QuizSubmittedAnswerCount.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/ShortAnswerMapping.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/ShortAnswerQuestion.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/ShortAnswerQuestionStatistic.java (99%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/ShortAnswerSolution.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/ShortAnswerSpot.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/ShortAnswerSpotCounter.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/ShortAnswerSubmittedAnswer.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/ShortAnswerSubmittedText.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/SubmittedAnswer.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/compare/DnDMapping.java (56%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/compare/SAMapping.java (54%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/scoring/ScoringStrategy.java (71%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropAllOrNothing.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropProportionalWithPenalty.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropProportionalWithoutPenalty.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceAllOrNothing.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceProportionalWithPenalty.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceProportionalWithoutPenalty.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerAllOrNothing.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerProportionalWithPenalty.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerProportionalWithoutPenalty.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerUtil.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/science/ScienceEvent.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/science/ScienceEventType.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/science/ScienceSetting.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/scores/ParticipantScore.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/scores/StudentScore.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/scores/TeamScore.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/settings/ide/Ide.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/settings/ide/UserIdeMapping.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/statistics/BuildLogStatisticsEntry.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/statistics/CourseStatisticsAverageScore.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/statistics/ScoreDistribution.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/statistics/StatisticsEntry.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/statistics/tutor/effort/TutorEffort.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/submissionpolicy/LockRepositoryPolicy.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/submissionpolicy/SubmissionPenaltyPolicy.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/submissionpolicy/SubmissionPolicy.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/tutorialgroups/TutorialGroup.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/tutorialgroups/TutorialGroupFreePeriod.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/tutorialgroups/TutorialGroupRegistration.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/tutorialgroups/TutorialGroupSchedule.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/tutorialgroups/TutorialGroupSession.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/tutorialgroups/TutorialGroupsConfiguration.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/domain/view/QuizView.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/exception/AccountRegistrationBlockedException.java (72%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/exception/ArtemisMailException.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/exception/ContinuousIntegrationBuildPlanException.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/exception/ContinuousIntegrationException.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/exception/EmptyFileException.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/exception/FilePathParsingException.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/exception/GitException.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/exception/GitLabCIException.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/exception/JenkinsException.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/exception/LocalCIException.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/exception/LtiEmailAlreadyInUseException.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/exception/NetworkingException.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/exception/QuizJoinException.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/exception/QuizSubmissionException.java (76%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/exception/UsernameAlreadyUsedException.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/exception/VersionControlException.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/exception/localvc/LocalVCAuthException.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/exception/localvc/LocalVCForbiddenException.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/exception/localvc/LocalVCInternalException.java (77%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/exception/localvc/LocalVCOperationException.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/management/SecurityMetersService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ApollonDiagramRepository.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/AttachmentRepository.java (78%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/AttachmentUnitRepository.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/AuthorityRepository.java (70%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/AuxiliaryRepositoryRepository.java (64%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/BonusRepository.java (76%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/BuildJobRepository.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/BuildLogEntryRepository.java (71%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/BuildLogStatisticsEntryRepository.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/BuildPlanRepository.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/CompetencyProgressRepository.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/CompetencyRelationRepository.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/CompetencyRepository.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ComplaintRepository.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ComplaintResponseRepository.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ConductAgreementRepository.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/CourseCompetencyRepository.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/CourseRepository.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/CustomAuditEventRepository.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/DataExportRepository.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/DragAndDropMappingRepository.java (58%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/DragItemRepository.java (75%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ExamLiveEventRepository.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ExamRepository.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ExamSessionRepository.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ExamUserRepository.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ExampleSubmissionRepository.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ExerciseGroupRepository.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ExerciseRepository.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ExerciseUnitRepository.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/FeedbackRepository.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/FileUploadExerciseRepository.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/FileUploadSubmissionRepository.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/GradeStepRepository.java (58%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/GradingCriterionRepository.java (78%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/GradingInstructionRepository.java (59%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/GradingScaleRepository.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/GroupNotificationRepository.java (63%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/GuidedTourSettingsRepository.java (59%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/LdapUserRepository.java (74%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/LearningPathRepository.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/LectureRepository.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/LectureUnitCompletionRepository.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/LectureUnitRepository.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/LongFeedbackTextRepository.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/Lti13ResourceLaunchRepository.java (66%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/LtiPlatformConfigurationRepository.java (88%) create mode 100644 src/main/java/de/tum/cit/aet/artemis/repository/MigrationChangeRepository.java rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ModelClusterRepository.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ModelElementRepository.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ModelingExerciseRepository.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ModelingSubmissionRepository.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/NotificationRepository.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/NotificationSettingRepository.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/OnlineCourseConfigurationRepository.java (66%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/OnlineUnitRepository.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/OrganizationRepository.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ParticipantScoreRepository.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ParticipationRepository.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ParticipationVCSAccessTokenRepository.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/PersistenceAuditEventRepository.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/PrerequisiteRepository.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ProgrammingExerciseBuildConfigRepository.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ProgrammingExerciseRepository.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ProgrammingExerciseStudentParticipationRepository.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ProgrammingExerciseTestCaseRepository.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ProgrammingSubmissionRepository.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/PushNotificationDeviceConfigurationRepository.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/QuizBatchRepository.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/QuizExerciseRepository.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/QuizGroupRepository.java (59%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/QuizPointStatisticRepository.java (58%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/QuizPoolRepository.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/QuizQuestionRepository.java (76%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/QuizQuestionStatisticRepository.java (59%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/QuizSubmissionRepository.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/RatingRepository.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ResultRepository.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ShortAnswerMappingRepository.java (58%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/SingleUserNotificationRepository.java (58%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/SlideRepository.java (68%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/SolutionProgrammingExerciseParticipationRepository.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/SourceRepository.java (57%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/StaticCodeAnalysisCategoryRepository.java (65%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/StatisticsRepository.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/StudentExamRepository.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/StudentParticipationRepository.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/StudentScoreRepository.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/SubmissionPolicyRepository.java (77%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/SubmissionRepository.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/SubmissionVersionRepository.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/SubmittedAnswerRepository.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/SystemNotificationRepository.java (78%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/TeamRepository.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/TeamScoreRepository.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/TemplateProgrammingExerciseParticipationRepository.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/TextAssessmentEventRepository.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/TextBlockRepository.java (73%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/TextExerciseRepository.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/TextSubmissionRepository.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/TextUnitRepository.java (75%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/TutorParticipationRepository.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/UserRepository.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/VideoUnitRepository.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/base/ArtemisJpaRepository.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/base/DynamicSpecificationRepository.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/base/FetchOptions.java (73%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/base/RepositoryImpl.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/competency/CompetencyJolRepository.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/competency/KnowledgeAreaRepository.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/competency/StandardizedCompetencyRepository.java (59%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/hestia/CodeHintRepository.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/hestia/CoverageFileReportRepository.java (51%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/hestia/CoverageReportRepository.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/hestia/ExerciseHintActivationRepository.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/hestia/ExerciseHintRepository.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/hestia/ProgrammingExerciseGitDiffReportRepository.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/hestia/ProgrammingExerciseSolutionEntryRepository.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/hestia/ProgrammingExerciseTaskRepository.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/hestia/TestwiseCoverageReportEntryRepository.java (60%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/iris/IrisCourseChatSessionRepository.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/iris/IrisExerciseChatSessionRepository.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/iris/IrisHestiaSessionRepository.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/iris/IrisMessageRepository.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/iris/IrisSessionRepository.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/iris/IrisSettingsRepository.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/iris/IrisSubSettingsRepository.java (50%) create mode 100644 src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisTemplateRepository.java rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/metis/AnswerPostRepository.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/metis/ConversationMessageRepository.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/metis/ConversationParticipantRepository.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/metis/CustomPostRepository.java (75%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/metis/CustomPostRepositoryImpl.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/metis/PostRepository.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/metis/ReactionRepository.java (68%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/metis/conversation/ChannelRepository.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/metis/conversation/ConversationNotificationRepository.java (52%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/metis/conversation/ConversationRepository.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/metis/conversation/GroupChatRepository.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/metis/conversation/OneToOneChatRepository.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/metrics/CompetencyMetricsRepository.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/metrics/ExerciseMetricsRepository.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/metrics/LectureUnitMetricsRepository.java (82%) create mode 100644 src/main/java/de/tum/cit/aet/artemis/repository/package-info.java rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/plagiarism/PlagiarismCaseRepository.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/plagiarism/PlagiarismComparisonRepository.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/plagiarism/PlagiarismResultRepository.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/plagiarism/PlagiarismSubmissionRepository.java (75%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/science/ScienceEventRepository.java (77%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/science/ScienceSettingRepository.java (62%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/settings/IdeRepository.java (60%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/settings/UserIdeMappingRepository.java (60%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/specs/MessageSpecs.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/specs/UserSpecs.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/tutorialgroups/TutorialGroupFreePeriodRepository.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/tutorialgroups/TutorialGroupNotificationRepository.java (67%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/tutorialgroups/TutorialGroupRegistrationRepository.java (77%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/tutorialgroups/TutorialGroupRepository.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/tutorialgroups/TutorialGroupScheduleRepository.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/tutorialgroups/TutorialGroupSessionRepository.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/repository/tutorialgroups/TutorialGroupsConfigurationRepository.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/ArtemisAuthenticationProvider.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/ArtemisAuthenticationProviderImpl.java (72%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/ArtemisInternalAuthenticationProvider.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/DomainUserDetailsService.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/OAuth2JWKSService.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/Role.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/SecurityUtils.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/SpringSecurityAuditorAware.java (77%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/UserNotActivatedException.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/annotations/AnnotationUtils.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/annotations/EnforceAdmin.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/annotations/EnforceAtLeastEditor.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/annotations/EnforceAtLeastInstructor.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/annotations/EnforceAtLeastStudent.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/annotations/EnforceAtLeastTutor.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/annotations/EnforceNothing.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/annotations/EnforceRoleInResourceAspect.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/annotations/ManualConfig.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/annotations/enforceRoleInCourse/EnforceAtLeastEditorInCourse.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/annotations/enforceRoleInCourse/EnforceAtLeastInstructorInCourse.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/annotations/enforceRoleInCourse/EnforceAtLeastStudentInCourse.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/annotations/enforceRoleInCourse/EnforceAtLeastTutorInCourse.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/annotations/enforceRoleInCourse/EnforceRoleInCourse.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/annotations/enforceRoleInCourse/EnforceRoleInCourseAspect.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/annotations/enforceRoleInExercise/EnforceAtLeastEditorInExercise.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/annotations/enforceRoleInExercise/EnforceAtLeastInstructorInExercise.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/annotations/enforceRoleInExercise/EnforceAtLeastStudentInExercise.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/annotations/enforceRoleInExercise/EnforceAtLeastTutorInExercise.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/annotations/enforceRoleInExercise/EnforceRoleInExercise.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/annotations/enforceRoleInExercise/EnforceRoleInExerciseAspect.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/jwt/JWTConfigurer.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/jwt/JWTCookieService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/jwt/JWTFilter.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/jwt/TokenProvider.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/lti/Lti13TokenRetriever.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/security/package-info.java (50%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/AbstractQuizSubmissionService.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/AccountService.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/AssessmentDashboardService.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/AssessmentService.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/AttachmentUnitService.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/AuditEventService.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/AuthorizationCheckService.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/BonusService.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/BuildLogEntryService.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/ComplaintResponseService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/ComplaintService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/ConductAgreementService.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/ConsistencyCheckService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/CourseScoreCalculationService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/CourseService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/DragAndDropQuizAnswerConversionService.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/EmailSummaryService.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/ExampleSubmissionService.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/ExerciseDateService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/ExerciseDeletionService.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/ExerciseImportService.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/ExerciseLifecycleService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/ExerciseScoresChartService.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/ExerciseService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/ExerciseSpecificationService.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/FeedbackService.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/FilePathService.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/FileService.java (99%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/FileUploadExerciseImportService.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/FileUploadExerciseService.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/FileUploadSubmissionService.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/GradingScaleService.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/HazelcastPathSerializer.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/InternalUrlService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/LearningObjectService.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/LectureImportService.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/LectureService.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/LectureUnitProcessingService.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/LectureUnitService.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/LegalDocumentService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/ModelingExerciseImportService.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/ModelingExerciseService.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/ModelingSubmissionService.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/OnlineCourseConfigurationService.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/OrganizationService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/ParticipantScoreService.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/ParticipationAuthorizationCheckService.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/ParticipationLifecycleService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/ParticipationService.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/ParticipationVcsAccessTokenService.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/PlantUmlService.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/PresentationPointsCalculationService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/ProfileService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/RatingService.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/ResourceLoaderService.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/ResultService.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/SlideSplitterService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/StaticCodeAnalysisService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/StatisticsService.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/SubmissionPolicyService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/SubmissionService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/SubmissionVersionService.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/SystemNotificationService.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/TeamService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/TextAssessmentService.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/TextBlockService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/TextExerciseFeedbackService.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/TextExerciseImportService.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/TextExerciseService.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/TextSubmissionService.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/TimeService.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/TitleCacheEvictionService.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/TutorEffortService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/TutorLeaderboardService.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/TutorParticipationService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/UriService.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/WebsocketMessagingService.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/ZipFileService.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/archival/ArchivalReportEntry.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/CompassService.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/assessment/Context.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/controller/FeedbackSelector.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/controller/ModelClusterFactory.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/strategy/NameSimilarity.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/Similarity.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/UMLContainerElement.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/UMLDiagram.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/UMLElement.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/activity/UMLActivity.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/activity/UMLActivityDiagram.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/activity/UMLActivityElement.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/activity/UMLActivityNode.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/activity/UMLControlFlow.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/bpmn/BPMNAnnotation.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/bpmn/BPMNCallActivity.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/bpmn/BPMNDataObject.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/bpmn/BPMNDataStore.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/bpmn/BPMNDiagram.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/bpmn/BPMNEndEvent.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/bpmn/BPMNFlow.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/bpmn/BPMNGateway.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/bpmn/BPMNGroup.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/bpmn/BPMNIntermediateEvent.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/bpmn/BPMNPool.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/bpmn/BPMNStartEvent.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/bpmn/BPMNSubprocess.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/bpmn/BPMNSwimlane.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/bpmn/BPMNTask.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/bpmn/BPMNTransaction.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/classdiagram/UMLAttribute.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/classdiagram/UMLClass.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/classdiagram/UMLClassDiagram.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/classdiagram/UMLMethod.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/classdiagram/UMLPackage.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/classdiagram/UMLRelationship.java (93%) create mode 100644 src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/communication/Direction.java rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/communication/UMLCommunicationDiagram.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/communication/UMLCommunicationLink.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/communication/UMLMessage.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/component/UMLComponent.java (77%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/component/UMLComponentDiagram.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/component/UMLComponentInterface.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/component/UMLComponentRelationship.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/deployment/UMLArtifact.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/deployment/UMLDeploymentComponent.java (78%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/deployment/UMLDeploymentDiagram.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/deployment/UMLDeploymentInterface.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/deployment/UMLNode.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/flowchart/Flowchart.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/flowchart/FlowchartDecision.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/flowchart/FlowchartFlowline.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/flowchart/FlowchartFunctionCall.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/flowchart/FlowchartInputOutput.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/flowchart/FlowchartProcess.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/flowchart/FlowchartTerminal.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/object/UMLObject.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/object/UMLObjectAttribute.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/object/UMLObjectDiagram.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/object/UMLObjectLink.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/object/UMLObjectMethod.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/parsers/UMLModelParser.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/parsers/v2/ActivityDiagramParser.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/parsers/v2/ClassDiagramParser.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/parsers/v2/CommunicationDiagramParser.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/parsers/v2/ComponentDiagramParser.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/parsers/v2/DeploymentDiagramParser.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/parsers/v2/FlowchartParser.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/parsers/v2/ObjectDiagramParser.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/parsers/v2/PetriNetParser.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/parsers/v2/SyntaxTreeParser.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/parsers/v2/UMLModelV2Parser.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/parsers/v2/UseCaseDiagramParser.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/parsers/v3/ActivityDiagramParser.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/parsers/v3/BPMNDiagramParser.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/parsers/v3/ClassDiagramParser.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/parsers/v3/CommunicationDiagramParser.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/parsers/v3/ComponentDiagramParser.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/parsers/v3/DeploymentDiagramParser.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/parsers/v3/FlowchartParser.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/parsers/v3/ObjectDiagramParser.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/parsers/v3/PetriNetParser.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/parsers/v3/SyntaxTreeParser.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/parsers/v3/UMLModelV3Parser.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/parsers/v3/UseCaseDiagramParser.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/petrinet/PetriNet.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/petrinet/PetriNetArc.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/petrinet/PetriNetPlace.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/petrinet/PetriNetTransition.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/syntaxtree/SyntaxTree.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeLink.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeNonterminal.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeTerminal.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/usecase/UMLActor.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/usecase/UMLSystemBoundary.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/usecase/UMLUseCase.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/usecase/UMLUseCaseAssociation.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/umlmodel/usecase/UMLUseCaseDiagram.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/utils/CompassConfiguration.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/utils/JSONMapping.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/compass/utils/SimilarityUtils.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/competency/CompetencyJolService.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/competency/CompetencyProgressService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/competency/CompetencyRelationService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/competency/CompetencyService.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/competency/CourseCompetencyService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/competency/KnowledgeAreaService.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/competency/PrerequisiteService.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/competency/StandardizedCompetencyService.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/AbstractGitService.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/BuildScriptGenerationService.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/BuildScriptProviderService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/ConnectorHealth.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/GenericBuildScriptGenerationService.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/GitService.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/HazelcastHealthIndicator.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/SAML2Service.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/aeolus/Action.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/aeolus/ActionDeserializer.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/aeolus/AeolusBuildPlanService.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/aeolus/AeolusBuildScriptGenerationService.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/aeolus/AeolusRepository.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/aeolus/AeolusResult.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/aeolus/AeolusTemplateService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/aeolus/DockerConfig.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/aeolus/PlatformAction.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/aeolus/ScriptAction.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/aeolus/Windfile.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/aeolus/WindfileMetadata.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/aeolus/dto/AeolusGenerationResponseDTO.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/apollon/ApollonConversionService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/apollon/ApollonHealthIndicator.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/apollon/dto/ApollonModelDTO.java (76%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/athena/AthenaConnector.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/athena/AthenaDTOConverterService.java (75%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/athena/AthenaFeedbackSendingService.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/athena/AthenaFeedbackSuggestionsService.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/athena/AthenaHealthIndicator.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/athena/AthenaModuleService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/athena/AthenaRepositoryExportService.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/athena/AthenaSubmissionSelectionService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/athena/AthenaSubmissionSendingService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/ci/AbstractBuildPlanCreator.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/ci/AbstractContinuousIntegrationResultService.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/ci/AbstractContinuousIntegrationService.java (65%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/ci/CIPermission.java (59%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/ci/CIUserManagementService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/ci/ContinuousIntegrationResultService.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/ci/ContinuousIntegrationServerHealthIndicator.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/ci/ContinuousIntegrationService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/ci/ContinuousIntegrationTriggerService.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/ci/ContinuousIntegrationUpdateService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/ci/notification/BuildLogParseUtils.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/ci/notification/dto/CommitDTO.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/ci/notification/dto/TestCaseDTO.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/ci/notification/dto/TestCaseDetailMessageDTO.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/ci/notification/dto/TestResultsDTO.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/ci/notification/dto/TestSuiteDTO.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/ci/notification/dto/TestwiseCoverageReportDTO.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/gitlab/AbstractGitLabAuthorizationInterceptor.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/gitlab/GitLabAuthorizationInterceptor.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/gitlab/GitLabException.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/gitlab/GitLabService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/gitlab/GitLabUserDoesNotExistException.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/gitlab/GitLabUserManagementService.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/gitlab/GitlabInfoContributor.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/gitlab/dto/GitLabCommitDTO.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/gitlab/dto/GitLabProjectDTO.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/gitlab/dto/GitLabRepositoryDTO.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java (78%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/gitlabci/GitLabCIInfoContributor.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java (68%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/gitlabci/GitLabCIResultService.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/gitlabci/GitLabCIService.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/gitlabci/GitLabCITriggerService.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/jenkins/JenkinsAuthorizationInterceptor.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/jenkins/JenkinsEndpoints.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/jenkins/JenkinsInfoContributor.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/jenkins/JenkinsInternalUrlService.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java (62%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/jenkins/JenkinsResultService.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/jenkins/JenkinsService.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/jenkins/JenkinsTriggerService.java (77%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/jenkins/JenkinsUserManagementService.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/jenkins/JenkinsXmlConfigBuilder.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/jenkins/JenkinsXmlFileUtils.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanCreator.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanLinkInfoContributor.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanUtils.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/jenkins/dto/JenkinsUserDTO.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/jenkins/jobs/JenkinsJobPermission.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsService.java (99%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtils.java (99%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/jenkins/jobs/JenkinsJobService.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/ldap/LdapAuthenticationProvider.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/LocalCIBuildConfigurationService.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/LocalCIInfoContributor.java (76%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/LocalCIPriorityQueueComparator.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java (64%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/LocalCIQueueWebsocketService.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/LocalCIResultProcessingService.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/LocalCIResultService.java (63%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/LocalCIService.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/LocalCITriggerService.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/SharedQueueManagementService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/buildagent/BuildAgentDockerService.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/buildagent/BuildAgentSshKeyService.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/buildagent/BuildJobContainerService.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/buildagent/BuildJobExecutionService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/buildagent/BuildJobGitService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/buildagent/BuildJobManagementService.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/buildagent/BuildLogsMap.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/buildagent/TestResultXmlParser.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/dto/BuildAgentInformation.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/dto/BuildConfig.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/dto/BuildJobQueueItem.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/dto/BuildResult.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/dto/DockerImageBuild.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/dto/JobTimingInfo.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/dto/RepositoryInfo.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/dto/ResultBuildJob.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/dto/ResultQueueItem.java (73%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/scaparser/ReportParser.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/scaparser/exception/ParserException.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/scaparser/exception/UnsupportedToolException.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/scaparser/strategy/CheckstyleParser.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/scaparser/strategy/PMDCPDParser.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/scaparser/strategy/PMDParser.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/scaparser/strategy/ParserPolicy.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/scaparser/strategy/ParserStrategy.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/scaparser/strategy/SpotbugsParser.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/scaparser/utils/FileUtils.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/scaparser/utils/ReportUtils.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localvc/LocalVCFetchFilter.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localvc/LocalVCInfoContributor.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localvc/LocalVCPersonalAccessTokenManagementService.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localvc/LocalVCPostPushHook.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localvc/LocalVCPrePushHook.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localvc/LocalVCPushFilter.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localvc/LocalVCRepositoryUri.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localvc/LocalVCService.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localvc/LocalVCServletService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/lti/ExternalPasswordResetInfoContributor.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/lti/Lti13Service.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/lti/LtiDeepLinkingService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/lti/LtiDynamicRegistrationService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/lti/LtiNewResultService.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/lti/LtiService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/PyrisConnectorException.java (72%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/PyrisConnectorService.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/PyrisDTOService.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/PyrisHealthIndicator.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/PyrisJobService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/PyrisPipelineService.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/PyrisStatusUpdateService.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/PyrisWebhookService.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/PyrisErrorResponseDTO.java (78%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/PyrisHealthStatusDTO.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/PyrisModelDTO.java (74%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/PyrisPipelineExecutionDTO.java (67%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/PyrisPipelineExecutionSettingsDTO.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/chat/PyrisChatPipelineExecutionBaseDataDTO.java (55%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/chat/PyrisChatStatusUpdateDTO.java (66%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java (51%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/chat/exercise/PyrisExerciseChatPipelineExecutionDTO.java (52%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionInputDTO.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyStatusUpdateDTO.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/data/PyrisBuildLogEntryDTO.java (76%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/data/PyrisCompetencyDTO.java (69%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/data/PyrisCourseDTO.java (73%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/data/PyrisExamDTO.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/data/PyrisExerciseWithStudentSubmissionsDTO.java (78%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/data/PyrisExtendedCourseDTO.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/data/PyrisFeedbackDTO.java (74%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/data/PyrisImageMessageContentDTO.java (76%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/data/PyrisJsonMessageContentDTO.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/data/PyrisLectureDTO.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/data/PyrisLectureUnitDTO.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/data/PyrisMessageContentBaseDTO.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/data/PyrisMessageDTO.java (76%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/data/PyrisProgrammingExerciseDTO.java (77%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/data/PyrisResultDTO.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/data/PyrisStudentSubmissionDTO.java (76%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/data/PyrisSubmissionDTO.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/data/PyrisTextMessageContentDTO.java (76%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/data/PyrisUserDTO.java (73%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java (67%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureIngestionExecutionDTO.java (67%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/status/PyrisStageDTO.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/dto/status/PyrisStageState.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/job/CompetencyExtractionJob.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/job/CourseChatJob.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/job/ExerciseChatJob.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/job/IngestionWebhookJob.java (73%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/pyris/job/PyrisJob.java (78%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/vcs/AbstractVersionControlService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/vcs/VcsTokenManagementService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/vcs/VcsTokenRenewalService.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/vcs/VcsUserManagementService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/vcs/VersionControlRepositoryPermission.java (58%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/vcs/VersionControlServerHealthIndicator.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/vcs/VersionControlService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/AbstractBuildResultNotificationDTO.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/AuditingEntityDTO.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/BuildJobDTOInterface.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/BuildJobResultCountDTO.java (62%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/BuildJobsStatisticsDTO.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/ComplaintAction.java (61%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/ComplaintRequestDTO.java (70%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/ComplaintResponseUpdateDTO.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/ConsistencyErrorDTO.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/CoverageReportAndSubmissionDateDTO.java (70%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/FinishedBuildJobDTO.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/GradingCriterionDTO.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/GradingInstructionDTO.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/MaxAndReachablePoints.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/PasswordChangeDTO.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/ProgrammingSubmissionIdAndSubmissionDateDTO.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/ResponsibleUserDTO.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/StaticCodeAnalysisIssue.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/StaticCodeAnalysisReportDTO.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/StudentDTO.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/TeamSearchUserDTO.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/TestCaseBaseDTO.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/UserDTO.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/UserInitializationDTO.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/UserPublicInfoDTO.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/UserRoleDTO.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/athena/ExerciseBaseDTO.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/athena/FeedbackBaseDTO.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/athena/ModelingExerciseDTO.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/athena/ModelingFeedbackDTO.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/athena/ModelingSubmissionDTO.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/athena/ProgrammingExerciseDTO.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/athena/ProgrammingFeedbackDTO.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/athena/ProgrammingSubmissionDTO.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/athena/SubmissionBaseDTO.java (74%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/athena/TextExerciseDTO.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/athena/TextFeedbackDTO.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/dto/athena/TextSubmissionDTO.java (90%) create mode 100644 src/main/java/de/tum/cit/aet/artemis/service/dto/package-info.java rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/exam/ExamAccessService.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/exam/ExamDateService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/exam/ExamDeletionService.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/exam/ExamImportService.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/exam/ExamLiveEventsService.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/exam/ExamQuizQuestionsGenerator.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/exam/ExamQuizService.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/exam/ExamRegistrationService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/exam/ExamService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/exam/ExamSessionService.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/exam/ExamSubmissionService.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/exam/ExamUserService.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/exam/ImageExtractor.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/exam/StudentExamAccessService.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/exam/StudentExamService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/export/CourseExamExportService.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/export/DataExportCommunicationDataService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/export/DataExportCreationService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/export/DataExportExamCreationService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/export/DataExportExerciseCreationService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/export/DataExportQuizExerciseCreationService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/export/DataExportScienceEventService.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/export/DataExportService.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/export/DataExportUtil.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/export/ExerciseWithSubmissionsExportService.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/export/FileUploadExerciseWithSubmissionsExportService.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/export/FileUploadSubmissionExportService.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/export/ModelingExerciseWithSubmissionsExportService.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/export/ModelingSubmissionExportService.java (74%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/export/ProgrammingExerciseExportService.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/export/QuizExerciseWithSubmissionsExportService.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/export/SubmissionExportService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/export/TextExerciseWithSubmissionsExportService.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/export/TextSubmissionExportService.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/feature/Feature.java (78%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/feature/FeatureToggle.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/feature/FeatureToggleAspect.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/feature/FeatureToggleInfoContributor.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/feature/FeatureToggleService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/CodeHintService.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/ExerciseHintService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/ProgrammingExerciseTaskService.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/TestwiseCoverageService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/behavioral/BehavioralBlackboard.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/behavioral/BehavioralSolutionEntryGenerationException.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/behavioral/BehavioralTestCaseService.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/behavioral/GroupedFile.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/behavioral/knowledgesource/AddUncoveredLinesAsPotentialCodeBlocks.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/behavioral/knowledgesource/BehavioralKnowledgeSource.java (78%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/behavioral/knowledgesource/CombineChangeBlocks.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/behavioral/knowledgesource/CreateCommonChangeBlocks.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/behavioral/knowledgesource/CreateSolutionEntries.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/behavioral/knowledgesource/DropRemovedGitDiffEntries.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/behavioral/knowledgesource/ExtractChangedLines.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/behavioral/knowledgesource/ExtractCoveredLines.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/behavioral/knowledgesource/FindCommonLines.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/behavioral/knowledgesource/GroupGitDiffAndCoverageEntriesByFilePathAndTestCase.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/behavioral/knowledgesource/InsertFileContents.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/structural/StructuralAttribute.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/structural/StructuralClass.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/structural/StructuralClassElements.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/structural/StructuralConstructor.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/structural/StructuralElement.java (99%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/structural/StructuralMethod.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/structural/StructuralSolutionEntryGenerationException.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/hestia/structural/StructuralTestCaseService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/icl/ArtemisGitServletService.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/icl/GitPublickeyAuthenticatorService.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/icl/SshGitCommandFactoryService.java (76%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/icl/SshGitLocationResolverService.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/iris/IrisCompetencyGenerationService.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/iris/IrisDefaultTemplateService.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/iris/IrisMessageService.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/iris/IrisRateLimitService.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/iris/IrisSessionService.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/iris/dto/IrisChatWebsocketDTO.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/iris/dto/IrisCombinedChatSubSettingsDTO.java (78%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java (77%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/iris/dto/IrisCombinedHestiaSubSettingsDTO.java (75%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/iris/dto/IrisCombinedLectureIngestionSubSettingsDTO.java (78%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/iris/dto/IrisCombinedSettingsDTO.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/iris/exception/IrisException.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/iris/exception/IrisForbiddenException.java (78%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/iris/exception/IrisInternalPyrisErrorException.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/iris/exception/IrisRateLimitExceededException.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/iris/session/AbstractIrisChatSessionService.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/iris/session/IrisButtonBasedFeatureInterface.java (74%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/iris/session/IrisChatBasedFeatureInterface.java (76%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/iris/session/IrisCourseChatSessionService.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/iris/session/IrisExerciseChatSessionService.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/iris/session/IrisHestiaSessionService.java (85%) create mode 100644 src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisRateLimitedFeatureInterface.java rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/iris/session/IrisSubFeatureInterface.java (76%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/iris/settings/IrisSettingsService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/iris/settings/IrisSubSettingsService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/iris/websocket/IrisChatWebsocketService.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/iris/websocket/IrisWebsocketService.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/ldap/LdapConfig.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/ldap/LdapUserDto.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/ldap/LdapUserService.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/learningpath/LearningPathNavigationService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/learningpath/LearningPathNgxService.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/learningpath/LearningPathRecommendationService.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/learningpath/LearningPathService.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/linkpreview/LinkPreviewService.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/linkpreview/ogparser/Content.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/linkpreview/ogparser/OgParser.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/linkpreview/ogparser/OpenGraph.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/linkpreview/ogparser/htmlparser/OgMetaElement.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/linkpreview/ogparser/htmlparser/OgMetaElementHtmlParser.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/listeners/ResultListener.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/messaging/DistributedInstanceMessageSendService.java (99%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/messaging/InstanceMessageReceiveService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/messaging/InstanceMessageSendService.java (99%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/messaging/MainInstanceMessageSendService.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/messaging/MessageTopic.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/metis/AnswerMessageService.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/metis/ConversationMessagingService.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/metis/PostingService.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/metis/ReactionService.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/metis/conversation/ChannelService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/metis/conversation/ConversationDTOService.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/metis/conversation/ConversationService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/metis/conversation/GroupChatService.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/metis/conversation/OneToOneChatService.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/metis/conversation/auth/ChannelAuthorizationService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/metis/conversation/auth/ConversationAuthorizationService.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/metis/conversation/auth/GroupChatAuthorizationService.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/metis/conversation/auth/OneToOneChatAuthorizationService.java (73%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/metis/conversation/errors/ChannelNameDuplicateException.java (78%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/metis/similarity/PostSimilarityComparisonStrategy.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/metis/similarity/TitleJaccardSimilarityCompareStrategy.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/metrics/LearningMetricsService.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/notifications/ConversationNotificationService.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/notifications/GeneralInstantNotificationService.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/notifications/GroupNotificationScheduleService.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/notifications/GroupNotificationService.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/notifications/InstantNotificationService.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/notifications/MailSendingService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/notifications/MailService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/notifications/NotificationSettingsCommunicationChannel.java (77%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/notifications/NotificationSettingsService.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/notifications/SingleUserNotificationService.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/notifications/TutorialGroupNotificationService.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/notifications/push_notifications/ApplePushNotificationService.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/notifications/push_notifications/FirebasePushNotificationService.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/notifications/push_notifications/FirebaseRelayNotificationRequests.java (67%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/notifications/push_notifications/PushNotificationService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/notifications/push_notifications/RelayNotificationRequest.java (65%) create mode 100644 src/main/java/de/tum/cit/aet/artemis/service/package-info.java rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/plagiarism/ContinuousPlagiarismControlPostContentProvider.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/plagiarism/ContinuousPlagiarismControlService.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/plagiarism/ModelingPlagiarismDetectionService.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/plagiarism/PlagiarismAnswerPostService.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/plagiarism/PlagiarismCaseService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/plagiarism/PlagiarismDetectionService.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/plagiarism/PlagiarismPostService.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/plagiarism/PlagiarismService.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/plagiarism/PlagiarismWebsocketService.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/plagiarism/ProgrammingLanguageNotSupportedForPlagiarismDetectionException.java (73%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/plagiarism/TextPlagiarismDetectionService.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/plagiarism/cache/PlagiarismCacheService.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/programming/AuxiliaryRepositoryService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/programming/CommitHistoryService.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/programming/DefaultTemplateUpgradeService.java (65%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/programming/JavaTemplateUpgradeService.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/programming/ProgrammingAssessmentService.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/programming/ProgrammingExerciseCodeReviewFeedbackService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/programming/ProgrammingExerciseFeedbackCreationService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/programming/ProgrammingExerciseGradingService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/programming/ProgrammingExerciseImportBasicService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/programming/ProgrammingExerciseImportFromFileService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/programming/ProgrammingExerciseImportService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/programming/ProgrammingExerciseParticipationService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/programming/ProgrammingExerciseRepositoryService.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/programming/ProgrammingExerciseService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/programming/ProgrammingExerciseTestCaseService.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/programming/ProgrammingLanguageFeature.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/programming/ProgrammingLanguageFeatureService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/programming/ProgrammingMessagingService.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/programming/ProgrammingSubmissionService.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/programming/ProgrammingTriggerService.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/programming/RepositoryAccessService.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/programming/RepositoryParticipationService.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/programming/RepositoryService.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/programming/TemplateUpgradePolicyService.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/programming/TemplateUpgradeService.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/quiz/QuizBatchService.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/quiz/QuizExerciseImportService.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/quiz/QuizExerciseService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/quiz/QuizMessagingService.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/quiz/QuizPoolService.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/quiz/QuizResultService.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/quiz/QuizScheduleService.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/quiz/QuizService.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/quiz/QuizStatisticService.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/quiz/QuizSubmissionService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/scheduled/AthenaScheduleService.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/scheduled/AutomaticProgrammingExerciseCleanupService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/scheduled/DataExportScheduleService.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/scheduled/IExerciseScheduleService.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/scheduled/ModelingExerciseScheduleService.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/scheduled/NotificationScheduleService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/scheduled/ParticipantScoreScheduleService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/scheduled/ProgrammingExerciseScheduleService.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupService.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/scheduled/ScheduleService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/scheduled/UserScheduleService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/scheduled/WeeklyEmailSummaryScheduleService.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/science/ScienceEventService.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/team/TeamImportStrategy.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/team/strategies/CreateOnlyStrategy.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/team/strategies/PurgeExistingStrategy.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/telemetry/TelemetryService.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/theia/TheiaInfoContributor.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/tutorialgroups/TutorialGroupChannelManagementService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/tutorialgroups/TutorialGroupFreePeriodService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/tutorialgroups/TutorialGroupScheduleService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/tutorialgroups/TutorialGroupService.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/tutorialgroups/TutorialGroupsConfigurationService.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/user/AuthorityService.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/user/PasswordService.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/user/UserCreationService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/user/UserManagementInfoContributor.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/user/UserService.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/util/CommonsMultipartFile.java (99%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/util/ExamExerciseStartPreparationStatus.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/util/HttpRequestUtils.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/util/RoundingUtil.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/util/TimeLogUtil.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/util/TimeUtil.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/util/Tuple.java (74%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/util/UrlUtils.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/util/structureoraclegenerator/JavaClassDiff.java (99%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/util/structureoraclegenerator/JavaClassDiffSerializer.java (99%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/util/structureoraclegenerator/OracleGenerator.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/service/util/structureoraclegenerator/SerializerUtil.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/validation/InetSocketAddressValidator.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/validation/TeamAssignmentConfigValidator.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/validation/constraints/TeamAssignmentConfigConstraints.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/filter/ApiVersionFilter.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/filter/CachingHttpHeadersFilter.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/filter/Lti13LaunchFilter.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/filter/SpaWebFilter.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/AbstractSubmissionResource.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/AccountResource.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/AeolusTemplateResource.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/AndroidAppSiteAssociationResource.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/ApollonConversionResource.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/ApollonDiagramResource.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/AppleAppSiteAssociationResource.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/AssessmentResource.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/AthenaResource.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/AttachmentResource.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/BonusResource.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/ComplaintResource.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/ComplaintResponseResource.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/ConsistencyCheckResource.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/CourseResource.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/CustomMetricsExtension.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/DataExportResource.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/ExamLockResource.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/ExamResource.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/ExamUserResource.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/ExampleSubmissionResource.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/ExerciseGroupResource.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/ExerciseResource.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/ExerciseScoresChartResource.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/FileResource.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/FileUploadAssessmentResource.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/FileUploadExerciseResource.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/FileUploadSubmissionResource.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/GitDiffReportParserService.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/GradeStepResource.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/GradingScaleResource.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/GuidedTourSettingsResource.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/LearningPathResource.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/LectureResource.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/LongFeedbackTextResource.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/LtiResource.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/MetricsResource.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/ModelingAssessmentResource.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/ModelingExerciseResource.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/ModelingSubmissionResource.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/NotificationResource.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/NotificationSettingsResource.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/OrganizationResource.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/ParticipantScoreResource.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/ParticipationResource.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/PlantUmlResource.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/QuizExerciseResource.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/QuizParticipationResource.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/QuizPoolResource.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/QuizSubmissionResource.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/RatingResource.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/ResultResource.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/StaticCodeAnalysisResource.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/StatisticsResource.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/StudentExamResource.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/SubmissionPolicyResource.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/SubmissionResource.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/SystemNotificationResource.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/TeamResource.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/TextAssessmentEventResource.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/TextAssessmentResource.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/TextExerciseResource.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/TextSubmissionResource.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/TutorEffortResource.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/TutorParticipationResource.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/UserResource.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/admin/AdminBuildJobQueueResource.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/admin/AdminCourseResource.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/admin/AdminDataExportResource.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/admin/AdminExamResource.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/admin/AdminExerciseResource.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/admin/AdminImprintResource.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/admin/AdminLtiConfigurationResource.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/admin/AdminModelingExerciseResource.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/admin/AdminOrganizationResource.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/admin/AdminPrivacyStatementResource.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/admin/AdminStandardizedCompetencyResource.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/admin/AdminStatisticsResource.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/admin/AdminSystemNotificationResource.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/admin/AdminTextAssessmentEventResource.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/admin/AdminUserResource.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/admin/AuditResource.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/admin/FeatureToggleResource.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/admin/LogResource.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/admin/iris/AdminIrisSettingsResource.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/competency/CompetencyResource.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/competency/CourseCompetencyResource.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/competency/PrerequisiteResource.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/competency/StandardizedCompetencyResource.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/AssessmentUpdateBaseDTO.java (68%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/AssessmentUpdateDTO.java (77%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/BonusExampleDTO.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/BonusResultDTO.java (76%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/BonusSourceResultDTO.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/BuildLogStatisticsDTO.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/BuildPlanCheckoutDirectoriesDTO.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/CheckoutDirectoriesDTO.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/CommitInfoDTO.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/CourseCompetencyProgressDTO.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/CourseContentCount.java (78%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/CourseForDashboardDTO.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/CourseForImportDTO.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/CourseManagementDetailViewDTO.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/CourseManagementOverviewExerciseStatisticsDTO.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/CourseManagementOverviewStatisticsDTO.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/CourseManagementStatisticsDTO.java (71%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/CourseScoresDTO.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/CourseWithIdDTO.java (75%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/CoursesForDashboardDTO.java (70%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/DataExportDTO.java (71%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/DueDateStat.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ExamChecklistDTO.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ExamInformationDTO.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ExamScoresDTO.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ExamSessionDTO.java (77%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ExamUserAttendanceCheckDTO.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ExamUserDTO.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ExamUsersNotFoundDTO.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ExamWithIdAndCourseDTO.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ExerciseDTO.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ExerciseDetailsDTO.java (57%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ExerciseForPlagiarismCasesOverviewDTO.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ExerciseGroupWithIdAndExamDTO.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ExerciseManagementStatisticsDTO.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ExerciseScoresAggregatedInformation.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ExerciseScoresDTO.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/FileMove.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/FileUploadAssessmentDTO.java (70%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/GradeDTO.java (67%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/GradeStepsDTO.java (71%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ImageDTO.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ImprintDTO.java (66%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/LectureUnitInformationDTO.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/LectureUnitSplitDTO.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/LegalDocument.java (56%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/LinkPreviewDTO.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ModelingAssessmentDTO.java (69%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/OnlineCourseDTO.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/OnlineResourceDTO.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/OrganizationCountDTO.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ParticipationDTO.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ParticipationResultDTO.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ParticipationWithExerciseDTO.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/PostContextFilterDTO.java (73%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/PrivacyStatementDTO.java (68%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ProgrammingExerciseGitDiffEntryDTO.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ProgrammingExerciseGitDiffReportDTO.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ProgrammingExerciseGradingStatisticsDTO.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ProgrammingExerciseResetOptionsDTO.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ProgrammingExerciseTestCaseDTO.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/QuizBatchJoinDTO.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/RepositoryExportOptionsDTO.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/RepositoryStatusDTO.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/RepositoryStatusDTOType.java (64%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/RequestDataExportDTO.java (69%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ResultDTO.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/ResultWithPointsPerGradingCriterionDTO.java (71%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/SearchResultPageDTO.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/StatsForDashboardDTO.java (99%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/StudentExamWithGradeDTO.java (78%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/StudentExamWithIdAndExamAndUserDTO.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/SubmissionDTO.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/SubmissionExportOptionsDTO.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/SubmissionVersionDTO.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/SubmissionWithComplaintDTO.java (68%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/SubmissionWithParticipationDTO.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/SuspiciousExamSessionsDTO.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/TextAssessmentDTO.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/TextAssessmentUpdateDTO.java (63%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/TutorLeaderboardDTO.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/TutorialGroupFreePeriodDTO.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/UserWithIdAndLoginDTO.java (78%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/competency/CompetencyGraphEdgeDTO.java (75%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/competency/CompetencyGraphNodeDTO.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/competency/CompetencyImportResponseDTO.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/competency/CompetencyJolDTO.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/competency/CompetencyJolPairDTO.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/competency/CompetencyNameDTO.java (69%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/competency/CompetencyProgressForLearningPathDTO.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/competency/CompetencyRelationDTO.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/competency/CompetencyWithTailRelationDTO.java (73%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/competency/LearningPathCompetencyGraphDTO.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/competency/LearningPathHealthDTO.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/competency/LearningPathInformationDTO.java (70%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/competency/LearningPathNavigationDTO.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/competency/LearningPathNavigationObjectDTO.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/competency/LearningPathNavigationOverviewDTO.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/competency/LinkedCourseCompetencyDTO.java (71%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/competency/NgxLearningPathDTO.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/examevent/ExamAttendanceCheckEventDTO.java (78%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/examevent/ExamLiveEventBaseDTO.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/examevent/ExamWideAnnouncementEventDTO.java (72%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/examevent/ProblemStatementUpdateEventDTO.java (76%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/examevent/WorkingTimeUpdateEventDTO.java (75%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/feedback/FeedbackDetailDTO.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/lectureunit/LectureUnitForLearningPathNodeDetailsDTO.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/metrics/CompetencyExerciseMasteryCalculationDTO.java (75%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/metrics/CompetencyInformationDTO.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/metrics/CompetencyProgressDTO.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/metrics/CompetencyStudentMetricsDTO.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/metrics/ExerciseInformationDTO.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/metrics/ExerciseStudentMetricsDTO.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/metrics/LectureUnitInformationDTO.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/metrics/LectureUnitStudentMetricsDTO.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/metrics/MapEntryLongLong.java (78%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/metrics/ResourceTimestampDTO.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/metrics/ScoreDTO.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/metrics/StudentMetricsDTO.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/pageablesearch/CompetencyPageableSearchDTO.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/pageablesearch/FinishedBuildJobPageableSearchDTO.java (76%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/pageablesearch/PageableSearchDTO.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/pageablesearch/SearchTermPageableSearchDTO.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/pageablesearch/UserPageableSearchDTO.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/plagiarism/PlagiarismCaseInfoDTO.java (73%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/plagiarism/PlagiarismComparisonStatusDTO.java (59%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/plagiarism/PlagiarismResultDTO.java (70%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/plagiarism/PlagiarismVerdictDTO.java (69%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/science/ScienceEventDTO.java (60%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/score/ScoreDTO.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/score/StudentScoreSum.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/score/StudentScoresDTO.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/score/TeamScoreSum.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/settings/ide/IdeDTO.java (67%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/settings/ide/IdeMappingDTO.java (64%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaRequestDTO.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaResultDTO.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/standardizedCompetency/SourceDTO.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyCatalogDTO.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyRequestDTO.java (75%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyResultDTO.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/dto/user/UserNameAndLoginDTO.java (76%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/errors/AccessForbiddenAlertException.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/errors/AccessForbiddenException.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/errors/BadRequestAlertException.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/errors/CaptchaRequiredException.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/errors/ComplaintResponseLockedException.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/errors/ConflictException.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/errors/EmailAlreadyUsedException.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/errors/EntityNotFoundException.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/errors/ErrorConstants.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/errors/ExamConfigurationException.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/errors/ExceptionTranslator.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/errors/FieldErrorVM.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/errors/HttpStatusException.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/errors/InternalServerErrorAlertException.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/errors/InternalServerErrorException.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/errors/LoginAlreadyUsedException.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/errors/PasswordViolatesRequirementsException.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/errors/ServiceUnavailableException.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/errors/StudentsAlreadyAssignedException.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/errors/StudentsAppearMultipleTimesException.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/errors/StudentsNotFoundException.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/errors/package-info.java (74%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/hestia/CodeHintResource.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/hestia/CoverageReportResource.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/hestia/ExerciseHintResource.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/iris/IrisCourseChatSessionResource.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/iris/IrisExerciseChatSessionResource.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/iris/IrisMessageResource.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/iris/IrisModelsResource.java (78%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/iris/IrisResource.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/iris/IrisSettingsResource.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/iris/IrisStatusDTO.java (65%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/lecture/AttachmentUnitResource.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/lecture/ExerciseUnitResource.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/lecture/LectureUnitResource.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/lecture/OnlineUnitResource.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/lecture/TextUnitResource.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/lecture/VideoUnitResource.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/localci/BuildJobQueueResource.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/localci/BuildLogResource.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/localci/BuildPlanResource.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/metis/AnswerMessageResource.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/metis/ConversationMessageResource.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/metis/ReactionResource.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/metis/conversation/ChannelResource.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/metis/conversation/ConversationManagementResource.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/metis/conversation/ConversationResource.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/metis/conversation/GroupChatResource.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/metis/conversation/OneToOneChatResource.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/metis/conversation/dtos/ChannelDTO.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/metis/conversation/dtos/ChannelIdAndNameDTO.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/metis/conversation/dtos/ConversationDTO.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/metis/conversation/dtos/ConversationUserDTO.java (84%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/metis/conversation/dtos/GroupChatDTO.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/metis/conversation/dtos/OneToOneChatDTO.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/ogparser/LinkPreviewResource.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/open/PublicAccountResource.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/open/PublicBuildPlanResource.java (85%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/open/PublicImprintResource.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/open/PublicLtiResource.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/open/PublicOAuth2JWKSResource.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/open/PublicPrivacyStatementResource.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/open/PublicProgrammingSubmissionResource.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/open/PublicPyrisStatusUpdateResource.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/open/PublicResultResource.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/open/PublicSystemNotificationResource.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/open/PublicTimeResource.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/open/PublicUserJwtResource.java (92%) create mode 100644 src/main/java/de/tum/cit/aet/artemis/web/rest/package-info.java rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/plagiarism/PlagiarismAnswerPostResource.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/plagiarism/PlagiarismCaseResource.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/plagiarism/PlagiarismPostResource.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/plagiarism/PlagiarismResource.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilder.java (86%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/plagiarism/PlagiarismResultStats.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/programming/ProgrammingAssessmentResource.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/programming/ProgrammingExerciseLockResource.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/programming/ProgrammingExerciseResource.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/programming/ProgrammingExerciseResourceErrorKeys.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/programming/ProgrammingSubmissionResource.java (91%) create mode 100644 src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationRegisterBody.java rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/push_notification/PushNotificationRegisterDTO.java (75%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/push_notification/PushNotificationResource.java (89%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/push_notification/PushNotificationUnregisterRequest.java (50%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/repository/FileSubmission.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/repository/FileSubmissionError.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/repository/RepositoryActionType.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/repository/RepositoryResource.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/repository/TestRepositoryResource.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/repository/util/RepositoryExecutor.java (82%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/science/ScienceResource.java (77%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/science/ScienceSettingsResource.java (88%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/settings/ide/IdeSettingsResource.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/theia/TheiaConfigurationResource.java (80%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/tutorialgroups/TutorialGroupResource.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/tutorialgroups/errors/ScheduleOverlapsWithSessionException.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/tutorialgroups/errors/SessionOverlapsWithSessionException.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/util/DateUtil.java (98%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/util/HeaderUtil.java (97%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/util/PageUtil.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/util/ResponseUtil.java (91%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/util/StringUtil.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/vm/KeyAndPasswordVM.java (92%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/vm/LoggerVM.java (96%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/vm/LoginVM.java (79%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/vm/ManagedUserVM.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/vm/package-info.java (57%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/websocket/ResultWebsocketService.java (87%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/websocket/WebsocketError.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/websocket/dto/OnlineTeamStudentDTO.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/websocket/dto/ProgrammingExerciseTestCaseStateDTO.java (94%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/websocket/dto/SubmissionPatch.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/websocket/dto/SubmissionPatchPayload.java (90%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/websocket/dto/SubmissionSyncPayload.java (55%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/websocket/dto/TeamAssignmentPayload.java (72%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/websocket/dto/metis/ConversationWebsocketDTO.java (71%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/websocket/dto/metis/MetisCrudAction.java (81%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/websocket/dto/metis/PostDTO.java (68%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/websocket/dto/package-info.java (54%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/websocket/localci/LocalCIWebsocketMessagingService.java (95%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/websocket/package-info.java (54%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/websocket/programmingSubmission/BuildTriggerWebsocketError.java (83%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/websocket/team/ParticipationTeamWebsocketService.java (93%) rename src/main/java/de/tum/{in/www1 => cit/aet}/artemis/web/websocket/team/TeamWebsocketService.java (87%) delete mode 100644 src/main/java/de/tum/in/www1/artemis/config/audit/package-info.java delete mode 100644 src/main/java/de/tum/in/www1/artemis/domain/package-info.java delete mode 100644 src/main/java/de/tum/in/www1/artemis/repository/MigrationChangeRepository.java delete mode 100644 src/main/java/de/tum/in/www1/artemis/repository/iris/IrisTemplateRepository.java delete mode 100644 src/main/java/de/tum/in/www1/artemis/repository/package-info.java delete mode 100644 src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/communication/Direction.java delete mode 100644 src/main/java/de/tum/in/www1/artemis/service/dto/package-info.java delete mode 100644 src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisRateLimitedFeatureInterface.java delete mode 100644 src/main/java/de/tum/in/www1/artemis/service/package-info.java delete mode 100644 src/main/java/de/tum/in/www1/artemis/web/rest/package-info.java delete mode 100644 src/main/java/de/tum/in/www1/artemis/web/rest/push_notification/PushNotificationRegisterBody.java delete mode 100644 src/main/resources/org/eclipse/jgit/http/server/HttpServerText.properties rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/AbstractArtemisIntegrationTest.java (78%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/AbstractAthenaTest.java (86%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/AbstractSpringIntegrationIndependentTest.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/BuildPlanIntegrationTest.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/ClientForwardTest.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/ContentVersionIntegrationTest.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/DatabaseQueryCountTest.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/FileIntegrationTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/GuidedTourSettingResourceTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/ImprintResourceIntegrationTest.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/InetSocketAddressValidatorTest.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/LogResourceIntegrationTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/LongFeedbackResourceIntegrationTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/Lti13LaunchIntegrationTest.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/LtiDeepLinkingIntegrationTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/LtiIntegrationTest.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/LtiQuizIntegrationTest.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/ManagementResourceIntegrationTest.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/MetricsIntegrationTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/OAuth2JWKSIntegrationTest.java (87%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/PrivacyStatementResourceIntegrationTest.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/StatisticsIntegrationTest.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/StringUtilTest.java (82%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/StudentScoreUtilService.java (87%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/architecture/AbstractArchitectureTest.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/architecture/ArchitectureTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/architecture/EnforceRoleInResourceArchitectureTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/architecture/FeedbackArchitectureTest.java (87%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/architecture/RepositoryArchitectureTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/architecture/ResourceArchitectureTest.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/architecture/ServiceArchitectureTest.java (89%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/aspects/AbstractEnforceRoleInResourceTest.java (86%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/aspects/EnforceRoleInCourseTest.java (99%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/aspects/EnforceRoleInExerciseTest.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/aspects/resources/EnforceRoleInCourseResource.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/aspects/resources/EnforceRoleInExerciseResource.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/assessment/AssessmentComplaintIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/assessment/ComplaintResponseIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/assessment/ComplaintUtilService.java (89%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/assessment/ExampleSubmissionIntegrationTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/assessment/ExerciseScoresChartIntegrationTest.java (89%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/assessment/GradeStepIntegrationTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/assessment/GradingScaleFactory.java (88%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/assessment/GradingScaleIntegrationTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/assessment/GradingScaleUtilService.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/assessment/ParticipantScoreIntegrationTest.java (88%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/assessment/RatingResourceIntegrationTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/assessment/ResultServiceIntegrationTest.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/assessment/TutorEffortIntegrationTest.java (89%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java (88%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/assessment/TutorParticipationIntegrationTest.java (89%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/assessment/TutorParticipationResourceIntegrationTest.java (87%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/authentication/AuthenticationIntegrationTestHelper.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/authentication/InternalAuthenticationIntegrationTest.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/authentication/LdapAuthenticationIntegrationTest.java (88%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/authentication/UserAccountLocalVcsIntegrationTest.java (89%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/authentication/UserJenkinsGitlabIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/authentication/UserSaml2IntegrationTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/authorization/AuthorizationArchitectureTest.java (86%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/authorization/AuthorizationGeneralAndIndependentEndpointTest.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/authorization/AuthorizationGitlabCISamlEndpointTest.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/authorization/AuthorizationJenkinsGitlabEndpointTest.java (89%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/authorization/AuthorizationLocalCILocalVCEndpointTest.java (89%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/authorization/AuthorizationTestService.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/bonus/BonusFactory.java (87%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/bonus/BonusIntegrationTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/competency/AbstractCompetencyPrerequisiteIntegrationTest.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/competency/CompetencyIntegrationTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/competency/CompetencyJolIntegrationTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/competency/CompetencyProgressUtilService.java (82%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/competency/CompetencyUtilService.java (89%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/competency/CourseCompetencyIntegrationTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/competency/LearningPathIntegrationTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/competency/LearningPathUtilService.java (85%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/competency/PrerequisiteIntegrationTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/competency/PrerequisiteUtilService.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/competency/StandardizedCompetencyIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/competency/StandardizedCompetencyUtilService.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/config/HibernatePropertiesConfig.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/config/MetricsBeanTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/config/ProgrammingLanguageConfigurationTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/config/TheiaConfigurationTest.java (87%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/config/TopicSubscriptionInterceptorTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/connector/AeolusRequestMockProvider.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/connector/AthenaRequestMockProvider.java (99%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/connector/GitlabRequestMockProvider.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/connector/IrisRequestMockProvider.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/connector/JenkinsRequestMockProvider.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/connector/apollon/ApollonRequestMockProvider.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/connectors/AeolusBuildScriptGenerationServiceTest.java (86%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/connectors/AeolusServiceTest.java (89%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/connectors/AeolusTemplateResourceTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/connectors/AeolusTest.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/connectors/ApollonConversionServiceTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/connectors/ApollonHealthIndicatorTest.java (84%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/connectors/Lti13ServiceTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/connectors/LtiDynamicRegistrationServiceTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/connectors/LtiNewResultServiceTest.java (81%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/connectors/LtiServiceTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/course/CourseFactory.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/course/CourseTestService.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/course/CourseUtilService.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/dataexport/DataExportResourceIntegrationTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/domain/CourseTest.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/domain/ExerciseTest.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/domain/FeedbackTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/domain/GuidedTourSettingTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/domain/ObjectMethodTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/domain/ObjectMethodTestExclusions.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/domain/ResultTest.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/domain/ShortAnswerQuestionTest.java (82%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/domain/ShortAnswerSubmittedTextTest.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/domain/enumeration/ExerciseTypeTest.java (71%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/domain/notification/GroupNotificationFactoryTest.java (82%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/domain/notification/NotificationPlaceholderArchitectureTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/domain/notification/NotificationPlaceholderSignatureTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/domain/notification/SingleUserNotificationFactoryTest.java (81%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/domain/notification/TutorialGroupNotificationFactoryTest.java (85%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/entitylistener/ResultListenerIntegrationTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exam/ExamFactory.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exam/ExamIntegrationTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exam/ExamParticipationIntegrationTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exam/ExamRegistrationIntegrationTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exam/ExamSessionIntegrationTest.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exam/ExamStartTest.java (86%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exam/ExamUserIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exam/ExamUtilService.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exam/ExerciseGroupIntegrationJenkinsGitlabTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exam/ProgrammingExamIntegrationTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exam/QuizPoolIntegrationTest.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exam/StudentExamIntegrationTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exam/TestExamIntegrationTest.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/AthenaExerciseIntegrationTest.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/AthenaResourceIntegrationTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/ExerciseFactory.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/ExerciseIntegrationTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/ExerciseUtilService.java (89%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/GradingCriterionUtil.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/fileupload/FileUploadExerciseFactory.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/fileupload/FileUploadExerciseUtilService.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/ApollonConversionIntegrationTest.java (88%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/ApollonDiagramResourceIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/ModelingComparisonTest.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/ModelingExerciseFactory.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/ModelingExerciseUtilService.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/controller/FeedbackSelectorTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/controller/ModelClusterFactoryTest.java (88%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/controller/UMLModelParserTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/AbstractUMLDiagramTest.java (79%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/UMLDiagramTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityDiagramTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityDiagrams.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityNodeTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityTest.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/activity/UMLControlFlowTest.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/bpmn/BPMNDiagramTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/bpmn/BPMNDiagrams.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLAttributeTest.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassDiagramTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassDiagrams.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassTest.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLMethodTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLPackageTest.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLRelationshipTest.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/communication/UMLCommunicationDiagramTest.java (88%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/communication/UMLCommunicationDiagrams.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/component/UMLComponentDiagramTest.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/component/UMLComponentDiagrams.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/deployment/UMLDeploymentDiagramTest.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/deployment/UMLDeploymentDiagrams.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/flowchart/FlowchartTest.java (85%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/flowchart/FlowchartUtil.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/object/UMLObjectDiagramTest.java (87%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/object/UMLObjectDiagrams.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/petrinet/PetriNetTest.java (84%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/petrinet/PetriNets.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/syntaxtree/SyntaxTreeTest.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/syntaxtree/SyntaxTrees.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/usecase/UMLUseCaseDiagramTest.java (87%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/usecase/UMLUseCaseDiagrams.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ArgumentSources.java (67%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ConsistencyCheckGitlabJenkinsIntegrationTest.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ContinuousIntegrationTestService.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/CourseGitlabJenkinsIntegrationTest.java (99%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/GitServiceTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/GitlabServiceTest.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/MockDelegate.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/PlantUmlIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ProgrammingExerciseBuildPlanTest.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ProgrammingExerciseFactory.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ProgrammingExerciseGitlabJenkinsIntegrationTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java (99%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ProgrammingExerciseRepositoryServiceTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ProgrammingExerciseResultJenkinsIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ProgrammingExerciseResultTestService.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ProgrammingExerciseServiceIntegrationTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ProgrammingExerciseServiceTest.java (85%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ProgrammingExerciseTemplateIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ProgrammingExerciseTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java (89%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ProgrammingExerciseTestService.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ProgrammingExerciseUtilService.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java (87%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ProgrammingSubmissionConstants.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/RepositoryIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/RepositoryProgrammingExerciseParticipationJenkinsIntegrationTest.java (86%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/quiz/QuizComparisonTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/quiz/QuizExerciseFactory.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/quiz/QuizExerciseIntegrationTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/quiz/QuizExerciseUtilService.java (89%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/text/TextComparisonTest.java (87%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/text/TextExerciseFactory.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/exercise/text/TextExerciseUtilService.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/hestia/CodeHintIntegrationTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/hestia/CodeHintServiceTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/hestia/ExerciseHintIntegrationTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/hestia/ExerciseHintServiceTest.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/hestia/HestiaDatabaseTest.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/hestia/ProgrammingExerciseSolutionEntryIntegrationTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/hestia/ProgrammingExerciseTaskIntegrationTest.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/hestia/ProgrammingExerciseTaskServiceTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/hestia/StructuralTestCaseServiceTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/hestia/TestwiseCoverageIntegrationTest.java (87%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/hestia/TestwiseCoverageReportServiceTest.java (84%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/hestia/TestwiseCoverageTestUtil.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/hestia/behavioral/AddUncoveredLinesAsPotentialCodeBlocksTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java (81%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/hestia/behavioral/CombineChangeBlocksTest.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/hestia/behavioral/CreateCommonChangeBlocksTest.java (88%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/hestia/behavioral/CreateSolutionEntriesTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/hestia/behavioral/DropRemovedGitDiffEntriesTest.java (81%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/hestia/behavioral/ExtractChangedLinesTest.java (87%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/hestia/behavioral/ExtractCoveredLinesTest.java (88%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/hestia/behavioral/FindCommonLinesTest.java (86%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/hestia/behavioral/GroupGitDiffAndCoverageEntriesByFilePathAndTestCaseTest.java (88%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/hestia/behavioral/InsertFileContentsTest.java (85%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/iris/AbstractIrisIntegrationTest.java (88%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/iris/IrisChatMessageIntegrationTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/iris/IrisChatWebsocketTest.java (84%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/iris/IrisCompetencyGenerationIntegrationTest.java (89%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/iris/IrisExerciseChatSessionIntegrationTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/iris/IrisSessionActivationIntegrationTest.java (86%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/iris/PyrisConnectorServiceTest.java (89%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/iris/PyrisLectureIngestionTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/iris/settings/IrisSettingsIntegrationTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/learninganalytics/StudentLearningAnalyticsIntegrationTest.java (89%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/lecture/AttachmentResourceIntegrationTest.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/lecture/AttachmentUnitIntegrationTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/lecture/AttachmentUnitsIntegrationTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/lecture/ExerciseUnitIntegrationTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/lecture/LectureFactory.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/lecture/LectureIntegrationTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/lecture/LectureUnitIntegrationTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/lecture/LectureUnitServiceTest.java (86%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/lecture/LectureUtilService.java (87%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/lecture/OnlineUnitIntegrationTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/lecture/TextUnitIntegrationTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/lecture/VideoUnitIntegrationTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java (86%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/localvcci/BuildAgentConfigurationTest.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/localvcci/BuildAgentDockerServiceTest.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/localvcci/BuildAgentSshAuthenticationIntegrationTest.java (84%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/localvcci/BuildResultTest.java (73%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/localvcci/LocalCIIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/localvcci/LocalCIResourceIntegrationTest.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/localvcci/LocalCIResultServiceTest.java (81%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/localvcci/LocalCIServiceTest.java (88%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/localvcci/LocalVCInfoContributorTest.java (79%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/localvcci/LocalVCIntegrationTest.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/localvcci/LocalVCLocalCIIntegrationTest.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java (85%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/localvcci/LocalVCLocalCITestService.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/localvcci/LocalVCServiceTest.java (83%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/localvcci/LocalVCSshIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/localvcci/MultipleHostKeyProviderTest.java (76%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/localvcci/SharedQueueManagementServiceTest.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/localvcci/TestBuildAgentConfiguration.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/management/SecurityMetersServiceTest.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/metis/AbstractConversationTest.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/metis/AnswerMessageIntegrationTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/metis/ChannelIntegrationTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/metis/ConversationIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/metis/GroupChatIntegrationTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/metis/MessageIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/metis/OneToOneChatIntegrationTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/metis/PostingServiceUnitTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/metis/ReactionIntegrationTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/metis/linkpreview/LinkPreviewIntegrationTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/metis/linkpreview/mockFiles/github_home.txt (100%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/metis/linkpreview/mockFiles/github_pull_request_6615.txt (100%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/metis/linkpreview/mockFiles/github_pull_request_6618.txt (100%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/metis/linkpreview/mockFiles/google.txt (100%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/metis/similarity/TitleJaccardSimilarityCompareStrategyTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/migration/MigrationIntegrityTest.java (75%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/migration/MigrationServiceTest.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/migration/entries/TestChangeEntry20211214_231800.java (80%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/migration/entries/TestChangeEntry20211215_231800.java (80%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/migration/entries/TestChangeEntry20211216_231800.java (80%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/notification/GroupNotificationServiceTest.java (89%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/notification/NotificationFactory.java (85%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/notification/NotificationResourceIntegrationTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/notification/NotificationScheduleServiceTest.java (80%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/notification/NotificationSettingsResourceIntegrationTest.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/notification/NotificationSettingsServiceTest.java (88%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/notification/NotificationTargetFactoryTest.java (81%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/notification/PushNotificationResourceTest.java (84%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/notification/SingleUserNotificationServiceTest.java (85%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/notification/SystemNotificationIntegrationTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/organization/OrganizationFactory.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/organization/OrganizationIntegrationTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/organization/OrganizationUtilService.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/participation/ParticipationFactory.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/participation/ParticipationIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/participation/ParticipationSubmissionIntegrationTest.java (87%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/participation/ParticipationUtilService.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/participation/SubmissionExportIntegrationTest.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/participation/SubmissionIntegrationTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java (88%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/plagiarism/PlagiarismAnswerPostIntegrationTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/plagiarism/PlagiarismCaseIntegrationTest.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/plagiarism/PlagiarismCheckIntegrationTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/plagiarism/PlagiarismDetectionConfigHelperTest.java (89%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/plagiarism/PlagiarismDetectionServiceTest.java (87%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/plagiarism/PlagiarismIntegrationTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/plagiarism/PlagiarismPostIntegrationTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/plagiarism/PlagiarismUtilService.java (88%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/post/ConversationFactory.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/post/ConversationUtilService.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ParticipationTestRepository.java (73%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ProgrammingExerciseStudentParticipationTestRepository.java (85%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ProgrammingExerciseTestRepository.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/repository/ProgrammingSubmissionTestRepository.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/repository/StatisticsRepositoryTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/repository/UserRepositoryTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/repository/UserTestRepository.java (50%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/science/ScienceIntegrationTest.java (81%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/science/ScienceSettingsIntegrationTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/science/ScienceUtilService.java (88%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/security/Lti13LaunchFilterTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/security/OAuth2JWKSServiceTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/security/SecurityUtilsUnitTest.java (99%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/security/jwt/JWTFilterTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/security/jwt/TokenProviderSecurityMetersTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/security/jwt/TokenProviderTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/security/lti/Lti13TokenRetrieverTest.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/AssessmentServiceTest.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/AuthorizationCheckServiceTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/BuildLogEntryServiceTest.java (99%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/ComplaintResponseServiceTest.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/ConductAgreementServiceTest.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/ConsistencyCheckTestService.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/CourseScoreCalculationServiceTest.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/CourseServiceTest.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/DataExportCreationServiceTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/EmailSummaryServiceTest.java (89%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/ExerciseDateServiceTest.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/ExerciseLifecycleServiceTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/FeatureToggleServiceTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/FeedbackServiceTest.java (87%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/FilePathServiceTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/FileServiceTest.java (99%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/GitlabCIServiceTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/GradingScaleServiceTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/JenkinsAuthorizationInterceptorTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/JenkinsInternalUriServiceTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/JenkinsJobPermissionServiceTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/JenkinsJobServiceTest.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/JenkinsServiceTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/LearningObjectServiceTest.java (84%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/LearningPathServiceTest.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/LectureImportServiceTest.java (86%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/LectureServiceTest.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/OnlineCourseConfigurationServiceTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/ParticipationAuthorizationCheckServiceTest.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/ParticipationLifecycleServiceTest.java (88%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/ParticipationServiceTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/ParticipationTeamWebsocketServiceTest.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/PresentationPointsCalculationServiceTest.java (85%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/RepositoryAccessServiceTest.java (81%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/ResourceLoaderServiceTest.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/ResultServiceTest.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/SubmissionServiceTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/TeamWebsocketServiceTest.java (87%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/TextBlockServiceTest.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/TitleCacheEvictionServiceTest.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/UriServiceTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/WeeklyEmailSummaryScheduleServiceTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/ZipFileServiceTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java (88%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java (82%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/athena/AthenaHealthIndicatorTest.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java (84%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementServiceTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreatorTest.java (84%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtilsTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/localci/buildagent/TestResultXmlParserTest.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/connectors/vcs/VcsTokenRenewalServiceTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/exam/ExamAccessServiceTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/exam/ExamQuizServiceTest.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/exam/ExamServiceTest.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/exam/ExamSubmissionServiceTest.java (86%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/exam/StudentExamAccessServiceTest.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/export/CourseExamExportServiceTest.java (86%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/notifications/ConversationNotificationServiceTest.java (80%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/notifications/GeneralInstantNotificationServiceTest.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/notifications/MailServiceTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/notifications/TutorialGroupNotificationServiceTest.java (85%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/notifications/push_notifications/AppleFirebasePushNotificationServiceTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/scheduled/DataExportScheduleServiceTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupServiceTest.java (82%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/util/HttpRequestUtilsTest.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/service/util/TimeUtilTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/settings/ide/IdePreferencesIntegrationTest.java (89%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/staticcodeanalysis/StaticCodeAnalysisParserUnitTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/team/TeamFactory.java (89%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/team/TeamImportIntegrationTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/team/TeamIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/team/TeamUtilService.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/telemetry/TelemetryServiceTest.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/text/AssessmentEventIntegrationTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/text/TextAssessmentIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/text/TextEmbeddingIntegrationTest.java (84%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/text/TextExerciseIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/text/TextSubmissionIntegrationTest.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/theia/TheiaInfoContributorTest.java (78%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/tutorialgroups/AbstractTutorialGroupIntegrationTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/tutorialgroups/TutorialGroupFactory.java (93%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/tutorialgroups/TutorialGroupFreePeriodIntegrationTest.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/tutorialgroups/TutorialGroupIntegrationTest.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/tutorialgroups/TutorialGroupScheduleIntegrationTest.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/tutorialgroups/TutorialGroupSessionIntegrationTest.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/tutorialgroups/TutorialGroupUtilService.java (88%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/tutorialgroups/TutorialGroupsConfigurationIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/uri/RepositoryUriTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/user/AccountResourceIntegrationTest.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/user/AccountResourceWithGitLabIntegrationTest.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/user/UserFactory.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/user/UserTestService.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/user/UserUtilService.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/ConfigUtil.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/ExamPrepareExercisesTestUtil.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/ExerciseIntegrationTestService.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/FixMissingServletPathProcessor.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/GitUtilService.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/HestiaUtilTestService.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/HibernateQueryInterceptor.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/InvalidExamExerciseDatesArgumentProvider.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/InvalidExerciseConfiguration.java (92%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/LocalRepository.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/PageableSearchUtilService.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/QueryCountAssert.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/RequestUtilService.java (99%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/SensitiveInformationUtil.java (86%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/TestConstants.java (89%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/TestResourceUtils.java (96%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/TestUriParamsUtil.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/ThrowingProducer.java (74%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/Verifiable.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/ZipFileTestUtilService.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/classpath/ClassNode.java (97%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/classpath/ClassPathNode.java (99%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/classpath/ClassPathUtil.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/classpath/PackageNode.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/classpath/RootNode.java (98%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/junit_extensions/AwaitilityExtension.java (95%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/junit_extensions/ParallelLoggingExtension.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/junit_parallel_logging/ParallelConsoleAppender.java (94%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/util/junit_parallel_logging/ThreadIdConverter.java (89%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/AndroidAppSiteAssociationResourceTest.java (91%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/AppleAppSiteAssociationResourceTest.java (90%) rename src/test/java/de/tum/{in/www1 => cit/aet}/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilderTest.java (91%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/activity/activityModel1.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/activity/activityModel1v3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/activity/activityModel2.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/activity/activityModel2v3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/activity/activityModel3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/activity/activityModel3v3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/bpmn/bpmnModel1.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/bpmn/bpmnModel2.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/bpmn/bpmnModel3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel1.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel1v3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel2.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel2v3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel1.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel1v3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel2.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel2v3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/component/componentModel1.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/component/componentModel1v3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/component/componentModel2.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/component/componentModel2v3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/component/componentModel3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/component/componentModel3v3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel1.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel1v3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel2.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel2v3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel3v3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1a.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1av3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1b.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1bv3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel2.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel2v3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/object/objectModel1.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/object/objectModel1v3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/object/objectModel2.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/object/objectModel2v3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1a.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1av3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1b.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1bv3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel2.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel2v3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1a.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1av3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1b.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1bv3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel2.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel2v3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel1.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel1v3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel2.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel2v3.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/gitlabPushEventRequest.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/gitlabPushEventRequestWithoutCommit.json (100%) rename src/test/resources/de/tum/{in/www1 => cit/aet}/artemis/exercise/programming/gitlabPushEventRequestWrongCommitOrder.json (100%) diff --git a/build.gradle b/build.gradle index be02c9dc2a2f..7f0bec04d586 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ plugins { id "com.adarshr.test-logger" version "4.0.0" } -group = "de.tum.in.www1.artemis" +group = "de.tum.cit.aet.artemis" version = "7.5.3" description = "Interactive Learning with Individual Feedback" @@ -103,7 +103,7 @@ spotless { defaultTasks "bootRun" springBoot { - mainClass = "de.tum.in.www1.artemis.ArtemisApp" + mainClass = "de.tum.cit.aet.artemis.ArtemisApp" } modernizer { diff --git a/docs/dev/guidelines/criteria-builder.rst b/docs/dev/guidelines/criteria-builder.rst index 5a51d9e75b6e..2b65bf98b3da 100644 --- a/docs/dev/guidelines/criteria-builder.rst +++ b/docs/dev/guidelines/criteria-builder.rst @@ -13,7 +13,7 @@ In order to use Criteria Builder and benefit from Specifications, we need to adj @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(User.class) - public abstract class User_ extends de.tum.in.www1.artemis.domain.AbstractAuditingEntity_ { + public abstract class User_ extends de.tum.cit.aet.artemis.domain.AbstractAuditingEntity_ { public static volatile SingularAttribute lastName; public static volatile SingularAttribute resetDate; diff --git a/docs/dev/guidelines/resources/FileUpload_UtilService_Factory.puml b/docs/dev/guidelines/resources/FileUpload_UtilService_Factory.puml index 2fb62a2aba4d..b14c945a71d1 100644 --- a/docs/dev/guidelines/resources/FileUpload_UtilService_Factory.puml +++ b/docs/dev/guidelines/resources/FileUpload_UtilService_Factory.puml @@ -10,12 +10,12 @@ skinparam class { ArrowColor black } !pragma useIntermediatePackages false -package "src.main.java.de.tum.in.www1.artemis.repository" { +package "src.main.java.de.tum.cit.aet.artemis.repository" { interface FileUploadExerciseRepository { save(FileUploadExerciseRepository): FileUploadExerciseRepository } } -package "src.test.java.de.tum.in.www1.artemis.exercise" { +package "src.test.java.de.tum.cit.aet.artemis.exercise" { class ExerciseTestFactory { + {static} populateExercise(Exercise, [...]): Exercise + {static} populateExerciseForExam(Exercise, [...]): Exercise diff --git a/docs/dev/setup/server.rst b/docs/dev/setup/server.rst index 39d4e6adb182..a702b0316161 100644 --- a/docs/dev/setup/server.rst +++ b/docs/dev/setup/server.rst @@ -6,7 +6,7 @@ Server Setup To start the Artemis application server from the development environment, first import the project into IntelliJ and then make sure to install the Spring Boot plugins to run the main class -``de.tum.in.www1.artemis.ArtemisApp``. Before the application runs, you +``de.tum.cit.aet.artemis.ArtemisApp``. Before the application runs, you have to change some configuration options. You can change the options directly in the file ``application-artemis.yml`` in the folder ``src/main/resources/config``. However, you have to be careful that you do not @@ -214,7 +214,7 @@ Run the server with Spring Boot and Spring profiles ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The Artemis server should startup by running the main class -``de.tum.in.www1.artemis.ArtemisApp`` using Spring Boot. +``de.tum.cit.aet.artemis.ArtemisApp`` using Spring Boot. .. note:: Artemis uses Spring profiles to segregate parts of the diff --git a/gradle/war.gradle b/gradle/war.gradle index a38ec443d813..fe9e9cd85aa4 100644 --- a/gradle/war.gradle +++ b/gradle/war.gradle @@ -1,7 +1,7 @@ apply plugin: "war" bootWar { - mainClass = 'de.tum.in.www1.artemis.ArtemisApp' + mainClass = 'de.tum.cit.aet.artemis.ArtemisApp' includes = ["WEB-INF/**", "META-INF/**"] webXml = file("${project.rootDir}/src/main/webapp/WEB-INF/web.xml") manifest { diff --git a/src/main/java/de/tum/in/www1/artemis/ApplicationWebXml.java b/src/main/java/de/tum/cit/aet/artemis/ApplicationWebXml.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/ApplicationWebXml.java rename to src/main/java/de/tum/cit/aet/artemis/ApplicationWebXml.java index 74a019316c3d..4a0650daa7a7 100644 --- a/src/main/java/de/tum/in/www1/artemis/ApplicationWebXml.java +++ b/src/main/java/de/tum/cit/aet/artemis/ApplicationWebXml.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; diff --git a/src/main/java/de/tum/in/www1/artemis/ArtemisApp.java b/src/main/java/de/tum/cit/aet/artemis/ArtemisApp.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/ArtemisApp.java rename to src/main/java/de/tum/cit/aet/artemis/ArtemisApp.java index 674012737006..39ac1317cfe9 100644 --- a/src/main/java/de/tum/in/www1/artemis/ArtemisApp.java +++ b/src/main/java/de/tum/cit/aet/artemis/ArtemisApp.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; import java.net.InetAddress; import java.net.UnknownHostException; @@ -18,8 +18,8 @@ import org.springframework.boot.info.GitProperties; import org.springframework.core.env.Environment; -import de.tum.in.www1.artemis.config.ProgrammingLanguageConfiguration; -import de.tum.in.www1.artemis.config.TheiaConfiguration; +import de.tum.cit.aet.artemis.config.ProgrammingLanguageConfiguration; +import de.tum.cit.aet.artemis.config.TheiaConfiguration; import tech.jhipster.config.DefaultProfileUtil; import tech.jhipster.config.JHipsterConstants; diff --git a/src/main/java/de/tum/in/www1/artemis/aop/logging/LoggingAspect.java b/src/main/java/de/tum/cit/aet/artemis/aop/logging/LoggingAspect.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/aop/logging/LoggingAspect.java rename to src/main/java/de/tum/cit/aet/artemis/aop/logging/LoggingAspect.java index be14e97ea34e..4bf6e0ce1f81 100644 --- a/src/main/java/de/tum/in/www1/artemis/aop/logging/LoggingAspect.java +++ b/src/main/java/de/tum/cit/aet/artemis/aop/logging/LoggingAspect.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.aop.logging; +package de.tum.cit.aet.artemis.aop.logging; import java.util.Arrays; import java.util.Objects; @@ -14,8 +14,8 @@ import org.springframework.core.env.Environment; import org.springframework.core.env.Profiles; -import de.tum.in.www1.artemis.exception.localvc.LocalVCAuthException; -import de.tum.in.www1.artemis.service.connectors.vcs.AbstractVersionControlService; +import de.tum.cit.aet.artemis.exception.localvc.LocalVCAuthException; +import de.tum.cit.aet.artemis.service.connectors.vcs.AbstractVersionControlService; import tech.jhipster.config.JHipsterConstants; /** @@ -46,7 +46,7 @@ public void springBeanPointcut() { /** * Pointcut that matches all Spring beans in the application's main packages. */ - @Pointcut("within(de.tum.in.www1.artemis.repository..*)" + " || within(de.tum.in.www1.artemis.service..*)" + " || within(de.tum.in.www1.artemis.web.rest..*)") + @Pointcut("within(de.tum.cit.aet.artemis.repository..*)" + " || within(de.tum.cit.aet.artemis.service..*)" + " || within(de.tum.cit.aet.artemis.web.rest..*)") public void applicationPackagePointcut() { // Method is empty as this is just a Pointcut, the implementations are in the advices. } diff --git a/src/main/java/de/tum/in/www1/artemis/config/ApplicationConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/ApplicationConfiguration.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/config/ApplicationConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/ApplicationConfiguration.java index 48cb0ed7089b..303229e442eb 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/ApplicationConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/ApplicationConfiguration.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; diff --git a/src/main/java/de/tum/in/www1/artemis/config/AsyncConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/AsyncConfiguration.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/config/AsyncConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/AsyncConfiguration.java index 3ed9cf94b24f..bd4cb263b08f 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/AsyncConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/AsyncConfiguration.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_BUILDAGENT; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.concurrent.Executor; diff --git a/src/main/java/de/tum/in/www1/artemis/config/BuildAgentWithoutCoreCondition.java b/src/main/java/de/tum/cit/aet/artemis/config/BuildAgentWithoutCoreCondition.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/config/BuildAgentWithoutCoreCondition.java rename to src/main/java/de/tum/cit/aet/artemis/config/BuildAgentWithoutCoreCondition.java index 92e1fdd28439..ed6d11c294ab 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/BuildAgentWithoutCoreCondition.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/BuildAgentWithoutCoreCondition.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_BUILDAGENT; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Arrays; import java.util.Collection; diff --git a/src/main/java/de/tum/in/www1/artemis/config/CacheConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/CacheConfiguration.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/config/CacheConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/CacheConfiguration.java index f661ea0dcbcf..a14ea1ff45b4 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/CacheConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/CacheConfiguration.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_BUILDAGENT; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_LOCALCI; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALCI; import java.net.UnknownHostException; import java.nio.file.Path; @@ -50,8 +50,8 @@ import com.hazelcast.spring.cache.HazelcastCacheManager; import com.hazelcast.spring.context.SpringManagedContext; -import de.tum.in.www1.artemis.service.HazelcastPathSerializer; -import de.tum.in.www1.artemis.service.connectors.localci.LocalCIPriorityQueueComparator; +import de.tum.cit.aet.artemis.service.HazelcastPathSerializer; +import de.tum.cit.aet.artemis.service.connectors.localci.LocalCIPriorityQueueComparator; import tech.jhipster.config.JHipsterProperties; import tech.jhipster.config.cache.PrefixedKeyGenerator; @@ -241,7 +241,7 @@ public HazelcastInstance hazelcastInstance(JHipsterProperties jHipsterProperties } config.getMapConfigs().put("default", initializeDefaultMapConfig(jHipsterProperties)); config.getMapConfigs().put("files", initializeFilesMapConfig(jHipsterProperties)); - config.getMapConfigs().put("de.tum.in.www1.artemis.domain.*", initializeDomainMapConfig(jHipsterProperties)); + config.getMapConfigs().put("de.tum.cit.aet.artemis.domain.*", initializeDomainMapConfig(jHipsterProperties)); // Configure split brain protection if the cluster was split at some point var splitBrainProtectionConfig = new SplitBrainProtectionConfig(); @@ -292,7 +292,7 @@ private void hazelcastBindOnlyOnInterface(String hazelcastInterface, Config conf } /** - * Note: this is configured to be able to cache files in the Hazelcast cluster, see {@link de.tum.in.www1.artemis.service.FileService#getFileForPath} + * Note: this is configured to be able to cache files in the Hazelcast cluster, see {@link de.tum.cit.aet.artemis.service.FileService#getFileForPath} * * @return the serializer config for files based on paths */ diff --git a/src/main/java/de/tum/in/www1/artemis/config/ConditionalMetricsExclusionConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/ConditionalMetricsExclusionConfiguration.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/config/ConditionalMetricsExclusionConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/ConditionalMetricsExclusionConfiguration.java index 45902396c729..1f989c3ab29c 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/ConditionalMetricsExclusionConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/ConditionalMetricsExclusionConfiguration.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/src/main/java/de/tum/in/www1/artemis/config/Constants.java b/src/main/java/de/tum/cit/aet/artemis/config/Constants.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/config/Constants.java rename to src/main/java/de/tum/cit/aet/artemis/config/Constants.java index 2f11ca5c6604..a306fa444b38 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/Constants.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/Constants.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; import java.util.regex.Pattern; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.service.programming.ProgrammingSubmissionService; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.service.programming.ProgrammingSubmissionService; /** * Application constants. @@ -307,7 +307,7 @@ public final class Constants { public static final String PROFILE_AEOLUS = "aeolus"; /** - * The name of the Spring profile used for activating LTI in Artemis, see {@link de.tum.in.www1.artemis.web.rest.LtiResource}. + * The name of the Spring profile used for activating LTI in Artemis, see {@link de.tum.cit.aet.artemis.web.rest.LtiResource}. */ public static final String PROFILE_LTI = "lti"; diff --git a/src/main/java/de/tum/in/www1/artemis/config/CustomMetricsExtensionConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/CustomMetricsExtensionConfiguration.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/config/CustomMetricsExtensionConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/CustomMetricsExtensionConfiguration.java index 969fb02052e0..82af998bf771 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/CustomMetricsExtensionConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/CustomMetricsExtensionConfiguration.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint; import org.springframework.boot.autoconfigure.AutoConfigureAfter; @@ -12,7 +12,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.messaging.simp.user.SimpUserRegistry; -import de.tum.in.www1.artemis.web.rest.CustomMetricsExtension; +import de.tum.cit.aet.artemis.web.rest.CustomMetricsExtension; import io.micrometer.core.annotation.Timed; import tech.jhipster.config.metric.JHipsterMetricsEndpoint; diff --git a/src/main/java/de/tum/in/www1/artemis/config/DatabaseConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/DatabaseConfiguration.java similarity index 71% rename from src/main/java/de/tum/in/www1/artemis/config/DatabaseConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/DatabaseConfiguration.java index 8e7ddf1266dd..ac40826daddd 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/DatabaseConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/DatabaseConfiguration.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; @@ -8,11 +8,11 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.transaction.annotation.EnableTransactionManagement; -import de.tum.in.www1.artemis.repository.base.RepositoryImpl; +import de.tum.cit.aet.artemis.repository.base.RepositoryImpl; @Profile(PROFILE_CORE) @Configuration -@EnableJpaRepositories(basePackages = "de.tum.in.www1.artemis.repository", repositoryBaseClass = RepositoryImpl.class) +@EnableJpaRepositories(basePackages = "de.tum.cit.aet.artemis.repository", repositoryBaseClass = RepositoryImpl.class) @EnableJpaAuditing(auditorAwareRef = "springSecurityAuditorAware") @EnableTransactionManagement public class DatabaseConfiguration { diff --git a/src/main/java/de/tum/in/www1/artemis/config/DateTimeFormatConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/DateTimeFormatConfiguration.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/config/DateTimeFormatConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/DateTimeFormatConfiguration.java index b92ca48066f4..5ed0d8fe002a 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/DateTimeFormatConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/DateTimeFormatConfiguration.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; diff --git a/src/main/java/de/tum/in/www1/artemis/config/EurekaClientRestTemplateConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/EurekaClientRestTemplateConfiguration.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/config/EurekaClientRestTemplateConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/EurekaClientRestTemplateConfiguration.java index 9c18d00f111d..b1ea31529593 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/EurekaClientRestTemplateConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/EurekaClientRestTemplateConfiguration.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_BUILDAGENT; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.IOException; import java.security.GeneralSecurityException; diff --git a/src/main/java/de/tum/in/www1/artemis/config/GuidedTourConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/GuidedTourConfiguration.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/config/GuidedTourConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/GuidedTourConfiguration.java index c1540471863e..72a881d7c3a9 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/GuidedTourConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/GuidedTourConfiguration.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.List; @@ -11,9 +11,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; @Profile(PROFILE_CORE) @Component diff --git a/src/main/java/de/tum/in/www1/artemis/config/JacksonConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/JacksonConfiguration.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/config/JacksonConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/JacksonConfiguration.java index dd706aec6c5d..ffcf2c39d515 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/JacksonConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/JacksonConfiguration.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/de/tum/in/www1/artemis/config/LiquibaseConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/LiquibaseConfiguration.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/config/LiquibaseConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/LiquibaseConfiguration.java index 9a28e5c6a46f..33a8a8ad26de 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/LiquibaseConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/LiquibaseConfiguration.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static tech.jhipster.config.JHipsterConstants.SPRING_PROFILE_TEST; import java.sql.SQLException; @@ -23,7 +23,7 @@ import org.springframework.core.env.Environment; import org.springframework.core.env.Profiles; -import de.tum.in.www1.artemis.config.migration.DatabaseMigration; +import de.tum.cit.aet.artemis.config.migration.DatabaseMigration; import liquibase.Scope; import liquibase.SingletonScopeManager; import liquibase.integration.spring.SpringLiquibase; diff --git a/src/main/java/de/tum/in/www1/artemis/config/LoggingAspectConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/LoggingAspectConfiguration.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/config/LoggingAspectConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/LoggingAspectConfiguration.java index e10a2f43e96e..dde86e6e2838 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/LoggingAspectConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/LoggingAspectConfiguration.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -8,7 +8,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.core.env.Environment; -import de.tum.in.www1.artemis.aop.logging.LoggingAspect; +import de.tum.cit.aet.artemis.aop.logging.LoggingAspect; import tech.jhipster.config.JHipsterConstants; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/in/www1/artemis/config/LoggingConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/LoggingConfiguration.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/config/LoggingConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/LoggingConfiguration.java index d21db2911cae..dd3efe5af53b 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/LoggingConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/LoggingConfiguration.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_BUILDAGENT; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static tech.jhipster.config.logging.LoggingUtils.addContextListener; import static tech.jhipster.config.logging.LoggingUtils.addJsonConsoleAppender; import static tech.jhipster.config.logging.LoggingUtils.addLogstashTcpSocketAppender; diff --git a/src/main/java/de/tum/in/www1/artemis/config/MetricsBean.java b/src/main/java/de/tum/cit/aet/artemis/config/MetricsBean.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/config/MetricsBean.java rename to src/main/java/de/tum/cit/aet/artemis/config/MetricsBean.java index e449df264c6b..fadce647bf8f 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/MetricsBean.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/MetricsBean.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.Duration; import java.time.ZonedDateTime; @@ -34,20 +34,20 @@ import com.zaxxer.hikari.HikariDataSource; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseType; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.metrics.ExerciseTypeMetricsEntry; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.StatisticsRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.ProfileService; -import de.tum.in.www1.artemis.service.connectors.localci.SharedQueueManagementService; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.metrics.ExerciseTypeMetricsEntry; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.StatisticsRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.ProfileService; +import de.tum.cit.aet.artemis.service.connectors.localci.SharedQueueManagementService; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.MultiGauge; diff --git a/src/main/java/de/tum/in/www1/artemis/config/ProgrammingLanguageConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/ProgrammingLanguageConfiguration.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/config/ProgrammingLanguageConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/ProgrammingLanguageConfiguration.java index 1df6bcad31ee..50cde4f40552 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/ProgrammingLanguageConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/ProgrammingLanguageConfiguration.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.EnumMap; import java.util.List; @@ -14,8 +14,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Profile; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; /** * This configuration file provides functions to get the configured Docker Images for {@link ProgrammingLanguage ProgrammingLanguages}. diff --git a/src/main/java/de/tum/in/www1/artemis/config/PropertiesConfigurationGuard.java b/src/main/java/de/tum/cit/aet/artemis/config/PropertiesConfigurationGuard.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/config/PropertiesConfigurationGuard.java rename to src/main/java/de/tum/cit/aet/artemis/config/PropertiesConfigurationGuard.java index 898bf2d78c38..d524a323929e 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/PropertiesConfigurationGuard.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/PropertiesConfigurationGuard.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/de/tum/in/www1/artemis/config/PublicResourcesConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/PublicResourcesConfiguration.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/config/PublicResourcesConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/PublicResourcesConfiguration.java index 1bba360cfbfc..438e1359993d 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/PublicResourcesConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/PublicResourcesConfiguration.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.nio.file.Path; import java.util.Arrays; diff --git a/src/main/java/de/tum/in/www1/artemis/config/RestTemplateConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/RestTemplateConfiguration.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/config/RestTemplateConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/RestTemplateConfiguration.java index 3ae57f9aefc8..e6fde21d3043 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/RestTemplateConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/RestTemplateConfiguration.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.ArrayList; @@ -17,10 +17,10 @@ import org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConverter; import org.springframework.web.client.RestTemplate; -import de.tum.in.www1.artemis.config.auth.AthenaAuthorizationInterceptor; -import de.tum.in.www1.artemis.config.auth.PyrisAuthorizationInterceptor; -import de.tum.in.www1.artemis.service.connectors.gitlab.GitLabAuthorizationInterceptor; -import de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsAuthorizationInterceptor; +import de.tum.cit.aet.artemis.config.auth.AthenaAuthorizationInterceptor; +import de.tum.cit.aet.artemis.config.auth.PyrisAuthorizationInterceptor; +import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabAuthorizationInterceptor; +import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsAuthorizationInterceptor; /** * For now only provides a basic {@link org.springframework.web.client.RestTemplate RestTemplate} bean. Can be extended diff --git a/src/main/java/de/tum/in/www1/artemis/config/SAML2Configuration.java b/src/main/java/de/tum/cit/aet/artemis/config/SAML2Configuration.java similarity index 99% rename from src/main/java/de/tum/in/www1/artemis/config/SAML2Configuration.java rename to src/main/java/de/tum/cit/aet/artemis/config/SAML2Configuration.java index 53802684a9d9..43a5c34e9882 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/SAML2Configuration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/SAML2Configuration.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; import java.io.File; import java.io.FileInputStream; diff --git a/src/main/java/de/tum/in/www1/artemis/config/SAML2Properties.java b/src/main/java/de/tum/cit/aet/artemis/config/SAML2Properties.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/config/SAML2Properties.java rename to src/main/java/de/tum/cit/aet/artemis/config/SAML2Properties.java index aac53e0fe6b6..0943ad6b4826 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/SAML2Properties.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/SAML2Properties.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/config/SecurityConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/SecurityConfiguration.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/config/SecurityConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/SecurityConfiguration.java index 7495fc660e47..9af116b5f073 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/SecurityConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/SecurityConfiguration.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Optional; @@ -33,14 +33,14 @@ import org.springframework.web.servlet.HandlerExceptionResolver; import org.zalando.problem.spring.web.advice.security.SecurityProblemSupport; -import de.tum.in.www1.artemis.config.lti.CustomLti13Configurer; -import de.tum.in.www1.artemis.security.DomainUserDetailsService; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.jwt.JWTConfigurer; -import de.tum.in.www1.artemis.security.jwt.TokenProvider; -import de.tum.in.www1.artemis.service.ProfileService; -import de.tum.in.www1.artemis.service.user.PasswordService; -import de.tum.in.www1.artemis.web.filter.SpaWebFilter; +import de.tum.cit.aet.artemis.config.lti.CustomLti13Configurer; +import de.tum.cit.aet.artemis.security.DomainUserDetailsService; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.jwt.JWTConfigurer; +import de.tum.cit.aet.artemis.security.jwt.TokenProvider; +import de.tum.cit.aet.artemis.service.ProfileService; +import de.tum.cit.aet.artemis.service.user.PasswordService; +import de.tum.cit.aet.artemis.web.filter.SpaWebFilter; @Configuration @EnableWebSecurity @@ -87,7 +87,7 @@ public AuthenticationManager authenticationManager(HttpSecurity http, UserDetail var builder = http.getSharedObject(AuthenticationManagerBuilder.class); // Configure the user details service for internal authentication using the Artemis database. builder.userDetailsService(userDetailsService); - // Optionally configure an external authentication provider (e.g., {@link de.tum.in.www1.artemis.service.connectors.ldap.LdapAuthenticationProvider}) for remote user + // Optionally configure an external authentication provider (e.g., {@link de.tum.cit.aet.artemis.service.connectors.ldap.LdapAuthenticationProvider}) for remote user // authentication. remoteUserAuthenticationProvider.ifPresent(builder::authenticationProvider); // Spring Security processes authentication providers in the order they're added. If an external provider is configured, diff --git a/src/main/java/de/tum/in/www1/artemis/config/SentryConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/SentryConfiguration.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/config/SentryConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/SentryConfiguration.java index 12bae2c2da66..8e48746e4ce3 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/SentryConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/SentryConfiguration.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; import java.util.Optional; @@ -39,7 +39,7 @@ public void init() { } try { - final String dsn = sentryDsn.get() + "?stacktrace.app.packages=de.tum.in.www1.artemis"; + final String dsn = sentryDsn.get() + "?stacktrace.app.packages=de.tum.cit.aet.artemis"; log.info("Sentry DSN: {}", dsn); Sentry.init(options -> { diff --git a/src/main/java/de/tum/in/www1/artemis/config/StartupDelayConfig.java b/src/main/java/de/tum/cit/aet/artemis/config/StartupDelayConfig.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/config/StartupDelayConfig.java rename to src/main/java/de/tum/cit/aet/artemis/config/StartupDelayConfig.java index 9a59b94ff483..57933f79528c 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/StartupDelayConfig.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/StartupDelayConfig.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; public class StartupDelayConfig { diff --git a/src/main/java/de/tum/in/www1/artemis/config/StaticCodeAnalysisConfigurer.java b/src/main/java/de/tum/cit/aet/artemis/config/StaticCodeAnalysisConfigurer.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/config/StaticCodeAnalysisConfigurer.java rename to src/main/java/de/tum/cit/aet/artemis/config/StaticCodeAnalysisConfigurer.java index a50d6ae6e106..58328ddf2fff 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/StaticCodeAnalysisConfigurer.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/StaticCodeAnalysisConfigurer.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; import java.util.List; import java.util.Map; -import de.tum.in.www1.artemis.domain.StaticCodeAnalysisDefaultCategory; -import de.tum.in.www1.artemis.domain.enumeration.CategoryState; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisDefaultCategory; +import de.tum.cit.aet.artemis.domain.enumeration.CategoryState; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; /** * Provides hard-coded programming language specific static code analysis default categories as an unmodifiable Map diff --git a/src/main/java/de/tum/in/www1/artemis/config/TaskSchedulingConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/TaskSchedulingConfiguration.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/config/TaskSchedulingConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/TaskSchedulingConfiguration.java index abf31216530c..69c4f86278f8 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/TaskSchedulingConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/TaskSchedulingConfiguration.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/de/tum/in/www1/artemis/config/TheiaConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/TheiaConfiguration.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/config/TheiaConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/TheiaConfiguration.java index 02a50a5201ed..8021a91e91fc 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/TheiaConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/TheiaConfiguration.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_THEIA; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_THEIA; import java.util.Map; @@ -8,7 +8,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; @Profile(PROFILE_THEIA) @Configuration diff --git a/src/main/java/de/tum/in/www1/artemis/config/TomcatConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/TomcatConfiguration.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/config/TomcatConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/TomcatConfiguration.java index 7cd3da4692d2..76aa9249223e 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/TomcatConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/TomcatConfiguration.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.apache.catalina.Context; import org.apache.catalina.webresources.ExtractingRoot; diff --git a/src/main/java/de/tum/in/www1/artemis/config/WebConfigurer.java b/src/main/java/de/tum/cit/aet/artemis/config/WebConfigurer.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/config/WebConfigurer.java rename to src/main/java/de/tum/cit/aet/artemis/config/WebConfigurer.java index 304ccd33b6be..938ba524da30 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/WebConfigurer.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/WebConfigurer.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static java.net.URLDecoder.decode; import java.io.File; @@ -28,7 +28,7 @@ import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.filter.CorsFilter; -import de.tum.in.www1.artemis.web.filter.CachingHttpHeadersFilter; +import de.tum.cit.aet.artemis.web.filter.CachingHttpHeadersFilter; import tech.jhipster.config.JHipsterProperties; /** diff --git a/src/main/java/de/tum/in/www1/artemis/config/audit/AuditEventConverter.java b/src/main/java/de/tum/cit/aet/artemis/config/audit/AuditEventConverter.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/config/audit/AuditEventConverter.java rename to src/main/java/de/tum/cit/aet/artemis/config/audit/AuditEventConverter.java index a2acb9b6b072..a5c3725dccec 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/audit/AuditEventConverter.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/audit/AuditEventConverter.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.config.audit; +package de.tum.cit.aet.artemis.config.audit; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.Collections; @@ -15,7 +15,7 @@ import org.springframework.security.web.authentication.WebAuthenticationDetails; import org.springframework.stereotype.Component; -import de.tum.in.www1.artemis.domain.PersistentAuditEvent; +import de.tum.cit.aet.artemis.domain.PersistentAuditEvent; @Profile(PROFILE_CORE) @Component diff --git a/src/main/java/de/tum/cit/aet/artemis/config/audit/package-info.java b/src/main/java/de/tum/cit/aet/artemis/config/audit/package-info.java new file mode 100644 index 000000000000..e46393baf5d9 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/config/audit/package-info.java @@ -0,0 +1,4 @@ +/** + * Audit specific code. + */ +package de.tum.cit.aet.artemis.config.audit; diff --git a/src/main/java/de/tum/in/www1/artemis/config/auth/AthenaAuthorizationInterceptor.java b/src/main/java/de/tum/cit/aet/artemis/config/auth/AthenaAuthorizationInterceptor.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/config/auth/AthenaAuthorizationInterceptor.java rename to src/main/java/de/tum/cit/aet/artemis/config/auth/AthenaAuthorizationInterceptor.java index 86e27497c51b..f4e271cc174e 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/auth/AthenaAuthorizationInterceptor.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/auth/AthenaAuthorizationInterceptor.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.config.auth; +package de.tum.cit.aet.artemis.config.auth; import java.io.IOException; diff --git a/src/main/java/de/tum/in/www1/artemis/config/auth/PyrisAuthorizationInterceptor.java b/src/main/java/de/tum/cit/aet/artemis/config/auth/PyrisAuthorizationInterceptor.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/config/auth/PyrisAuthorizationInterceptor.java rename to src/main/java/de/tum/cit/aet/artemis/config/auth/PyrisAuthorizationInterceptor.java index dbeef78de74c..25ceef8a05a5 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/auth/PyrisAuthorizationInterceptor.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/auth/PyrisAuthorizationInterceptor.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.config.auth; +package de.tum.cit.aet.artemis.config.auth; import java.io.IOException; diff --git a/src/main/java/de/tum/in/www1/artemis/config/connector/GitLabApiConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/connector/GitLabApiConfiguration.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/config/connector/GitLabApiConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/connector/GitLabApiConfiguration.java index f88d93656d1b..bbe7a9e6d54f 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/connector/GitLabApiConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/connector/GitLabApiConfiguration.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.config.connector; +package de.tum.cit.aet.artemis.config.connector; import java.net.URL; diff --git a/src/main/java/de/tum/in/www1/artemis/config/connector/JenkinsServerConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/connector/JenkinsServerConfiguration.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/config/connector/JenkinsServerConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/connector/JenkinsServerConfiguration.java index 25ee36908626..32811c79c646 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/connector/JenkinsServerConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/connector/JenkinsServerConfiguration.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.config.connector; +package de.tum.cit.aet.artemis.config.connector; import java.net.URISyntaxException; import java.net.URL; diff --git a/src/main/java/de/tum/in/www1/artemis/config/icl/BuildAgentConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/icl/BuildAgentConfiguration.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/config/icl/BuildAgentConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/icl/BuildAgentConfiguration.java index b438738059da..c32a487556b5 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/icl/BuildAgentConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/icl/BuildAgentConfiguration.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.config.icl; +package de.tum.cit.aet.artemis.config.icl; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; import java.util.List; import java.util.concurrent.ExecutorService; @@ -27,8 +27,8 @@ import com.github.dockerjava.transport.DockerHttpClient; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import de.tum.in.www1.artemis.config.ProgrammingLanguageConfiguration; -import de.tum.in.www1.artemis.exception.LocalCIException; +import de.tum.cit.aet.artemis.config.ProgrammingLanguageConfiguration; +import de.tum.cit.aet.artemis.exception.LocalCIException; /** * Creates beans needed for the local CI system. diff --git a/src/main/java/de/tum/in/www1/artemis/config/icl/JGitServletConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/icl/JGitServletConfiguration.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/config/icl/JGitServletConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/icl/JGitServletConfiguration.java index 17652e820efe..7bac9a2bb522 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/icl/JGitServletConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/icl/JGitServletConfiguration.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.config.icl; +package de.tum.cit.aet.artemis.config.icl; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; import org.eclipse.jgit.http.server.GitServlet; import org.slf4j.Logger; @@ -10,7 +10,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; -import de.tum.in.www1.artemis.service.icl.ArtemisGitServletService; +import de.tum.cit.aet.artemis.service.icl.ArtemisGitServletService; /** * Configuration of the JGit Servlet that handles fetch and push requests for local Version Control. diff --git a/src/main/java/de/tum/in/www1/artemis/config/icl/ssh/HashUtils.java b/src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/HashUtils.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/config/icl/ssh/HashUtils.java rename to src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/HashUtils.java index f03ede6da8d5..0f71338a1a58 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/icl/ssh/HashUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/HashUtils.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.config.icl.ssh; +package de.tum.cit.aet.artemis.config.icl.ssh; import java.security.PublicKey; diff --git a/src/main/java/de/tum/in/www1/artemis/config/icl/ssh/MultipleHostKeyProvider.java b/src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/MultipleHostKeyProvider.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/config/icl/ssh/MultipleHostKeyProvider.java rename to src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/MultipleHostKeyProvider.java index 2fac32c26c4f..383dca871a7e 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/icl/ssh/MultipleHostKeyProvider.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/MultipleHostKeyProvider.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.config.icl.ssh; +package de.tum.cit.aet.artemis.config.icl.ssh; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/de/tum/in/www1/artemis/config/icl/ssh/SshConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/SshConfiguration.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/config/icl/ssh/SshConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/SshConfiguration.java index bda0adc3d9e7..407fda1f2b8a 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/icl/ssh/SshConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/SshConfiguration.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.config.icl.ssh; +package de.tum.cit.aet.artemis.config.icl.ssh; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; import java.net.URI; import java.net.URISyntaxException; @@ -18,9 +18,9 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; -import de.tum.in.www1.artemis.service.icl.GitPublickeyAuthenticatorService; -import de.tum.in.www1.artemis.service.icl.SshGitCommandFactoryService; -import de.tum.in.www1.artemis.service.icl.SshGitLocationResolverService; +import de.tum.cit.aet.artemis.service.icl.GitPublickeyAuthenticatorService; +import de.tum.cit.aet.artemis.service.icl.SshGitCommandFactoryService; +import de.tum.cit.aet.artemis.service.icl.SshGitLocationResolverService; @Profile(PROFILE_LOCALVC) @Configuration diff --git a/src/main/java/de/tum/in/www1/artemis/config/icl/ssh/SshConstants.java b/src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/SshConstants.java similarity index 73% rename from src/main/java/de/tum/in/www1/artemis/config/icl/ssh/SshConstants.java rename to src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/SshConstants.java index 1c133aa4c1bc..bb722842f508 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/icl/ssh/SshConstants.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/SshConstants.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.config.icl.ssh; +package de.tum.cit.aet.artemis.config.icl.ssh; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; import org.apache.sshd.common.AttributeRepository; import org.springframework.context.annotation.Profile; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.User; @Profile(PROFILE_LOCALVC) public class SshConstants { diff --git a/src/main/java/de/tum/in/www1/artemis/config/icl/ssh/SshGitCommand.java b/src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/SshGitCommand.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/config/icl/ssh/SshGitCommand.java rename to src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/SshGitCommand.java index 4d650d29c7af..ef9be8db4992 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/icl/ssh/SshGitCommand.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/SshGitCommand.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.config.icl.ssh; +package de.tum.cit.aet.artemis.config.icl.ssh; import java.io.IOException; import java.nio.file.Path; @@ -20,10 +20,10 @@ import org.eclipse.jgit.transport.UploadPack; import org.eclipse.jgit.util.FS; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCPostPushHook; -import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCPrePushHook; -import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCServletService; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCPostPushHook; +import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCPrePushHook; +import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCServletService; public class SshGitCommand extends GitPackCommand { diff --git a/src/main/java/de/tum/in/www1/artemis/config/lti/CustomLti13Configurer.java b/src/main/java/de/tum/cit/aet/artemis/config/lti/CustomLti13Configurer.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/config/lti/CustomLti13Configurer.java rename to src/main/java/de/tum/cit/aet/artemis/config/lti/CustomLti13Configurer.java index 41662e7c3be6..3388e6ba5741 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/lti/CustomLti13Configurer.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/lti/CustomLti13Configurer.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.config.lti; +package de.tum.cit.aet.artemis.config.lti; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Profile; @@ -7,10 +7,10 @@ import org.springframework.security.web.authentication.logout.LogoutFilter; import org.springframework.stereotype.Component; -import de.tum.in.www1.artemis.security.jwt.JWTFilter; -import de.tum.in.www1.artemis.service.OnlineCourseConfigurationService; -import de.tum.in.www1.artemis.service.connectors.lti.Lti13Service; -import de.tum.in.www1.artemis.web.filter.Lti13LaunchFilter; +import de.tum.cit.aet.artemis.security.jwt.JWTFilter; +import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; +import de.tum.cit.aet.artemis.service.connectors.lti.Lti13Service; +import de.tum.cit.aet.artemis.web.filter.Lti13LaunchFilter; import uk.ac.ox.ctl.lti13.Lti13Configurer; import uk.ac.ox.ctl.lti13.security.oauth2.client.lti.authentication.OidcLaunchFlowAuthenticationProvider; import uk.ac.ox.ctl.lti13.security.oauth2.client.lti.web.HttpSessionOAuth2AuthorizationRequestRepository; diff --git a/src/main/java/de/tum/in/www1/artemis/config/lti/DistributedStateAuthorizationRequestRepository.java b/src/main/java/de/tum/cit/aet/artemis/config/lti/DistributedStateAuthorizationRequestRepository.java similarity index 99% rename from src/main/java/de/tum/in/www1/artemis/config/lti/DistributedStateAuthorizationRequestRepository.java rename to src/main/java/de/tum/cit/aet/artemis/config/lti/DistributedStateAuthorizationRequestRepository.java index 49bd7162d587..69b4f2941af6 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/lti/DistributedStateAuthorizationRequestRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/lti/DistributedStateAuthorizationRequestRepository.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.config.lti; +package de.tum.cit.aet.artemis.config.lti; import java.util.Map; import java.util.Objects; diff --git a/src/main/java/de/tum/in/www1/artemis/config/lti/StateBasedOptimisticAuthorizationRequestRepository.java b/src/main/java/de/tum/cit/aet/artemis/config/lti/StateBasedOptimisticAuthorizationRequestRepository.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/config/lti/StateBasedOptimisticAuthorizationRequestRepository.java rename to src/main/java/de/tum/cit/aet/artemis/config/lti/StateBasedOptimisticAuthorizationRequestRepository.java index df997dc49ee0..1817c557200b 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/lti/StateBasedOptimisticAuthorizationRequestRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/lti/StateBasedOptimisticAuthorizationRequestRepository.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.config.lti; +package de.tum.cit.aet.artemis.config.lti; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/src/main/java/de/tum/in/www1/artemis/config/migration/DatabaseMigration.java b/src/main/java/de/tum/cit/aet/artemis/config/migration/DatabaseMigration.java similarity index 99% rename from src/main/java/de/tum/in/www1/artemis/config/migration/DatabaseMigration.java rename to src/main/java/de/tum/cit/aet/artemis/config/migration/DatabaseMigration.java index e15252486e71..f178aa64af12 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/migration/DatabaseMigration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/migration/DatabaseMigration.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.config.migration; +package de.tum.cit.aet.artemis.config.migration; import java.sql.SQLException; import java.sql.Statement; diff --git a/src/main/java/de/tum/in/www1/artemis/config/migration/MigrationEntry.java b/src/main/java/de/tum/cit/aet/artemis/config/migration/MigrationEntry.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/config/migration/MigrationEntry.java rename to src/main/java/de/tum/cit/aet/artemis/config/migration/MigrationEntry.java index 27d1e3cc86ee..ca965baa401d 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/migration/MigrationEntry.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/migration/MigrationEntry.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.config.migration; +package de.tum.cit.aet.artemis.config.migration; public abstract class MigrationEntry { diff --git a/src/main/java/de/tum/in/www1/artemis/config/migration/MigrationIntegrityException.java b/src/main/java/de/tum/cit/aet/artemis/config/migration/MigrationIntegrityException.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/config/migration/MigrationIntegrityException.java rename to src/main/java/de/tum/cit/aet/artemis/config/migration/MigrationIntegrityException.java index 327b48a0e265..2dbb92fa5293 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/migration/MigrationIntegrityException.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/migration/MigrationIntegrityException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.config.migration; +package de.tum.cit.aet.artemis.config.migration; public class MigrationIntegrityException extends RuntimeException { diff --git a/src/main/java/de/tum/in/www1/artemis/config/migration/MigrationRegistry.java b/src/main/java/de/tum/cit/aet/artemis/config/migration/MigrationRegistry.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/config/migration/MigrationRegistry.java rename to src/main/java/de/tum/cit/aet/artemis/config/migration/MigrationRegistry.java index b39b1be1d0d8..d0d86a890294 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/migration/MigrationRegistry.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/migration/MigrationRegistry.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.config.migration; +package de.tum.cit.aet.artemis.config.migration; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; import java.io.IOException; import java.security.NoSuchAlgorithmException; @@ -12,7 +12,7 @@ import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; -import de.tum.in.www1.artemis.config.migration.entries.MigrationEntry20240614_140000; +import de.tum.cit.aet.artemis.config.migration.entries.MigrationEntry20240614_140000; /** * This component allows registering certain entries containing functionality that gets executed on application startup. The entries must extend {@link MigrationEntry}. diff --git a/src/main/java/de/tum/in/www1/artemis/config/migration/MigrationService.java b/src/main/java/de/tum/cit/aet/artemis/config/migration/MigrationService.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/config/migration/MigrationService.java rename to src/main/java/de/tum/cit/aet/artemis/config/migration/MigrationService.java index 41b542390b76..bbf2386fa99f 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/migration/MigrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/migration/MigrationService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.config.migration; +package de.tum.cit.aet.artemis.config.migration; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; import static tech.jhipster.config.JHipsterConstants.SPRING_PROFILE_TEST; import java.nio.charset.StandardCharsets; @@ -26,8 +26,8 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import de.tum.in.www1.artemis.domain.MigrationChangelog; -import de.tum.in.www1.artemis.repository.MigrationChangeRepository; +import de.tum.cit.aet.artemis.domain.MigrationChangelog; +import de.tum.cit.aet.artemis.repository.MigrationChangeRepository; /** * This service contains utility functionality that verifies a changelog to prevent corruption and executes a given changelog. diff --git a/src/main/java/de/tum/in/www1/artemis/config/migration/entries/.gitkeep b/src/main/java/de/tum/cit/aet/artemis/config/migration/entries/.gitkeep similarity index 100% rename from src/main/java/de/tum/in/www1/artemis/config/migration/entries/.gitkeep rename to src/main/java/de/tum/cit/aet/artemis/config/migration/entries/.gitkeep diff --git a/src/main/java/de/tum/in/www1/artemis/config/migration/entries/MigrationEntry20240614_140000.java b/src/main/java/de/tum/cit/aet/artemis/config/migration/entries/MigrationEntry20240614_140000.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/config/migration/entries/MigrationEntry20240614_140000.java rename to src/main/java/de/tum/cit/aet/artemis/config/migration/entries/MigrationEntry20240614_140000.java index a889fbd0bec5..57b37ee31046 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/migration/entries/MigrationEntry20240614_140000.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/migration/entries/MigrationEntry20240614_140000.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.config.migration.entries; +package de.tum.cit.aet.artemis.config.migration.entries; import java.time.ZonedDateTime; import java.util.List; @@ -6,12 +6,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tum.in.www1.artemis.config.migration.MigrationEntry; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.competency.Competency; -import de.tum.in.www1.artemis.repository.CompetencyRepository; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.config.migration.MigrationEntry; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.competency.Competency; +import de.tum.cit.aet.artemis.repository.CompetencyRepository; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; public class MigrationEntry20240614_140000 extends MigrationEntry { diff --git a/src/main/java/de/tum/in/www1/artemis/config/package-info.java b/src/main/java/de/tum/cit/aet/artemis/config/package-info.java similarity index 55% rename from src/main/java/de/tum/in/www1/artemis/config/package-info.java rename to src/main/java/de/tum/cit/aet/artemis/config/package-info.java index efa57ede398d..43686df3440c 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/package-info.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/package-info.java @@ -1,4 +1,4 @@ /** * Spring Framework configuration files. */ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; diff --git a/src/main/java/de/tum/in/www1/artemis/config/websocket/WebsocketBrokerHealthIndicator.java b/src/main/java/de/tum/cit/aet/artemis/config/websocket/WebsocketBrokerHealthIndicator.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/config/websocket/WebsocketBrokerHealthIndicator.java rename to src/main/java/de/tum/cit/aet/artemis/config/websocket/WebsocketBrokerHealthIndicator.java index 06a9a482ca7f..0456ee7e8e9e 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/websocket/WebsocketBrokerHealthIndicator.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/websocket/WebsocketBrokerHealthIndicator.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.config.websocket; +package de.tum.cit.aet.artemis.config.websocket; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Map; @@ -13,7 +13,7 @@ import org.springframework.messaging.simp.broker.BrokerAvailabilityEvent; import org.springframework.stereotype.Component; -import de.tum.in.www1.artemis.service.connectors.ConnectorHealth; +import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; @Profile(PROFILE_CORE) @Component diff --git a/src/main/java/de/tum/in/www1/artemis/config/websocket/WebsocketConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/websocket/WebsocketConfiguration.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/config/websocket/WebsocketConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/websocket/WebsocketConfiguration.java index f82720b640c0..bc87d208050b 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/websocket/WebsocketConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/websocket/WebsocketConfiguration.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.config.websocket; +package de.tum.cit.aet.artemis.config.websocket; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.web.websocket.ResultWebsocketService.getExerciseIdFromNonPersonalExerciseResultDestination; -import static de.tum.in.www1.artemis.web.websocket.ResultWebsocketService.isNonPersonalExerciseResultDestination; -import static de.tum.in.www1.artemis.web.websocket.localci.LocalCIWebsocketMessagingService.isBuildAgentDestination; -import static de.tum.in.www1.artemis.web.websocket.localci.LocalCIWebsocketMessagingService.isBuildQueueAdminDestination; -import static de.tum.in.www1.artemis.web.websocket.localci.LocalCIWebsocketMessagingService.isBuildQueueCourseDestination; -import static de.tum.in.www1.artemis.web.websocket.team.ParticipationTeamWebsocketService.getParticipationIdFromDestination; -import static de.tum.in.www1.artemis.web.websocket.team.ParticipationTeamWebsocketService.isParticipationTeamDestination; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService.getExerciseIdFromNonPersonalExerciseResultDestination; +import static de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService.isNonPersonalExerciseResultDestination; +import static de.tum.cit.aet.artemis.web.websocket.localci.LocalCIWebsocketMessagingService.isBuildAgentDestination; +import static de.tum.cit.aet.artemis.web.websocket.localci.LocalCIWebsocketMessagingService.isBuildQueueAdminDestination; +import static de.tum.cit.aet.artemis.web.websocket.localci.LocalCIWebsocketMessagingService.isBuildQueueCourseDestination; +import static de.tum.cit.aet.artemis.web.websocket.team.ParticipationTeamWebsocketService.getParticipationIdFromDestination; +import static de.tum.cit.aet.artemis.web.websocket.team.ParticipationTeamWebsocketService.isParticipationTeamDestination; import java.net.InetSocketAddress; import java.security.Principal; @@ -57,17 +57,17 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Iterators; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.jwt.JWTFilter; -import de.tum.in.www1.artemis.security.jwt.TokenProvider; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.validation.InetSocketAddressValidator; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.jwt.JWTFilter; +import de.tum.cit.aet.artemis.security.jwt.TokenProvider; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.validation.InetSocketAddressValidator; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile(PROFILE_CORE) @Configuration diff --git a/src/main/java/de/tum/in/www1/artemis/config/websocket/WebsocketSecurityConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/config/websocket/WebsocketSecurityConfiguration.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/config/websocket/WebsocketSecurityConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/config/websocket/WebsocketSecurityConfiguration.java index 7f90585bacba..3c3eb709aeb2 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/websocket/WebsocketSecurityConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/websocket/WebsocketSecurityConfiguration.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.config.websocket; +package de.tum.cit.aet.artemis.config.websocket; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -11,7 +11,7 @@ import org.springframework.security.config.annotation.web.socket.EnableWebSocketSecurity; import org.springframework.security.messaging.access.intercept.MessageMatcherDelegatingAuthorizationManager; -import de.tum.in.www1.artemis.security.Role; +import de.tum.cit.aet.artemis.security.Role; @Profile(PROFILE_CORE) @Configuration diff --git a/src/main/java/de/tum/in/www1/artemis/config/websocket/package-info.java b/src/main/java/de/tum/cit/aet/artemis/config/websocket/package-info.java similarity index 50% rename from src/main/java/de/tum/in/www1/artemis/config/websocket/package-info.java rename to src/main/java/de/tum/cit/aet/artemis/config/websocket/package-info.java index 95a332060f31..f561134338b5 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/websocket/package-info.java +++ b/src/main/java/de/tum/cit/aet/artemis/config/websocket/package-info.java @@ -1,4 +1,4 @@ /** * Spring Framework configuration files. */ -package de.tum.in.www1.artemis.config.websocket; +package de.tum.cit.aet.artemis.config.websocket; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/AbstractAuditingEntity.java b/src/main/java/de/tum/cit/aet/artemis/domain/AbstractAuditingEntity.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/domain/AbstractAuditingEntity.java rename to src/main/java/de/tum/cit/aet/artemis/domain/AbstractAuditingEntity.java index 37f0532b3812..f79e0135f2d2 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/AbstractAuditingEntity.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/AbstractAuditingEntity.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.time.Instant; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/AssessmentNote.java b/src/main/java/de/tum/cit/aet/artemis/domain/AssessmentNote.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/AssessmentNote.java rename to src/main/java/de/tum/cit/aet/artemis/domain/AssessmentNote.java index e89e6c903086..df8abfc9afad 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/AssessmentNote.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/AssessmentNote.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.time.Instant; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Attachment.java b/src/main/java/de/tum/cit/aet/artemis/domain/Attachment.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/domain/Attachment.java rename to src/main/java/de/tum/cit/aet/artemis/domain/Attachment.java index 7274d223af12..c64c439e2d94 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/Attachment.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/Attachment.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.io.Serializable; import java.time.ZonedDateTime; @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.AttachmentType; -import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; +import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; /** * A Attachment. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Authority.java b/src/main/java/de/tum/cit/aet/artemis/domain/Authority.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/Authority.java rename to src/main/java/de/tum/cit/aet/artemis/domain/Authority.java index 2e154aa07c10..798d6a69235f 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/Authority.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/Authority.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.io.Serial; import java.io.Serializable; @@ -16,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.security.Role; +import de.tum.cit.aet.artemis.security.Role; /** * An authority (a security role) used by Spring Security. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/AuxiliaryRepository.java b/src/main/java/de/tum/cit/aet/artemis/domain/AuxiliaryRepository.java similarity index 99% rename from src/main/java/de/tum/in/www1/artemis/domain/AuxiliaryRepository.java rename to src/main/java/de/tum/cit/aet/artemis/domain/AuxiliaryRepository.java index 2c25c7e1e72e..75def08c2bf5 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/AuxiliaryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/AuxiliaryRepository.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.net.URISyntaxException; import java.util.Objects; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/BaseExercise.java b/src/main/java/de/tum/cit/aet/artemis/domain/BaseExercise.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/BaseExercise.java rename to src/main/java/de/tum/cit/aet/artemis/domain/BaseExercise.java index d51d7685d452..700282cf2365 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/BaseExercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/BaseExercise.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.time.ZonedDateTime; @@ -11,12 +11,12 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.DifficultyLevel; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.in.www1.artemis.domain.view.QuizView; -import de.tum.in.www1.artemis.web.rest.util.StringUtil; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.web.rest.util.StringUtil; @MappedSuperclass public abstract class BaseExercise extends DomainObject { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Bonus.java b/src/main/java/de/tum/cit/aet/artemis/domain/Bonus.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/domain/Bonus.java rename to src/main/java/de/tum/cit/aet/artemis/domain/Bonus.java index 10ce0f4c8dbc..b48648d1d228 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/Bonus.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/Bonus.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/BonusStrategy.java b/src/main/java/de/tum/cit/aet/artemis/domain/BonusStrategy.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/BonusStrategy.java rename to src/main/java/de/tum/cit/aet/artemis/domain/BonusStrategy.java index 45b61a42cbfd..7b0b88eb4894 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/BonusStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/BonusStrategy.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; -import static de.tum.in.www1.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; +import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; import org.apache.commons.lang3.NotImplementedException; -import de.tum.in.www1.artemis.repository.GradingScaleRepository; -import de.tum.in.www1.artemis.web.rest.dto.BonusExampleDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; public enum BonusStrategy implements IBonusStrategy { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/BuildJob.java b/src/main/java/de/tum/cit/aet/artemis/domain/BuildJob.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/BuildJob.java rename to src/main/java/de/tum/cit/aet/artemis/domain/BuildJob.java index fad90ce6c300..1741af4e68a0 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/BuildJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/BuildJob.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.time.ZonedDateTime; @@ -13,9 +13,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.BuildStatus; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; @Entity @Table(name = "build_job") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/BuildLogEntry.java b/src/main/java/de/tum/cit/aet/artemis/domain/BuildLogEntry.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/domain/BuildLogEntry.java rename to src/main/java/de/tum/cit/aet/artemis/domain/BuildLogEntry.java index c6cbfa9b9353..d19b2a19ff46 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/BuildLogEntry.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/BuildLogEntry.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/BuildPlan.java b/src/main/java/de/tum/cit/aet/artemis/domain/BuildPlan.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/BuildPlan.java rename to src/main/java/de/tum/cit/aet/artemis/domain/BuildPlan.java index b1da1d462683..3ace1f2e3c8d 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/BuildPlan.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/BuildPlan.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.util.HashSet; import java.util.Objects; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/BuildRunState.java b/src/main/java/de/tum/cit/aet/artemis/domain/BuildRunState.java similarity index 58% rename from src/main/java/de/tum/in/www1/artemis/domain/BuildRunState.java rename to src/main/java/de/tum/cit/aet/artemis/domain/BuildRunState.java index 8bce5127de3d..e2836db7e2ba 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/BuildRunState.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/BuildRunState.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; public enum BuildRunState { RUNNING, COMPLETED diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Commit.java b/src/main/java/de/tum/cit/aet/artemis/domain/Commit.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/domain/Commit.java rename to src/main/java/de/tum/cit/aet/artemis/domain/Commit.java index 76135b626b6a..ee7a3eeb604b 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/Commit.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/Commit.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import jakarta.annotation.Nullable; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Complaint.java b/src/main/java/de/tum/cit/aet/artemis/domain/Complaint.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/domain/Complaint.java rename to src/main/java/de/tum/cit/aet/artemis/domain/Complaint.java index ce9dc21eaa39..962a6ec8fae9 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/Complaint.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/Complaint.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; -import static de.tum.in.www1.artemis.config.Constants.COMPLAINT_TEXT_LIMIT; +import static de.tum.cit.aet.artemis.config.Constants.COMPLAINT_TEXT_LIMIT; import java.time.ZonedDateTime; import java.util.Optional; @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.ComplaintType; -import de.tum.in.www1.artemis.domain.participation.Participant; +import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; +import de.tum.cit.aet.artemis.domain.participation.Participant; /** * A Complaint. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/ComplaintResponse.java b/src/main/java/de/tum/cit/aet/artemis/domain/ComplaintResponse.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/ComplaintResponse.java rename to src/main/java/de/tum/cit/aet/artemis/domain/ComplaintResponse.java index ab7f9f1ddd65..be1e05831693 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/ComplaintResponse.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/ComplaintResponse.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; -import static de.tum.in.www1.artemis.config.Constants.COMPLAINT_LOCK_DURATION_IN_MINUTES; -import static de.tum.in.www1.artemis.config.Constants.COMPLAINT_RESPONSE_TEXT_LIMIT; +import static de.tum.cit.aet.artemis.config.Constants.COMPLAINT_LOCK_DURATION_IN_MINUTES; +import static de.tum.cit.aet.artemis.config.Constants.COMPLAINT_RESPONSE_TEXT_LIMIT; import java.time.ZoneOffset; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/ConductAgreement.java b/src/main/java/de/tum/cit/aet/artemis/domain/ConductAgreement.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/ConductAgreement.java rename to src/main/java/de/tum/cit/aet/artemis/domain/ConductAgreement.java index 038373ad8eca..9c6635b27d93 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/ConductAgreement.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/ConductAgreement.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.util.Objects; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/ConductAgreementId.java b/src/main/java/de/tum/cit/aet/artemis/domain/ConductAgreementId.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/ConductAgreementId.java rename to src/main/java/de/tum/cit/aet/artemis/domain/ConductAgreementId.java index 930de471cea1..af3605382c67 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/ConductAgreementId.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/ConductAgreementId.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.io.Serializable; import java.util.Objects; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/ConversationNotificationRecipientSummary.java b/src/main/java/de/tum/cit/aet/artemis/domain/ConversationNotificationRecipientSummary.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/ConversationNotificationRecipientSummary.java rename to src/main/java/de/tum/cit/aet/artemis/domain/ConversationNotificationRecipientSummary.java index 253cade3a08d..07db7afadeb0 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/ConversationNotificationRecipientSummary.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/ConversationNotificationRecipientSummary.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; /** * Stores the user of a conversation participant, who is supposed to receive a websocket message and stores whether diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Course.java b/src/main/java/de/tum/cit/aet/artemis/domain/Course.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/Course.java rename to src/main/java/de/tum/cit/aet/artemis/domain/Course.java index 128a897777e1..bad27c2980d6 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/Course.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/Course.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; -import static de.tum.in.www1.artemis.config.Constants.ARTEMIS_GROUP_DEFAULT_PREFIX; -import static de.tum.in.www1.artemis.config.Constants.COMPLAINT_RESPONSE_TEXT_LIMIT; -import static de.tum.in.www1.artemis.config.Constants.COMPLAINT_TEXT_LIMIT; -import static de.tum.in.www1.artemis.config.Constants.SHORT_NAME_PATTERN; +import static de.tum.cit.aet.artemis.config.Constants.ARTEMIS_GROUP_DEFAULT_PREFIX; +import static de.tum.cit.aet.artemis.config.Constants.COMPLAINT_RESPONSE_TEXT_LIMIT; +import static de.tum.cit.aet.artemis.config.Constants.COMPLAINT_TEXT_LIMIT; +import static de.tum.cit.aet.artemis.config.Constants.SHORT_NAME_PATTERN; import java.time.ZonedDateTime; import java.util.HashSet; @@ -34,18 +34,18 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.domain.competency.Competency; -import de.tum.in.www1.artemis.domain.competency.LearningPath; -import de.tum.in.www1.artemis.domain.competency.Prerequisite; -import de.tum.in.www1.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; -import de.tum.in.www1.artemis.domain.view.QuizView; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.competency.Competency; +import de.tum.cit.aet.artemis.domain.competency.LearningPath; +import de.tum.cit.aet.artemis.domain.competency.Prerequisite; +import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; +import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; /** * A Course. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/CourseExamExportErrorCause.java b/src/main/java/de/tum/cit/aet/artemis/domain/CourseExamExportErrorCause.java similarity index 80% rename from src/main/java/de/tum/in/www1/artemis/domain/CourseExamExportErrorCause.java rename to src/main/java/de/tum/cit/aet/artemis/domain/CourseExamExportErrorCause.java index 466cfd045ec0..6ebd999b3671 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/CourseExamExportErrorCause.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/CourseExamExportErrorCause.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; /** * Enum to define the different error causes for an course/exam export diff --git a/src/main/java/de/tum/in/www1/artemis/domain/CourseExamExportState.java b/src/main/java/de/tum/cit/aet/artemis/domain/CourseExamExportState.java similarity index 73% rename from src/main/java/de/tum/in/www1/artemis/domain/CourseExamExportState.java rename to src/main/java/de/tum/cit/aet/artemis/domain/CourseExamExportState.java index 0b161ad805e3..3aad6d1241dc 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/CourseExamExportState.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/CourseExamExportState.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; public enum CourseExamExportState { RUNNING, COMPLETED, COMPLETED_WITH_WARNINGS, COMPLETED_WITH_ERRORS diff --git a/src/main/java/de/tum/in/www1/artemis/domain/DataExport.java b/src/main/java/de/tum/cit/aet/artemis/domain/DataExport.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/domain/DataExport.java rename to src/main/java/de/tum/cit/aet/artemis/domain/DataExport.java index edb5a2bdcc83..201b399082b2 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/DataExport.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/DataExport.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.time.ZonedDateTime; @@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.DataExportState; +import de.tum.cit.aet.artemis.domain.enumeration.DataExportState; /** * A data export for user data diff --git a/src/main/java/de/tum/in/www1/artemis/domain/DomainObject.java b/src/main/java/de/tum/cit/aet/artemis/domain/DomainObject.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/DomainObject.java rename to src/main/java/de/tum/cit/aet/artemis/domain/DomainObject.java index de06dd42faad..d2cfee1a28a9 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/DomainObject.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/DomainObject.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.io.Serial; import java.io.Serializable; @@ -13,7 +13,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.domain.view.QuizView; /** * Base abstract class for entities which have an id that is generated automatically (basically all domain objects). diff --git a/src/main/java/de/tum/in/www1/artemis/domain/ExampleSubmission.java b/src/main/java/de/tum/cit/aet/artemis/domain/ExampleSubmission.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/ExampleSubmission.java rename to src/main/java/de/tum/cit/aet/artemis/domain/ExampleSubmission.java index df1ad97fea93..deb01263cad2 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/ExampleSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/ExampleSubmission.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.util.HashSet; import java.util.Set; @@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.participation.TutorParticipation; +import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; /** * A ExampleSubmission. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Exercise.java b/src/main/java/de/tum/cit/aet/artemis/domain/Exercise.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/Exercise.java rename to src/main/java/de/tum/cit/aet/artemis/domain/Exercise.java index ef1d75fde4de..ad5fc53b94b5 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/Exercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/Exercise.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -48,25 +48,25 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseType; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.participation.TutorParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.view.QuizView; -import de.tum.in.www1.artemis.service.ExerciseDateService; -import de.tum.in.www1.artemis.web.rest.dto.DueDateStat; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismDetectionConfig; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.service.ExerciseDateService; +import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; /** * An Exercise. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Feedback.java b/src/main/java/de/tum/cit/aet/artemis/domain/Feedback.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/Feedback.java rename to src/main/java/de/tum/cit/aet/artemis/domain/Feedback.java index 14df5beece84..3e3cc5cdbd01 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/Feedback.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/Feedback.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; -import static de.tum.in.www1.artemis.config.Constants.FEEDBACK_DETAIL_TEXT_DATABASE_MAX_LENGTH; -import static de.tum.in.www1.artemis.config.Constants.FEEDBACK_DETAIL_TEXT_SOFT_MAX_LENGTH; -import static de.tum.in.www1.artemis.config.Constants.FEEDBACK_PREVIEW_TEXT_MAX_LENGTH; -import static de.tum.in.www1.artemis.config.Constants.LONG_FEEDBACK_MAX_LENGTH; +import static de.tum.cit.aet.artemis.config.Constants.FEEDBACK_DETAIL_TEXT_DATABASE_MAX_LENGTH; +import static de.tum.cit.aet.artemis.config.Constants.FEEDBACK_DETAIL_TEXT_SOFT_MAX_LENGTH; +import static de.tum.cit.aet.artemis.config.Constants.FEEDBACK_PREVIEW_TEXT_MAX_LENGTH; +import static de.tum.cit.aet.artemis.config.Constants.LONG_FEEDBACK_MAX_LENGTH; import java.util.HashSet; import java.util.Map; @@ -31,8 +31,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.Visibility; /** * A Feedback. @@ -146,7 +146,7 @@ public void setDetailTextTruncated(@Nullable final String detailText) { * Sets the detail text of the feedback. *

* Always stores the whole detail text. - * In case the feedback is shorter than {@link de.tum.in.www1.artemis.config.Constants#FEEDBACK_DETAIL_TEXT_SOFT_MAX_LENGTH}, + * In case the feedback is shorter than {@link de.tum.cit.aet.artemis.config.Constants#FEEDBACK_DETAIL_TEXT_SOFT_MAX_LENGTH}, * the feedback is stored directly in the detail text. * Otherwise, an associated {@link LongFeedbackText} is attached that holds the full feedback. * In this case the actual detail text stored in this feedback only contains a short preview. @@ -343,7 +343,7 @@ public Feedback result(Result result) { } /** - * be careful when using this method as it might result in org.hibernate.HibernateException: null index column for collection: de.tum.in.www1.artemis.domain.Result.feedbacks + * be careful when using this method as it might result in org.hibernate.HibernateException: null index column for collection: de.tum.cit.aet.artemis.domain.Result.feedbacks * when saving the result. The result object is the container that owns the feedback and uses CascadeType.ALL and orphanRemoval * * @param result the result container object that owns the feedback diff --git a/src/main/java/de/tum/in/www1/artemis/domain/File.java b/src/main/java/de/tum/cit/aet/artemis/domain/File.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/File.java rename to src/main/java/de/tum/cit/aet/artemis/domain/File.java index f51c3594ee03..82144cf568d8 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/File.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/File.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.nio.file.Path; import java.util.regex.Pattern; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/FileType.java b/src/main/java/de/tum/cit/aet/artemis/domain/FileType.java similarity index 52% rename from src/main/java/de/tum/in/www1/artemis/domain/FileType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/FileType.java index b31281a744f0..f72ec30a760c 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/FileType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/FileType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; public enum FileType { FILE, FOLDER diff --git a/src/main/java/de/tum/in/www1/artemis/domain/FileUploadExercise.java b/src/main/java/de/tum/cit/aet/artemis/domain/FileUploadExercise.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/domain/FileUploadExercise.java rename to src/main/java/de/tum/cit/aet/artemis/domain/FileUploadExercise.java index 351d1d0223e7..9a9ef4ee5393 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/FileUploadExercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/FileUploadExercise.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; -import static de.tum.in.www1.artemis.domain.enumeration.ExerciseType.FILE_UPLOAD; +import static de.tum.cit.aet.artemis.domain.enumeration.ExerciseType.FILE_UPLOAD; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; @@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; /** * A FileUploadExercise. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/FileUploadSubmission.java b/src/main/java/de/tum/cit/aet/artemis/domain/FileUploadSubmission.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/domain/FileUploadSubmission.java rename to src/main/java/de/tum/cit/aet/artemis/domain/FileUploadSubmission.java index 07032c47ca01..0e7eb7ef9287 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/FileUploadSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/FileUploadSubmission.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.net.URI; import java.nio.file.Path; @@ -11,8 +11,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.service.FilePathService; -import de.tum.in.www1.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.service.FileService; /** * A FileUploadSubmission. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/GradeStep.java b/src/main/java/de/tum/cit/aet/artemis/domain/GradeStep.java similarity index 99% rename from src/main/java/de/tum/in/www1/artemis/domain/GradeStep.java rename to src/main/java/de/tum/cit/aet/artemis/domain/GradeStep.java index 103991d61318..67a08b373495 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/GradeStep.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/GradeStep.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/GradeType.java b/src/main/java/de/tum/cit/aet/artemis/domain/GradeType.java similarity index 56% rename from src/main/java/de/tum/in/www1/artemis/domain/GradeType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/GradeType.java index e9e2fa4ebe58..c3d9aa759b5e 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/GradeType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/GradeType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; public enum GradeType { NONE, BONUS, GRADE diff --git a/src/main/java/de/tum/in/www1/artemis/domain/GradingCriterion.java b/src/main/java/de/tum/cit/aet/artemis/domain/GradingCriterion.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/domain/GradingCriterion.java rename to src/main/java/de/tum/cit/aet/artemis/domain/GradingCriterion.java index 63cfeb5ab7f3..ba1ccbc07067 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/GradingCriterion.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/GradingCriterion.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/GradingInstruction.java b/src/main/java/de/tum/cit/aet/artemis/domain/GradingInstruction.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/domain/GradingInstruction.java rename to src/main/java/de/tum/cit/aet/artemis/domain/GradingInstruction.java index f4c196372217..6e08880d8b0c 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/GradingInstruction.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/GradingInstruction.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/GradingScale.java b/src/main/java/de/tum/cit/aet/artemis/domain/GradingScale.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/domain/GradingScale.java rename to src/main/java/de/tum/cit/aet/artemis/domain/GradingScale.java index acc1e469b498..db809487a3b8 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/GradingScale.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/GradingScale.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.util.HashSet; import java.util.Objects; @@ -25,7 +25,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.Exam; /** * A grading scale for a course or an exam that consists of grade steps diff --git a/src/main/java/de/tum/in/www1/artemis/domain/GuidedTourSetting.java b/src/main/java/de/tum/cit/aet/artemis/domain/GuidedTourSetting.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/domain/GuidedTourSetting.java rename to src/main/java/de/tum/cit/aet/artemis/domain/GuidedTourSetting.java index cf47d5f584f2..c879a7247277 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/GuidedTourSetting.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/GuidedTourSetting.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/IBonusStrategy.java b/src/main/java/de/tum/cit/aet/artemis/domain/IBonusStrategy.java similarity index 66% rename from src/main/java/de/tum/in/www1/artemis/domain/IBonusStrategy.java rename to src/main/java/de/tum/cit/aet/artemis/domain/IBonusStrategy.java index 7b24d613e8fd..22da0d2b4e85 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/IBonusStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/IBonusStrategy.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; -import de.tum.in.www1.artemis.repository.GradingScaleRepository; -import de.tum.in.www1.artemis.web.rest.dto.BonusExampleDTO; +import de.tum.cit.aet.artemis.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; public interface IBonusStrategy { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/LearningObject.java b/src/main/java/de/tum/cit/aet/artemis/domain/LearningObject.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/domain/LearningObject.java rename to src/main/java/de/tum/cit/aet/artemis/domain/LearningObject.java index 85962cd88821..c79e290b6f35 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/LearningObject.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/LearningObject.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.time.ZonedDateTime; import java.util.Optional; import java.util.Set; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; public interface LearningObject { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Lecture.java b/src/main/java/de/tum/cit/aet/artemis/domain/Lecture.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/Lecture.java rename to src/main/java/de/tum/cit/aet/artemis/domain/Lecture.java index ea9b4f2d0120..d6ab8dcbf8bc 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/Lecture.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/Lecture.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonIncludeProperties; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.domain.metis.Post; /** * A Lecture. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/LongFeedbackText.java b/src/main/java/de/tum/cit/aet/artemis/domain/LongFeedbackText.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/domain/LongFeedbackText.java rename to src/main/java/de/tum/cit/aet/artemis/domain/LongFeedbackText.java index c7e2337eab58..16a73d1a1ded 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/LongFeedbackText.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/LongFeedbackText.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -13,7 +13,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; -import de.tum.in.www1.artemis.config.Constants; +import de.tum.cit.aet.artemis.config.Constants; @Entity @Table(name = "long_feedback_text") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/LtiPlatformConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/domain/LtiPlatformConfiguration.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/domain/LtiPlatformConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/domain/LtiPlatformConfiguration.java index d725ca8f0d3d..70c7b89b0444 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/LtiPlatformConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/LtiPlatformConfiguration.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/MigrationChangelog.java b/src/main/java/de/tum/cit/aet/artemis/domain/MigrationChangelog.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/MigrationChangelog.java rename to src/main/java/de/tum/cit/aet/artemis/domain/MigrationChangelog.java index 1aeaab768014..f5a9e2e62009 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/MigrationChangelog.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/MigrationChangelog.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/NotificationSetting.java b/src/main/java/de/tum/cit/aet/artemis/domain/NotificationSetting.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/domain/NotificationSetting.java rename to src/main/java/de/tum/cit/aet/artemis/domain/NotificationSetting.java index 5052bc882e08..98719663047e 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/NotificationSetting.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/NotificationSetting.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/OnlineCourseConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/domain/OnlineCourseConfiguration.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/domain/OnlineCourseConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/domain/OnlineCourseConfiguration.java index 264eed843ee0..305116e5f95b 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/OnlineCourseConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/OnlineCourseConfiguration.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Organization.java b/src/main/java/de/tum/cit/aet/artemis/domain/Organization.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/domain/Organization.java rename to src/main/java/de/tum/cit/aet/artemis/domain/Organization.java index 33ec0dbc1d62..f67ac3ae0758 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/Organization.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/Organization.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/PersistentAuditEvent.java b/src/main/java/de/tum/cit/aet/artemis/domain/PersistentAuditEvent.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/domain/PersistentAuditEvent.java rename to src/main/java/de/tum/cit/aet/artemis/domain/PersistentAuditEvent.java index 7f061aa2b16c..84f77bf85168 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/PersistentAuditEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/PersistentAuditEvent.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.io.Serial; import java.io.Serializable; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/PlagiarismCheckState.java b/src/main/java/de/tum/cit/aet/artemis/domain/PlagiarismCheckState.java similarity index 61% rename from src/main/java/de/tum/in/www1/artemis/domain/PlagiarismCheckState.java rename to src/main/java/de/tum/cit/aet/artemis/domain/PlagiarismCheckState.java index 4ae147eb4286..19421fc5d0d0 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/PlagiarismCheckState.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/PlagiarismCheckState.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; public enum PlagiarismCheckState { RUNNING, COMPLETED diff --git a/src/main/java/de/tum/in/www1/artemis/domain/ProgrammingExercise.java b/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingExercise.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/ProgrammingExercise.java rename to src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingExercise.java index ccb797194f8d..23325c473c43 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/ProgrammingExercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingExercise.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; -import static de.tum.in.www1.artemis.domain.enumeration.ExerciseType.PROGRAMMING; +import static de.tum.cit.aet.artemis.domain.enumeration.ExerciseType.PROGRAMMING; import java.net.URISyntaxException; import java.time.ZonedDateTime; @@ -36,24 +36,24 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.BuildPlanType; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseType; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.enumeration.Visibility; -import de.tum.in.www1.artemis.domain.hestia.ExerciseHint; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.submissionpolicy.SubmissionPolicy; -import de.tum.in.www1.artemis.service.ExerciseDateService; -import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeature; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.domain.hestia.ExerciseHint; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.service.ExerciseDateService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeature; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; /** * A ProgrammingExercise. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/ProgrammingExerciseBuildConfig.java b/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingExerciseBuildConfig.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/domain/ProgrammingExerciseBuildConfig.java rename to src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingExerciseBuildConfig.java index 5d4bfe7724d0..b595bb4652eb 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/ProgrammingExerciseBuildConfig.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingExerciseBuildConfig.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.util.Objects; import java.util.UUID; @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; -import de.tum.in.www1.artemis.service.connectors.aeolus.Windfile; -import de.tum.in.www1.artemis.service.connectors.vcs.AbstractVersionControlService; +import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; +import de.tum.cit.aet.artemis.service.connectors.vcs.AbstractVersionControlService; @Entity @Table(name = "programming_exercise_build_config") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/ProgrammingExerciseTestCase.java b/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingExerciseTestCase.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/ProgrammingExerciseTestCase.java rename to src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingExerciseTestCase.java index 4d61bb984cfb..7f1076b540eb 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/ProgrammingExerciseTestCase.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingExerciseTestCase.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; -import static de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTestCaseType.DEFAULT; +import static de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTestCaseType.DEFAULT; import java.util.HashSet; import java.util.Set; @@ -26,12 +26,12 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.Visibility; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTestCaseType; -import de.tum.in.www1.artemis.domain.hestia.TestwiseCoverageReportEntry; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTestCaseType; +import de.tum.cit.aet.artemis.domain.hestia.TestwiseCoverageReportEntry; /** * A ProgrammingExerciseTestCase. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/ProgrammingSubmission.java b/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingSubmission.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/domain/ProgrammingSubmission.java rename to src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingSubmission.java index 3d8fda71f8ce..f4b2a4764f03 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/ProgrammingSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingSubmission.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -19,9 +19,9 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; /** * A ProgrammingSubmission. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Rating.java b/src/main/java/de/tum/cit/aet/artemis/domain/Rating.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/Rating.java rename to src/main/java/de/tum/cit/aet/artemis/domain/Rating.java index 44b840137f1f..75ffbdda5343 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/Rating.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/Rating.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Repository.java b/src/main/java/de/tum/cit/aet/artemis/domain/Repository.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/Repository.java rename to src/main/java/de/tum/cit/aet/artemis/domain/Repository.java index 46c6adf5d8a5..8285b867f58e 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/Repository.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/Repository.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.io.IOException; import java.nio.file.Path; @@ -6,8 +6,8 @@ import org.eclipse.jgit.lib.BaseRepositoryBuilder; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCRepositoryUri; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; /** * This class represents repositories cloned from the VC system to Artemis to then be used in the online editor. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Result.java b/src/main/java/de/tum/cit/aet/artemis/domain/Result.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/Result.java rename to src/main/java/de/tum/cit/aet/artemis/domain/Result.java index 521fec4bde47..adcda65906d5 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/Result.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/Result.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; -import static de.tum.in.www1.artemis.config.Constants.PROGRAMMING_GRACE_PERIOD_SECONDS; -import static de.tum.in.www1.artemis.config.Constants.SIZE_OF_UNSIGNED_TINYINT; -import static de.tum.in.www1.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; -import static de.tum.in.www1.artemis.service.util.RoundingUtil.roundToNDecimalPlaces; +import static de.tum.cit.aet.artemis.config.Constants.PROGRAMMING_GRACE_PERIOD_SECONDS; +import static de.tum.cit.aet.artemis.config.Constants.SIZE_OF_UNSIGNED_TINYINT; +import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; +import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundToNDecimalPlaces; import java.time.Instant; import java.time.ZonedDateTime; @@ -43,17 +43,17 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.hestia.CoverageFileReport; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.domain.view.QuizView; -import de.tum.in.www1.artemis.service.ExerciseDateService; -import de.tum.in.www1.artemis.service.listeners.ResultListener; -import de.tum.in.www1.artemis.web.rest.dto.ResultDTO; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.hestia.CoverageFileReport; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.service.ExerciseDateService; +import de.tum.cit.aet.artemis.service.listeners.ResultListener; +import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; /** * A Result. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/StaticCodeAnalysisCategory.java b/src/main/java/de/tum/cit/aet/artemis/domain/StaticCodeAnalysisCategory.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/StaticCodeAnalysisCategory.java rename to src/main/java/de/tum/cit/aet/artemis/domain/StaticCodeAnalysisCategory.java index f3e303b42128..387716457c91 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/StaticCodeAnalysisCategory.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/StaticCodeAnalysisCategory.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.CategoryState; +import de.tum.cit.aet.artemis.domain.enumeration.CategoryState; /** * Entity for storing static code analysis categories and their settings. @@ -87,7 +87,7 @@ public void setProgrammingExercise(ProgrammingExercise exercise) { * As an exception, the {exercise} attribute will not be set and be null. * * @return New SCA category object with the same values - * @see de.tum.in.www1.artemis.service.StaticCodeAnalysisService#importCategoriesFromExercise(ProgrammingExercise, ProgrammingExercise) + * @see de.tum.cit.aet.artemis.service.StaticCodeAnalysisService#importCategoriesFromExercise(ProgrammingExercise, ProgrammingExercise) */ public StaticCodeAnalysisCategory copy() { StaticCodeAnalysisCategory category = new StaticCodeAnalysisCategory(); diff --git a/src/main/java/de/tum/in/www1/artemis/domain/StaticCodeAnalysisDefaultCategory.java b/src/main/java/de/tum/cit/aet/artemis/domain/StaticCodeAnalysisDefaultCategory.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/domain/StaticCodeAnalysisDefaultCategory.java rename to src/main/java/de/tum/cit/aet/artemis/domain/StaticCodeAnalysisDefaultCategory.java index 9d9951b2407b..e60f6111e2a8 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/StaticCodeAnalysisDefaultCategory.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/StaticCodeAnalysisDefaultCategory.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.util.List; -import de.tum.in.www1.artemis.domain.enumeration.CategoryState; -import de.tum.in.www1.artemis.domain.enumeration.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.domain.enumeration.CategoryState; +import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; /** * Read-only POJO for storing static code analysis configurations initialized at start-up of Artemis diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Submission.java b/src/main/java/de/tum/cit/aet/artemis/domain/Submission.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/Submission.java rename to src/main/java/de/tum/cit/aet/artemis/domain/Submission.java index b6d819ca32e3..2bf3494c9663 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/Submission.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/Submission.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.time.Duration; import java.time.ZonedDateTime; @@ -38,11 +38,11 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.domain.view.QuizView; /** * A Submission. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/SubmissionVersion.java b/src/main/java/de/tum/cit/aet/artemis/domain/SubmissionVersion.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/domain/SubmissionVersion.java rename to src/main/java/de/tum/cit/aet/artemis/domain/SubmissionVersion.java index 05175ce974f2..67486f36cc6e 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/SubmissionVersion.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/SubmissionVersion.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.time.Instant; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Team.java b/src/main/java/de/tum/cit/aet/artemis/domain/Team.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/domain/Team.java rename to src/main/java/de/tum/cit/aet/artemis/domain/Team.java index 6169d7b49530..36e2d95ad1c7 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/Team.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/Team.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.time.Instant; import java.util.HashSet; @@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import de.tum.in.www1.artemis.domain.participation.Participant; +import de.tum.cit.aet.artemis.domain.participation.Participant; /** * A Team of students. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/TeamAssignmentConfig.java b/src/main/java/de/tum/cit/aet/artemis/domain/TeamAssignmentConfig.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/domain/TeamAssignmentConfig.java rename to src/main/java/de/tum/cit/aet/artemis/domain/TeamAssignmentConfig.java index 062b0f8e4e65..915deddec02d 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/TeamAssignmentConfig.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/TeamAssignmentConfig.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.validation.constraints.TeamAssignmentConfigConstraints; +import de.tum.cit.aet.artemis.validation.constraints.TeamAssignmentConfigConstraints; /** * A team assignment configuration. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/TempIdObject.java b/src/main/java/de/tum/cit/aet/artemis/domain/TempIdObject.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/TempIdObject.java rename to src/main/java/de/tum/cit/aet/artemis/domain/TempIdObject.java index 1250c88695d4..30049ffda17f 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/TempIdObject.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/TempIdObject.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.util.Objects; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/TextBlock.java b/src/main/java/de/tum/cit/aet/artemis/domain/TextBlock.java similarity index 99% rename from src/main/java/de/tum/in/www1/artemis/domain/TextBlock.java rename to src/main/java/de/tum/cit/aet/artemis/domain/TextBlock.java index f891a2b09e7e..f392d3866903 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/TextBlock.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/TextBlock.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import static org.apache.commons.codec.digest.DigestUtils.sha1Hex; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/TextBlockType.java b/src/main/java/de/tum/cit/aet/artemis/domain/TextBlockType.java similarity index 57% rename from src/main/java/de/tum/in/www1/artemis/domain/TextBlockType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/TextBlockType.java index d0a183c75d87..1df68fea81c5 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/TextBlockType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/TextBlockType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; public enum TextBlockType { AUTOMATIC, MANUAL diff --git a/src/main/java/de/tum/in/www1/artemis/domain/TextEmbedding.java b/src/main/java/de/tum/cit/aet/artemis/domain/TextEmbedding.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/domain/TextEmbedding.java rename to src/main/java/de/tum/cit/aet/artemis/domain/TextEmbedding.java index 80b93a1f1f18..e156f8c74b5e 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/TextEmbedding.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/TextEmbedding.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.util.Objects; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/TextExercise.java b/src/main/java/de/tum/cit/aet/artemis/domain/TextExercise.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/domain/TextExercise.java rename to src/main/java/de/tum/cit/aet/artemis/domain/TextExercise.java index 0d6c6c203ac9..e99965dac0c4 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/TextExercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/TextExercise.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; -import static de.tum.in.www1.artemis.domain.enumeration.ExerciseType.TEXT; +import static de.tum.cit.aet.artemis.domain.enumeration.ExerciseType.TEXT; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; /** * A TextExercise. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/TextSubmission.java b/src/main/java/de/tum/cit/aet/artemis/domain/TextSubmission.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/domain/TextSubmission.java rename to src/main/java/de/tum/cit/aet/artemis/domain/TextSubmission.java index c1283a51fd10..064c36615621 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/TextSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/TextSubmission.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; -import static de.tum.in.www1.artemis.config.Constants.MAX_SUBMISSION_TEXT_LENGTH; +import static de.tum.cit.aet.artemis.config.Constants.MAX_SUBMISSION_TEXT_LENGTH; import java.util.HashSet; import java.util.Set; @@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.enumeration.Language; /** * A TextSubmission. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/User.java b/src/main/java/de/tum/cit/aet/artemis/domain/User.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/domain/User.java rename to src/main/java/de/tum/cit/aet/artemis/domain/User.java index 4db22e4d9c94..8f09633eb41b 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/User.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/User.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; -import static de.tum.in.www1.artemis.config.Constants.USERNAME_MAX_LENGTH; -import static de.tum.in.www1.artemis.config.Constants.USERNAME_MIN_LENGTH; +import static de.tum.cit.aet.artemis.config.Constants.USERNAME_MAX_LENGTH; +import static de.tum.cit.aet.artemis.config.Constants.USERNAME_MIN_LENGTH; import java.time.Instant; import java.time.ZonedDateTime; @@ -38,15 +38,15 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.competency.CompetencyProgress; -import de.tum.in.www1.artemis.domain.competency.LearningPath; -import de.tum.in.www1.artemis.domain.exam.ExamUser; -import de.tum.in.www1.artemis.domain.lecture.LectureUnitCompletion; -import de.tum.in.www1.artemis.domain.participation.Participant; -import de.tum.in.www1.artemis.domain.push_notification.PushNotificationDeviceConfiguration; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupRegistration; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; +import de.tum.cit.aet.artemis.domain.competency.LearningPath; +import de.tum.cit.aet.artemis.domain.exam.ExamUser; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnitCompletion; +import de.tum.cit.aet.artemis.domain.participation.Participant; +import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfiguration; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupRegistration; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; /** * A user. @@ -145,8 +145,8 @@ public class User extends AbstractAuditingEntity implements Participant { * The expiry date of the VCS access token. * This is used for checking if a access token needs to be renewed. * - * @see de.tum.in.www1.artemis.service.connectors.vcs.VcsTokenRenewalService - * @see de.tum.in.www1.artemis.repository.UserRepository#getUsersWithAccessTokenExpirationDateBefore + * @see de.tum.cit.aet.artemis.service.connectors.vcs.VcsTokenRenewalService + * @see de.tum.cit.aet.artemis.repository.UserRepository#getUsersWithAccessTokenExpirationDateBefore */ @Nullable @JsonIgnore diff --git a/src/main/java/de/tum/in/www1/artemis/domain/UserGroup.java b/src/main/java/de/tum/cit/aet/artemis/domain/UserGroup.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/UserGroup.java rename to src/main/java/de/tum/cit/aet/artemis/domain/UserGroup.java index 54e236111d11..c5c70825778c 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/UserGroup.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/UserGroup.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.io.Serializable; import java.util.Objects; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/VcsRepositoryUri.java b/src/main/java/de/tum/cit/aet/artemis/domain/VcsRepositoryUri.java similarity index 99% rename from src/main/java/de/tum/in/www1/artemis/domain/VcsRepositoryUri.java rename to src/main/java/de/tum/cit/aet/artemis/domain/VcsRepositoryUri.java index 0fca4e59ff2a..1dea5f77ad0a 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/VcsRepositoryUri.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/VcsRepositoryUri.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.net.URI; import java.net.URISyntaxException; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/analytics/TextAssessmentEvent.java b/src/main/java/de/tum/cit/aet/artemis/domain/analytics/TextAssessmentEvent.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/domain/analytics/TextAssessmentEvent.java rename to src/main/java/de/tum/cit/aet/artemis/domain/analytics/TextAssessmentEvent.java index e906890bb687..a233e58d327d 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/analytics/TextAssessmentEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/analytics/TextAssessmentEvent.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.analytics; +package de.tum.cit.aet.artemis.domain.analytics; import java.time.Instant; @@ -14,10 +14,10 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.TextBlockType; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.TextAssessmentEventType; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.TextBlockType; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.TextAssessmentEventType; /** * A TextAssessmentEvent. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/assessment/dashboard/ExerciseMapEntry.java b/src/main/java/de/tum/cit/aet/artemis/domain/assessment/dashboard/ExerciseMapEntry.java similarity index 76% rename from src/main/java/de/tum/in/www1/artemis/domain/assessment/dashboard/ExerciseMapEntry.java rename to src/main/java/de/tum/cit/aet/artemis/domain/assessment/dashboard/ExerciseMapEntry.java index 81f15ee86e16..8d4c7521f1a6 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/assessment/dashboard/ExerciseMapEntry.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/assessment/dashboard/ExerciseMapEntry.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.assessment.dashboard; +package de.tum.cit.aet.artemis.domain.assessment.dashboard; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/assessment/dashboard/ExerciseRatingCount.java b/src/main/java/de/tum/cit/aet/artemis/domain/assessment/dashboard/ExerciseRatingCount.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/domain/assessment/dashboard/ExerciseRatingCount.java rename to src/main/java/de/tum/cit/aet/artemis/domain/assessment/dashboard/ExerciseRatingCount.java index 27996fb675c8..d580b40f1494 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/assessment/dashboard/ExerciseRatingCount.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/assessment/dashboard/ExerciseRatingCount.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.assessment.dashboard; +package de.tum.cit.aet.artemis.domain.assessment.dashboard; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/assessment/dashboard/ResultCount.java b/src/main/java/de/tum/cit/aet/artemis/domain/assessment/dashboard/ResultCount.java similarity index 80% rename from src/main/java/de/tum/in/www1/artemis/domain/assessment/dashboard/ResultCount.java rename to src/main/java/de/tum/cit/aet/artemis/domain/assessment/dashboard/ResultCount.java index 046d0f5761d7..16c03e42982e 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/assessment/dashboard/ResultCount.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/assessment/dashboard/ResultCount.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.assessment.dashboard; +package de.tum.cit.aet.artemis.domain.assessment.dashboard; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/competency/BaseCompetency.java b/src/main/java/de/tum/cit/aet/artemis/domain/competency/BaseCompetency.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/competency/BaseCompetency.java rename to src/main/java/de/tum/cit/aet/artemis/domain/competency/BaseCompetency.java index f6d71bb53d3b..c62ede25aaed 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/competency/BaseCompetency.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/competency/BaseCompetency.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.competency; +package de.tum.cit.aet.artemis.domain.competency; import jakarta.persistence.Column; import jakarta.persistence.Convert; @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.DomainObject; /** * BaseCompetency is an abstract class that contains basic information shared between all competency types. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/competency/Competency.java b/src/main/java/de/tum/cit/aet/artemis/domain/competency/Competency.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/competency/Competency.java rename to src/main/java/de/tum/cit/aet/artemis/domain/competency/Competency.java index cf79facedf9f..2333252f8eb0 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/competency/Competency.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/competency/Competency.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.competency; +package de.tum.cit.aet.artemis.domain.competency; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/competency/CompetencyJol.java b/src/main/java/de/tum/cit/aet/artemis/domain/competency/CompetencyJol.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/competency/CompetencyJol.java rename to src/main/java/de/tum/cit/aet/artemis/domain/competency/CompetencyJol.java index 37a793cc8a8f..bca876b49f34 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/competency/CompetencyJol.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/competency/CompetencyJol.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.competency; +package de.tum.cit.aet.artemis.domain.competency; import java.time.ZonedDateTime; @@ -11,8 +11,8 @@ import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.User; /** * An entity to store a students Judgement of Learning (JOL) value for a competency. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/competency/CompetencyProgress.java b/src/main/java/de/tum/cit/aet/artemis/domain/competency/CompetencyProgress.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/competency/CompetencyProgress.java rename to src/main/java/de/tum/cit/aet/artemis/domain/competency/CompetencyProgress.java index 4aa40d5fa5f9..3eb8356924ab 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/competency/CompetencyProgress.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/competency/CompetencyProgress.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.competency; +package de.tum.cit.aet.artemis.domain.competency; import java.io.Serial; import java.io.Serializable; @@ -24,8 +24,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.CompetencyProgressConfidenceReason; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.CompetencyProgressConfidenceReason; /** * This class models the 'progress' association between a user and a competency. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/competency/CompetencyRelation.java b/src/main/java/de/tum/cit/aet/artemis/domain/competency/CompetencyRelation.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/domain/competency/CompetencyRelation.java rename to src/main/java/de/tum/cit/aet/artemis/domain/competency/CompetencyRelation.java index 01ca9f79e17a..9964580c6dbc 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/competency/CompetencyRelation.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/competency/CompetencyRelation.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.competency; +package de.tum.cit.aet.artemis.domain.competency; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -8,7 +8,7 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; -import de.tum.in.www1.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.DomainObject; /** * This class models the relation between two competencies. Imagine a graph: (tail) --- type --> (head) diff --git a/src/main/java/de/tum/in/www1/artemis/domain/competency/CompetencyTaxonomy.java b/src/main/java/de/tum/cit/aet/artemis/domain/competency/CompetencyTaxonomy.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/competency/CompetencyTaxonomy.java rename to src/main/java/de/tum/cit/aet/artemis/domain/competency/CompetencyTaxonomy.java index 6b2809745740..3441872c9e11 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/competency/CompetencyTaxonomy.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/competency/CompetencyTaxonomy.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.competency; +package de.tum.cit.aet.artemis.domain.competency; import jakarta.persistence.AttributeConverter; import jakarta.persistence.Converter; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/competency/CourseCompetency.java b/src/main/java/de/tum/cit/aet/artemis/domain/competency/CourseCompetency.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/competency/CourseCompetency.java rename to src/main/java/de/tum/cit/aet/artemis/domain/competency/CourseCompetency.java index 686e1d56b53a..e6e8502fcbac 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/competency/CourseCompetency.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/competency/CourseCompetency.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.competency; +package de.tum.cit.aet.artemis.domain.competency; import java.time.ZonedDateTime; import java.util.HashSet; @@ -28,10 +28,10 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.lecture.ExerciseUnit; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; /** * CourseCompetency is an abstract class for all competency types that are part of a course. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/competency/KnowledgeArea.java b/src/main/java/de/tum/cit/aet/artemis/domain/competency/KnowledgeArea.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/competency/KnowledgeArea.java rename to src/main/java/de/tum/cit/aet/artemis/domain/competency/KnowledgeArea.java index 975c7fd2e195..9f38109b946d 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/competency/KnowledgeArea.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/competency/KnowledgeArea.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.competency; +package de.tum.cit.aet.artemis.domain.competency; import java.util.HashSet; import java.util.Set; @@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import de.tum.in.www1.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.DomainObject; @Entity @Table(name = "knowledge_area") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/competency/LearningPath.java b/src/main/java/de/tum/cit/aet/artemis/domain/competency/LearningPath.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/domain/competency/LearningPath.java rename to src/main/java/de/tum/cit/aet/artemis/domain/competency/LearningPath.java index daedaef9df3f..1a5e20fda3a1 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/competency/LearningPath.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/competency/LearningPath.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.competency; +package de.tum.cit.aet.artemis.domain.competency; import java.util.HashSet; import java.util.Set; @@ -16,9 +16,9 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.User; @Entity @Table(name = "learning_path") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/competency/Prerequisite.java b/src/main/java/de/tum/cit/aet/artemis/domain/competency/Prerequisite.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/competency/Prerequisite.java rename to src/main/java/de/tum/cit/aet/artemis/domain/competency/Prerequisite.java index 49e31bca53e1..0655f0f1dcc1 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/competency/Prerequisite.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/competency/Prerequisite.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.competency; +package de.tum.cit.aet.artemis.domain.competency; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/competency/RelationType.java b/src/main/java/de/tum/cit/aet/artemis/domain/competency/RelationType.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/domain/competency/RelationType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/competency/RelationType.java index ac4f04e7cb98..5aec2a28b357 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/competency/RelationType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/competency/RelationType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.competency; +package de.tum.cit.aet.artemis.domain.competency; public enum RelationType { /** diff --git a/src/main/java/de/tum/in/www1/artemis/domain/competency/Source.java b/src/main/java/de/tum/cit/aet/artemis/domain/competency/Source.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/competency/Source.java rename to src/main/java/de/tum/cit/aet/artemis/domain/competency/Source.java index eba5e506fe2c..f2ac2640da7e 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/competency/Source.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/competency/Source.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.competency; +package de.tum.cit.aet.artemis.domain.competency; import java.util.HashSet; import java.util.Set; @@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import de.tum.in.www1.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.DomainObject; @Entity @Table(name = "source") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/competency/StandardizedCompetency.java b/src/main/java/de/tum/cit/aet/artemis/domain/competency/StandardizedCompetency.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/domain/competency/StandardizedCompetency.java rename to src/main/java/de/tum/cit/aet/artemis/domain/competency/StandardizedCompetency.java index 8bb4a93e1f99..4b162fc039a1 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/competency/StandardizedCompetency.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/competency/StandardizedCompetency.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.competency; +package de.tum.cit.aet.artemis.domain.competency; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/AeolusTarget.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/AeolusTarget.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/AeolusTarget.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/AeolusTarget.java index f4801ece10f6..01021657dcb0 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/AeolusTarget.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/AeolusTarget.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** * Targets Aeolus is able to create build plans for. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/AssessmentType.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/AssessmentType.java similarity index 71% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/AssessmentType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/AssessmentType.java index 0ec51de7bb09..c1e9a530d898 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/AssessmentType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/AssessmentType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** * The AssessmentType enumeration. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/AttachmentType.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/AttachmentType.java similarity index 63% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/AttachmentType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/AttachmentType.java index 98f099d0a01c..24627d8c0196 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/AttachmentType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/AttachmentType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** * The AttachmentType enumeration. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/BuildPlanType.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/BuildPlanType.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/BuildPlanType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/BuildPlanType.java index 6c79029947a9..d3220f6caa04 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/BuildPlanType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/BuildPlanType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; public enum BuildPlanType { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/BuildStatus.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/BuildStatus.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/BuildStatus.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/BuildStatus.java index 2a221c9a7c17..fbc9cb23d59a 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/BuildStatus.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/BuildStatus.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** * SUCCESSFUL: the build was successful diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/CategoryState.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/CategoryState.java similarity index 73% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/CategoryState.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/CategoryState.java index 76f83a535981..a3c5ae5d3a1c 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/CategoryState.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/CategoryState.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** * Enumeration for category states used by StaticCodeAnalysisCategory diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/CompetencyProgressConfidenceReason.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/CompetencyProgressConfidenceReason.java similarity index 80% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/CompetencyProgressConfidenceReason.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/CompetencyProgressConfidenceReason.java index f57ddd8efecb..9a94a8094ce9 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/CompetencyProgressConfidenceReason.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/CompetencyProgressConfidenceReason.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; -import de.tum.in.www1.artemis.domain.competency.CompetencyProgress; +import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; /** * Enum to define the different reasons why the confidence is above/below 1 in the {@link CompetencyProgress}. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/ComplaintType.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ComplaintType.java similarity index 54% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/ComplaintType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ComplaintType.java index fc1b9c36bd84..bb77207f92ac 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/ComplaintType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ComplaintType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; public enum ComplaintType { COMPLAINT, MORE_FEEDBACK diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/CourseInformationSharingConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/CourseInformationSharingConfiguration.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/CourseInformationSharingConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/CourseInformationSharingConfiguration.java index 4dbf3630385c..9ededb449881 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/CourseInformationSharingConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/CourseInformationSharingConfiguration.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** * NOTE: Ordinal mapping in property of Course.java do NOT change the order of the existing values. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/DataExportState.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DataExportState.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/DataExportState.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DataExportState.java index 1789c1d2ce5d..37bcdeacee3f 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/DataExportState.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DataExportState.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** * An enum representing the state of a data export, which is used to determine which actions are currently available. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/DefaultChannelType.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DefaultChannelType.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/DefaultChannelType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DefaultChannelType.java index 0595b3cf7489..a8f5ac94c307 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/DefaultChannelType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DefaultChannelType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** * Enumeration for default channel types that are automatically created on course creation diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/DiagramType.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DiagramType.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/DiagramType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DiagramType.java index 939a9c983de1..f565a767efc6 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/DiagramType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DiagramType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** * The DiagramType enumeration. This has to be exactly the same as defined in Apollon on the client side diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/DifficultyLevel.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DifficultyLevel.java similarity index 66% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/DifficultyLevel.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DifficultyLevel.java index ebf623feeed1..54af08451f95 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/DifficultyLevel.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DifficultyLevel.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** * The DifficultyLevel enumeration. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/DisplayPriority.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DisplayPriority.java similarity index 78% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/DisplayPriority.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DisplayPriority.java index caef7f61c535..e418c9d41632 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/DisplayPriority.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DisplayPriority.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** * The priority with which a post is shown in a list, PINNED represents a high priority, whereas ARCHIVED low priority. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/ExerciseLifecycle.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseLifecycle.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/ExerciseLifecycle.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseLifecycle.java index 6464f8ce8681..9184b248e6e8 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/ExerciseLifecycle.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseLifecycle.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; import java.time.ZonedDateTime; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizBatch; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; public enum ExerciseLifecycle implements IExerciseLifecycle { RELEASE { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/ExerciseMode.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseMode.java similarity index 64% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/ExerciseMode.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseMode.java index ca7a065c7068..9452145dac70 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/ExerciseMode.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseMode.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** * The ExerciseMode enumeration. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/ExerciseType.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseType.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/ExerciseType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseType.java index b53e98644c69..6c5b43cca490 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/ExerciseType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseType.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; public enum ExerciseType { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/FeedbackType.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/FeedbackType.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/FeedbackType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/FeedbackType.java index 25234ff0c357..132b40aaf313 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/FeedbackType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/FeedbackType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** * The FeedbackType enumeration. @@ -6,7 +6,7 @@ * The order in which they are declared is important, as we use the enums default implementation of * compareTo() *

- * Note: The order is used as part of an {@link jakarta.persistence.EnumType#ORDINAL} mapping in {@link de.tum.in.www1.artemis.domain.Feedback}. + * Note: The order is used as part of an {@link jakarta.persistence.EnumType#ORDINAL} mapping in {@link de.tum.cit.aet.artemis.domain.Feedback}. * Do NOT change the order of existing values. */ public enum FeedbackType { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/GraphType.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/GraphType.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/GraphType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/GraphType.java index 2cab6657898c..4f6fc1d2565d 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/GraphType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/GraphType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; public enum GraphType { SUBMISSIONS, ACTIVE_USERS, LOGGED_IN_USERS, RELEASED_EXERCISES, EXERCISES_DUE, CONDUCTED_EXAMS, EXAM_PARTICIPATIONS, EXAM_REGISTRATIONS, ACTIVE_TUTORS, CREATED_RESULTS, diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/GroupNotificationType.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/GroupNotificationType.java similarity index 71% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/GroupNotificationType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/GroupNotificationType.java index 19ec8f6200fd..8e86eec648b9 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/GroupNotificationType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/GroupNotificationType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** * The GroupNotificationType enumeration. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/IExerciseLifecycle.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/IExerciseLifecycle.java similarity index 51% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/IExerciseLifecycle.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/IExerciseLifecycle.java index 171945c837c7..923c165dc496 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/IExerciseLifecycle.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/IExerciseLifecycle.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; import java.time.ZonedDateTime; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.quiz.QuizBatch; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; public interface IExerciseLifecycle { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/IncludedInOverallScore.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/IncludedInOverallScore.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/IncludedInOverallScore.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/IncludedInOverallScore.java index 17e509b29737..a955c818024e 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/IncludedInOverallScore.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/IncludedInOverallScore.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** * Enum that decides diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/InitializationState.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/InitializationState.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/InitializationState.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/InitializationState.java index d3e0bf4a2049..b99e3d2b2a1d 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/InitializationState.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/InitializationState.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** * The InitializationState enumeration. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/Language.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/Language.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/Language.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/Language.java index 835f30026c0a..d979a1e5ece4 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/Language.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/Language.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** * The Language enumeration. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/LegalDocumentType.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/LegalDocumentType.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/LegalDocumentType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/LegalDocumentType.java index b970a1e8550f..90c9a6d4a882 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/LegalDocumentType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/LegalDocumentType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** * An enum representing the type of legal document, currently the imprint and the privacy statement. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/NotificationPriority.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/NotificationPriority.java similarity index 68% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/NotificationPriority.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/NotificationPriority.java index 3575e970af98..df04a3002edf 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/NotificationPriority.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/NotificationPriority.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** * The NotificationPriority enumeration. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/NotificationType.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/NotificationType.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/NotificationType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/NotificationType.java index db6dd37894b4..be8670248291 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/NotificationType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/NotificationType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; public enum NotificationType { EXERCISE_SUBMISSION_ASSESSED, ATTACHMENT_CHANGE, EXERCISE_RELEASED, EXERCISE_PRACTICE, QUIZ_EXERCISE_STARTED, EXERCISE_UPDATED, NEW_REPLY_FOR_EXERCISE_POST, diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/ParticipationLifecycle.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ParticipationLifecycle.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/ParticipationLifecycle.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ParticipationLifecycle.java index b5e04cf4a991..eda0c4eeea68 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/ParticipationLifecycle.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ParticipationLifecycle.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; import java.util.Optional; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/ProgrammingLanguage.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ProgrammingLanguage.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/ProgrammingLanguage.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ProgrammingLanguage.java index 60da52e071f2..353ab470ae66 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/ProgrammingLanguage.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ProgrammingLanguage.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; import java.util.Set; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/ProjectType.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ProjectType.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/ProjectType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ProjectType.java index 4f5e82a9ae0f..8b43929299f2 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/ProjectType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ProjectType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; import java.util.Locale; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/QuizAction.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/QuizAction.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/QuizAction.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/QuizAction.java index 130939a4fa72..d9b10d5aeb8a 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/QuizAction.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/QuizAction.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; public enum QuizAction { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/QuizMode.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/QuizMode.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/QuizMode.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/QuizMode.java index f73257e0c6e3..0263ddb7f9fb 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/QuizMode.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/QuizMode.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** * The QuizMode enumeration. Describe the different (participation) modes of a quiz. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/RepositoryType.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/RepositoryType.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/RepositoryType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/RepositoryType.java index 6651d7911bcb..42db072cd900 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/RepositoryType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/RepositoryType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; public enum RepositoryType { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/ScoringType.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ScoringType.java similarity index 73% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/ScoringType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ScoringType.java index 47fe7f2654eb..1db11c6e2b7b 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/ScoringType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ScoringType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** * The ScoringType enumeration. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/SortingOrder.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/SortingOrder.java similarity index 52% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/SortingOrder.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/SortingOrder.java index 0e47865c3b5b..9c950ec914ac 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/SortingOrder.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/SortingOrder.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; public enum SortingOrder { ASCENDING, DESCENDING diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/SpanType.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/SpanType.java similarity index 54% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/SpanType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/SpanType.java index c0dde0fa4fa6..4d54304ec2ba 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/SpanType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/SpanType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; public enum SpanType { DAY, WEEK, MONTH, QUARTER, YEAR diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/StaticCodeAnalysisTool.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/StaticCodeAnalysisTool.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/StaticCodeAnalysisTool.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/StaticCodeAnalysisTool.java index d2082fb7e42d..dbdca713e748 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/StaticCodeAnalysisTool.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/StaticCodeAnalysisTool.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/StatisticsView.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/StatisticsView.java similarity index 54% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/StatisticsView.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/StatisticsView.java index 82838fc9f0b7..1edf436e914e 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/StatisticsView.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/StatisticsView.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; public enum StatisticsView { ARTEMIS, COURSE, EXERCISE diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/SubmissionType.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/SubmissionType.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/SubmissionType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/SubmissionType.java index 970f6cd1e9c6..21171e388399 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/SubmissionType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/SubmissionType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** * MANUAL: submission triggered by a student diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/SystemNotificationType.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/SystemNotificationType.java similarity index 68% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/SystemNotificationType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/SystemNotificationType.java index 139168b692fd..5a9fdf31b7cc 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/SystemNotificationType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/SystemNotificationType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** * The SystemNotificationType enumeration. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/TeamImportStrategyType.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TeamImportStrategyType.java similarity index 70% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/TeamImportStrategyType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TeamImportStrategyType.java index 898886a6355b..409bceb51d8e 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/TeamImportStrategyType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TeamImportStrategyType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** * The TeamImportStrategyType enumeration. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/TextAssessmentEventType.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TextAssessmentEventType.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/TextAssessmentEventType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TextAssessmentEventType.java index a112cf214a03..ac4af965c3e2 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/TextAssessmentEventType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TextAssessmentEventType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** * The TextAssessmentEventType enumeration. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/TutorParticipationStatus.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TutorParticipationStatus.java similarity index 75% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/TutorParticipationStatus.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TutorParticipationStatus.java index 28e1a7980c4f..90026606893d 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/TutorParticipationStatus.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TutorParticipationStatus.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** * The TutorParticipationStatus enumeration. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/TutorialGroupSessionStatus.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TutorialGroupSessionStatus.java similarity index 69% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/TutorialGroupSessionStatus.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TutorialGroupSessionStatus.java index 8001c278065a..b9416f8dae89 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/TutorialGroupSessionStatus.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TutorialGroupSessionStatus.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** - * Describes the status of a {@link de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupSession} + * Describes the status of a {@link de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession} */ public enum TutorialGroupSessionStatus { /** diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/Visibility.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/Visibility.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/Visibility.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/Visibility.java index c7753f4df6d6..86d6bff9f304 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/Visibility.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/Visibility.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** - * Used to define when students are able to see a {@link de.tum.in.www1.artemis.domain.Feedback}. + * Used to define when students are able to see a {@link de.tum.cit.aet.artemis.domain.Feedback}. *

- * Currently, this is only used for Feedbacks linked to a {@link de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase}. + * Currently, this is only used for Feedbacks linked to a {@link de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase}. *

* Tutors/Instructors/Admins should always see all levels of visibility. *

- * Note: The order is used as part of an {@link jakarta.persistence.EnumType#ORDINAL} mapping in {@link de.tum.in.www1.artemis.domain.Feedback}. + * Note: The order is used as part of an {@link jakarta.persistence.EnumType#ORDINAL} mapping in {@link de.tum.cit.aet.artemis.domain.Feedback}. * Do NOT change the order of existing values. */ public enum Visibility { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/Weekday.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/Weekday.java similarity index 68% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/Weekday.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/Weekday.java index 3aacc834b0d7..e5921bc431a0 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/Weekday.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/Weekday.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; /** * The Weekday enumeration. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/tutorialgroups/TutorialGroupRegistrationType.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/tutorialgroups/TutorialGroupRegistrationType.java similarity index 60% rename from src/main/java/de/tum/in/www1/artemis/domain/enumeration/tutorialgroups/TutorialGroupRegistrationType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/enumeration/tutorialgroups/TutorialGroupRegistrationType.java index 5e0e11bd8cfb..118906addfe8 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/tutorialgroups/TutorialGroupRegistrationType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/tutorialgroups/TutorialGroupRegistrationType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.enumeration.tutorialgroups; +package de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups; public enum TutorialGroupRegistrationType { SELF_REGISTRATION, INSTRUCTOR_REGISTRATION, diff --git a/src/main/java/de/tum/in/www1/artemis/domain/exam/Exam.java b/src/main/java/de/tum/cit/aet/artemis/domain/exam/Exam.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/domain/exam/Exam.java rename to src/main/java/de/tum/cit/aet/artemis/domain/exam/Exam.java index 227228996857..b3fc7506b84e 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/exam/Exam.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/exam/Exam.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.exam; +package de.tum.cit.aet.artemis.domain.exam; import java.time.Duration; import java.time.ZonedDateTime; @@ -29,10 +29,10 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.web.rest.util.StringUtil; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.web.rest.util.StringUtil; @Entity @Table(name = "exam") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/exam/ExamSession.java b/src/main/java/de/tum/cit/aet/artemis/domain/exam/ExamSession.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/exam/ExamSession.java rename to src/main/java/de/tum/cit/aet/artemis/domain/exam/ExamSession.java index be0055138ed2..db39c412e01f 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/exam/ExamSession.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/exam/ExamSession.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.exam; +package de.tum.cit.aet.artemis.domain.exam; import java.util.HashSet; import java.util.Set; @@ -16,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.AbstractAuditingEntity; +import de.tum.cit.aet.artemis.domain.AbstractAuditingEntity; import inet.ipaddr.IPAddress; import inet.ipaddr.IPAddressString; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/exam/ExamUser.java b/src/main/java/de/tum/cit/aet/artemis/domain/exam/ExamUser.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/exam/ExamUser.java rename to src/main/java/de/tum/cit/aet/artemis/domain/exam/ExamUser.java index 4ebb5fd623a5..41bdf358adbf 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/exam/ExamUser.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/exam/ExamUser.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.exam; +package de.tum.cit.aet.artemis.domain.exam; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -9,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.AbstractAuditingEntity; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.AbstractAuditingEntity; +import de.tum.cit.aet.artemis.domain.User; @Entity @Table(name = "exam_user") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/exam/ExerciseGroup.java b/src/main/java/de/tum/cit/aet/artemis/domain/exam/ExerciseGroup.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/domain/exam/ExerciseGroup.java rename to src/main/java/de/tum/cit/aet/artemis/domain/exam/ExerciseGroup.java index 5cec00825a8b..f05de252a0b2 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/exam/ExerciseGroup.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/exam/ExerciseGroup.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.exam; +package de.tum.cit.aet.artemis.domain.exam; import java.util.HashSet; import java.util.Set; @@ -17,8 +17,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.Exercise; @Entity @Table(name = "exercise_group") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/exam/StudentExam.java b/src/main/java/de/tum/cit/aet/artemis/domain/exam/StudentExam.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/exam/StudentExam.java rename to src/main/java/de/tum/cit/aet/artemis/domain/exam/StudentExam.java index 537a37dafa17..0df30e66df51 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/exam/StudentExam.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/exam/StudentExam.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.exam; +package de.tum.cit.aet.artemis.domain.exam; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -28,10 +28,10 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.AbstractAuditingEntity; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.domain.AbstractAuditingEntity; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; @Entity @Table(name = "student_exam") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/exam/SuspiciousExamSessions.java b/src/main/java/de/tum/cit/aet/artemis/domain/exam/SuspiciousExamSessions.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/domain/exam/SuspiciousExamSessions.java rename to src/main/java/de/tum/cit/aet/artemis/domain/exam/SuspiciousExamSessions.java index d473fcf14b4f..1e97db5c3d7b 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/exam/SuspiciousExamSessions.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/exam/SuspiciousExamSessions.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.exam; +package de.tum.cit.aet.artemis.domain.exam; import java.util.Set; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/exam/SuspiciousSessionReason.java b/src/main/java/de/tum/cit/aet/artemis/domain/exam/SuspiciousSessionReason.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/domain/exam/SuspiciousSessionReason.java rename to src/main/java/de/tum/cit/aet/artemis/domain/exam/SuspiciousSessionReason.java index 2ebe5c9449ab..b960ebc18880 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/exam/SuspiciousSessionReason.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/exam/SuspiciousSessionReason.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.exam; +package de.tum.cit.aet.artemis.domain.exam; /** * Enum representing reasons why a session is considered suspicious. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/exam/SuspiciousSessionsAnalysisOptions.java b/src/main/java/de/tum/cit/aet/artemis/domain/exam/SuspiciousSessionsAnalysisOptions.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/exam/SuspiciousSessionsAnalysisOptions.java rename to src/main/java/de/tum/cit/aet/artemis/domain/exam/SuspiciousSessionsAnalysisOptions.java index 8ab8a718d940..6e3d3a91e223 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/exam/SuspiciousSessionsAnalysisOptions.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/exam/SuspiciousSessionsAnalysisOptions.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.exam; +package de.tum.cit.aet.artemis.domain.exam; /** * Options for the analysis of suspicious sessions. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/exam/event/ExamAttendanceCheckEvent.java b/src/main/java/de/tum/cit/aet/artemis/domain/exam/event/ExamAttendanceCheckEvent.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/domain/exam/event/ExamAttendanceCheckEvent.java rename to src/main/java/de/tum/cit/aet/artemis/domain/exam/event/ExamAttendanceCheckEvent.java index 4ebac3bf72c4..596c59b7ae28 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/exam/event/ExamAttendanceCheckEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/exam/event/ExamAttendanceCheckEvent.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.domain.exam.event; +package de.tum.cit.aet.artemis.domain.exam.event; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; -import de.tum.in.www1.artemis.web.rest.dto.examevent.ExamAttendanceCheckEventDTO; +import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamAttendanceCheckEventDTO; /** * An event indicating an attendance check trigger during an exam. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/exam/event/ExamLiveEvent.java b/src/main/java/de/tum/cit/aet/artemis/domain/exam/event/ExamLiveEvent.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/domain/exam/event/ExamLiveEvent.java rename to src/main/java/de/tum/cit/aet/artemis/domain/exam/event/ExamLiveEvent.java index 0985a181eb24..d93728f6d7ee 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/exam/event/ExamLiveEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/exam/event/ExamLiveEvent.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.exam.event; +package de.tum.cit.aet.artemis.domain.exam.event; import java.time.Instant; @@ -16,9 +16,9 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.service.exam.ExamLiveEventsService; -import de.tum.in.www1.artemis.web.rest.dto.examevent.ExamLiveEventBaseDTO; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.service.exam.ExamLiveEventsService; +import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamLiveEventBaseDTO; /** * Base class for all exam live events. An exam live event indicates that an event or change has occurred during an exam. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/exam/event/ExamWideAnnouncementEvent.java b/src/main/java/de/tum/cit/aet/artemis/domain/exam/event/ExamWideAnnouncementEvent.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/domain/exam/event/ExamWideAnnouncementEvent.java rename to src/main/java/de/tum/cit/aet/artemis/domain/exam/event/ExamWideAnnouncementEvent.java index c45501ac2fb7..f132bec417d7 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/exam/event/ExamWideAnnouncementEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/exam/event/ExamWideAnnouncementEvent.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.domain.exam.event; +package de.tum.cit.aet.artemis.domain.exam.event; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; -import de.tum.in.www1.artemis.web.rest.dto.examevent.ExamWideAnnouncementEventDTO; +import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamWideAnnouncementEventDTO; /** * An exam wide announcement event. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/exam/event/ProblemStatementUpdateEvent.java b/src/main/java/de/tum/cit/aet/artemis/domain/exam/event/ProblemStatementUpdateEvent.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/domain/exam/event/ProblemStatementUpdateEvent.java rename to src/main/java/de/tum/cit/aet/artemis/domain/exam/event/ProblemStatementUpdateEvent.java index 9655545c91b9..f1b9aef3ba1c 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/exam/event/ProblemStatementUpdateEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/exam/event/ProblemStatementUpdateEvent.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.domain.exam.event; +package de.tum.cit.aet.artemis.domain.exam.event; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; -import de.tum.in.www1.artemis.web.rest.dto.examevent.ProblemStatementUpdateEventDTO; +import de.tum.cit.aet.artemis.web.rest.dto.examevent.ProblemStatementUpdateEventDTO; /** * An event indicating an update of the problem statement of an exercise during an exam. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/exam/event/WorkingTimeUpdateEvent.java b/src/main/java/de/tum/cit/aet/artemis/domain/exam/event/WorkingTimeUpdateEvent.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/domain/exam/event/WorkingTimeUpdateEvent.java rename to src/main/java/de/tum/cit/aet/artemis/domain/exam/event/WorkingTimeUpdateEvent.java index f99afa3e99b8..72382f108da0 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/exam/event/WorkingTimeUpdateEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/exam/event/WorkingTimeUpdateEvent.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.domain.exam.event; +package de.tum.cit.aet.artemis.domain.exam.event; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; -import de.tum.in.www1.artemis.web.rest.dto.examevent.WorkingTimeUpdateEventDTO; +import de.tum.cit.aet.artemis.web.rest.dto.examevent.WorkingTimeUpdateEventDTO; /** * An event indicating an updated working time for a specific student exam. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/hestia/CodeHint.java b/src/main/java/de/tum/cit/aet/artemis/domain/hestia/CodeHint.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/hestia/CodeHint.java rename to src/main/java/de/tum/cit/aet/artemis/domain/hestia/CodeHint.java index 4918256b3303..832b5d68d3f4 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/hestia/CodeHint.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/hestia/CodeHint.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.hestia; +package de.tum.cit.aet.artemis.domain.hestia; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/hestia/CoverageFileReport.java b/src/main/java/de/tum/cit/aet/artemis/domain/hestia/CoverageFileReport.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/hestia/CoverageFileReport.java rename to src/main/java/de/tum/cit/aet/artemis/domain/hestia/CoverageFileReport.java index 00cf33c243ad..438c41243cf2 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/hestia/CoverageFileReport.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/hestia/CoverageFileReport.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.hestia; +package de.tum.cit.aet.artemis.domain.hestia; import java.util.Set; @@ -16,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.DomainObject; @Entity @Table(name = "coverage_file_report") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/hestia/CoverageReport.java b/src/main/java/de/tum/cit/aet/artemis/domain/hestia/CoverageReport.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/hestia/CoverageReport.java rename to src/main/java/de/tum/cit/aet/artemis/domain/hestia/CoverageReport.java index 313dd16c7f9e..6691abdbf73b 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/hestia/CoverageReport.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/hestia/CoverageReport.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.hestia; +package de.tum.cit.aet.artemis.domain.hestia; import java.util.Set; @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; /** * A testwise coverage report representing the executed code by file path of a single ProgrammingExerciseTestCase. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/hestia/ExerciseHint.java b/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ExerciseHint.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/hestia/ExerciseHint.java rename to src/main/java/de/tum/cit/aet/artemis/domain/hestia/ExerciseHint.java index 98677e4cbe55..d8d97c79f3c3 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/hestia/ExerciseHint.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ExerciseHint.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.hestia; +package de.tum.cit.aet.artemis.domain.hestia; import java.util.HashSet; import java.util.Set; @@ -28,8 +28,8 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; /** * An ExerciseHint. @@ -163,7 +163,7 @@ public void setExerciseHintActivations(Set exerciseHintA /** * Returns a threshold value that defines when this exercise hint is displayed to student participating in a programming exercise. - * The algorithm defining if the hint is display is described in {@link de.tum.in.www1.artemis.service.hestia.ExerciseHintService#getAvailableExerciseHints} + * The algorithm defining if the hint is display is described in {@link de.tum.cit.aet.artemis.service.hestia.ExerciseHintService#getAvailableExerciseHints} * * @return the display threshold value */ diff --git a/src/main/java/de/tum/in/www1/artemis/domain/hestia/ExerciseHintActivation.java b/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ExerciseHintActivation.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/domain/hestia/ExerciseHintActivation.java rename to src/main/java/de/tum/cit/aet/artemis/domain/hestia/ExerciseHintActivation.java index 8b02f8e3b470..631bfe7a64c9 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/hestia/ExerciseHintActivation.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ExerciseHintActivation.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.hestia; +package de.tum.cit.aet.artemis.domain.hestia; import java.time.ZonedDateTime; @@ -12,8 +12,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.User; @Entity @Table(name = "exercise_hint_activation") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/hestia/ProgrammingExerciseGitDiffEntry.java b/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseGitDiffEntry.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/hestia/ProgrammingExerciseGitDiffEntry.java rename to src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseGitDiffEntry.java index d0817c7cd37a..0aa66a60ae1c 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/hestia/ProgrammingExerciseGitDiffEntry.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseGitDiffEntry.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.hestia; +package de.tum.cit.aet.artemis.domain.hestia; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.DomainObject; /** * A single difference from a git-diff report between the template and solution repositories. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/hestia/ProgrammingExerciseGitDiffReport.java b/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseGitDiffReport.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/domain/hestia/ProgrammingExerciseGitDiffReport.java rename to src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseGitDiffReport.java index 64245a4a083b..682a440b7f45 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/hestia/ProgrammingExerciseGitDiffReport.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseGitDiffReport.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.hestia; +package de.tum.cit.aet.artemis.domain.hestia; import java.util.Set; @@ -16,8 +16,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; /** * A git-diff report representing a git-diff between the template and solution repositories of a ProgrammingExercise. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/hestia/ProgrammingExerciseSolutionEntry.java b/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseSolutionEntry.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/hestia/ProgrammingExerciseSolutionEntry.java rename to src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseSolutionEntry.java index 6db2f1a089dc..d31115fe3ee1 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/hestia/ProgrammingExerciseSolutionEntry.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseSolutionEntry.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.hestia; +package de.tum.cit.aet.artemis.domain.hestia; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -13,8 +13,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; /** * A ProgrammingExerciseSolutionEntry represents a single change in a file that a students has to make in order to pass the related test. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/hestia/ProgrammingExerciseTask.java b/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseTask.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/domain/hestia/ProgrammingExerciseTask.java rename to src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseTask.java index 9b41edff30a4..23b0fd3665d9 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/hestia/ProgrammingExerciseTask.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseTask.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.hestia; +package de.tum.cit.aet.artemis.domain.hestia; import java.util.HashSet; import java.util.Set; @@ -21,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; /** * A ProgrammingExerciseTask diff --git a/src/main/java/de/tum/in/www1/artemis/domain/hestia/ProgrammingExerciseTestCaseType.java b/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseTestCaseType.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/domain/hestia/ProgrammingExerciseTestCaseType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseTestCaseType.java index 054644935137..03cc29a5cd07 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/hestia/ProgrammingExerciseTestCaseType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseTestCaseType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.hestia; +package de.tum.cit.aet.artemis.domain.hestia; /** * Used to define the type of a ProgrammingExerciseTestCase. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/hestia/TestwiseCoverageReportEntry.java b/src/main/java/de/tum/cit/aet/artemis/domain/hestia/TestwiseCoverageReportEntry.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/domain/hestia/TestwiseCoverageReportEntry.java rename to src/main/java/de/tum/cit/aet/artemis/domain/hestia/TestwiseCoverageReportEntry.java index bf3394c17cb1..3d4cfc76b6fe 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/hestia/TestwiseCoverageReportEntry.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/hestia/TestwiseCoverageReportEntry.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.hestia; +package de.tum.cit.aet.artemis.domain.hestia; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -11,8 +11,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; /** * A single entry from testwise coverage report by file path and consecutive executed code block. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/IrisTemplate.java b/src/main/java/de/tum/cit/aet/artemis/domain/iris/IrisTemplate.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/iris/IrisTemplate.java rename to src/main/java/de/tum/cit/aet/artemis/domain/iris/IrisTemplate.java index bcd06908178d..15751126eebd 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/iris/IrisTemplate.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/iris/IrisTemplate.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.iris; +package de.tum.cit.aet.artemis.domain.iris; import java.util.Objects; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.DomainObject; /** * An IrisTemplate represents a handlebars template for Iris. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/message/IrisJsonMessageContent.java b/src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisJsonMessageContent.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/domain/iris/message/IrisJsonMessageContent.java rename to src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisJsonMessageContent.java index b0667a5306a7..ca9672c17329 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/iris/message/IrisJsonMessageContent.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisJsonMessageContent.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.iris.message; +package de.tum.cit.aet.artemis.domain.iris.message; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/message/IrisMessage.java b/src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisMessage.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/domain/iris/message/IrisMessage.java rename to src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisMessage.java index 26688510f8f0..9ec0b9e1a4c6 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/iris/message/IrisMessage.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisMessage.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.iris.message; +package de.tum.cit.aet.artemis.domain.iris.message; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -25,8 +25,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.iris.session.IrisSession; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; /** * An IrisMessage represents a single message in an IrisSession. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/message/IrisMessageContent.java b/src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisMessageContent.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/domain/iris/message/IrisMessageContent.java rename to src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisMessageContent.java index 9767675cfbb8..f4fc9ceeceb8 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/iris/message/IrisMessageContent.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisMessageContent.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.iris.message; +package de.tum.cit.aet.artemis.domain.iris.message; import jakarta.annotation.Nullable; import jakarta.persistence.DiscriminatorColumn; @@ -17,7 +17,7 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import de.tum.in.www1.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.DomainObject; @Entity @Table(name = "iris_message_content") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/message/IrisMessageSender.java b/src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisMessageSender.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/domain/iris/message/IrisMessageSender.java rename to src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisMessageSender.java index a41a0ec834ff..ab4d74998913 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/iris/message/IrisMessageSender.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisMessageSender.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.iris.message; +package de.tum.cit.aet.artemis.domain.iris.message; /** * This enum represents the different senders of Iris messages. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/message/IrisTextMessageContent.java b/src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisTextMessageContent.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/iris/message/IrisTextMessageContent.java rename to src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisTextMessageContent.java index fd9da933c2ce..e7e509098408 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/iris/message/IrisTextMessageContent.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisTextMessageContent.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.iris.message; +package de.tum.cit.aet.artemis.domain.iris.message; import jakarta.annotation.Nullable; import jakarta.persistence.Column; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/session/IrisChatSession.java b/src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisChatSession.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/domain/iris/session/IrisChatSession.java rename to src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisChatSession.java index 9c330f7fe999..8549e359407c 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/iris/session/IrisChatSession.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisChatSession.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.domain.iris.session; +package de.tum.cit.aet.artemis.domain.iris.session; import jakarta.persistence.Entity; import jakarta.persistence.ManyToOne; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.User; @Entity public abstract class IrisChatSession extends IrisSession { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/session/IrisCourseChatSession.java b/src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisCourseChatSession.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/domain/iris/session/IrisCourseChatSession.java rename to src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisCourseChatSession.java index 673119155302..c7d66ccbee8e 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/iris/session/IrisCourseChatSession.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisCourseChatSession.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.iris.session; +package de.tum.cit.aet.artemis.domain.iris.session; import java.util.Optional; @@ -9,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; /** * An IrisCourseChatSession represents a conversation between a user and an LLM. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/session/IrisExerciseChatSession.java b/src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisExerciseChatSession.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/domain/iris/session/IrisExerciseChatSession.java rename to src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisExerciseChatSession.java index 405aa9d859a5..3e1b8326f800 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/iris/session/IrisExerciseChatSession.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisExerciseChatSession.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.iris.session; +package de.tum.cit.aet.artemis.domain.iris.session; import java.util.Optional; @@ -9,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.User; /** * An IrisExerciseChatSession represents a conversation between a user and an LLM. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/session/IrisHestiaSession.java b/src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisHestiaSession.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/domain/iris/session/IrisHestiaSession.java rename to src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisHestiaSession.java index 71a6005062b1..f32e5c9e39bb 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/iris/session/IrisHestiaSession.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisHestiaSession.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.iris.session; +package de.tum.cit.aet.artemis.domain.iris.session; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.domain.hestia.CodeHint; /** * An Iris session for a hestia code hint. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/session/IrisSession.java b/src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisSession.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/iris/session/IrisSession.java rename to src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisSession.java index 688d3a6b2b62..0730d4ab141e 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/iris/session/IrisSession.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisSession.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.iris.session; +package de.tum.cit.aet.artemis.domain.iris.session; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -23,8 +23,8 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.iris.message.IrisMessage; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; /** * An IrisSession represents a list of messages of Artemis, a user, and an LLM. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisChatSubSettings.java b/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisChatSubSettings.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisChatSubSettings.java rename to src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisChatSubSettings.java index 82684b669684..2114ce6328c9 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisChatSubSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisChatSubSettings.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.iris.settings; +package de.tum.cit.aet.artemis.domain.iris.settings; import jakarta.annotation.Nullable; import jakarta.persistence.CascadeType; @@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.iris.IrisTemplate; +import de.tum.cit.aet.artemis.domain.iris.IrisTemplate; /** * An {@link IrisSubSettings} implementation for chat settings. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisCompetencyGenerationSubSettings.java b/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisCompetencyGenerationSubSettings.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisCompetencyGenerationSubSettings.java rename to src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisCompetencyGenerationSubSettings.java index 4dfba654ae88..5af0c7389b08 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisCompetencyGenerationSubSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisCompetencyGenerationSubSettings.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.iris.settings; +package de.tum.cit.aet.artemis.domain.iris.settings; import jakarta.annotation.Nullable; import jakarta.persistence.CascadeType; @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.iris.IrisTemplate; +import de.tum.cit.aet.artemis.domain.iris.IrisTemplate; /** * An {@link IrisSubSettings} implementation for the settings for competency generation. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisCourseSettings.java b/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisCourseSettings.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisCourseSettings.java rename to src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisCourseSettings.java index f4b28bbd6ae6..d3664dcd713f 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisCourseSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisCourseSettings.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.iris.settings; +package de.tum.cit.aet.artemis.domain.iris.settings; import jakarta.persistence.CascadeType; import jakarta.persistence.DiscriminatorValue; @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Course; /** * An {@link IrisSettings} implementation for course specific settings. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisExerciseSettings.java b/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisExerciseSettings.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisExerciseSettings.java rename to src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisExerciseSettings.java index 404ef246b7ed..43257ce0a807 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisExerciseSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisExerciseSettings.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.iris.settings; +package de.tum.cit.aet.artemis.domain.iris.settings; import jakarta.persistence.CascadeType; import jakarta.persistence.DiscriminatorValue; @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Exercise; /** * An {@link IrisSettings} implementation for exercise specific settings. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisGlobalSettings.java b/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisGlobalSettings.java similarity index 99% rename from src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisGlobalSettings.java rename to src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisGlobalSettings.java index 1a69d221cfe3..7f990d5b9fb8 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisGlobalSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisGlobalSettings.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.iris.settings; +package de.tum.cit.aet.artemis.domain.iris.settings; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisHestiaSubSettings.java b/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisHestiaSubSettings.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisHestiaSubSettings.java rename to src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisHestiaSubSettings.java index ceb69f3de6d8..db45b6e94b73 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisHestiaSubSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisHestiaSubSettings.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.iris.settings; +package de.tum.cit.aet.artemis.domain.iris.settings; import jakarta.annotation.Nullable; import jakarta.persistence.CascadeType; @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.iris.IrisTemplate; +import de.tum.cit.aet.artemis.domain.iris.IrisTemplate; /** * An {@link IrisSubSettings} implementation for the Hestia integration settings. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisLectureIngestionSubSettings.java b/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisLectureIngestionSubSettings.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisLectureIngestionSubSettings.java rename to src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisLectureIngestionSubSettings.java index 2d7283aba8fc..b34f644a9be7 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisLectureIngestionSubSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisLectureIngestionSubSettings.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.iris.settings; +package de.tum.cit.aet.artemis.domain.iris.settings; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisModelListConverter.java b/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisModelListConverter.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisModelListConverter.java rename to src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisModelListConverter.java index c94c8810bca0..99b971615bd8 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisModelListConverter.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisModelListConverter.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.iris.settings; +package de.tum.cit.aet.artemis.domain.iris.settings; import java.util.Comparator; import java.util.Set; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisSettings.java b/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisSettings.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisSettings.java rename to src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisSettings.java index 6a5d82b4d4c4..5d2d9ae970bc 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisSettings.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.iris.settings; +package de.tum.cit.aet.artemis.domain.iris.settings; import jakarta.persistence.DiscriminatorColumn; import jakarta.persistence.DiscriminatorType; @@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import de.tum.in.www1.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.DomainObject; /** * IrisSettings is an abstract super class for the specific settings types. @@ -23,7 +23,7 @@ * {@link IrisCourseSettings} are used to specify settings on a course level. * {@link IrisExerciseSettings} are used to specify settings on an exercise level. *

- * Also see {@link de.tum.in.www1.artemis.service.iris.settings.IrisSettingsService} for more information. + * Also see {@link de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService} for more information. */ @Entity @Table(name = "iris_settings") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisSettingsType.java b/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisSettingsType.java similarity index 54% rename from src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisSettingsType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisSettingsType.java index 90ec73a0bf87..773f18b7bf97 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisSettingsType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisSettingsType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.iris.settings; +package de.tum.cit.aet.artemis.domain.iris.settings; public enum IrisSettingsType { GLOBAL, COURSE, EXERCISE diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisSubSettings.java b/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisSubSettings.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisSubSettings.java rename to src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisSubSettings.java index 50598cc4f8b3..d248c0ce0c4b 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisSubSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisSubSettings.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.iris.settings; +package de.tum.cit.aet.artemis.domain.iris.settings; import java.util.SortedSet; import java.util.TreeSet; @@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import de.tum.in.www1.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.DomainObject; /** * IrisSubSettings is an abstract super class for the specific sub settings types. @@ -29,7 +29,7 @@ * {@link IrisHestiaSubSettings} are used to specify settings for the Hestia integration. * {@link IrisCompetencyGenerationSubSettings} are used to specify settings for the competency generation feature. *

- * Also see {@link de.tum.in.www1.artemis.service.iris.settings.IrisSettingsService} for more information. + * Also see {@link de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService} for more information. */ @Entity @Table(name = "iris_sub_settings") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisSubSettingsType.java b/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisSubSettingsType.java similarity index 64% rename from src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisSubSettingsType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisSubSettingsType.java index 73e214c48da0..823642b71eed 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisSubSettingsType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisSubSettingsType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.iris.settings; +package de.tum.cit.aet.artemis.domain.iris.settings; public enum IrisSubSettingsType { CHAT, HESTIA, COMPETENCY_GENERATION, LECTURE_INGESTION diff --git a/src/main/java/de/tum/in/www1/artemis/domain/leaderboard/tutor/TutorLeaderboardAnsweredMoreFeedbackRequests.java b/src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardAnsweredMoreFeedbackRequests.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/domain/leaderboard/tutor/TutorLeaderboardAnsweredMoreFeedbackRequests.java rename to src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardAnsweredMoreFeedbackRequests.java index c72cbf008d4e..9e2b58048056 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/leaderboard/tutor/TutorLeaderboardAnsweredMoreFeedbackRequests.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardAnsweredMoreFeedbackRequests.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.leaderboard.tutor; +package de.tum.cit.aet.artemis.domain.leaderboard.tutor; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/leaderboard/tutor/TutorLeaderboardAssessments.java b/src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardAssessments.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/domain/leaderboard/tutor/TutorLeaderboardAssessments.java rename to src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardAssessments.java index 189209354127..2830bfb1bdd1 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/leaderboard/tutor/TutorLeaderboardAssessments.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardAssessments.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.leaderboard.tutor; +package de.tum.cit.aet.artemis.domain.leaderboard.tutor; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/leaderboard/tutor/TutorLeaderboardComplaintResponses.java b/src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardComplaintResponses.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/domain/leaderboard/tutor/TutorLeaderboardComplaintResponses.java rename to src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardComplaintResponses.java index f9e36f6db8d3..c0e58a6bdf7d 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/leaderboard/tutor/TutorLeaderboardComplaintResponses.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardComplaintResponses.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.leaderboard.tutor; +package de.tum.cit.aet.artemis.domain.leaderboard.tutor; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/leaderboard/tutor/TutorLeaderboardComplaints.java b/src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardComplaints.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/domain/leaderboard/tutor/TutorLeaderboardComplaints.java rename to src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardComplaints.java index 6e33ecd22180..5afcefb1df75 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/leaderboard/tutor/TutorLeaderboardComplaints.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardComplaints.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.leaderboard.tutor; +package de.tum.cit.aet.artemis.domain.leaderboard.tutor; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/leaderboard/tutor/TutorLeaderboardMoreFeedbackRequests.java b/src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardMoreFeedbackRequests.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/domain/leaderboard/tutor/TutorLeaderboardMoreFeedbackRequests.java rename to src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardMoreFeedbackRequests.java index 2d800e69c2f9..ca3c79b67284 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/leaderboard/tutor/TutorLeaderboardMoreFeedbackRequests.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardMoreFeedbackRequests.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.leaderboard.tutor; +package de.tum.cit.aet.artemis.domain.leaderboard.tutor; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lecture/AttachmentUnit.java b/src/main/java/de/tum/cit/aet/artemis/domain/lecture/AttachmentUnit.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/lecture/AttachmentUnit.java rename to src/main/java/de/tum/cit/aet/artemis/domain/lecture/AttachmentUnit.java index da84dab34bd5..e7c16fd05a9b 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/lecture/AttachmentUnit.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/lecture/AttachmentUnit.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.lecture; +package de.tum.cit.aet.artemis.domain.lecture; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Attachment; +import de.tum.cit.aet.artemis.domain.Attachment; @Entity @DiscriminatorValue("A") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lecture/ExerciseUnit.java b/src/main/java/de/tum/cit/aet/artemis/domain/lecture/ExerciseUnit.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/lecture/ExerciseUnit.java rename to src/main/java/de/tum/cit/aet/artemis/domain/lecture/ExerciseUnit.java index 1d661b4eacfd..9a2320b12a4a 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/lecture/ExerciseUnit.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/lecture/ExerciseUnit.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.lecture; +package de.tum.cit.aet.artemis.domain.lecture; import java.time.ZonedDateTime; import java.util.HashSet; @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; @Entity @DiscriminatorValue("E") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lecture/LectureUnit.java b/src/main/java/de/tum/cit/aet/artemis/domain/lecture/LectureUnit.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/lecture/LectureUnit.java rename to src/main/java/de/tum/cit/aet/artemis/domain/lecture/LectureUnit.java index 25ca1a98b87a..d3e4a0a099a1 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/lecture/LectureUnit.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/lecture/LectureUnit.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.lecture; +package de.tum.cit.aet.artemis.domain.lecture; import java.time.ZonedDateTime; import java.util.HashSet; @@ -33,11 +33,11 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.LearningObject; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.LearningObject; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; @Entity @Table(name = "lecture_unit") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lecture/LectureUnitCompletion.java b/src/main/java/de/tum/cit/aet/artemis/domain/lecture/LectureUnitCompletion.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/lecture/LectureUnitCompletion.java rename to src/main/java/de/tum/cit/aet/artemis/domain/lecture/LectureUnitCompletion.java index 9a0e916a3303..62a9ac59f77b 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/lecture/LectureUnitCompletion.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/lecture/LectureUnitCompletion.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.lecture; +package de.tum.cit.aet.artemis.domain.lecture; import java.io.Serial; import java.io.Serializable; @@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.User; /** * This class models the 'completion' association between a user and a lecture unit. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lecture/OnlineUnit.java b/src/main/java/de/tum/cit/aet/artemis/domain/lecture/OnlineUnit.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/domain/lecture/OnlineUnit.java rename to src/main/java/de/tum/cit/aet/artemis/domain/lecture/OnlineUnit.java index c6de35720dbf..4ceee1a9cbad 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/lecture/OnlineUnit.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/lecture/OnlineUnit.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.lecture; +package de.tum.cit.aet.artemis.domain.lecture; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lecture/Slide.java b/src/main/java/de/tum/cit/aet/artemis/domain/lecture/Slide.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/domain/lecture/Slide.java rename to src/main/java/de/tum/cit/aet/artemis/domain/lecture/Slide.java index ad31c457b116..eb1327b21c46 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/lecture/Slide.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/lecture/Slide.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.lecture; +package de.tum.cit.aet.artemis.domain.lecture; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.DomainObject; @Entity @Table(name = "slide") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lecture/TextUnit.java b/src/main/java/de/tum/cit/aet/artemis/domain/lecture/TextUnit.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/domain/lecture/TextUnit.java rename to src/main/java/de/tum/cit/aet/artemis/domain/lecture/TextUnit.java index cf421a4f96c3..8b111bb011f1 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/lecture/TextUnit.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/lecture/TextUnit.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.lecture; +package de.tum.cit.aet.artemis.domain.lecture; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lecture/VideoUnit.java b/src/main/java/de/tum/cit/aet/artemis/domain/lecture/VideoUnit.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/domain/lecture/VideoUnit.java rename to src/main/java/de/tum/cit/aet/artemis/domain/lecture/VideoUnit.java index bf4ceebb2b9e..e497857ef3ad 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/lecture/VideoUnit.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/lecture/VideoUnit.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.lecture; +package de.tum.cit.aet.artemis.domain.lecture; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lti/Claims.java b/src/main/java/de/tum/cit/aet/artemis/domain/lti/Claims.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/lti/Claims.java rename to src/main/java/de/tum/cit/aet/artemis/domain/lti/Claims.java index ca5d8494cc74..95f165c63a74 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/lti/Claims.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/lti/Claims.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.lti; +package de.tum.cit.aet.artemis.domain.lti; public class Claims extends uk.ac.ox.ctl.lti13.lti.Claims { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13AgsClaim.java b/src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13AgsClaim.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13AgsClaim.java rename to src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13AgsClaim.java index 62282902ae69..53ee6ec18b7b 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13AgsClaim.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13AgsClaim.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.lti; +package de.tum.cit.aet.artemis.domain.lti; import java.util.Collections; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13ClientRegistration.java b/src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13ClientRegistration.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13ClientRegistration.java rename to src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13ClientRegistration.java index 816d18157234..61e43c88ab2f 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13ClientRegistration.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13ClientRegistration.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.lti; +package de.tum.cit.aet.artemis.domain.lti; import java.util.Arrays; import java.util.List; @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; -import de.tum.in.www1.artemis.config.lti.CustomLti13Configurer; +import de.tum.cit.aet.artemis.config.lti.CustomLti13Configurer; /** * Represents the client registration details for an LTI 1.3 integration. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13DeepLinkingResponse.java b/src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13DeepLinkingResponse.java similarity index 99% rename from src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13DeepLinkingResponse.java rename to src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13DeepLinkingResponse.java index 9e89152aec91..61441e0798b3 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13DeepLinkingResponse.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13DeepLinkingResponse.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.lti; +package de.tum.cit.aet.artemis.domain.lti; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13LaunchRequest.java b/src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13LaunchRequest.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13LaunchRequest.java rename to src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13LaunchRequest.java index cc4ea50a6555..6b3fe5e029f3 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13LaunchRequest.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13LaunchRequest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.lti; +package de.tum.cit.aet.artemis.domain.lti; import org.springframework.security.oauth2.core.oidc.IdTokenClaimNames; import org.springframework.security.oauth2.core.oidc.OidcIdToken; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13PlatformConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13PlatformConfiguration.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13PlatformConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13PlatformConfiguration.java index 4428c38b9c05..a16ddd07ee38 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13PlatformConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13PlatformConfiguration.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.lti; +package de.tum.cit.aet.artemis.domain.lti; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lti/LtiAuthenticationResponse.java b/src/main/java/de/tum/cit/aet/artemis/domain/lti/LtiAuthenticationResponse.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/domain/lti/LtiAuthenticationResponse.java rename to src/main/java/de/tum/cit/aet/artemis/domain/lti/LtiAuthenticationResponse.java index a89fa468c56d..2cee8557e7e2 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/lti/LtiAuthenticationResponse.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/lti/LtiAuthenticationResponse.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.lti; +package de.tum.cit.aet.artemis.domain.lti; /** * Holds LTI authentication response details. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lti/LtiResourceLaunch.java b/src/main/java/de/tum/cit/aet/artemis/domain/lti/LtiResourceLaunch.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/domain/lti/LtiResourceLaunch.java rename to src/main/java/de/tum/cit/aet/artemis/domain/lti/LtiResourceLaunch.java index 72af5948bee5..2430ad0ed481 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/lti/LtiResourceLaunch.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/lti/LtiResourceLaunch.java @@ -1,14 +1,14 @@ -package de.tum.in.www1.artemis.domain.lti; +package de.tum.cit.aet.artemis.domain.lti; import jakarta.persistence.Entity; import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.LtiPlatformConfiguration; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; +import de.tum.cit.aet.artemis.domain.User; /** * Represents an LTI 1.3 Resource Link Launch. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lti/Scopes.java b/src/main/java/de/tum/cit/aet/artemis/domain/lti/Scopes.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/domain/lti/Scopes.java rename to src/main/java/de/tum/cit/aet/artemis/domain/lti/Scopes.java index 8ec7187fa55e..7c43fbeac69d 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/lti/Scopes.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/lti/Scopes.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.lti; +package de.tum.cit.aet.artemis.domain.lti; public class Scopes { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/metis/AnswerPost.java b/src/main/java/de/tum/cit/aet/artemis/domain/metis/AnswerPost.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/metis/AnswerPost.java rename to src/main/java/de/tum/cit/aet/artemis/domain/metis/AnswerPost.java index 26e1ae372659..dc722329e404 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/metis/AnswerPost.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/metis/AnswerPost.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.metis; +package de.tum.cit.aet.artemis.domain.metis; import java.util.HashSet; import java.util.Set; @@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonIncludeProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import de.tum.in.www1.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Course; /** * An AnswerPost. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/metis/ConversationParticipant.java b/src/main/java/de/tum/cit/aet/artemis/domain/metis/ConversationParticipant.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/domain/metis/ConversationParticipant.java rename to src/main/java/de/tum/cit/aet/artemis/domain/metis/ConversationParticipant.java index b9cd9c8aab27..ea7c89a7440e 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/metis/ConversationParticipant.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/metis/ConversationParticipant.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.metis; +package de.tum.cit.aet.artemis.domain.metis; import java.time.ZonedDateTime; @@ -12,9 +12,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonIncludeProperties; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.metis.conversation.Conversation; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; @Entity @Table(name = "conversation_participant") @@ -31,7 +31,7 @@ public class ConversationParticipant extends DomainObject { private User user; /** - * Currently only used for {@link de.tum.in.www1.artemis.domain.metis.conversation.Channel} + * Currently only used for {@link de.tum.cit.aet.artemis.domain.metis.conversation.Channel} */ @Column(name = "is_moderator") private Boolean isModerator; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/metis/ConversationParticipantSettingsView.java b/src/main/java/de/tum/cit/aet/artemis/domain/metis/ConversationParticipantSettingsView.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/domain/metis/ConversationParticipantSettingsView.java rename to src/main/java/de/tum/cit/aet/artemis/domain/metis/ConversationParticipantSettingsView.java index 28f0b21a24b1..cfa68eabfc5e 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/metis/ConversationParticipantSettingsView.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/metis/ConversationParticipantSettingsView.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.metis; +package de.tum.cit.aet.artemis.domain.metis; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/metis/ConversationType.java b/src/main/java/de/tum/cit/aet/artemis/domain/metis/ConversationType.java similarity index 54% rename from src/main/java/de/tum/in/www1/artemis/domain/metis/ConversationType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/metis/ConversationType.java index dcfeddcf8e39..89585c83b8fd 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/metis/ConversationType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/metis/ConversationType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.metis; +package de.tum.cit.aet.artemis.domain.metis; public enum ConversationType { CHANNEL, DIRECT diff --git a/src/main/java/de/tum/in/www1/artemis/domain/metis/CourseWideContext.java b/src/main/java/de/tum/cit/aet/artemis/domain/metis/CourseWideContext.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/domain/metis/CourseWideContext.java rename to src/main/java/de/tum/cit/aet/artemis/domain/metis/CourseWideContext.java index eb19c5e49f46..1ab9f4cfed10 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/metis/CourseWideContext.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/metis/CourseWideContext.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.metis; +package de.tum.cit.aet.artemis.domain.metis; /** * The CourseWideContext enumeration for linking posts to other contexts besides certain exercises or lectures. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/metis/CreatedConversationMessage.java b/src/main/java/de/tum/cit/aet/artemis/domain/metis/CreatedConversationMessage.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/domain/metis/CreatedConversationMessage.java rename to src/main/java/de/tum/cit/aet/artemis/domain/metis/CreatedConversationMessage.java index 33e19374f8f8..3eef5b782b20 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/metis/CreatedConversationMessage.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/metis/CreatedConversationMessage.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.domain.metis; +package de.tum.cit.aet.artemis.domain.metis; import java.util.Set; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.metis.conversation.Conversation; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; /** * Encapsulates data needed after a new message has been created in a conversation. This data is used to send notifications to involved users about the new message asynchronously diff --git a/src/main/java/de/tum/in/www1/artemis/domain/metis/Post.java b/src/main/java/de/tum/cit/aet/artemis/domain/metis/Post.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/metis/Post.java rename to src/main/java/de/tum/cit/aet/artemis/domain/metis/Post.java index a5d5cd3c2809..cc428cda1778 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/metis/Post.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/metis/Post.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.metis; +package de.tum.cit.aet.artemis.domain.metis; import java.util.HashSet; import java.util.Set; @@ -25,12 +25,12 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonIncludeProperties; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.enumeration.DisplayPriority; -import de.tum.in.www1.artemis.domain.metis.conversation.Conversation; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; +import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; /** * A Post, i.e. start of a Metis thread. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/metis/PostConstraints.java b/src/main/java/de/tum/cit/aet/artemis/domain/metis/PostConstraints.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/domain/metis/PostConstraints.java rename to src/main/java/de/tum/cit/aet/artemis/domain/metis/PostConstraints.java index 77f1d6e49c45..7f8842880734 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/metis/PostConstraints.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/metis/PostConstraints.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.metis; +package de.tum.cit.aet.artemis.domain.metis; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -21,7 +21,7 @@ /** * @return the message of the violated constraint */ - String message() default "{de.tum.in.www1.artemis.domain.metis.PostConstraints}"; + String message() default "{de.tum.cit.aet.artemis.domain.metis.PostConstraints}"; /** * @return the groups, default is empty diff --git a/src/main/java/de/tum/in/www1/artemis/domain/metis/PostContextConstraintValidator.java b/src/main/java/de/tum/cit/aet/artemis/domain/metis/PostContextConstraintValidator.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/metis/PostContextConstraintValidator.java rename to src/main/java/de/tum/cit/aet/artemis/domain/metis/PostContextConstraintValidator.java index 00c2b5965023..8d2821b5c01d 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/metis/PostContextConstraintValidator.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/metis/PostContextConstraintValidator.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.metis; +package de.tum.cit.aet.artemis.domain.metis; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/metis/PostSortCriterion.java b/src/main/java/de/tum/cit/aet/artemis/domain/metis/PostSortCriterion.java similarity index 62% rename from src/main/java/de/tum/in/www1/artemis/domain/metis/PostSortCriterion.java rename to src/main/java/de/tum/cit/aet/artemis/domain/metis/PostSortCriterion.java index 78b37aee56e7..47de4d7dc3fd 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/metis/PostSortCriterion.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/metis/PostSortCriterion.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.metis; +package de.tum.cit.aet.artemis.domain.metis; public enum PostSortCriterion { CREATION_DATE, VOTES, ANSWER_COUNT diff --git a/src/main/java/de/tum/in/www1/artemis/domain/metis/Posting.java b/src/main/java/de/tum/cit/aet/artemis/domain/metis/Posting.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/metis/Posting.java rename to src/main/java/de/tum/cit/aet/artemis/domain/metis/Posting.java index 1e784e45b818..d71253287399 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/metis/Posting.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/metis/Posting.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.metis; +package de.tum.cit.aet.artemis.domain.metis; import java.time.ZonedDateTime; import java.util.Set; @@ -18,9 +18,9 @@ import com.fasterxml.jackson.annotation.JsonIncludeProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.User; /** * A METIS Posting. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/metis/Reaction.java b/src/main/java/de/tum/cit/aet/artemis/domain/metis/Reaction.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/domain/metis/Reaction.java rename to src/main/java/de/tum/cit/aet/artemis/domain/metis/Reaction.java index fb4da112eee4..9c337bfcbca6 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/metis/Reaction.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/metis/Reaction.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.metis; +package de.tum.cit.aet.artemis.domain.metis; import java.time.ZonedDateTime; @@ -15,8 +15,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonIncludeProperties; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.User; /** * A Reaction on a Posting. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/metis/ReactionConstraintValidator.java b/src/main/java/de/tum/cit/aet/artemis/domain/metis/ReactionConstraintValidator.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/domain/metis/ReactionConstraintValidator.java rename to src/main/java/de/tum/cit/aet/artemis/domain/metis/ReactionConstraintValidator.java index abeadb46b340..f4a4e8558b8d 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/metis/ReactionConstraintValidator.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/metis/ReactionConstraintValidator.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.metis; +package de.tum.cit.aet.artemis.domain.metis; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/metis/ReactionConstraints.java b/src/main/java/de/tum/cit/aet/artemis/domain/metis/ReactionConstraints.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/domain/metis/ReactionConstraints.java rename to src/main/java/de/tum/cit/aet/artemis/domain/metis/ReactionConstraints.java index dec0fadf5aac..6f2791a1ff3e 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/metis/ReactionConstraints.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/metis/ReactionConstraints.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.metis; +package de.tum.cit.aet.artemis.domain.metis; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -21,7 +21,7 @@ /** * @return the message of the violated constraint */ - String message() default "{de.tum.in.www1.artemis.domain.metis.ReactionConstraints}"; + String message() default "{de.tum.cit.aet.artemis.domain.metis.ReactionConstraints}"; /** * @return the groups, default is empty diff --git a/src/main/java/de/tum/in/www1/artemis/domain/metis/UserRole.java b/src/main/java/de/tum/cit/aet/artemis/domain/metis/UserRole.java similarity index 54% rename from src/main/java/de/tum/in/www1/artemis/domain/metis/UserRole.java rename to src/main/java/de/tum/cit/aet/artemis/domain/metis/UserRole.java index b458a033f0c5..6f6361654567 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/metis/UserRole.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/metis/UserRole.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.metis; +package de.tum.cit.aet.artemis.domain.metis; public enum UserRole { INSTRUCTOR, TUTOR, USER diff --git a/src/main/java/de/tum/in/www1/artemis/domain/metis/conversation/Channel.java b/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/Channel.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/metis/conversation/Channel.java rename to src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/Channel.java index d16e16569afd..80f0f440ca19 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/metis/conversation/Channel.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/Channel.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.metis.conversation; +package de.tum.cit.aet.artemis.domain.metis.conversation; import java.time.ZonedDateTime; import java.util.Set; @@ -16,13 +16,13 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.metis.ConversationParticipant; -import de.tum.in.www1.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; +import de.tum.cit.aet.artemis.domain.metis.Post; @Entity @DiscriminatorValue("C") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/metis/conversation/ChannelSubType.java b/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/ChannelSubType.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/domain/metis/conversation/ChannelSubType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/ChannelSubType.java index 514eb9bfbf94..90b607cc87a8 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/metis/conversation/ChannelSubType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/ChannelSubType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.metis.conversation; +package de.tum.cit.aet.artemis.domain.metis.conversation; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/metis/conversation/Conversation.java b/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/Conversation.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/metis/conversation/Conversation.java rename to src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/Conversation.java index 75c5dc67fc1d..b5d7a411ea7b 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/metis/conversation/Conversation.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/Conversation.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.metis.conversation; +package de.tum.cit.aet.artemis.domain.metis.conversation; import java.time.ZonedDateTime; import java.util.HashSet; @@ -29,11 +29,11 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.metis.ConversationParticipant; -import de.tum.in.www1.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; +import de.tum.cit.aet.artemis.domain.metis.Post; @Entity @Table(name = "conversation") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/metis/conversation/ConversationSettings.java b/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/ConversationSettings.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/domain/metis/conversation/ConversationSettings.java rename to src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/ConversationSettings.java index f2050315e2f1..caa7ba79cad0 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/metis/conversation/ConversationSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/ConversationSettings.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.metis.conversation; +package de.tum.cit.aet.artemis.domain.metis.conversation; public final class ConversationSettings { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/metis/conversation/ConversationSummary.java b/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/ConversationSummary.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/domain/metis/conversation/ConversationSummary.java rename to src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/ConversationSummary.java index e311e8bc4bb2..95ea795e21c8 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/metis/conversation/ConversationSummary.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/ConversationSummary.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.metis.conversation; +package de.tum.cit.aet.artemis.domain.metis.conversation; /** * Summaries user related and general information about a conversation. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/metis/conversation/GeneralConversationInfo.java b/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/GeneralConversationInfo.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/domain/metis/conversation/GeneralConversationInfo.java rename to src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/GeneralConversationInfo.java index 788723b09670..922cda28bc67 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/metis/conversation/GeneralConversationInfo.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/GeneralConversationInfo.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.metis.conversation; +package de.tum.cit.aet.artemis.domain.metis.conversation; /** * Stores general information about a conversation that is not related to a user diff --git a/src/main/java/de/tum/in/www1/artemis/domain/metis/conversation/GroupChat.java b/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/GroupChat.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/domain/metis/conversation/GroupChat.java rename to src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/GroupChat.java index e886ff8112f9..46e1a469c293 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/metis/conversation/GroupChat.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/GroupChat.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.domain.metis.conversation; +package de.tum.cit.aet.artemis.domain.metis.conversation; -import static de.tum.in.www1.artemis.domain.metis.conversation.ConversationSettings.MAX_GROUP_CHAT_PARTICIPANTS; +import static de.tum.cit.aet.artemis.domain.metis.conversation.ConversationSettings.MAX_GROUP_CHAT_PARTICIPANTS; import java.time.ZonedDateTime; import java.util.Set; @@ -15,11 +15,11 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.metis.ConversationParticipant; -import de.tum.in.www1.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; +import de.tum.cit.aet.artemis.domain.metis.Post; @Entity @DiscriminatorValue("G") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/metis/conversation/OneToOneChat.java b/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/OneToOneChat.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/domain/metis/conversation/OneToOneChat.java rename to src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/OneToOneChat.java index a00f5810430c..7753a31786b9 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/metis/conversation/OneToOneChat.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/OneToOneChat.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.domain.metis.conversation; +package de.tum.cit.aet.artemis.domain.metis.conversation; -import static de.tum.in.www1.artemis.domain.metis.conversation.ConversationSettings.MAX_ONE_TO_ONE_CHAT_PARTICIPANTS; +import static de.tum.cit.aet.artemis.domain.metis.conversation.ConversationSettings.MAX_ONE_TO_ONE_CHAT_PARTICIPANTS; import java.time.ZonedDateTime; import java.util.Set; @@ -10,10 +10,10 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.metis.ConversationParticipant; -import de.tum.in.www1.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; +import de.tum.cit.aet.artemis.domain.metis.Post; @Entity @DiscriminatorValue("O") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/metis/conversation/UserConversationInfo.java b/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/UserConversationInfo.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/domain/metis/conversation/UserConversationInfo.java rename to src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/UserConversationInfo.java index 7216ac3f4faf..27fdb18fae98 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/metis/conversation/UserConversationInfo.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/UserConversationInfo.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.domain.metis.conversation; +package de.tum.cit.aet.artemis.domain.metis.conversation; import java.time.ZonedDateTime; -import de.tum.in.www1.artemis.domain.metis.ConversationParticipantSettingsView; +import de.tum.cit.aet.artemis.domain.metis.ConversationParticipantSettingsView; /** * Stores user-related information about a conversation diff --git a/src/main/java/de/tum/in/www1/artemis/domain/metrics/ExerciseTypeMetricsEntry.java b/src/main/java/de/tum/cit/aet/artemis/domain/metrics/ExerciseTypeMetricsEntry.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/domain/metrics/ExerciseTypeMetricsEntry.java rename to src/main/java/de/tum/cit/aet/artemis/domain/metrics/ExerciseTypeMetricsEntry.java index 5c9971aa2229..398e8e92e256 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/metrics/ExerciseTypeMetricsEntry.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/metrics/ExerciseTypeMetricsEntry.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.domain.metrics; +package de.tum.cit.aet.artemis.domain.metrics; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Exercise; /** * Custom record for SQL queries. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/modeling/ApollonDiagram.java b/src/main/java/de/tum/cit/aet/artemis/domain/modeling/ApollonDiagram.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/domain/modeling/ApollonDiagram.java rename to src/main/java/de/tum/cit/aet/artemis/domain/modeling/ApollonDiagram.java index bab5998edaf7..4039ef662a28 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/modeling/ApollonDiagram.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/modeling/ApollonDiagram.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.modeling; +package de.tum.cit.aet.artemis.domain.modeling; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -11,8 +11,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.enumeration.DiagramType; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; /** * An ApollonDiagram. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/modeling/ModelCluster.java b/src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelCluster.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/domain/modeling/ModelCluster.java rename to src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelCluster.java index f1c6d56fdf62..7af2d2ee258f 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/modeling/ModelCluster.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelCluster.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.modeling; +package de.tum.cit.aet.artemis.domain.modeling; import java.util.HashSet; import java.util.Set; @@ -16,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.DomainObject; /** * A ModelCluster. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/modeling/ModelElement.java b/src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelElement.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/modeling/ModelElement.java rename to src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelElement.java index 045922d1d5b2..233892311e24 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/modeling/ModelElement.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelElement.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.modeling; +package de.tum.cit.aet.artemis.domain.modeling; import java.io.Serial; import java.io.Serializable; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/modeling/ModelingExercise.java b/src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelingExercise.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/domain/modeling/ModelingExercise.java rename to src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelingExercise.java index 37de46ca8e71..255940091fb1 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/modeling/ModelingExercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelingExercise.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.domain.modeling; +package de.tum.cit.aet.artemis.domain.modeling; -import static de.tum.in.www1.artemis.domain.enumeration.ExerciseType.MODELING; +import static de.tum.cit.aet.artemis.domain.enumeration.ExerciseType.MODELING; import java.time.ZonedDateTime; @@ -15,9 +15,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.enumeration.DiagramType; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; /** * A ModelingExercise. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/modeling/ModelingSubmission.java b/src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelingSubmission.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/modeling/ModelingSubmission.java rename to src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelingSubmission.java index f48e9ae5cb20..a6be24a2688a 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/modeling/ModelingSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelingSubmission.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.domain.modeling; +package de.tum.cit.aet.artemis.domain.modeling; -import static de.tum.in.www1.artemis.config.Constants.MAX_SUBMISSION_MODEL_LENGTH; -import static de.tum.in.www1.artemis.config.Constants.MAX_SUBMISSION_TEXT_LENGTH; +import static de.tum.cit.aet.artemis.config.Constants.MAX_SUBMISSION_MODEL_LENGTH; +import static de.tum.cit.aet.artemis.config.Constants.MAX_SUBMISSION_TEXT_LENGTH; import java.util.HashSet; import java.util.Set; @@ -19,7 +19,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import de.tum.in.www1.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.Submission; /** * A ModelingSubmission. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/modeling/SimilarElementCount.java b/src/main/java/de/tum/cit/aet/artemis/domain/modeling/SimilarElementCount.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/domain/modeling/SimilarElementCount.java rename to src/main/java/de/tum/cit/aet/artemis/domain/modeling/SimilarElementCount.java index 9360fa339c3f..9753e67d3e13 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/modeling/SimilarElementCount.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/modeling/SimilarElementCount.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.domain.modeling; +package de.tum.cit.aet.artemis.domain.modeling; -import de.tum.in.www1.artemis.repository.ModelElementRepository; +import de.tum.cit.aet.artemis.repository.ModelElementRepository; public class SimilarElementCount implements ModelElementRepository.ModelElementCount { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/notification/ConversationNotification.java b/src/main/java/de/tum/cit/aet/artemis/domain/notification/ConversationNotification.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/domain/notification/ConversationNotification.java rename to src/main/java/de/tum/cit/aet/artemis/domain/notification/ConversationNotification.java index 7ba11b4aaaed..cfe65b9ca583 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/notification/ConversationNotification.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/notification/ConversationNotification.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.notification; +package de.tum.cit.aet.artemis.domain.notification; import java.time.ZonedDateTime; @@ -10,9 +10,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.metis.conversation.Conversation; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; /** * A Notification concerning all new messages in a conversation. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/notification/ConversationNotificationFactory.java b/src/main/java/de/tum/cit/aet/artemis/domain/notification/ConversationNotificationFactory.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/domain/notification/ConversationNotificationFactory.java rename to src/main/java/de/tum/cit/aet/artemis/domain/notification/ConversationNotificationFactory.java index 5fbc23d5a49a..23df93e0157d 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/notification/ConversationNotificationFactory.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/notification/ConversationNotificationFactory.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.domain.notification; +package de.tum.cit.aet.artemis.domain.notification; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.findCorrespondingNotificationTitleOrThrow; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createConversationMessageTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.findCorrespondingNotificationTitleOrThrow; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createConversationMessageTarget; -import de.tum.in.www1.artemis.domain.enumeration.NotificationType; -import de.tum.in.www1.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.domain.metis.Post; public class ConversationNotificationFactory { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/notification/GroupNotification.java b/src/main/java/de/tum/cit/aet/artemis/domain/notification/GroupNotification.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/domain/notification/GroupNotification.java rename to src/main/java/de/tum/cit/aet/artemis/domain/notification/GroupNotification.java index 207e40d506af..d4293945f710 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/notification/GroupNotification.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/notification/GroupNotification.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.notification; +package de.tum.cit.aet.artemis.domain.notification; import java.time.ZonedDateTime; @@ -12,10 +12,10 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.GroupNotificationType; -import de.tum.in.www1.artemis.domain.enumeration.NotificationPriority; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority; /** * A GroupNotification. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/notification/GroupNotificationFactory.java b/src/main/java/de/tum/cit/aet/artemis/domain/notification/GroupNotificationFactory.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/domain/notification/GroupNotificationFactory.java rename to src/main/java/de/tum/cit/aet/artemis/domain/notification/GroupNotificationFactory.java index d01f11772411..8092d8467396 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/notification/GroupNotificationFactory.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/notification/GroupNotificationFactory.java @@ -1,49 +1,49 @@ -package de.tum.in.www1.artemis.domain.notification; +package de.tum.cit.aet.artemis.domain.notification; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationPriority.HIGH; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationPriority.MEDIUM; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.ATTACHMENT_CHANGE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_FAILED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_FINISHED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_STARTED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.DUPLICATE_TEST_CASE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_FAILED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_FINISHED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_STARTED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXERCISE_PRACTICE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXERCISE_RELEASED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXERCISE_UPDATED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.ILLEGAL_SUBMISSION; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_ANNOUNCEMENT_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_MANUAL_FEEDBACK_REQUEST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.PROGRAMMING_BUILD_RUN_UPDATE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.PROGRAMMING_REPOSITORY_LOCKS; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.PROGRAMMING_TEST_CASES_CHANGED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.QUIZ_EXERCISE_STARTED; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createAttachmentUpdatedTarget; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createCoursePostTarget; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createCourseTarget; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createDuplicateTestCaseTarget; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createExamExerciseTargetWithExerciseUpdate; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createExamProgrammingExerciseOrTestCaseTarget; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createExerciseReleasedTarget; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createExerciseUpdatedTarget; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority.HIGH; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority.MEDIUM; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.ATTACHMENT_CHANGE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_FAILED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_FINISHED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_STARTED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DUPLICATE_TEST_CASE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_FAILED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_FINISHED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_STARTED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_PRACTICE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_RELEASED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_UPDATED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.ILLEGAL_SUBMISSION; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_ANNOUNCEMENT_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_MANUAL_FEEDBACK_REQUEST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PROGRAMMING_BUILD_RUN_UPDATE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PROGRAMMING_REPOSITORY_LOCKS; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PROGRAMMING_TEST_CASES_CHANGED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.QUIZ_EXERCISE_STARTED; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createAttachmentUpdatedTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createCoursePostTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createCourseTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createDuplicateTestCaseTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createExamExerciseTargetWithExerciseUpdate; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createExamProgrammingExerciseOrTestCaseTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createExerciseReleasedTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createExerciseUpdatedTarget; import java.util.List; import org.jsoup.Jsoup; -import de.tum.in.www1.artemis.domain.Attachment; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.GroupNotificationType; -import de.tum.in.www1.artemis.domain.enumeration.NotificationPriority; -import de.tum.in.www1.artemis.domain.enumeration.NotificationType; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.Attachment; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.metis.Post; public class GroupNotificationFactory { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/notification/Notification.java b/src/main/java/de/tum/cit/aet/artemis/domain/notification/Notification.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/notification/Notification.java rename to src/main/java/de/tum/cit/aet/artemis/domain/notification/Notification.java index ee81f805eb63..e9808962faf5 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/notification/Notification.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/notification/Notification.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.notification; +package de.tum.cit.aet.artemis.domain.notification; import java.time.ZonedDateTime; @@ -27,9 +27,9 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.NotificationPriority; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority; /** * A Notification. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/notification/NotificationConstants.java b/src/main/java/de/tum/cit/aet/artemis/domain/notification/NotificationConstants.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/domain/notification/NotificationConstants.java rename to src/main/java/de/tum/cit/aet/artemis/domain/notification/NotificationConstants.java index 8cc7856afdf7..468d6e764841 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/notification/NotificationConstants.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/notification/NotificationConstants.java @@ -1,62 +1,62 @@ -package de.tum.in.www1.artemis.domain.notification; - -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.ATTACHMENT_CHANGE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_CHANNEL; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_GROUP_CHAT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_CREATE_GROUP_CHAT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_CREATE_ONE_TO_ONE_CHAT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_DELETE_CHANNEL; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_MESSAGE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_REPLY_MESSAGE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_REMOVE_USER_CHANNEL; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_REMOVE_USER_GROUP_CHAT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_USER_MENTIONED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_FAILED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_FINISHED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_STARTED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.DATA_EXPORT_CREATED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.DATA_EXPORT_FAILED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.DUPLICATE_TEST_CASE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_FAILED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_FINISHED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_STARTED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXERCISE_PRACTICE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXERCISE_RELEASED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXERCISE_SUBMISSION_ASSESSED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXERCISE_UPDATED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.FILE_SUBMISSION_SUCCESSFUL; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.ILLEGAL_SUBMISSION; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_ANNOUNCEMENT_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_COURSE_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_CPC_PLAGIARISM_CASE_STUDENT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_EXAM_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_EXERCISE_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_LECTURE_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_MANUAL_FEEDBACK_REQUEST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_PLAGIARISM_CASE_STUDENT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_COURSE_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_EXAM_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_EXERCISE_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_LECTURE_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.PLAGIARISM_CASE_VERDICT_STUDENT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.PROGRAMMING_BUILD_RUN_UPDATE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.PROGRAMMING_REPOSITORY_LOCKS; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.PROGRAMMING_TEST_CASES_CHANGED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.QUIZ_EXERCISE_STARTED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_ASSIGNED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DELETED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_STUDENT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_TUTOR; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_MULTIPLE_REGISTRATION_TUTOR; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_STUDENT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_TUTOR; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UNASSIGNED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UPDATED; +package de.tum.cit.aet.artemis.domain.notification; + +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.ATTACHMENT_CHANGE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_CHANNEL; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_GROUP_CHAT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_CREATE_GROUP_CHAT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_CREATE_ONE_TO_ONE_CHAT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_DELETE_CHANNEL; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_MESSAGE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_REPLY_MESSAGE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_REMOVE_USER_CHANNEL; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_REMOVE_USER_GROUP_CHAT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_USER_MENTIONED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_FAILED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_FINISHED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_STARTED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DATA_EXPORT_CREATED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DATA_EXPORT_FAILED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DUPLICATE_TEST_CASE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_FAILED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_FINISHED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_STARTED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_PRACTICE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_RELEASED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_SUBMISSION_ASSESSED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_UPDATED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.FILE_SUBMISSION_SUCCESSFUL; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.ILLEGAL_SUBMISSION; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_ANNOUNCEMENT_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_COURSE_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_CPC_PLAGIARISM_CASE_STUDENT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_EXAM_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_EXERCISE_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_LECTURE_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_MANUAL_FEEDBACK_REQUEST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_PLAGIARISM_CASE_STUDENT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_COURSE_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_EXAM_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_EXERCISE_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_LECTURE_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PLAGIARISM_CASE_VERDICT_STUDENT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PROGRAMMING_BUILD_RUN_UPDATE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PROGRAMMING_REPOSITORY_LOCKS; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PROGRAMMING_TEST_CASES_CHANGED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.QUIZ_EXERCISE_STARTED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_ASSIGNED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DELETED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_STUDENT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_MULTIPLE_REGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_STUDENT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UNASSIGNED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UPDATED; import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableBiMap; -import de.tum.in.www1.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; public class NotificationConstants { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/notification/NotificationPlaceholderCreator.java b/src/main/java/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderCreator.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/domain/notification/NotificationPlaceholderCreator.java rename to src/main/java/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderCreator.java index 0645f88a6afb..87085fc6f5b9 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/notification/NotificationPlaceholderCreator.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderCreator.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.domain.notification; +package de.tum.cit.aet.artemis.domain.notification; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import de.tum.in.www1.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; /** * Marks a method to be a notification placeholder creator. Allows automatic testing of placeholders in notifications. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/notification/NotificationTarget.java b/src/main/java/de/tum/cit/aet/artemis/domain/notification/NotificationTarget.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/domain/notification/NotificationTarget.java rename to src/main/java/de/tum/cit/aet/artemis/domain/notification/NotificationTarget.java index 1b6e01e7a39d..86951b49c1ee 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/notification/NotificationTarget.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/notification/NotificationTarget.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.notification; +package de.tum.cit.aet.artemis.domain.notification; import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_EMPTY; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/notification/NotificationTargetFactory.java b/src/main/java/de/tum/cit/aet/artemis/domain/notification/NotificationTargetFactory.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/notification/NotificationTargetFactory.java rename to src/main/java/de/tum/cit/aet/artemis/domain/notification/NotificationTargetFactory.java index 76f24a8456c4..4fff741de9d9 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/notification/NotificationTargetFactory.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/notification/NotificationTargetFactory.java @@ -1,14 +1,14 @@ -package de.tum.in.www1.artemis.domain.notification; - -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.DataExport; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.metis.AnswerPost; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.metis.conversation.Conversation; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroup; +package de.tum.cit.aet.artemis.domain.notification; + +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.DataExport; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.metis.AnswerPost; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; public class NotificationTargetFactory { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/notification/SingleUserNotification.java b/src/main/java/de/tum/cit/aet/artemis/domain/notification/SingleUserNotification.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/domain/notification/SingleUserNotification.java rename to src/main/java/de/tum/cit/aet/artemis/domain/notification/SingleUserNotification.java index daccd4103f9b..4bb300f27cca 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/notification/SingleUserNotification.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/notification/SingleUserNotification.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.notification; +package de.tum.cit.aet.artemis.domain.notification; import java.time.ZonedDateTime; @@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.User; /** * A SingleUserNotification. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/notification/SingleUserNotificationFactory.java b/src/main/java/de/tum/cit/aet/artemis/domain/notification/SingleUserNotificationFactory.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/domain/notification/SingleUserNotificationFactory.java rename to src/main/java/de/tum/cit/aet/artemis/domain/notification/SingleUserNotificationFactory.java index afc13230bb91..314986a0d564 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/notification/SingleUserNotificationFactory.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/notification/SingleUserNotificationFactory.java @@ -1,86 +1,86 @@ -package de.tum.in.www1.artemis.domain.notification; - -import static de.tum.in.www1.artemis.domain.enumeration.NotificationPriority.HIGH; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_CHANNEL; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_GROUP_CHAT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_CREATE_GROUP_CHAT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_CREATE_ONE_TO_ONE_CHAT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_DELETE_CHANNEL; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_REPLY_MESSAGE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_REMOVE_USER_CHANNEL; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_REMOVE_USER_GROUP_CHAT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_USER_MENTIONED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.DATA_EXPORT_CREATED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.DATA_EXPORT_FAILED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXERCISE_SUBMISSION_ASSESSED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.FILE_SUBMISSION_SUCCESSFUL; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_CPC_PLAGIARISM_CASE_STUDENT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_PLAGIARISM_CASE_STUDENT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_COURSE_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_EXAM_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_EXERCISE_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_LECTURE_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.PLAGIARISM_CASE_VERDICT_STUDENT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_ASSIGNED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_STUDENT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_TUTOR; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_MULTIPLE_REGISTRATION_TUTOR; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_STUDENT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_TUTOR; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UNASSIGNED; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_CHANNEL_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_GROUP_CHAT_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.CONVERSATION_DELETE_CHANNEL_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.CONVERSATION_REMOVE_USER_CHANNEL_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.CONVERSATION_REMOVE_USER_GROUP_CHAT_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.DATA_EXPORT_CREATED_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.DATA_EXPORT_CREATED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.DATA_EXPORT_FAILED_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.DATA_EXPORT_FAILED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.EXERCISE_SUBMISSION_ASSESSED_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.EXERCISE_SUBMISSION_ASSESSED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.FILE_SUBMISSION_SUCCESSFUL_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.FILE_SUBMISSION_SUCCESSFUL_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.MESSAGE_REPLY_IN_CHANNEL_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.MESSAGE_REPLY_IN_CONVERSATION_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.NEW_CPC_PLAGIARISM_CASE_STUDENT_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.NEW_CPC_PLAGIARISM_CASE_STUDENT_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.NEW_PLAGIARISM_CASE_STUDENT_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.NEW_PLAGIARISM_CASE_STUDENT_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.PLAGIARISM_CASE_VERDICT_STUDENT_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.PLAGIARISM_CASE_VERDICT_STUDENT_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_ASSIGNED_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_STUDENT_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_TUTOR_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_MULTIPLE_TUTOR_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_STUDENT_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_TUTOR_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_UNASSIGNED_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.findCorrespondingNotificationTitleOrThrow; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createConversationCreationTarget; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createConversationDeletionTarget; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createConversationMessageTarget; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createDataExportCreatedTarget; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createDataExportFailedTarget; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createExerciseTarget; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createMessageReplyTarget; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createPlagiarismCaseTarget; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createTutorialGroupTarget; +package de.tum.cit.aet.artemis.domain.notification; + +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority.HIGH; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_CHANNEL; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_GROUP_CHAT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_CREATE_GROUP_CHAT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_CREATE_ONE_TO_ONE_CHAT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_DELETE_CHANNEL; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_REPLY_MESSAGE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_REMOVE_USER_CHANNEL; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_REMOVE_USER_GROUP_CHAT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_USER_MENTIONED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DATA_EXPORT_CREATED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DATA_EXPORT_FAILED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_SUBMISSION_ASSESSED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.FILE_SUBMISSION_SUCCESSFUL; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_CPC_PLAGIARISM_CASE_STUDENT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_PLAGIARISM_CASE_STUDENT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_COURSE_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_EXAM_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_EXERCISE_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_LECTURE_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PLAGIARISM_CASE_VERDICT_STUDENT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_ASSIGNED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_STUDENT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_MULTIPLE_REGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_STUDENT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UNASSIGNED; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_CHANNEL_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_GROUP_CHAT_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_DELETE_CHANNEL_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_REMOVE_USER_CHANNEL_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_REMOVE_USER_GROUP_CHAT_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.DATA_EXPORT_CREATED_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.DATA_EXPORT_CREATED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.DATA_EXPORT_FAILED_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.DATA_EXPORT_FAILED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXERCISE_SUBMISSION_ASSESSED_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXERCISE_SUBMISSION_ASSESSED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.FILE_SUBMISSION_SUCCESSFUL_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.FILE_SUBMISSION_SUCCESSFUL_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.MESSAGE_REPLY_IN_CHANNEL_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.MESSAGE_REPLY_IN_CONVERSATION_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_CPC_PLAGIARISM_CASE_STUDENT_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_CPC_PLAGIARISM_CASE_STUDENT_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_PLAGIARISM_CASE_STUDENT_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_PLAGIARISM_CASE_STUDENT_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.PLAGIARISM_CASE_VERDICT_STUDENT_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.PLAGIARISM_CASE_VERDICT_STUDENT_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_ASSIGNED_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_STUDENT_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_TUTOR_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_MULTIPLE_TUTOR_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_STUDENT_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_TUTOR_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_UNASSIGNED_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.findCorrespondingNotificationTitleOrThrow; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createConversationCreationTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createConversationDeletionTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createConversationMessageTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createDataExportCreatedTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createDataExportFailedTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createExerciseTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createMessageReplyTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createPlagiarismCaseTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createTutorialGroupTarget; import java.util.Set; import jakarta.validation.constraints.NotNull; -import de.tum.in.www1.artemis.domain.DataExport; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.NotificationType; -import de.tum.in.www1.artemis.domain.metis.AnswerPost; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.metis.conversation.Conversation; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.domain.DataExport; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.domain.metis.AnswerPost; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; public class SingleUserNotificationFactory { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/notification/SystemNotification.java b/src/main/java/de/tum/cit/aet/artemis/domain/notification/SystemNotification.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/domain/notification/SystemNotification.java rename to src/main/java/de/tum/cit/aet/artemis/domain/notification/SystemNotification.java index 279308b9d06a..077a854d324b 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/notification/SystemNotification.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/notification/SystemNotification.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.notification; +package de.tum.cit.aet.artemis.domain.notification; import java.time.ZonedDateTime; @@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.SystemNotificationType; +import de.tum.cit.aet.artemis.domain.enumeration.SystemNotificationType; /** * A SystemNotification. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/notification/TutorialGroupNotification.java b/src/main/java/de/tum/cit/aet/artemis/domain/notification/TutorialGroupNotification.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/domain/notification/TutorialGroupNotification.java rename to src/main/java/de/tum/cit/aet/artemis/domain/notification/TutorialGroupNotification.java index cbbb3489a934..0d7f51e3ab3e 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/notification/TutorialGroupNotification.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/notification/TutorialGroupNotification.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.domain.notification; +package de.tum.cit.aet.artemis.domain.notification; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DELETED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UPDATED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DELETED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UPDATED; import java.time.ZonedDateTime; import java.util.Set; @@ -15,8 +15,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.NotificationType; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; /** * A Notification concerning all students and the assigned tutor of a tutorial group. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/notification/TutorialGroupNotificationFactory.java b/src/main/java/de/tum/cit/aet/artemis/domain/notification/TutorialGroupNotificationFactory.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/domain/notification/TutorialGroupNotificationFactory.java rename to src/main/java/de/tum/cit/aet/artemis/domain/notification/TutorialGroupNotificationFactory.java index c6d1ebf99d40..3330d3d29748 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/notification/TutorialGroupNotificationFactory.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/notification/TutorialGroupNotificationFactory.java @@ -1,14 +1,14 @@ -package de.tum.in.www1.artemis.domain.notification; +package de.tum.cit.aet.artemis.domain.notification; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DELETED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UPDATED; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DELETED_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_UPDATED_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.findCorrespondingNotificationTitleOrThrow; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createTutorialGroupTarget; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DELETED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UPDATED; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DELETED_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_UPDATED_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.findCorrespondingNotificationTitleOrThrow; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createTutorialGroupTarget; -import de.tum.in.www1.artemis.domain.enumeration.NotificationType; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; public class TutorialGroupNotificationFactory { diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/package-info.java b/src/main/java/de/tum/cit/aet/artemis/domain/package-info.java new file mode 100644 index 000000000000..e761a66bde7a --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/domain/package-info.java @@ -0,0 +1,4 @@ +/** + * JPA domain objects. + */ +package de.tum.cit.aet.artemis.domain; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/participation/AbstractBaseProgrammingExerciseParticipation.java b/src/main/java/de/tum/cit/aet/artemis/domain/participation/AbstractBaseProgrammingExerciseParticipation.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/domain/participation/AbstractBaseProgrammingExerciseParticipation.java rename to src/main/java/de/tum/cit/aet/artemis/domain/participation/AbstractBaseProgrammingExerciseParticipation.java index 3f549242e635..60c76d0998b4 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/participation/AbstractBaseProgrammingExerciseParticipation.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/participation/AbstractBaseProgrammingExerciseParticipation.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.participation; +package de.tum.cit.aet.artemis.domain.participation; import jakarta.persistence.Column; import jakarta.persistence.MappedSuperclass; @@ -7,9 +7,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.view.QuizView; @MappedSuperclass @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/in/www1/artemis/domain/participation/IdToPresentationScoreSum.java b/src/main/java/de/tum/cit/aet/artemis/domain/participation/IdToPresentationScoreSum.java similarity index 63% rename from src/main/java/de/tum/in/www1/artemis/domain/participation/IdToPresentationScoreSum.java rename to src/main/java/de/tum/cit/aet/artemis/domain/participation/IdToPresentationScoreSum.java index d08445e207dd..4c66734e96e1 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/participation/IdToPresentationScoreSum.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/participation/IdToPresentationScoreSum.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.participation; +package de.tum.cit.aet.artemis.domain.participation; public record IdToPresentationScoreSum(long participantId, double presentationScoreSum) { } diff --git a/src/main/java/de/tum/in/www1/artemis/domain/participation/Participant.java b/src/main/java/de/tum/cit/aet/artemis/domain/participation/Participant.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/domain/participation/Participant.java rename to src/main/java/de/tum/cit/aet/artemis/domain/participation/Participant.java index d47d38e3437c..7c10e62c4897 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/participation/Participant.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/participation/Participant.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.domain.participation; +package de.tum.cit.aet.artemis.domain.participation; import java.util.Set; import com.fasterxml.jackson.annotation.JsonIgnore; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.User; public interface Participant { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/participation/Participation.java b/src/main/java/de/tum/cit/aet/artemis/domain/participation/Participation.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/participation/Participation.java rename to src/main/java/de/tum/cit/aet/artemis/domain/participation/Participation.java index 3ba17b76b75b..4d1f113789f0 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/participation/Participation.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/participation/Participation.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.participation; +package de.tum.cit.aet.artemis.domain.participation; import java.time.ZonedDateTime; import java.util.Comparator; @@ -34,13 +34,13 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.view.QuizView; /** * A Participation. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/participation/ParticipationInterface.java b/src/main/java/de/tum/cit/aet/artemis/domain/participation/ParticipationInterface.java similarity index 74% rename from src/main/java/de/tum/in/www1/artemis/domain/participation/ParticipationInterface.java rename to src/main/java/de/tum/cit/aet/artemis/domain/participation/ParticipationInterface.java index 47b82badc717..11d4649ee588 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/participation/ParticipationInterface.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/participation/ParticipationInterface.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.domain.participation; +package de.tum.cit.aet.artemis.domain.participation; import java.time.ZonedDateTime; import java.util.Optional; import java.util.Set; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; public interface ParticipationInterface { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/participation/ParticipationVCSAccessToken.java b/src/main/java/de/tum/cit/aet/artemis/domain/participation/ParticipationVCSAccessToken.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/domain/participation/ParticipationVCSAccessToken.java rename to src/main/java/de/tum/cit/aet/artemis/domain/participation/ParticipationVCSAccessToken.java index 9e7da199ad4a..f249e1186a7d 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/participation/ParticipationVCSAccessToken.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/participation/ParticipationVCSAccessToken.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.participation; +package de.tum.cit.aet.artemis.domain.participation; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -9,8 +9,8 @@ import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.User; /** * A ParticipationVcsAccessToken. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/participation/ProgrammingExerciseParticipation.java b/src/main/java/de/tum/cit/aet/artemis/domain/participation/ProgrammingExerciseParticipation.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/domain/participation/ProgrammingExerciseParticipation.java rename to src/main/java/de/tum/cit/aet/artemis/domain/participation/ProgrammingExerciseParticipation.java index 7acf563fa5f4..331a2b685f19 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/participation/ProgrammingExerciseParticipation.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/participation/ProgrammingExerciseParticipation.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.participation; +package de.tum.cit.aet.artemis.domain.participation; import java.net.URI; import java.net.URISyntaxException; @@ -12,9 +12,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; public interface ProgrammingExerciseParticipation extends ParticipationInterface { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/participation/ProgrammingExerciseStudentParticipation.java b/src/main/java/de/tum/cit/aet/artemis/domain/participation/ProgrammingExerciseStudentParticipation.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/domain/participation/ProgrammingExerciseStudentParticipation.java rename to src/main/java/de/tum/cit/aet/artemis/domain/participation/ProgrammingExerciseStudentParticipation.java index 7332e5f828c8..f21dfee70bd9 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/participation/ProgrammingExerciseStudentParticipation.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/participation/ProgrammingExerciseStudentParticipation.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.participation; +package de.tum.cit.aet.artemis.domain.participation; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; @@ -8,10 +8,10 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.view.QuizView; -import de.tum.in.www1.artemis.service.connectors.vcs.AbstractVersionControlService; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.service.connectors.vcs.AbstractVersionControlService; @Entity @DiscriminatorValue(value = "PESP") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/participation/SolutionProgrammingExerciseParticipation.java b/src/main/java/de/tum/cit/aet/artemis/domain/participation/SolutionProgrammingExerciseParticipation.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/domain/participation/SolutionProgrammingExerciseParticipation.java rename to src/main/java/de/tum/cit/aet/artemis/domain/participation/SolutionProgrammingExerciseParticipation.java index 7c9f0931c5a3..7ae95bc8eb86 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/participation/SolutionProgrammingExerciseParticipation.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/participation/SolutionProgrammingExerciseParticipation.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.participation; +package de.tum.cit.aet.artemis.domain.participation; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; @Entity @DiscriminatorValue(value = "SPEP") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/participation/StudentParticipation.java b/src/main/java/de/tum/cit/aet/artemis/domain/participation/StudentParticipation.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/participation/StudentParticipation.java rename to src/main/java/de/tum/cit/aet/artemis/domain/participation/StudentParticipation.java index 8480045ed477..ae6eacbf3242 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/participation/StudentParticipation.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/participation/StudentParticipation.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.participation; +package de.tum.cit.aet.artemis.domain.participation; import java.util.Optional; import java.util.Set; @@ -12,10 +12,10 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.view.QuizView; @Entity @DiscriminatorValue(value = "SP") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/participation/TemplateProgrammingExerciseParticipation.java b/src/main/java/de/tum/cit/aet/artemis/domain/participation/TemplateProgrammingExerciseParticipation.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/domain/participation/TemplateProgrammingExerciseParticipation.java rename to src/main/java/de/tum/cit/aet/artemis/domain/participation/TemplateProgrammingExerciseParticipation.java index 1d755c1334d8..56b427071eff 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/participation/TemplateProgrammingExerciseParticipation.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/participation/TemplateProgrammingExerciseParticipation.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.participation; +package de.tum.cit.aet.artemis.domain.participation; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; @Entity @DiscriminatorValue(value = "TPEP") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/participation/TutorParticipation.java b/src/main/java/de/tum/cit/aet/artemis/domain/participation/TutorParticipation.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/domain/participation/TutorParticipation.java rename to src/main/java/de/tum/cit/aet/artemis/domain/participation/TutorParticipation.java index 70838f0450fb..36d29671edd7 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/participation/TutorParticipation.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/participation/TutorParticipation.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.participation; +package de.tum.cit.aet.artemis.domain.participation; import java.util.HashSet; import java.util.Set; @@ -19,11 +19,11 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.ExampleSubmission; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.TutorParticipationStatus; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus; /** * A TutorParticipation. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismCase.java b/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismCase.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismCase.java rename to src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismCase.java index 36b20e33db15..d92f0c50a04e 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismCase.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismCase.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.plagiarism; +package de.tum.cit.aet.artemis.domain.plagiarism; import java.time.ZonedDateTime; import java.util.Collections; @@ -18,11 +18,11 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import de.tum.in.www1.artemis.domain.AbstractAuditingEntity; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.AbstractAuditingEntity; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.metis.Post; @Entity @Table(name = "plagiarism_case") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismComparison.java b/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismComparison.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismComparison.java rename to src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismComparison.java index f6935a44e00b..cb5f3c583b92 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismComparison.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismComparison.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.plagiarism; +package de.tum.cit.aet.artemis.domain.plagiarism; import java.io.File; import java.util.Set; @@ -18,9 +18,9 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import de.jplag.JPlagComparison; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.plagiarism.text.TextSubmissionElement; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; /** * Pair of compared student submissions whose similarity is above a certain threshold. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java b/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismDetectionConfig.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java rename to src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismDetectionConfig.java index f015bf1e9924..d29e315f6f42 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismDetectionConfig.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.plagiarism; +package de.tum.cit.aet.artemis.domain.plagiarism; import java.util.Objects; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.DomainObject; /** * Stores configuration for manual and continuous plagiarism control. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismMatch.java b/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismMatch.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismMatch.java rename to src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismMatch.java index a323dc396d72..c5ee856db69f 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismMatch.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismMatch.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.plagiarism; +package de.tum.cit.aet.artemis.domain.plagiarism; import java.util.Objects; @@ -78,10 +78,10 @@ public void setLength(int length) { *

* Note: * This is required here since unlike other domain classes this one does not extend - * {@link de.tum.in.www1.artemis.domain.DomainObject} since it only represents an {@link Embeddable} part of another + * {@link de.tum.cit.aet.artemis.domain.DomainObject} since it only represents an {@link Embeddable} part of another * entity. * Therefore, it does inherit neither the database ID attribute nor the matching - * {@link de.tum.in.www1.artemis.domain.DomainObject#equals(Object)} implementation. + * {@link de.tum.cit.aet.artemis.domain.DomainObject#equals(Object)} implementation. * Instead, we have to compare all relevant attributes here. * * @param other Some other object. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismResult.java b/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismResult.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismResult.java rename to src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismResult.java index 85e2585aff4c..338f329c7a04 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismResult.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismResult.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.plagiarism; +package de.tum.cit.aet.artemis.domain.plagiarism; import static java.util.Comparator.comparingInt; import static java.util.Comparator.reverseOrder; @@ -32,10 +32,10 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import de.tum.in.www1.artemis.domain.AbstractAuditingEntity; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; -import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.domain.AbstractAuditingEntity; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; +import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; /** * Base result of any automatic plagiarism detection. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismStatus.java b/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismStatus.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismStatus.java rename to src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismStatus.java index a5affd39f2e2..af862db37ac9 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismStatus.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismStatus.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.plagiarism; +package de.tum.cit.aet.artemis.domain.plagiarism; /** * After automatic detection, each plagiarism has to be reviewed and revalidated by an instructor. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismSubmission.java b/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismSubmission.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismSubmission.java rename to src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismSubmission.java index f6b64eb738e8..b607b89c40be 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismSubmission.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.plagiarism; +package de.tum.cit.aet.artemis.domain.plagiarism; import java.io.File; import java.util.ArrayList; @@ -22,12 +22,12 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import de.jplag.Submission; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingSubmissionElement; -import de.tum.in.www1.artemis.domain.plagiarism.text.TextSubmissionElement; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingSubmissionElement; +import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; @Entity @Table(name = "plagiarism_submission") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismSubmissionElement.java b/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismSubmissionElement.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismSubmissionElement.java rename to src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismSubmissionElement.java index b6029b3bdf03..f4da831dc56d 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismSubmissionElement.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismSubmissionElement.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.plagiarism; +package de.tum.cit.aet.artemis.domain.plagiarism; import jakarta.persistence.DiscriminatorColumn; import jakarta.persistence.DiscriminatorType; @@ -9,7 +9,7 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; -import de.tum.in.www1.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.DomainObject; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismVerdict.java b/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismVerdict.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismVerdict.java rename to src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismVerdict.java index b8cb8190edd9..14e1637398c8 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismVerdict.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismVerdict.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.plagiarism; +package de.tum.cit.aet.artemis.domain.plagiarism; import java.util.Collection; import java.util.Comparator; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/modeling/ModelingPlagiarismResult.java b/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/modeling/ModelingPlagiarismResult.java similarity index 64% rename from src/main/java/de/tum/in/www1/artemis/domain/plagiarism/modeling/ModelingPlagiarismResult.java rename to src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/modeling/ModelingPlagiarismResult.java index 92d25b5f0580..b8a0f2f770ab 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/modeling/ModelingPlagiarismResult.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/modeling/ModelingPlagiarismResult.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.domain.plagiarism.modeling; +package de.tum.cit.aet.artemis.domain.plagiarism.modeling; import jakarta.persistence.Entity; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismResult; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismResult; /** * Result of the automatic plagiarism detection for modeling exercises. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/modeling/ModelingSubmissionElement.java b/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/modeling/ModelingSubmissionElement.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/domain/plagiarism/modeling/ModelingSubmissionElement.java rename to src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/modeling/ModelingSubmissionElement.java index 007d6a504bbc..56aa1eaef2ba 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/modeling/ModelingSubmissionElement.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/modeling/ModelingSubmissionElement.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.domain.plagiarism.modeling; +package de.tum.cit.aet.artemis.domain.plagiarism.modeling; import jakarta.persistence.Entity; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmissionElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmissionElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; @Entity // TODO: use @DiscriminatorValue(value = "M") or even better use integers (because they use less space in the database) diff --git a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/text/TextPlagiarismResult.java b/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/text/TextPlagiarismResult.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/domain/plagiarism/text/TextPlagiarismResult.java rename to src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/text/TextPlagiarismResult.java index 71d3939193fd..af202b55703e 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/text/TextPlagiarismResult.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/text/TextPlagiarismResult.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.domain.plagiarism.text; +package de.tum.cit.aet.artemis.domain.plagiarism.text; import jakarta.persistence.Entity; import de.jplag.JPlagResult; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismResult; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismResult; /** * Result of the automatic plagiarism detection for text or programming exercises. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/text/TextSubmissionElement.java b/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/text/TextSubmissionElement.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/domain/plagiarism/text/TextSubmissionElement.java rename to src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/text/TextSubmissionElement.java index 626d5b4cbf48..c7b4238bb99e 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/text/TextSubmissionElement.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/text/TextSubmissionElement.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.plagiarism.text; +package de.tum.cit.aet.artemis.domain.plagiarism.text; import java.io.File; @@ -6,10 +6,10 @@ import jakarta.persistence.Entity; import de.jplag.Token; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmissionElement; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmissionElement; @Entity // TODO: use @DiscriminatorValue(value = "T") or even better use integers (because they use less space in the database) diff --git a/src/main/java/de/tum/in/www1/artemis/domain/push_notification/PushNotificationDeviceConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/domain/push_notification/PushNotificationDeviceConfiguration.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/push_notification/PushNotificationDeviceConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/domain/push_notification/PushNotificationDeviceConfiguration.java index e41fcc9996a5..56e77c3252a0 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/push_notification/PushNotificationDeviceConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/push_notification/PushNotificationDeviceConfiguration.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.push_notification; +package de.tum.cit.aet.artemis.domain.push_notification; import java.util.Arrays; import java.util.Date; @@ -15,7 +15,7 @@ import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.User; /** * Model for saving PushNotification DeviceTokens for native clients diff --git a/src/main/java/de/tum/in/www1/artemis/domain/push_notification/PushNotificationDeviceConfigurationId.java b/src/main/java/de/tum/cit/aet/artemis/domain/push_notification/PushNotificationDeviceConfigurationId.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/push_notification/PushNotificationDeviceConfigurationId.java rename to src/main/java/de/tum/cit/aet/artemis/domain/push_notification/PushNotificationDeviceConfigurationId.java index c387fbc9c015..8fdc84d4f094 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/push_notification/PushNotificationDeviceConfigurationId.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/push_notification/PushNotificationDeviceConfigurationId.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.domain.push_notification; +package de.tum.cit.aet.artemis.domain.push_notification; import java.io.Serializable; import java.util.Objects; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.User; /** * The PrimaryKey used for PushNotificationDeviceConfiguration diff --git a/src/main/java/de/tum/in/www1/artemis/domain/push_notification/PushNotificationDeviceType.java b/src/main/java/de/tum/cit/aet/artemis/domain/push_notification/PushNotificationDeviceType.java similarity index 70% rename from src/main/java/de/tum/in/www1/artemis/domain/push_notification/PushNotificationDeviceType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/push_notification/PushNotificationDeviceType.java index 789a4daf7e7b..4eda21369841 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/push_notification/PushNotificationDeviceType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/push_notification/PushNotificationDeviceType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.push_notification; +package de.tum.cit.aet.artemis.domain.push_notification; /** * The Enum DeviceType used for PushNotificationDeviceConfiguration diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/AbstractQuizSubmission.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/AbstractQuizSubmission.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/AbstractQuizSubmission.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/AbstractQuizSubmission.java index e5bcab4d636f..594d3c870c15 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/AbstractQuizSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/AbstractQuizSubmission.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import java.util.HashSet; import java.util.List; @@ -17,9 +17,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.view.QuizView; @Entity public abstract class AbstractQuizSubmission extends Submission { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/AnswerCounter.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/AnswerCounter.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/AnswerCounter.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/AnswerCounter.java index f72e0f4b3570..6398b8f578ab 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/AnswerCounter.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/AnswerCounter.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import jakarta.persistence.CascadeType; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/AnswerOption.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/AnswerOption.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/AnswerOption.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/AnswerOption.java index acd4b8d24a36..449d63d0d1fe 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/AnswerOption.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/AnswerOption.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -13,8 +13,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.view.QuizView; /** * A AnswerOption. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/DragAndDropMapping.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropMapping.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/DragAndDropMapping.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropMapping.java index 9e723d41c67d..d686e1fb2732 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/DragAndDropMapping.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropMapping.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -13,8 +13,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.view.QuizView; /** * A DragAndDropMapping. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/DragAndDropQuestion.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropQuestion.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/DragAndDropQuestion.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropQuestion.java index 9056e86d0752..a4a24ae9fd69 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/DragAndDropQuestion.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropQuestion.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import java.net.URI; import java.util.ArrayList; @@ -28,15 +28,15 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategy; -import de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyDragAndDropAllOrNothing; -import de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyDragAndDropProportionalWithPenalty; -import de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyDragAndDropProportionalWithoutPenalty; -import de.tum.in.www1.artemis.domain.view.QuizView; -import de.tum.in.www1.artemis.exception.FilePathParsingException; -import de.tum.in.www1.artemis.service.FilePathService; -import de.tum.in.www1.artemis.service.FileService; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategy; +import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategyDragAndDropAllOrNothing; +import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategyDragAndDropProportionalWithPenalty; +import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategyDragAndDropProportionalWithoutPenalty; +import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.exception.FilePathParsingException; +import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.service.FileService; /** * A DragAndDropQuestion. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/DragAndDropQuestionStatistic.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropQuestionStatistic.java similarity index 99% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/DragAndDropQuestionStatistic.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropQuestionStatistic.java index 7c4bf8e395db..e05537011fbd 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/DragAndDropQuestionStatistic.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropQuestionStatistic.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/DragAndDropSubmittedAnswer.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropSubmittedAnswer.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/DragAndDropSubmittedAnswer.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropSubmittedAnswer.java index caf5c5a0f5d3..facfeaa6e1dc 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/DragAndDropSubmittedAnswer.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropSubmittedAnswer.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import java.util.HashSet; import java.util.Set; @@ -17,8 +17,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.domain.quiz.compare.DnDMapping; -import de.tum.in.www1.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.domain.quiz.compare.DnDMapping; +import de.tum.cit.aet.artemis.domain.view.QuizView; /** * A DragAndDropSubmittedAnswer. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/DragItem.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragItem.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/DragItem.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragItem.java index 74a105f02d25..b0eef0fa6fcb 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/DragItem.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragItem.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import java.net.URI; import java.util.HashSet; @@ -24,12 +24,12 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.TempIdObject; -import de.tum.in.www1.artemis.domain.view.QuizView; -import de.tum.in.www1.artemis.exception.FilePathParsingException; -import de.tum.in.www1.artemis.service.FilePathService; -import de.tum.in.www1.artemis.service.FileService; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.TempIdObject; +import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.exception.FilePathParsingException; +import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.service.FileService; /** * A DragItem. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/DropLocation.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DropLocation.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/DropLocation.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/DropLocation.java index b0001ea895ff..f10c09020690 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/DropLocation.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DropLocation.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import java.util.HashSet; import java.util.Set; @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.domain.TempIdObject; -import de.tum.in.www1.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.domain.TempIdObject; +import de.tum.cit.aet.artemis.domain.view.QuizView; /** * A DropLocation. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/DropLocationCounter.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DropLocationCounter.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/DropLocationCounter.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/DropLocationCounter.java index 899831129e90..87570ea463fd 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/DropLocationCounter.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DropLocationCounter.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import jakarta.persistence.CascadeType; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/MultipleChoiceQuestion.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/MultipleChoiceQuestion.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/MultipleChoiceQuestion.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/MultipleChoiceQuestion.java index 078ebecae581..385e79c15dce 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/MultipleChoiceQuestion.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/MultipleChoiceQuestion.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import java.util.ArrayList; import java.util.HashSet; @@ -21,12 +21,12 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.domain.enumeration.ScoringType; -import de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategy; -import de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyMultipleChoiceAllOrNothing; -import de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyMultipleChoiceProportionalWithPenalty; -import de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyMultipleChoiceProportionalWithoutPenalty; -import de.tum.in.www1.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.domain.enumeration.ScoringType; +import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategy; +import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategyMultipleChoiceAllOrNothing; +import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategyMultipleChoiceProportionalWithPenalty; +import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategyMultipleChoiceProportionalWithoutPenalty; +import de.tum.cit.aet.artemis.domain.view.QuizView; /** * A MultipleChoiceQuestion. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/MultipleChoiceQuestionStatistic.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/MultipleChoiceQuestionStatistic.java similarity index 99% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/MultipleChoiceQuestionStatistic.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/MultipleChoiceQuestionStatistic.java index 72567f87c586..9285e67dd692 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/MultipleChoiceQuestionStatistic.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/MultipleChoiceQuestionStatistic.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/MultipleChoiceSubmittedAnswer.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/MultipleChoiceSubmittedAnswer.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/MultipleChoiceSubmittedAnswer.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/MultipleChoiceSubmittedAnswer.java index 61fed7fad77c..2d2f8d963e18 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/MultipleChoiceSubmittedAnswer.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/MultipleChoiceSubmittedAnswer.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import java.util.HashSet; import java.util.Objects; @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.view.QuizView; /** * A MultipleChoiceSubmittedAnswer. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/PointCounter.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/PointCounter.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/PointCounter.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/PointCounter.java index 82b2dead11bf..157a8f11a719 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/PointCounter.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/PointCounter.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizBatch.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizBatch.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizBatch.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizBatch.java index d8fb559ed98a..f85432319e60 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizBatch.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizBatch.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import java.time.ZonedDateTime; import java.time.temporal.ChronoUnit; @@ -16,9 +16,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.view.QuizView; /** * A QuizBatch. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizConfiguration.java similarity index 99% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizConfiguration.java index 1a1e9b7caec2..afd56154aafc 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizConfiguration.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import java.util.Collection; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizExercise.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizExercise.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizExercise.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizExercise.java index df15a972b56b..b80a94351230 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizExercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizExercise.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; -import static de.tum.in.www1.artemis.domain.enumeration.ExerciseType.QUIZ; +import static de.tum.cit.aet.artemis.domain.enumeration.ExerciseType.QUIZ; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -34,15 +34,15 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseType; -import de.tum.in.www1.artemis.domain.enumeration.QuizMode; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.view.QuizView; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; /** * A QuizExercise contains multiple quiz quizQuestions, which can be either multiple choice, drag and drop or short answer. Artemis supports live quizzes with a start and end time diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizGroup.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizGroup.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizGroup.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizGroup.java index f13f99f6804b..110c39b571c3 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizGroup.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizGroup.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.DomainObject; @Entity @Table(name = "quiz_group") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizPointStatistic.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizPointStatistic.java similarity index 99% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizPointStatistic.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizPointStatistic.java index ac14b304f339..668e3d4e20d5 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizPointStatistic.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizPointStatistic.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizPool.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizPool.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizPool.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizPool.java index 8db2337927c3..b92dacf85145 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizPool.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizPool.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import java.util.ArrayList; import java.util.List; @@ -17,9 +17,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.view.QuizView; @Entity @Table(name = "quiz_pool") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizQuestion.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizQuestion.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizQuestion.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizQuestion.java index 17884c55d7e5..ce7a89404590 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizQuestion.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizQuestion.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; @@ -27,10 +27,10 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.enumeration.ScoringType; -import de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategy; -import de.tum.in.www1.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.enumeration.ScoringType; +import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategy; +import de.tum.cit.aet.artemis.domain.view.QuizView; /** * A QuizQuestion. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizQuestionComponent.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizQuestionComponent.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizQuestionComponent.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizQuestionComponent.java index 19c256f1e865..5c3b55d0dc64 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizQuestionComponent.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizQuestionComponent.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; public interface QuizQuestionComponent { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizQuestionStatistic.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizQuestionStatistic.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizQuestionStatistic.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizQuestionStatistic.java index 14382c7757db..e12d8b4a820f 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizQuestionStatistic.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizQuestionStatistic.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizQuestionStatisticComponent.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizQuestionStatisticComponent.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizQuestionStatisticComponent.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizQuestionStatisticComponent.java index 01fa94f10c3b..dbbe68c17a6f 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizQuestionStatisticComponent.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizQuestionStatisticComponent.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; public interface QuizQuestionStatisticComponent, Q extends QuizQuestion> { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizStatistic.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizStatistic.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizStatistic.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizStatistic.java index e4073df56682..0e6da957c50d 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizStatistic.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizStatistic.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorColumn; @@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.DomainObject; /** * A QuizStatistic. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizStatisticCounter.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizStatisticCounter.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizStatisticCounter.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizStatisticCounter.java index a7ed50f28b42..bb6c80f5e502 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizStatisticCounter.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizStatisticCounter.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorColumn; @@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.DomainObject; /** * A QuizStatisticCounter. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizSubmission.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizSubmission.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizSubmission.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizSubmission.java index 7a5360867196..67f608235ac3 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizSubmission.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizSubmittedAnswerCount.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizSubmittedAnswerCount.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizSubmittedAnswerCount.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizSubmittedAnswerCount.java index b305cc8929f1..849da0eeca0e 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/QuizSubmittedAnswerCount.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizSubmittedAnswerCount.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/ShortAnswerMapping.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerMapping.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/ShortAnswerMapping.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerMapping.java index 307438e7cae6..74bebb20e322 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/ShortAnswerMapping.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerMapping.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -13,8 +13,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.view.QuizView; /** * A ShortAnswerMapping. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/ShortAnswerQuestion.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerQuestion.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/ShortAnswerQuestion.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerQuestion.java index 859207c151d4..aea2d3722a77 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/ShortAnswerQuestion.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerQuestion.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import java.util.ArrayList; import java.util.HashSet; @@ -21,11 +21,11 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategy; -import de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyShortAnswerAllOrNothing; -import de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyShortAnswerProportionalWithPenalty; -import de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyShortAnswerProportionalWithoutPenalty; -import de.tum.in.www1.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategy; +import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategyShortAnswerAllOrNothing; +import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategyShortAnswerProportionalWithPenalty; +import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategyShortAnswerProportionalWithoutPenalty; +import de.tum.cit.aet.artemis.domain.view.QuizView; /** * A ShortAnswerQuestion. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/ShortAnswerQuestionStatistic.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerQuestionStatistic.java similarity index 99% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/ShortAnswerQuestionStatistic.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerQuestionStatistic.java index c4aa0bbb801b..7acd96b8fee6 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/ShortAnswerQuestionStatistic.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerQuestionStatistic.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/ShortAnswerSolution.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSolution.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/ShortAnswerSolution.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSolution.java index 7b638cf21039..432c800d3b97 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/ShortAnswerSolution.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSolution.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import java.util.HashSet; import java.util.Set; @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.domain.TempIdObject; -import de.tum.in.www1.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.domain.TempIdObject; +import de.tum.cit.aet.artemis.domain.view.QuizView; /** * A ShortAnswerSolution. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/ShortAnswerSpot.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSpot.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/ShortAnswerSpot.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSpot.java index 66948576ffa6..f53b5578c598 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/ShortAnswerSpot.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSpot.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import java.util.HashSet; import java.util.Set; @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.domain.TempIdObject; -import de.tum.in.www1.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.domain.TempIdObject; +import de.tum.cit.aet.artemis.domain.view.QuizView; /** * A ShortAnswerSpot. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/ShortAnswerSpotCounter.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSpotCounter.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/ShortAnswerSpotCounter.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSpotCounter.java index 51a3e3ab3352..34c284f63200 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/ShortAnswerSpotCounter.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSpotCounter.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import jakarta.persistence.CascadeType; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/ShortAnswerSubmittedAnswer.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSubmittedAnswer.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/ShortAnswerSubmittedAnswer.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSubmittedAnswer.java index 65f89d933170..601c33262296 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/ShortAnswerSubmittedAnswer.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSubmittedAnswer.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import java.util.HashSet; import java.util.Set; @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.domain.quiz.compare.SAMapping; -import de.tum.in.www1.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.domain.quiz.compare.SAMapping; +import de.tum.cit.aet.artemis.domain.view.QuizView; /** * A ShortAnswerSubmittedAnswer. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/ShortAnswerSubmittedText.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSubmittedText.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/ShortAnswerSubmittedText.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSubmittedText.java index 8b0baa7262cf..1e0881a422c4 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/ShortAnswerSubmittedText.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSubmittedText.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; -import static de.tum.in.www1.artemis.config.Constants.MAX_QUIZ_SHORT_ANSWER_TEXT_LENGTH; +import static de.tum.cit.aet.artemis.config.Constants.MAX_QUIZ_SHORT_ANSWER_TEXT_LENGTH; import java.util.Objects; @@ -20,8 +20,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.view.QuizView; import me.xdrop.fuzzywuzzy.FuzzySearch; /** diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/SubmittedAnswer.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/SubmittedAnswer.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/SubmittedAnswer.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/SubmittedAnswer.java index 80bee2a2a23c..2e842bea9e89 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/SubmittedAnswer.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/SubmittedAnswer.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz; +package de.tum.cit.aet.artemis.domain.quiz; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorColumn; @@ -20,8 +20,8 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.view.QuizView; /** * A SubmittedAnswer. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/compare/DnDMapping.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/compare/DnDMapping.java similarity index 56% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/compare/DnDMapping.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/compare/DnDMapping.java index db8033c93ba8..a4e899d15c78 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/compare/DnDMapping.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/compare/DnDMapping.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz.compare; +package de.tum.cit.aet.artemis.domain.quiz.compare; public record DnDMapping(long dragItemId, long dropLocationId) { } diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/compare/SAMapping.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/compare/SAMapping.java similarity index 54% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/compare/SAMapping.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/compare/SAMapping.java index 7b60cb816e7e..b251ca6554d4 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/compare/SAMapping.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/compare/SAMapping.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.quiz.compare; +package de.tum.cit.aet.artemis.domain.quiz.compare; public record SAMapping(long spotId, String answerText) { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategy.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategy.java similarity index 71% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategy.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategy.java index e226236d5631..a3ac0f6df449 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategy.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.domain.quiz.scoring; +package de.tum.cit.aet.artemis.domain.quiz.scoring; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; public interface ScoringStrategy { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropAllOrNothing.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropAllOrNothing.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropAllOrNothing.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropAllOrNothing.java index eff10e4e493d..2af415c71382 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropAllOrNothing.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropAllOrNothing.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.domain.quiz.scoring; +package de.tum.cit.aet.artemis.domain.quiz.scoring; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.DragItem; -import de.tum.in.www1.artemis.domain.quiz.DropLocation; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.DragItem; +import de.tum.cit.aet.artemis.domain.quiz.DropLocation; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; /** * All or nothing means the full score is given if the answer is 100% correct, otherwise a score of 0 is given diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropProportionalWithPenalty.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropProportionalWithPenalty.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropProportionalWithPenalty.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropProportionalWithPenalty.java index 761d566f95f9..11ca6eebdb8e 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropProportionalWithPenalty.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropProportionalWithPenalty.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.domain.quiz.scoring; +package de.tum.cit.aet.artemis.domain.quiz.scoring; import java.util.Set; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.DragItem; -import de.tum.in.www1.artemis.domain.quiz.DropLocation; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.DragItem; +import de.tum.cit.aet.artemis.domain.quiz.DropLocation; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; /** * Proportional with penalty means that every correct mapping increases the score by x and every incorrect mapping decreases the score by x where x = maxScore / diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropProportionalWithoutPenalty.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropProportionalWithoutPenalty.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropProportionalWithoutPenalty.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropProportionalWithoutPenalty.java index 443167dec140..aefd75e4e277 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropProportionalWithoutPenalty.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropProportionalWithoutPenalty.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.domain.quiz.scoring; +package de.tum.cit.aet.artemis.domain.quiz.scoring; import java.util.Set; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.DragItem; -import de.tum.in.www1.artemis.domain.quiz.DropLocation; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.DragItem; +import de.tum.cit.aet.artemis.domain.quiz.DropLocation; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; /** * Proportional without penalty means that every correct mapping increases the score by maxScore / numberOfDropLocationsThatShouldHaveAMapping diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceAllOrNothing.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceAllOrNothing.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceAllOrNothing.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceAllOrNothing.java index b6ef2ee5855b..b24d1315fab2 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceAllOrNothing.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceAllOrNothing.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.domain.quiz.scoring; +package de.tum.cit.aet.artemis.domain.quiz.scoring; -import de.tum.in.www1.artemis.domain.quiz.AnswerOption; -import de.tum.in.www1.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.in.www1.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.AnswerOption; +import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; /** * All or nothing means the full score is given if the answer is 100% correct, otherwise a score of 0 is given diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceProportionalWithPenalty.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceProportionalWithPenalty.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceProportionalWithPenalty.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceProportionalWithPenalty.java index 02c123ea4a2a..1585cbd5b3f3 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceProportionalWithPenalty.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceProportionalWithPenalty.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.domain.quiz.scoring; +package de.tum.cit.aet.artemis.domain.quiz.scoring; -import de.tum.in.www1.artemis.domain.quiz.AnswerOption; -import de.tum.in.www1.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.in.www1.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.AnswerOption; +import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; /** * Proportional with penalty means that every correctly selected/unselected answer increases the score by x and every incorrectly selected/unselected answer the score by x where x diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceProportionalWithoutPenalty.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceProportionalWithoutPenalty.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceProportionalWithoutPenalty.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceProportionalWithoutPenalty.java index 04c5373bed9e..a83e4e974a8e 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceProportionalWithoutPenalty.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceProportionalWithoutPenalty.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.domain.quiz.scoring; +package de.tum.cit.aet.artemis.domain.quiz.scoring; -import de.tum.in.www1.artemis.domain.quiz.AnswerOption; -import de.tum.in.www1.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.in.www1.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.AnswerOption; +import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; /** * Proportional without penalty means that every correctly selected/unselected answer increases the score by maxScore / numberOfAnswerOptions diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerAllOrNothing.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerAllOrNothing.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerAllOrNothing.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerAllOrNothing.java index 216fb9795c9f..15a6e7281d03 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerAllOrNothing.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerAllOrNothing.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.domain.quiz.scoring; +package de.tum.cit.aet.artemis.domain.quiz.scoring; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; /** * All or nothing means the full score is given if the answer is 100% correct, otherwise a score of 0 is given diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerProportionalWithPenalty.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerProportionalWithPenalty.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerProportionalWithPenalty.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerProportionalWithPenalty.java index 266175c566e6..54c31173d5ae 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerProportionalWithPenalty.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerProportionalWithPenalty.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.domain.quiz.scoring; +package de.tum.cit.aet.artemis.domain.quiz.scoring; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; /** * Proportional with Penalty means that every correct mapping increases the score by x and every incorrect mapping decreases the score by x where x = maxScore / diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerProportionalWithoutPenalty.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerProportionalWithoutPenalty.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerProportionalWithoutPenalty.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerProportionalWithoutPenalty.java index 9039ae086998..b661c0283b3a 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerProportionalWithoutPenalty.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerProportionalWithoutPenalty.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.domain.quiz.scoring; +package de.tum.cit.aet.artemis.domain.quiz.scoring; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; /** * Proportional without penalty means that every correct mapping increases the score by maxScore / numberOfSpotsThatShouldHaveAMapping diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerUtil.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerUtil.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerUtil.java rename to src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerUtil.java index f8f1ae4c4bb5..9ad764211364 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerUtil.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.domain.quiz.scoring; +package de.tum.cit.aet.artemis.domain.quiz.scoring; import java.util.HashSet; import java.util.Set; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSolution; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSpot; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedText; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSolution; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSpot; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedText; public class ScoringStrategyShortAnswerUtil { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/science/ScienceEvent.java b/src/main/java/de/tum/cit/aet/artemis/domain/science/ScienceEvent.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/science/ScienceEvent.java rename to src/main/java/de/tum/cit/aet/artemis/domain/science/ScienceEvent.java index a5d0f1d4b5de..07611b69763c 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/science/ScienceEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/science/ScienceEvent.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.science; +package de.tum.cit.aet.artemis.domain.science; import java.time.ZonedDateTime; @@ -13,7 +13,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.DomainObject; /** * Individual Science Setting which combined make the Science Settings (inside the hierarchical structure on the client side) diff --git a/src/main/java/de/tum/in/www1/artemis/domain/science/ScienceEventType.java b/src/main/java/de/tum/cit/aet/artemis/domain/science/ScienceEventType.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/domain/science/ScienceEventType.java rename to src/main/java/de/tum/cit/aet/artemis/domain/science/ScienceEventType.java index 2f2c7733bcae..a80605178187 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/science/ScienceEventType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/science/ScienceEventType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.science; +package de.tum.cit.aet.artemis.domain.science; /** * Types of events that can be logged for scientific purposes. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/science/ScienceSetting.java b/src/main/java/de/tum/cit/aet/artemis/domain/science/ScienceSetting.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/domain/science/ScienceSetting.java rename to src/main/java/de/tum/cit/aet/artemis/domain/science/ScienceSetting.java index da391085bc00..e9ad638681a1 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/science/ScienceSetting.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/science/ScienceSetting.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.science; +package de.tum.cit.aet.artemis.domain.science; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -13,8 +13,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.User; /** * Individual Science Setting which combined make the Science Settings (inside the hierarchical structure on the client side) diff --git a/src/main/java/de/tum/in/www1/artemis/domain/scores/ParticipantScore.java b/src/main/java/de/tum/cit/aet/artemis/domain/scores/ParticipantScore.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/scores/ParticipantScore.java rename to src/main/java/de/tum/cit/aet/artemis/domain/scores/ParticipantScore.java index 99a2b4855587..41e504e1929b 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/scores/ParticipantScore.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/scores/ParticipantScore.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.scores; +package de.tum.cit.aet.artemis.domain.scores; import java.time.Instant; @@ -26,11 +26,11 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.participation.Participant; -import de.tum.in.www1.artemis.service.scheduled.ParticipantScoreScheduleService; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.participation.Participant; +import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; /** * Participant scores store the last (rated) result for each student/team and exercise combination. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/scores/StudentScore.java b/src/main/java/de/tum/cit/aet/artemis/domain/scores/StudentScore.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/domain/scores/StudentScore.java rename to src/main/java/de/tum/cit/aet/artemis/domain/scores/StudentScore.java index 9ac7ed73a8b7..3bec848ab19c 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/scores/StudentScore.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/scores/StudentScore.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.scores; +package de.tum.cit.aet.artemis.domain.scores; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; @@ -8,8 +8,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.participation.Participant; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.participation.Participant; @Entity @DiscriminatorValue("SS") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/scores/TeamScore.java b/src/main/java/de/tum/cit/aet/artemis/domain/scores/TeamScore.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/domain/scores/TeamScore.java rename to src/main/java/de/tum/cit/aet/artemis/domain/scores/TeamScore.java index 135ecbb39924..10c4e48cc26e 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/scores/TeamScore.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/scores/TeamScore.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.scores; +package de.tum.cit.aet.artemis.domain.scores; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; @@ -8,8 +8,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.participation.Participant; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.participation.Participant; @Entity @DiscriminatorValue("TS") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/settings/ide/Ide.java b/src/main/java/de/tum/cit/aet/artemis/domain/settings/ide/Ide.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/settings/ide/Ide.java rename to src/main/java/de/tum/cit/aet/artemis/domain/settings/ide/Ide.java index 9d7d29445458..bc6fe017f451 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/settings/ide/Ide.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/settings/ide/Ide.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.settings.ide; +package de.tum.cit.aet.artemis.domain.settings.ide; import java.util.Set; @@ -10,7 +10,7 @@ import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import de.tum.in.www1.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.DomainObject; @Entity @Table(name = "ide") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/settings/ide/UserIdeMapping.java b/src/main/java/de/tum/cit/aet/artemis/domain/settings/ide/UserIdeMapping.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/settings/ide/UserIdeMapping.java rename to src/main/java/de/tum/cit/aet/artemis/domain/settings/ide/UserIdeMapping.java index 84f7cfb39882..a58662c327d5 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/settings/ide/UserIdeMapping.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/settings/ide/UserIdeMapping.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.settings.ide; +package de.tum.cit.aet.artemis.domain.settings.ide; import java.io.Serializable; import java.util.Objects; @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; @Entity @Table(name = "user_ide_mapping") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/statistics/BuildLogStatisticsEntry.java b/src/main/java/de/tum/cit/aet/artemis/domain/statistics/BuildLogStatisticsEntry.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/statistics/BuildLogStatisticsEntry.java rename to src/main/java/de/tum/cit/aet/artemis/domain/statistics/BuildLogStatisticsEntry.java index 527ad96a10ee..3af94d991d15 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/statistics/BuildLogStatisticsEntry.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/statistics/BuildLogStatisticsEntry.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.statistics; +package de.tum.cit.aet.artemis.domain.statistics; import java.time.ZonedDateTime; import java.time.temporal.ChronoUnit; @@ -14,8 +14,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; @Entity @Table(name = "build_log_statistics_entry") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/statistics/CourseStatisticsAverageScore.java b/src/main/java/de/tum/cit/aet/artemis/domain/statistics/CourseStatisticsAverageScore.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/domain/statistics/CourseStatisticsAverageScore.java rename to src/main/java/de/tum/cit/aet/artemis/domain/statistics/CourseStatisticsAverageScore.java index 5ef6ba1b78b5..454194d3f393 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/statistics/CourseStatisticsAverageScore.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/statistics/CourseStatisticsAverageScore.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.domain.statistics; +package de.tum.cit.aet.artemis.domain.statistics; import java.time.ZonedDateTime; import java.util.Set; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; @JsonInclude(JsonInclude.Include.NON_EMPTY) public class CourseStatisticsAverageScore { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/statistics/ScoreDistribution.java b/src/main/java/de/tum/cit/aet/artemis/domain/statistics/ScoreDistribution.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/domain/statistics/ScoreDistribution.java rename to src/main/java/de/tum/cit/aet/artemis/domain/statistics/ScoreDistribution.java index fc3b5e9c52be..5b5fc3ffba18 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/statistics/ScoreDistribution.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/statistics/ScoreDistribution.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.statistics; +package de.tum.cit.aet.artemis.domain.statistics; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/statistics/StatisticsEntry.java b/src/main/java/de/tum/cit/aet/artemis/domain/statistics/StatisticsEntry.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/statistics/StatisticsEntry.java rename to src/main/java/de/tum/cit/aet/artemis/domain/statistics/StatisticsEntry.java index ab3865b78fb1..d6fd36cf4714 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/statistics/StatisticsEntry.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/statistics/StatisticsEntry.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.statistics; +package de.tum.cit.aet.artemis.domain.statistics; import java.time.temporal.TemporalAccessor; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/statistics/tutor/effort/TutorEffort.java b/src/main/java/de/tum/cit/aet/artemis/domain/statistics/tutor/effort/TutorEffort.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/domain/statistics/tutor/effort/TutorEffort.java rename to src/main/java/de/tum/cit/aet/artemis/domain/statistics/tutor/effort/TutorEffort.java index cef50aac3d65..bae64ebaa759 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/statistics/tutor/effort/TutorEffort.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/statistics/tutor/effort/TutorEffort.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.statistics.tutor.effort; +package de.tum.cit.aet.artemis.domain.statistics.tutor.effort; /** * A data entry used by the tutor effort statistics page. It represents the respective information in terms of diff --git a/src/main/java/de/tum/in/www1/artemis/domain/submissionpolicy/LockRepositoryPolicy.java b/src/main/java/de/tum/cit/aet/artemis/domain/submissionpolicy/LockRepositoryPolicy.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/domain/submissionpolicy/LockRepositoryPolicy.java rename to src/main/java/de/tum/cit/aet/artemis/domain/submissionpolicy/LockRepositoryPolicy.java index 30c1dddf8f06..daecd7e8e33a 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/submissionpolicy/LockRepositoryPolicy.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/submissionpolicy/LockRepositoryPolicy.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.domain.submissionpolicy; +package de.tum.cit.aet.artemis.domain.submissionpolicy; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.service.SubmissionPolicyService; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.service.SubmissionPolicyService; /** * Configures a Lock Repository Policy.
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/submissionpolicy/SubmissionPenaltyPolicy.java b/src/main/java/de/tum/cit/aet/artemis/domain/submissionpolicy/SubmissionPenaltyPolicy.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/domain/submissionpolicy/SubmissionPenaltyPolicy.java rename to src/main/java/de/tum/cit/aet/artemis/domain/submissionpolicy/SubmissionPenaltyPolicy.java index 84827d606f39..edac4ed81e5e 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/submissionpolicy/SubmissionPenaltyPolicy.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/submissionpolicy/SubmissionPenaltyPolicy.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.submissionpolicy; +package de.tum.cit.aet.artemis.domain.submissionpolicy; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; @@ -6,8 +6,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.service.SubmissionPolicyService; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.service.SubmissionPolicyService; /** * Configures a Submission Penalty Policy.
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/submissionpolicy/SubmissionPolicy.java b/src/main/java/de/tum/cit/aet/artemis/domain/submissionpolicy/SubmissionPolicy.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/domain/submissionpolicy/SubmissionPolicy.java rename to src/main/java/de/tum/cit/aet/artemis/domain/submissionpolicy/SubmissionPolicy.java index d39232e4b3e1..83529cb4ed14 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/submissionpolicy/SubmissionPolicy.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/submissionpolicy/SubmissionPolicy.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.submissionpolicy; +package de.tum.cit.aet.artemis.domain.submissionpolicy; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorColumn; @@ -17,8 +17,8 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; /** * Represents an abstract submission policy. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/tutorialgroups/TutorialGroup.java b/src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroup.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/tutorialgroups/TutorialGroup.java rename to src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroup.java index bdf20ceebdbb..524044af65a0 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/tutorialgroups/TutorialGroup.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroup.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.tutorialgroups; +package de.tum.cit.aet.artemis.domain.tutorialgroups; import java.util.HashSet; import java.util.Set; @@ -26,11 +26,11 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.ChannelDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; @Entity @Table(name = "tutorial_group") @@ -124,7 +124,7 @@ public class TutorialGroup extends DomainObject { /** * This field represents the average attendance of this tutorial group *

- * For more information on how this is calculated check out {@link de.tum.in.www1.artemis.service.tutorialgroups.TutorialGroupService#setAverageAttendance} + * For more information on how this is calculated check out {@link de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupService#setAverageAttendance} */ @Transient private Integer averageAttendance; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/tutorialgroups/TutorialGroupFreePeriod.java b/src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupFreePeriod.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/domain/tutorialgroups/TutorialGroupFreePeriod.java rename to src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupFreePeriod.java index f2eeef8aff46..6e5027fbaa66 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/tutorialgroups/TutorialGroupFreePeriod.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupFreePeriod.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.tutorialgroups; +package de.tum.cit.aet.artemis.domain.tutorialgroups; import java.time.ZonedDateTime; @@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.DomainObject; @Entity @Table(name = "tutorial_group_free_period") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/tutorialgroups/TutorialGroupRegistration.java b/src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupRegistration.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/domain/tutorialgroups/TutorialGroupRegistration.java rename to src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupRegistration.java index 47007aac7c04..2f6220a7326d 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/tutorialgroups/TutorialGroupRegistration.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupRegistration.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.tutorialgroups; +package de.tum.cit.aet.artemis.domain.tutorialgroups; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -15,9 +15,9 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; @Entity @Table(name = "tutorial_group_registration") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/tutorialgroups/TutorialGroupSchedule.java b/src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupSchedule.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/domain/tutorialgroups/TutorialGroupSchedule.java rename to src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupSchedule.java index cf0a4ac24988..b543daf0b9f3 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/tutorialgroups/TutorialGroupSchedule.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupSchedule.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.tutorialgroups; +package de.tum.cit.aet.artemis.domain.tutorialgroups; import java.util.ArrayList; import java.util.List; @@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.DomainObject; /** * A {@link TutorialGroupSchedule} is a schedule for a {@link TutorialGroup}. It represents a recurrence pattern for {@link TutorialGroupSession}s. diff --git a/src/main/java/de/tum/in/www1/artemis/domain/tutorialgroups/TutorialGroupSession.java b/src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupSession.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/domain/tutorialgroups/TutorialGroupSession.java rename to src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupSession.java index 94776acbfb43..52846779a4d4 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/tutorialgroups/TutorialGroupSession.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupSession.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.tutorialgroups; +package de.tum.cit.aet.artemis.domain.tutorialgroups; import static jakarta.persistence.Persistence.getPersistenceUtil; @@ -21,8 +21,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.enumeration.TutorialGroupSessionStatus; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; @Entity @Table(name = "tutorial_group_session") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/tutorialgroups/TutorialGroupsConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupsConfiguration.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/domain/tutorialgroups/TutorialGroupsConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupsConfiguration.java index 648d2fdec70b..c8ab0dd7b086 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/tutorialgroups/TutorialGroupsConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupsConfiguration.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.tutorialgroups; +package de.tum.cit.aet.artemis.domain.tutorialgroups; import java.util.HashSet; import java.util.Set; @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.DomainObject; @Entity @Table(name = "tutorial_groups_configuration") diff --git a/src/main/java/de/tum/in/www1/artemis/domain/view/QuizView.java b/src/main/java/de/tum/cit/aet/artemis/domain/view/QuizView.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/domain/view/QuizView.java rename to src/main/java/de/tum/cit/aet/artemis/domain/view/QuizView.java index 8cbc09feb38b..ea1ab31265d2 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/view/QuizView.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/view/QuizView.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.view; +package de.tum.cit.aet.artemis.domain.view; /** * NOTE: This class provides inner classes for use with @JsonView diff --git a/src/main/java/de/tum/in/www1/artemis/exception/AccountRegistrationBlockedException.java b/src/main/java/de/tum/cit/aet/artemis/exception/AccountRegistrationBlockedException.java similarity index 72% rename from src/main/java/de/tum/in/www1/artemis/exception/AccountRegistrationBlockedException.java rename to src/main/java/de/tum/cit/aet/artemis/exception/AccountRegistrationBlockedException.java index 269785a21870..3b203673aba3 100644 --- a/src/main/java/de/tum/in/www1/artemis/exception/AccountRegistrationBlockedException.java +++ b/src/main/java/de/tum/cit/aet/artemis/exception/AccountRegistrationBlockedException.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.exception; +package de.tum.cit.aet.artemis.exception; import java.io.Serial; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.ErrorConstants; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; public class AccountRegistrationBlockedException extends BadRequestAlertException { diff --git a/src/main/java/de/tum/in/www1/artemis/exception/ArtemisMailException.java b/src/main/java/de/tum/cit/aet/artemis/exception/ArtemisMailException.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/exception/ArtemisMailException.java rename to src/main/java/de/tum/cit/aet/artemis/exception/ArtemisMailException.java index bd1d282641f6..695501dfabbe 100644 --- a/src/main/java/de/tum/in/www1/artemis/exception/ArtemisMailException.java +++ b/src/main/java/de/tum/cit/aet/artemis/exception/ArtemisMailException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exception; +package de.tum.cit.aet.artemis.exception; public class ArtemisMailException extends RuntimeException { diff --git a/src/main/java/de/tum/in/www1/artemis/exception/ContinuousIntegrationBuildPlanException.java b/src/main/java/de/tum/cit/aet/artemis/exception/ContinuousIntegrationBuildPlanException.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/exception/ContinuousIntegrationBuildPlanException.java rename to src/main/java/de/tum/cit/aet/artemis/exception/ContinuousIntegrationBuildPlanException.java index 52c121d763f7..0fbcb4276789 100644 --- a/src/main/java/de/tum/in/www1/artemis/exception/ContinuousIntegrationBuildPlanException.java +++ b/src/main/java/de/tum/cit/aet/artemis/exception/ContinuousIntegrationBuildPlanException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exception; +package de.tum.cit.aet.artemis.exception; public class ContinuousIntegrationBuildPlanException extends RuntimeException { diff --git a/src/main/java/de/tum/in/www1/artemis/exception/ContinuousIntegrationException.java b/src/main/java/de/tum/cit/aet/artemis/exception/ContinuousIntegrationException.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/exception/ContinuousIntegrationException.java rename to src/main/java/de/tum/cit/aet/artemis/exception/ContinuousIntegrationException.java index 28e9ad7780ee..eea78905f77e 100644 --- a/src/main/java/de/tum/in/www1/artemis/exception/ContinuousIntegrationException.java +++ b/src/main/java/de/tum/cit/aet/artemis/exception/ContinuousIntegrationException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exception; +package de.tum.cit.aet.artemis.exception; public class ContinuousIntegrationException extends RuntimeException { diff --git a/src/main/java/de/tum/in/www1/artemis/exception/EmptyFileException.java b/src/main/java/de/tum/cit/aet/artemis/exception/EmptyFileException.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/exception/EmptyFileException.java rename to src/main/java/de/tum/cit/aet/artemis/exception/EmptyFileException.java index 7c1994f6908f..6b1e2541904d 100644 --- a/src/main/java/de/tum/in/www1/artemis/exception/EmptyFileException.java +++ b/src/main/java/de/tum/cit/aet/artemis/exception/EmptyFileException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exception; +package de.tum.cit.aet.artemis.exception; public class EmptyFileException extends Exception { diff --git a/src/main/java/de/tum/in/www1/artemis/exception/FilePathParsingException.java b/src/main/java/de/tum/cit/aet/artemis/exception/FilePathParsingException.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/exception/FilePathParsingException.java rename to src/main/java/de/tum/cit/aet/artemis/exception/FilePathParsingException.java index 588cbc5c5126..28cae9a2574b 100644 --- a/src/main/java/de/tum/in/www1/artemis/exception/FilePathParsingException.java +++ b/src/main/java/de/tum/cit/aet/artemis/exception/FilePathParsingException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exception; +package de.tum.cit.aet.artemis.exception; public class FilePathParsingException extends IllegalArgumentException { diff --git a/src/main/java/de/tum/in/www1/artemis/exception/GitException.java b/src/main/java/de/tum/cit/aet/artemis/exception/GitException.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/exception/GitException.java rename to src/main/java/de/tum/cit/aet/artemis/exception/GitException.java index 294e4391fdd0..54f84fd96e72 100644 --- a/src/main/java/de/tum/in/www1/artemis/exception/GitException.java +++ b/src/main/java/de/tum/cit/aet/artemis/exception/GitException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exception; +package de.tum.cit.aet.artemis.exception; /** * Created by muenchdo on 22/06/16. diff --git a/src/main/java/de/tum/in/www1/artemis/exception/GitLabCIException.java b/src/main/java/de/tum/cit/aet/artemis/exception/GitLabCIException.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/exception/GitLabCIException.java rename to src/main/java/de/tum/cit/aet/artemis/exception/GitLabCIException.java index 77279e2a6593..7a563ac27093 100644 --- a/src/main/java/de/tum/in/www1/artemis/exception/GitLabCIException.java +++ b/src/main/java/de/tum/cit/aet/artemis/exception/GitLabCIException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exception; +package de.tum.cit.aet.artemis.exception; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/in/www1/artemis/exception/JenkinsException.java b/src/main/java/de/tum/cit/aet/artemis/exception/JenkinsException.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/exception/JenkinsException.java rename to src/main/java/de/tum/cit/aet/artemis/exception/JenkinsException.java index a8e1c687b254..ec45c4a47fb1 100644 --- a/src/main/java/de/tum/in/www1/artemis/exception/JenkinsException.java +++ b/src/main/java/de/tum/cit/aet/artemis/exception/JenkinsException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exception; +package de.tum.cit.aet.artemis.exception; public class JenkinsException extends ContinuousIntegrationException { diff --git a/src/main/java/de/tum/in/www1/artemis/exception/LocalCIException.java b/src/main/java/de/tum/cit/aet/artemis/exception/LocalCIException.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/exception/LocalCIException.java rename to src/main/java/de/tum/cit/aet/artemis/exception/LocalCIException.java index c163d17a1035..7985f5f0effc 100644 --- a/src/main/java/de/tum/in/www1/artemis/exception/LocalCIException.java +++ b/src/main/java/de/tum/cit/aet/artemis/exception/LocalCIException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exception; +package de.tum.cit.aet.artemis.exception; /** * Exception thrown when something goes wrong with the local CI system. diff --git a/src/main/java/de/tum/in/www1/artemis/exception/LtiEmailAlreadyInUseException.java b/src/main/java/de/tum/cit/aet/artemis/exception/LtiEmailAlreadyInUseException.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/exception/LtiEmailAlreadyInUseException.java rename to src/main/java/de/tum/cit/aet/artemis/exception/LtiEmailAlreadyInUseException.java index c56f83b66bf0..5b6be89e63b6 100644 --- a/src/main/java/de/tum/in/www1/artemis/exception/LtiEmailAlreadyInUseException.java +++ b/src/main/java/de/tum/cit/aet/artemis/exception/LtiEmailAlreadyInUseException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exception; +package de.tum.cit.aet.artemis.exception; import org.springframework.security.authentication.InternalAuthenticationServiceException; diff --git a/src/main/java/de/tum/in/www1/artemis/exception/NetworkingException.java b/src/main/java/de/tum/cit/aet/artemis/exception/NetworkingException.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/exception/NetworkingException.java rename to src/main/java/de/tum/cit/aet/artemis/exception/NetworkingException.java index caebad332cc9..7c4512adacca 100644 --- a/src/main/java/de/tum/in/www1/artemis/exception/NetworkingException.java +++ b/src/main/java/de/tum/cit/aet/artemis/exception/NetworkingException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exception; +package de.tum.cit.aet.artemis.exception; /** * This exception is thrown when a networking error occurs while communicating with external services. diff --git a/src/main/java/de/tum/in/www1/artemis/exception/QuizJoinException.java b/src/main/java/de/tum/cit/aet/artemis/exception/QuizJoinException.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/exception/QuizJoinException.java rename to src/main/java/de/tum/cit/aet/artemis/exception/QuizJoinException.java index 19228b9be7cd..d9cab9391d6e 100644 --- a/src/main/java/de/tum/in/www1/artemis/exception/QuizJoinException.java +++ b/src/main/java/de/tum/cit/aet/artemis/exception/QuizJoinException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exception; +package de.tum.cit.aet.artemis.exception; public class QuizJoinException extends Throwable { diff --git a/src/main/java/de/tum/in/www1/artemis/exception/QuizSubmissionException.java b/src/main/java/de/tum/cit/aet/artemis/exception/QuizSubmissionException.java similarity index 76% rename from src/main/java/de/tum/in/www1/artemis/exception/QuizSubmissionException.java rename to src/main/java/de/tum/cit/aet/artemis/exception/QuizSubmissionException.java index 923e6e94c473..295abf6db459 100644 --- a/src/main/java/de/tum/in/www1/artemis/exception/QuizSubmissionException.java +++ b/src/main/java/de/tum/cit/aet/artemis/exception/QuizSubmissionException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exception; +package de.tum.cit.aet.artemis.exception; public class QuizSubmissionException extends Throwable { diff --git a/src/main/java/de/tum/in/www1/artemis/exception/UsernameAlreadyUsedException.java b/src/main/java/de/tum/cit/aet/artemis/exception/UsernameAlreadyUsedException.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/exception/UsernameAlreadyUsedException.java rename to src/main/java/de/tum/cit/aet/artemis/exception/UsernameAlreadyUsedException.java index 149f33384a22..6b410ed264f4 100644 --- a/src/main/java/de/tum/in/www1/artemis/exception/UsernameAlreadyUsedException.java +++ b/src/main/java/de/tum/cit/aet/artemis/exception/UsernameAlreadyUsedException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exception; +package de.tum.cit.aet.artemis.exception; public class UsernameAlreadyUsedException extends RuntimeException { diff --git a/src/main/java/de/tum/in/www1/artemis/exception/VersionControlException.java b/src/main/java/de/tum/cit/aet/artemis/exception/VersionControlException.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/exception/VersionControlException.java rename to src/main/java/de/tum/cit/aet/artemis/exception/VersionControlException.java index 9172c8a6099f..c15174fbc50b 100644 --- a/src/main/java/de/tum/in/www1/artemis/exception/VersionControlException.java +++ b/src/main/java/de/tum/cit/aet/artemis/exception/VersionControlException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exception; +package de.tum.cit.aet.artemis.exception; /* * TODO our exception handling is awful in some places. An example with this exception: I just created this wrapper for now so that we don't have 'throws Exception' after some of @@ -8,7 +8,7 @@ * declaring "throws Exception" themselves (Although in the end, we just throw an unchecked RuntimeException). */ -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; /** * Generic exception thrown if there are any errors while communicating with the {@link VersionControlService VersionControlService} diff --git a/src/main/java/de/tum/in/www1/artemis/exception/localvc/LocalVCAuthException.java b/src/main/java/de/tum/cit/aet/artemis/exception/localvc/LocalVCAuthException.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/exception/localvc/LocalVCAuthException.java rename to src/main/java/de/tum/cit/aet/artemis/exception/localvc/LocalVCAuthException.java index ce4a7a019b90..bf329c80ac9d 100644 --- a/src/main/java/de/tum/in/www1/artemis/exception/localvc/LocalVCAuthException.java +++ b/src/main/java/de/tum/cit/aet/artemis/exception/localvc/LocalVCAuthException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exception.localvc; +package de.tum.cit.aet.artemis.exception.localvc; /** * Exception thrown when the user is not authenticated or authorized to fetch or push to a local VC repository. diff --git a/src/main/java/de/tum/in/www1/artemis/exception/localvc/LocalVCForbiddenException.java b/src/main/java/de/tum/cit/aet/artemis/exception/localvc/LocalVCForbiddenException.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/exception/localvc/LocalVCForbiddenException.java rename to src/main/java/de/tum/cit/aet/artemis/exception/localvc/LocalVCForbiddenException.java index c24206d8bb65..187837de1aa3 100644 --- a/src/main/java/de/tum/in/www1/artemis/exception/localvc/LocalVCForbiddenException.java +++ b/src/main/java/de/tum/cit/aet/artemis/exception/localvc/LocalVCForbiddenException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exception.localvc; +package de.tum.cit.aet.artemis.exception.localvc; /** * Exception thrown when the user is authorized but not allowed to fetch or push to a local VC repository. diff --git a/src/main/java/de/tum/in/www1/artemis/exception/localvc/LocalVCInternalException.java b/src/main/java/de/tum/cit/aet/artemis/exception/localvc/LocalVCInternalException.java similarity index 77% rename from src/main/java/de/tum/in/www1/artemis/exception/localvc/LocalVCInternalException.java rename to src/main/java/de/tum/cit/aet/artemis/exception/localvc/LocalVCInternalException.java index 49307c684218..356907267b4d 100644 --- a/src/main/java/de/tum/in/www1/artemis/exception/localvc/LocalVCInternalException.java +++ b/src/main/java/de/tum/cit/aet/artemis/exception/localvc/LocalVCInternalException.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.exception.localvc; +package de.tum.cit.aet.artemis.exception.localvc; -import de.tum.in.www1.artemis.exception.VersionControlException; +import de.tum.cit.aet.artemis.exception.VersionControlException; /** * Exception thrown when an internal error occurs in the local version control system. diff --git a/src/main/java/de/tum/in/www1/artemis/exception/localvc/LocalVCOperationException.java b/src/main/java/de/tum/cit/aet/artemis/exception/localvc/LocalVCOperationException.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/exception/localvc/LocalVCOperationException.java rename to src/main/java/de/tum/cit/aet/artemis/exception/localvc/LocalVCOperationException.java index cb0b8797fc76..a685cfb4283a 100644 --- a/src/main/java/de/tum/in/www1/artemis/exception/localvc/LocalVCOperationException.java +++ b/src/main/java/de/tum/cit/aet/artemis/exception/localvc/LocalVCOperationException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exception.localvc; +package de.tum.cit.aet.artemis.exception.localvc; /** * Generic exception for all local version control purposes. diff --git a/src/main/java/de/tum/in/www1/artemis/management/SecurityMetersService.java b/src/main/java/de/tum/cit/aet/artemis/management/SecurityMetersService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/management/SecurityMetersService.java rename to src/main/java/de/tum/cit/aet/artemis/management/SecurityMetersService.java index 10098f70fec4..5b5dcaa05022 100644 --- a/src/main/java/de/tum/in/www1/artemis/management/SecurityMetersService.java +++ b/src/main/java/de/tum/cit/aet/artemis/management/SecurityMetersService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.management; +package de.tum.cit.aet.artemis.management; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ApollonDiagramRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ApollonDiagramRepository.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/repository/ApollonDiagramRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/ApollonDiagramRepository.java index 3a25025dbd92..512307e1acd8 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ApollonDiagramRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ApollonDiagramRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; @@ -10,8 +10,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.modeling.ApollonDiagram; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.modeling.ApollonDiagram; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the ApollonDiagram entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/AttachmentRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/AttachmentRepository.java similarity index 78% rename from src/main/java/de/tum/in/www1/artemis/repository/AttachmentRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/AttachmentRepository.java index 05f0775ce569..08a5b09375f7 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/AttachmentRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/AttachmentRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.Attachment; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.Attachment; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the Attachment entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/AttachmentUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/AttachmentUnitRepository.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/repository/AttachmentUnitRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/AttachmentUnitRepository.java index 28c0a60f63c4..e2b4d1745f3f 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/AttachmentUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/AttachmentUnitRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; @@ -11,10 +11,10 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.enumeration.AttachmentType; -import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; +import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Spring Data JPA repository for the Attachment Unit entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/AuthorityRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/AuthorityRepository.java similarity index 70% rename from src/main/java/de/tum/in/www1/artemis/repository/AuthorityRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/AuthorityRepository.java index a1e1e8e9477f..91ab18e4efb1 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/AuthorityRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/AuthorityRepository.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; import java.util.List; -import de.tum.in.www1.artemis.domain.Authority; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.Authority; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Authority entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/AuxiliaryRepositoryRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/AuxiliaryRepositoryRepository.java similarity index 64% rename from src/main/java/de/tum/in/www1/artemis/repository/AuxiliaryRepositoryRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/AuxiliaryRepositoryRepository.java index cd3a3836a12e..18b7ac9a7a2e 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/AuxiliaryRepositoryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/AuxiliaryRepositoryRepository.java @@ -1,14 +1,14 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.AuxiliaryRepository; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the AuxiliaryRepository entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/BonusRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/BonusRepository.java similarity index 76% rename from src/main/java/de/tum/in/www1/artemis/repository/BonusRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/BonusRepository.java index a2636ab20c06..117ba8020217 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/BonusRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/BonusRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Set; @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.Bonus; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.Bonus; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Bonus entity diff --git a/src/main/java/de/tum/in/www1/artemis/repository/BuildJobRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/BuildJobRepository.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/repository/BuildJobRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/BuildJobRepository.java index 5f65feded254..5127d1e1eb97 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/BuildJobRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/BuildJobRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.time.Duration; @@ -19,13 +19,13 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.BuildJob; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.enumeration.BuildStatus; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.service.connectors.localci.dto.DockerImageBuild; -import de.tum.in.www1.artemis.service.connectors.localci.dto.ResultBuildJob; -import de.tum.in.www1.artemis.service.dto.BuildJobResultCountDTO; +import de.tum.cit.aet.artemis.domain.BuildJob; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.DockerImageBuild; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.ResultBuildJob; +import de.tum.cit.aet.artemis.service.dto.BuildJobResultCountDTO; @Profile(PROFILE_CORE) @Repository @@ -58,7 +58,7 @@ Page findIdsByFilterCriteria(@Param("buildStatus") BuildStatus buildStatus @Param("durationLower") Duration durationLower, @Param("durationUpper") Duration durationUpper, Pageable pageable); @Query(""" - SELECT new de.tum.in.www1.artemis.service.connectors.localci.dto.DockerImageBuild( + SELECT new de.tum.cit.aet.artemis.service.connectors.localci.dto.DockerImageBuild( b.dockerImage, MAX(b.buildStartDate) ) @@ -93,7 +93,7 @@ default Page findAllWithDataByCourseId(long courseId, Pageable pageabl } @Query(""" - SELECT new de.tum.in.www1.artemis.service.connectors.localci.dto.ResultBuildJob( + SELECT new de.tum.cit.aet.artemis.service.connectors.localci.dto.ResultBuildJob( b.result.id, b.buildJobId ) @@ -103,7 +103,7 @@ default Page findAllWithDataByCourseId(long courseId, Pageable pageabl Set findBuildJobIdsForResultIds(@Param("resultIds") List resultIds); @Query(""" - SELECT new de.tum.in.www1.artemis.service.dto.BuildJobResultCountDTO( + SELECT new de.tum.cit.aet.artemis.service.dto.BuildJobResultCountDTO( b.buildStatus, COUNT(b.buildStatus) ) diff --git a/src/main/java/de/tum/in/www1/artemis/repository/BuildLogEntryRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/BuildLogEntryRepository.java similarity index 71% rename from src/main/java/de/tum/in/www1/artemis/repository/BuildLogEntryRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/BuildLogEntryRepository.java index 0d6be87736a0..38fdd57c8d53 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/BuildLogEntryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/BuildLogEntryRepository.java @@ -1,14 +1,14 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.data.jpa.repository.Modifying; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import de.tum.in.www1.artemis.domain.BuildLogEntry; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the BuildLogEntry entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/BuildLogStatisticsEntryRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/BuildLogStatisticsEntryRepository.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/repository/BuildLogStatisticsEntryRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/BuildLogStatisticsEntryRepository.java index b9311bab166d..37aba09b696e 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/BuildLogStatisticsEntryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/BuildLogStatisticsEntryRepository.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.domain.statistics.BuildLogStatisticsEntry.BuildJobPartDuration; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.domain.statistics.BuildLogStatisticsEntry.BuildJobPartDuration; import org.springframework.context.annotation.Profile; import org.springframework.data.jpa.repository.Modifying; @@ -10,11 +10,11 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.statistics.BuildLogStatisticsEntry; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.web.rest.dto.BuildLogStatisticsDTO; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.statistics.BuildLogStatisticsEntry; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.web.rest.dto.BuildLogStatisticsDTO; /** * Spring Data JPA repository for the BuildLogStatisticsEntry entity. @@ -24,7 +24,7 @@ public interface BuildLogStatisticsEntryRepository extends ArtemisJpaRepository { @Query(""" - SELECT new de.tum.in.www1.artemis.web.rest.dto.BuildLogStatisticsDTO( + SELECT new de.tum.cit.aet.artemis.web.rest.dto.BuildLogStatisticsDTO( COUNT(b.id), AVG(b.agentSetupDuration), AVG(b.testDuration), diff --git a/src/main/java/de/tum/in/www1/artemis/repository/BuildPlanRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/BuildPlanRepository.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/repository/BuildPlanRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/BuildPlanRepository.java index 820618ebaa9b..a7436075585e 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/BuildPlanRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/BuildPlanRepository.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -8,9 +8,9 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import de.tum.in.www1.artemis.domain.BuildPlan; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.BuildPlan; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; public interface BuildPlanRepository extends ArtemisJpaRepository { diff --git a/src/main/java/de/tum/in/www1/artemis/repository/CompetencyProgressRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/CompetencyProgressRepository.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/repository/CompetencyProgressRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/CompetencyProgressRepository.java index de4c686cdb63..2bcaf1ed5d99 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/CompetencyProgressRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/CompetencyProgressRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Collection; import java.util.List; @@ -14,10 +14,10 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.CompetencyProgress; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository @@ -93,7 +93,7 @@ SELECT COUNT(cp) LEFT JOIN CompetencyRelation cr ON cr.tailCompetency = c LEFT JOIN CourseCompetency priorC ON priorC = cr.headCompetency LEFT JOIN FETCH CompetencyProgress cp ON cp.competency = priorC - WHERE cr.type <> de.tum.in.www1.artemis.domain.competency.RelationType.MATCHES + WHERE cr.type <> de.tum.cit.aet.artemis.domain.competency.RelationType.MATCHES AND cp.user = :user AND c = :competency """) diff --git a/src/main/java/de/tum/in/www1/artemis/repository/CompetencyRelationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/CompetencyRelationRepository.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/repository/CompetencyRelationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/CompetencyRelationRepository.java index 8ccc837904a2..708147c3c43b 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/CompetencyRelationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/CompetencyRelationRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Set; @@ -11,9 +11,9 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import de.tum.in.www1.artemis.domain.competency.CompetencyRelation; -import de.tum.in.www1.artemis.domain.competency.RelationType; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.competency.CompetencyRelation; +import de.tum.cit.aet.artemis.domain.competency.RelationType; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Competency Relation entity. @@ -55,7 +55,7 @@ SELECT COUNT(cr) LEFT JOIN relation.headCompetency LEFT JOIN relation.tailCompetency WHERE relation.tailCompetency.id IN :competencyIds - AND relation.type <> de.tum.in.www1.artemis.domain.competency.RelationType.MATCHES + AND relation.type <> de.tum.cit.aet.artemis.domain.competency.RelationType.MATCHES """) Set getPriorCompetenciesByCompetencyIds(@Param("competencyIds") Set competencyIds); @@ -91,7 +91,7 @@ WITH RECURSIVE transitive_closure(id) AS END FROM competency_relation AS relation JOIN transitive_closure AS tc ON relation.tail_competency_id = tc.id OR relation.head_competency_id = tc.id - WHERE relation.type = :#{T(de.tum.in.www1.artemis.domain.competency.RelationType).MATCHES.ordinal()} + WHERE relation.type = :#{T(de.tum.cit.aet.artemis.domain.competency.RelationType).MATCHES.ordinal()} ) ) SELECT * FROM transitive_closure diff --git a/src/main/java/de/tum/in/www1/artemis/repository/CompetencyRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/CompetencyRepository.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/repository/CompetencyRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/CompetencyRepository.java index e6d3189bbad8..749c9a85deca 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/CompetencyRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/CompetencyRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Optional; @@ -12,9 +12,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.competency.Competency; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.competency.Competency; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Competency entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ComplaintRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ComplaintRepository.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/repository/ComplaintRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/ComplaintRepository.java index cfa0e302a5ee..78ad81e894f7 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ComplaintRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ComplaintRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.List; @@ -15,14 +15,14 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import de.tum.in.www1.artemis.domain.Complaint; -import de.tum.in.www1.artemis.domain.assessment.dashboard.ExerciseMapEntry; -import de.tum.in.www1.artemis.domain.enumeration.ComplaintType; -import de.tum.in.www1.artemis.domain.leaderboard.tutor.TutorLeaderboardAnsweredMoreFeedbackRequests; -import de.tum.in.www1.artemis.domain.leaderboard.tutor.TutorLeaderboardComplaintResponses; -import de.tum.in.www1.artemis.domain.leaderboard.tutor.TutorLeaderboardComplaints; -import de.tum.in.www1.artemis.domain.leaderboard.tutor.TutorLeaderboardMoreFeedbackRequests; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.Complaint; +import de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseMapEntry; +import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; +import de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardAnsweredMoreFeedbackRequests; +import de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardComplaintResponses; +import de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardComplaints; +import de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardMoreFeedbackRequests; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Complaint entity. @@ -103,7 +103,7 @@ public interface ComplaintRepository extends ArtemisJpaRepository countComplaintsByExerciseIdsAndComplaintComplaintTypeIgno * @return list of exercise ids with their number of complaints based on the complaint type */ @Query(""" - SELECT new de.tum.in.www1.artemis.domain.assessment.dashboard.ExerciseMapEntry( + SELECT new de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseMapEntry( cr.complaint.result.participation.exercise.id, COUNT(DISTINCT cr) ) diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ConductAgreementRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ConductAgreementRepository.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/repository/ConductAgreementRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/ConductAgreementRepository.java index 22462b219347..5ac610eabbb6 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ConductAgreementRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ConductAgreementRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Optional; @@ -9,9 +9,9 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import de.tum.in.www1.artemis.domain.ConductAgreement; -import de.tum.in.www1.artemis.domain.ConductAgreementId; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.ConductAgreement; +import de.tum.cit.aet.artemis.domain.ConductAgreementId; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the Code of Conduct Agreement entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/CourseCompetencyRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/CourseCompetencyRepository.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/repository/CourseCompetencyRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/CourseCompetencyRepository.java index bd268a74de3a..2454f353a58a 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/CourseCompetencyRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/CourseCompetencyRepository.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; import java.util.List; import java.util.Optional; @@ -10,13 +10,13 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.LearningObject; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.web.rest.dto.metrics.CompetencyExerciseMasteryCalculationDTO; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.LearningObject; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.web.rest.dto.metrics.CompetencyExerciseMasteryCalculationDTO; /** * Spring Data JPA repository for the {@link CourseCompetency} entity. @@ -54,7 +54,7 @@ public interface CourseCompetencyRepository extends ArtemisJpaRepository findByCourseIdsForUser(@Param("courseIds") Set courseIds, @Param @Param("now") ZonedDateTime now); @Query(""" - SELECT new de.tum.in.www1.artemis.web.rest.dto.CourseContentCount( + SELECT new de.tum.cit.aet.artemis.web.rest.dto.CourseContentCount( COUNT(e.id), e.course.id ) diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ExamSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ExamSessionRepository.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/repository/ExamSessionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/ExamSessionRepository.java index 3924394b81ee..fdf67995704b 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ExamSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ExamSessionRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Set; @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.exam.ExamSession; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.exam.ExamSession; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the ExamSession entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ExamUserRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ExamUserRepository.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/repository/ExamUserRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/ExamUserRepository.java index a84d91539709..45ecaf3e6420 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ExamUserRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ExamUserRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.List; @@ -13,9 +13,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.exam.ExamUser; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.web.rest.dto.ExamUserAttendanceCheckDTO; +import de.tum.cit.aet.artemis.domain.exam.ExamUser; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.web.rest.dto.ExamUserAttendanceCheckDTO; @Profile(PROFILE_CORE) @Repository @@ -35,7 +35,7 @@ public interface ExamUserRepository extends ArtemisJpaRepository List findAllByExamId(long examId); @Query(""" - SELECT new de.tum.in.www1.artemis.web.rest.dto.ExamUserAttendanceCheckDTO( + SELECT new de.tum.cit.aet.artemis.web.rest.dto.ExamUserAttendanceCheckDTO( examUser.id, examUser.studentImagePath, examUser.user.login, diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ExampleSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ExampleSubmissionRepository.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/repository/ExampleSubmissionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/ExampleSubmissionRepository.java index 403038d66b30..4b40724b6e5c 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ExampleSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ExampleSubmissionRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.List; @@ -13,10 +13,10 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.ExampleSubmission; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the ExampleSubmission entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ExerciseGroupRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ExerciseGroupRepository.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/repository/ExerciseGroupRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/ExerciseGroupRepository.java index 97c1ad666ed6..14101def33e2 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ExerciseGroupRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ExerciseGroupRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.List; @@ -14,8 +14,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the ExerciseGroup entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ExerciseRepository.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/repository/ExerciseRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/ExerciseRepository.java index a6e417be4129..fbc525f788e5 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ExerciseRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.time.ZonedDateTime; @@ -21,10 +21,10 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.metrics.ExerciseTypeMetricsEntry; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.metrics.ExerciseTypeMetricsEntry; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Spring Data JPA repository for the Exercise entity. @@ -61,7 +61,7 @@ public interface ExerciseRepository extends ArtemisJpaRepository SELECT e FROM Exercise e WHERE e.course.id = :courseId - AND e.mode = de.tum.in.www1.artemis.domain.enumeration.ExerciseMode.TEAM + AND e.mode = de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode.TEAM """) Set findAllTeamExercisesByCourseId(@Param("courseId") Long courseId); @@ -97,7 +97,7 @@ public interface ExerciseRepository extends ArtemisJpaRepository * @return a list of ExerciseTypeMetricsEntries, one for each exercise type */ @Query(""" - SELECT new de.tum.in.www1.artemis.domain.metrics.ExerciseTypeMetricsEntry( + SELECT new de.tum.cit.aet.artemis.domain.metrics.ExerciseTypeMetricsEntry( TYPE(e), COUNT(e.id) ) @@ -116,7 +116,7 @@ GROUP BY TYPE(e) * @return a list of ExerciseTypeMetricsEntries, one for each exercise type */ @Query(""" - SELECT new de.tum.in.www1.artemis.domain.metrics.ExerciseTypeMetricsEntry( + SELECT new de.tum.cit.aet.artemis.domain.metrics.ExerciseTypeMetricsEntry( TYPE(e), COUNT(e.id) ) @@ -135,7 +135,7 @@ GROUP BY TYPE(e) * @return a list of ExerciseTypeMetricsEntries, one for each exercise type */ @Query(""" - SELECT new de.tum.in.www1.artemis.domain.metrics.ExerciseTypeMetricsEntry( + SELECT new de.tum.cit.aet.artemis.domain.metrics.ExerciseTypeMetricsEntry( TYPE(e), COUNT(e.id) ) @@ -156,7 +156,7 @@ GROUP BY TYPE(e) * @return a list of ExerciseTypeMetricsEntries, one for each exercise type */ @Query(""" - SELECT new de.tum.in.www1.artemis.domain.metrics.ExerciseTypeMetricsEntry( + SELECT new de.tum.cit.aet.artemis.domain.metrics.ExerciseTypeMetricsEntry( TYPE(e), COUNT(DISTINCT user.id) ) @@ -179,7 +179,7 @@ GROUP BY TYPE(e) * @return a list of ExerciseTypeMetricsEntries, one for each exercise type */ @Query(""" - SELECT new de.tum.in.www1.artemis.domain.metrics.ExerciseTypeMetricsEntry( + SELECT new de.tum.cit.aet.artemis.domain.metrics.ExerciseTypeMetricsEntry( TYPE(e), COUNT(DISTINCT user.id) ) @@ -203,7 +203,7 @@ List countActiveStudentsInExercisesWithDueDateBetweenG * @return a list of ExerciseTypeMetricsEntries, one for each exercise type */ @Query(""" - SELECT new de.tum.in.www1.artemis.domain.metrics.ExerciseTypeMetricsEntry( + SELECT new de.tum.cit.aet.artemis.domain.metrics.ExerciseTypeMetricsEntry( TYPE(e), COUNT(e.id) ) @@ -224,7 +224,7 @@ GROUP BY TYPE(e) * @return a list of ExerciseTypeMetricsEntries, one for each exercise type */ @Query(""" - SELECT new de.tum.in.www1.artemis.domain.metrics.ExerciseTypeMetricsEntry( + SELECT new de.tum.cit.aet.artemis.domain.metrics.ExerciseTypeMetricsEntry( TYPE(e), COUNT(DISTINCT user.id) ) @@ -248,7 +248,7 @@ List countStudentsInExercisesWithReleaseDateBetweenGro * @return a list of ExerciseTypeMetricsEntries, one for each exercise type */ @Query(""" - SELECT new de.tum.in.www1.artemis.domain.metrics.ExerciseTypeMetricsEntry( + SELECT new de.tum.cit.aet.artemis.domain.metrics.ExerciseTypeMetricsEntry( TYPE(e), COUNT(DISTINCT user.id) ) @@ -603,7 +603,7 @@ void revokeAccessToRestrictedFeedbackSuggestionModulesByCourseId(@Param("courseI @Param("restrictedFeedbackSuggestionModule") Collection restrictedFeedbackSuggestionModule); /** - * For an explanation, see {@link de.tum.in.www1.artemis.web.rest.ExamResource#getAllExercisesWithPotentialPlagiarismForExam(long, long)} + * For an explanation, see {@link de.tum.cit.aet.artemis.web.rest.ExamResource#getAllExercisesWithPotentialPlagiarismForExam(long, long)} * * @param examId the id of the exam for which we want to get all exercises with potential plagiarism * @return a list of exercises with potential plagiarism diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ExerciseUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ExerciseUnitRepository.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/repository/ExerciseUnitRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/ExerciseUnitRepository.java index c18fd99d0021..848c9f926764 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ExerciseUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ExerciseUnitRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.lecture.ExerciseUnit; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Exercise Unit entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/FeedbackRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/FeedbackRepository.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/repository/FeedbackRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/FeedbackRepository.java index 34ec357f4b57..46e0db7bc9ab 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/FeedbackRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/FeedbackRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.Collections; @@ -12,12 +12,12 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.GradingInstruction; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.GradingInstruction; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Feedback entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/FileUploadExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/FileUploadExerciseRepository.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/repository/FileUploadExerciseRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/FileUploadExerciseRepository.java index 1c0e7617f0cf..af7beb412610 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/FileUploadExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/FileUploadExerciseRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.List; @@ -15,8 +15,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the FileUploadExercise entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/FileUploadSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/FileUploadSubmissionRepository.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/repository/FileUploadSubmissionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/FileUploadSubmissionRepository.java index e35960f6edf7..69b751b52ee4 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/FileUploadSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/FileUploadSubmissionRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.Optional; @@ -13,8 +13,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.FileUploadSubmission; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the FileUploadSubmission entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/GradeStepRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/GradeStepRepository.java similarity index 58% rename from src/main/java/de/tum/in/www1/artemis/repository/GradeStepRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/GradeStepRepository.java index 6e43a3b8c7b6..768160036faa 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/GradeStepRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/GradeStepRepository.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.GradeStep; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.GradeStep; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA Repository for the GradeStep entity diff --git a/src/main/java/de/tum/in/www1/artemis/repository/GradingCriterionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/GradingCriterionRepository.java similarity index 78% rename from src/main/java/de/tum/in/www1/artemis/repository/GradingCriterionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/GradingCriterionRepository.java index a8876d64fb36..8e7f56000793 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/GradingCriterionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/GradingCriterionRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Set; @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the GradingCriteria entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/GradingInstructionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/GradingInstructionRepository.java similarity index 59% rename from src/main/java/de/tum/in/www1/artemis/repository/GradingInstructionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/GradingInstructionRepository.java index 41b1393a4712..98d255a2f104 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/GradingInstructionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/GradingInstructionRepository.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.GradingInstruction; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.GradingInstruction; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the GradingInstruction entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/GradingScaleRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/GradingScaleRepository.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/repository/GradingScaleRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/GradingScaleRepository.java index 5647ac17d0bb..f88ee3066cd4 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/GradingScaleRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/GradingScaleRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.Comparator; @@ -19,11 +19,11 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.GradeStep; -import de.tum.in.www1.artemis.domain.GradingScale; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.GradeStep; +import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Spring Data JPA for the GradingScale entity @@ -140,7 +140,7 @@ default GradingScale findByExamIdOrElseThrow(long examId) { LEFT JOIN gs.course LEFT JOIN gs.exam LEFT JOIN gs.exam.course - WHERE gs.gradeType = de.tum.in.www1.artemis.domain.GradeType.BONUS + WHERE gs.gradeType = de.tum.cit.aet.artemis.domain.GradeType.BONUS AND ( (gs.course.instructorGroupName IN :groups AND gs.course.title LIKE %:partialTitle%) OR (gs.exam.course.instructorGroupName IN :groups AND gs.exam.title LIKE %:partialTitle%) @@ -165,7 +165,7 @@ Page findWithBonusGradeTypeByTitleInCourseOrExamAndUserHasAccessTo FROM GradingScale gs LEFT JOIN gs.course LEFT JOIN gs.exam - WHERE gs.gradeType = de.tum.in.www1.artemis.domain.GradeType.BONUS + WHERE gs.gradeType = de.tum.cit.aet.artemis.domain.GradeType.BONUS AND (gs.course.title LIKE %:partialTitle% OR gs.exam.title LIKE %:partialTitle%) """) Page findWithBonusGradeTypeByTitleInCourseOrExamForAdmin(@Param("partialTitle") String partialTitle, Pageable pageable); diff --git a/src/main/java/de/tum/in/www1/artemis/repository/GroupNotificationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/GroupNotificationRepository.java similarity index 63% rename from src/main/java/de/tum/in/www1/artemis/repository/GroupNotificationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/GroupNotificationRepository.java index 8abebc5ea5d0..b4a4bdcf17e2 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/GroupNotificationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/GroupNotificationRepository.java @@ -1,14 +1,14 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.notification.GroupNotification; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.notification.GroupNotification; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the Notification entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/GuidedTourSettingsRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/GuidedTourSettingsRepository.java similarity index 59% rename from src/main/java/de/tum/in/www1/artemis/repository/GuidedTourSettingsRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/GuidedTourSettingsRepository.java index deb7d7a90e7a..d0e9277afe78 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/GuidedTourSettingsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/GuidedTourSettingsRepository.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.GuidedTourSetting; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.GuidedTourSetting; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the GuidedTourSetting entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/LdapUserRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/LdapUserRepository.java similarity index 74% rename from src/main/java/de/tum/in/www1/artemis/repository/LdapUserRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/LdapUserRepository.java index a074e91004a4..7fec30e60ddd 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/LdapUserRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/LdapUserRepository.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; import org.springframework.context.annotation.Profile; import org.springframework.data.ldap.repository.LdapRepository; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.service.ldap.LdapUserDto; +import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; @Repository @Profile("ldap | ldap-only") diff --git a/src/main/java/de/tum/in/www1/artemis/repository/LearningPathRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/LearningPathRepository.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/repository/LearningPathRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/LearningPathRepository.java index 2cd24fc365c2..32a4f51f4bd0 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/LearningPathRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/LearningPathRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.Optional; @@ -13,8 +13,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.competency.LearningPath; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.competency.LearningPath; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/in/www1/artemis/repository/LectureRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/LectureRepository.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/repository/LectureRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/LectureRepository.java index 5e079e923566..25ea7247b21e 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/LectureRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/LectureRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Optional; @@ -16,9 +16,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.web.rest.dto.CourseContentCount; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.web.rest.dto.CourseContentCount; /** * Spring Data repository for the Lecture entity. @@ -157,7 +157,7 @@ default Lecture findByIdWithLectureUnitsAndSlidesAndAttachmentsElseThrow(long le } @Query(""" - SELECT new de.tum.in.www1.artemis.web.rest.dto.CourseContentCount( + SELECT new de.tum.cit.aet.artemis.web.rest.dto.CourseContentCount( COUNT(l.id), l.course.id ) diff --git a/src/main/java/de/tum/in/www1/artemis/repository/LectureUnitCompletionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/LectureUnitCompletionRepository.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/repository/LectureUnitCompletionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/LectureUnitCompletionRepository.java index b7c9349479a0..922011265864 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/LectureUnitCompletionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/LectureUnitCompletionRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Collection; import java.util.Optional; @@ -11,10 +11,10 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.domain.lecture.LectureUnitCompletion; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnitCompletion; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/in/www1/artemis/repository/LectureUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/LectureUnitRepository.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/repository/LectureUnitRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/LectureUnitRepository.java index f3960b60e347..87bd2b438368 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/LectureUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/LectureUnitRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Optional; import java.util.Set; @@ -10,8 +10,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Lecture Unit entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/LongFeedbackTextRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/LongFeedbackTextRepository.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/repository/LongFeedbackTextRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/LongFeedbackTextRepository.java index cce1a63b3f84..8d59ebfbd792 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/LongFeedbackTextRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/LongFeedbackTextRepository.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; import java.util.List; import java.util.Optional; @@ -6,8 +6,8 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import de.tum.in.www1.artemis.domain.LongFeedbackText; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.LongFeedbackText; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; public interface LongFeedbackTextRepository extends ArtemisJpaRepository { diff --git a/src/main/java/de/tum/in/www1/artemis/repository/Lti13ResourceLaunchRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/Lti13ResourceLaunchRepository.java similarity index 66% rename from src/main/java/de/tum/in/www1/artemis/repository/Lti13ResourceLaunchRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/Lti13ResourceLaunchRepository.java index 184bf01fdb4e..6a60e7b7da30 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/Lti13ResourceLaunchRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/Lti13ResourceLaunchRepository.java @@ -1,14 +1,14 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; import java.util.Collection; import java.util.Optional; import jakarta.validation.constraints.NotNull; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.lti.LtiResourceLaunch; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.lti.LtiResourceLaunch; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; public interface Lti13ResourceLaunchRepository extends ArtemisJpaRepository { diff --git a/src/main/java/de/tum/in/www1/artemis/repository/LtiPlatformConfigurationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/LtiPlatformConfigurationRepository.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/repository/LtiPlatformConfigurationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/LtiPlatformConfigurationRepository.java index 6c718e40049f..0ba0de6071b2 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/LtiPlatformConfigurationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/LtiPlatformConfigurationRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.Optional; @@ -11,9 +11,9 @@ import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.LtiPlatformConfiguration; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Repository for managing LtiPlatformConfiguration entities. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/MigrationChangeRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/MigrationChangeRepository.java new file mode 100644 index 000000000000..b5307d212d24 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/repository/MigrationChangeRepository.java @@ -0,0 +1,7 @@ +package de.tum.cit.aet.artemis.repository; + +import de.tum.cit.aet.artemis.domain.MigrationChangelog; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; + +public interface MigrationChangeRepository extends ArtemisJpaRepository { +} diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ModelClusterRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ModelClusterRepository.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/repository/ModelClusterRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/ModelClusterRepository.java index dd4924abd278..6a464197f397 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ModelClusterRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ModelClusterRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.modeling.ModelCluster; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.modeling.ModelCluster; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the ModelCluster entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ModelElementRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ModelElementRepository.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/repository/ModelElementRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/ModelElementRepository.java index 94a11fde7e15..f55e5c196f42 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ModelElementRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ModelElementRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.modeling.ModelElement; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.modeling.ModelElement; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the ModelElement entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ModelingExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ModelingExerciseRepository.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/repository/ModelingExerciseRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/ModelingExerciseRepository.java index 79ff27f17661..fc4c60445612 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ModelingExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ModelingExerciseRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.time.ZonedDateTime; @@ -16,8 +16,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the ModelingExercise entity. @@ -70,7 +70,7 @@ public interface ModelingExerciseRepository extends ArtemisJpaRepository :now """) List findAllToBeScheduled(@Param("now") ZonedDateTime now); diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ModelingSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ModelingSubmissionRepository.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/repository/ModelingSubmissionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/ModelingSubmissionRepository.java index d7e7c8e18815..84b1adbb60bb 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ModelingSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ModelingSubmissionRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.List; @@ -12,8 +12,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the ModelingSubmission entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/NotificationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/NotificationRepository.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/repository/NotificationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/NotificationRepository.java index 134b24cac7af..c91dd7abf95a 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/NotificationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/NotificationRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Set; @@ -14,8 +14,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.notification.Notification; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.notification.Notification; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the Notification entity. @@ -34,16 +34,16 @@ LEFT JOIN TREAT(notification AS SingleUserNotification).recipient recipient (TYPE(notification) = GroupNotification AND (( course.instructorGroupName IN :currentGroups - AND TREAT(notification AS GroupNotification).type = de.tum.in.www1.artemis.domain.enumeration.GroupNotificationType.INSTRUCTOR + AND TREAT(notification AS GroupNotification).type = de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.INSTRUCTOR ) OR ( course.teachingAssistantGroupName IN :currentGroups - AND TREAT(notification AS GroupNotification).type = de.tum.in.www1.artemis.domain.enumeration.GroupNotificationType.TA + AND TREAT(notification AS GroupNotification).type = de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.TA ) OR ( course.editorGroupName IN :currentGroups - AND TREAT(notification AS GroupNotification).type = de.tum.in.www1.artemis.domain.enumeration.GroupNotificationType.EDITOR + AND TREAT(notification AS GroupNotification).type = de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.EDITOR ) OR ( course.studentGroupName IN :currentGroups - AND TREAT(notification AS GroupNotification).type = de.tum.in.www1.artemis.domain.enumeration.GroupNotificationType.STUDENT + AND TREAT(notification AS GroupNotification).type = de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.STUDENT ) ) ) OR (TYPE(notification) = SingleUserNotification @@ -71,16 +71,16 @@ LEFT JOIN TREAT(notification AS SingleUserNotification).recipient recipient AND (notification.title NOT IN :deactivatedTitles OR notification.title IS NULL) AND (( course.instructorGroupName IN :currentGroups - AND TREAT(notification AS GroupNotification).type = de.tum.in.www1.artemis.domain.enumeration.GroupNotificationType.INSTRUCTOR + AND TREAT(notification AS GroupNotification).type = de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.INSTRUCTOR ) OR ( course.teachingAssistantGroupName IN :currentGroups - AND TREAT(notification AS GroupNotification).type = de.tum.in.www1.artemis.domain.enumeration.GroupNotificationType.TA + AND TREAT(notification AS GroupNotification).type = de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.TA ) OR ( course.editorGroupName IN :currentGroups - AND TREAT(notification AS GroupNotification).type = de.tum.in.www1.artemis.domain.enumeration.GroupNotificationType.EDITOR + AND TREAT(notification AS GroupNotification).type = de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.EDITOR ) OR ( course.studentGroupName IN :currentGroups - AND TREAT(notification AS GroupNotification).type = de.tum.in.www1.artemis.domain.enumeration.GroupNotificationType.STUDENT + AND TREAT(notification AS GroupNotification).type = de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.STUDENT ) ) ) OR (TYPE(notification) = SingleUserNotification diff --git a/src/main/java/de/tum/in/www1/artemis/repository/NotificationSettingRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/NotificationSettingRepository.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/repository/NotificationSettingRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/NotificationSettingRepository.java index 261877b584a9..27923bee7bfb 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/NotificationSettingRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/NotificationSettingRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Set; @@ -11,9 +11,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.NotificationSetting; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.NotificationSetting; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the NotificationSetting entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/OnlineCourseConfigurationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/OnlineCourseConfigurationRepository.java similarity index 66% rename from src/main/java/de/tum/in/www1/artemis/repository/OnlineCourseConfigurationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/OnlineCourseConfigurationRepository.java index 0e42428f1009..6de499025be6 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/OnlineCourseConfigurationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/OnlineCourseConfigurationRepository.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.OnlineCourseConfiguration; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the OnlineCourseConfiguration entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/OnlineUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/OnlineUnitRepository.java similarity index 80% rename from src/main/java/de/tum/in/www1/artemis/repository/OnlineUnitRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/OnlineUnitRepository.java index a62b8c4c7dda..fbf23ff11011 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/OnlineUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/OnlineUnitRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Optional; @@ -11,8 +11,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.lecture.OnlineUnit; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.lecture.OnlineUnit; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Online Unit entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/OrganizationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/OrganizationRepository.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/repository/OrganizationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/OrganizationRepository.java index ddf15ce798b7..0606881b4803 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/OrganizationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/OrganizationRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.HashSet; import java.util.Optional; @@ -16,9 +16,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.Organization; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.Organization; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Spring JPA repository for Organization entities diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ParticipantScoreRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ParticipantScoreRepository.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/repository/ParticipantScoreRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/ParticipantScoreRepository.java index 88d4388925ea..f0b2611f5bde 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ParticipantScoreRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ParticipantScoreRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.time.Instant; @@ -20,14 +20,14 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.scores.ParticipantScore; -import de.tum.in.www1.artemis.domain.statistics.ScoreDistribution; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.service.scheduled.ParticipantScoreScheduleService; -import de.tum.in.www1.artemis.web.rest.dto.CourseManagementOverviewExerciseStatisticsDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExerciseScoresAggregatedInformation; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.scores.ParticipantScore; +import de.tum.cit.aet.artemis.domain.statistics.ScoreDistribution; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; +import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementOverviewExerciseStatisticsDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExerciseScoresAggregatedInformation; @Profile(PROFILE_CORE) @Repository @@ -107,7 +107,7 @@ SELECT MAX(ps.lastModifiedDate) AS latestModifiedDate Optional getLatestModifiedDate(); @Query(""" - SELECT new de.tum.in.www1.artemis.web.rest.dto.ExerciseScoresAggregatedInformation( + SELECT new de.tum.cit.aet.artemis.web.rest.dto.ExerciseScoresAggregatedInformation( p.exercise.id, AVG(p.lastRatedScore), MAX(p.lastRatedScore) @@ -119,7 +119,7 @@ SELECT MAX(ps.lastModifiedDate) AS latestModifiedDate List getAggregatedExerciseScoresInformation(@Param("exercises") Set exercises); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.ScoreDistribution(count(p.id), p.lastRatedScore) + SELECT new de.tum.cit.aet.artemis.domain.statistics.ScoreDistribution(count(p.id), p.lastRatedScore) FROM ParticipantScore p WHERE p.exercise.id = :exerciseId GROUP BY p.id diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ParticipationRepository.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/repository/ParticipationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/ParticipationRepository.java index b1fbd8fd04bf..d22657c7879c 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ParticipationRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -16,9 +16,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository @@ -62,7 +62,7 @@ default Participation findByIdWithLatestSubmissionElseThrow(Long participationId FROM Participation p LEFT JOIN FETCH p.submissions s WHERE p.id = :participationId - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) """) Optional findWithEagerLegalSubmissionsById(@Param("participationId") long participationId); diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ParticipationVCSAccessTokenRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ParticipationVCSAccessTokenRepository.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/repository/ParticipationVCSAccessTokenRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/ParticipationVCSAccessTokenRepository.java index 9f339eb72c79..d4da7c2bd205 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ParticipationVCSAccessTokenRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ParticipationVCSAccessTokenRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Optional; @@ -11,8 +11,8 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import de.tum.in.www1.artemis.domain.participation.ParticipationVCSAccessToken; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.participation.ParticipationVCSAccessToken; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/in/www1/artemis/repository/PersistenceAuditEventRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/PersistenceAuditEventRepository.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/repository/PersistenceAuditEventRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/PersistenceAuditEventRepository.java index 172de00d1839..2c4b4c488f84 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/PersistenceAuditEventRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/PersistenceAuditEventRepository.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -16,8 +16,8 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import de.tum.in.www1.artemis.domain.PersistentAuditEvent; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.PersistentAuditEvent; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the PersistentAuditEvent entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/PrerequisiteRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/PrerequisiteRepository.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/repository/PrerequisiteRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/PrerequisiteRepository.java index c5480fae02ad..46b8185109ef 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/PrerequisiteRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/PrerequisiteRepository.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; import java.util.List; import java.util.Optional; @@ -7,9 +7,9 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.competency.Prerequisite; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.competency.Prerequisite; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the {@link Prerequisite} entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseBuildConfigRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseBuildConfigRepository.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseBuildConfigRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseBuildConfigRepository.java index 06f2293e6d88..ff1b18ca64c1 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseBuildConfigRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseBuildConfigRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Optional; @@ -8,9 +8,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseRepository.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseRepository.java index 821d7a6932f0..8a743b354612 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseRepository.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.config.Constants.SHORT_NAME_PATTERN; -import static de.tum.in.www1.artemis.config.Constants.TITLE_NAME_PATTERN; -import static de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository.ProgrammingExerciseFetchOptions; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.SHORT_NAME_PATTERN; +import static de.tum.cit.aet.artemis.config.Constants.TITLE_NAME_PATTERN; +import static de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository.ProgrammingExerciseFetchOptions; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.time.ZonedDateTime; @@ -22,19 +22,19 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise_; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise_; -import de.tum.in.www1.artemis.domain.assessment.dashboard.ExerciseMapEntry; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.repository.base.DynamicSpecificationRepository; -import de.tum.in.www1.artemis.repository.base.FetchOptions; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise_; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise_; +import de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseMapEntry; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.repository.base.DynamicSpecificationRepository; +import de.tum.cit.aet.artemis.repository.base.FetchOptions; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Spring Data JPA repository for the ProgrammingExercise entity. @@ -266,7 +266,7 @@ default ProgrammingExercise findOneByProjectKeyOrThrow(String projectKey, boolea LEFT JOIN FETCH t.students LEFT JOIN FETCH pep.submissions s WHERE pe.id = :exerciseId - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) """) Optional findWithEagerStudentParticipationsStudentAndLegalSubmissionsById(@Param("exerciseId") long exerciseId); @@ -363,7 +363,7 @@ Optional findByIdWithEagerBuildConfigTestCasesStaticCodeAna /** * Returns all programming exercises that have a due date after {@code now} and have tests marked with - * {@link de.tum.in.www1.artemis.domain.enumeration.Visibility#AFTER_DUE_DATE} but no buildAndTestStudentSubmissionsAfterDueDate. + * {@link de.tum.cit.aet.artemis.domain.enumeration.Visibility#AFTER_DUE_DATE} but no buildAndTestStudentSubmissionsAfterDueDate. * * @param now the time after which the due date of the exercise has to be * @return List (can be empty) @@ -374,7 +374,7 @@ Optional findByIdWithEagerBuildConfigTestCasesStaticCodeAna LEFT JOIN pe.testCases tc WHERE pe.dueDate > :now AND pe.buildAndTestStudentSubmissionsAfterDueDate IS NULL - AND tc.visibility = de.tum.in.www1.artemis.domain.enumeration.Visibility.AFTER_DUE_DATE + AND tc.visibility = de.tum.cit.aet.artemis.domain.enumeration.Visibility.AFTER_DUE_DATE """) List findAllByDueDateAfterDateWithTestsAfterDueDateWithoutBuildStudentSubmissionsDate(@Param("now") ZonedDateTime now); @@ -409,7 +409,7 @@ SELECT COUNT (DISTINCT p) WHERE p.exercise.id = :exerciseId AND p.testRun = FALSE AND s.submitted = TRUE - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) """) long countLegalSubmissionsByExerciseIdSubmittedIgnoreTestRunSubmissions(@Param("exerciseId") long exerciseId); @@ -422,7 +422,7 @@ SELECT COUNT (DISTINCT p) * @return list of exercises with the count of distinct submissions belonging to the exercise id */ @Query(""" - SELECT new de.tum.in.www1.artemis.domain.assessment.dashboard.ExerciseMapEntry( + SELECT new de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseMapEntry( p.exercise.id, count(DISTINCT p) ) @@ -431,7 +431,7 @@ SELECT COUNT (DISTINCT p) WHERE p.exercise.id IN :exerciseIds AND p.testRun = FALSE AND s.submitted = TRUE - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) GROUP BY p.exercise.id """) List countSubmissionsByExerciseIdsSubmittedIgnoreTestRun(@Param("exerciseIds") Set exerciseIds); @@ -451,7 +451,7 @@ SELECT COUNT (DISTINCT p) WHERE p.exercise.id = :exerciseId AND p.testRun = FALSE AND r.submission.submitted = TRUE - AND (r.submission.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR r.submission.type IS NULL) + AND (r.submission.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR r.submission.type IS NULL) AND r.assessor IS NOT NULL AND r.completionDate IS NOT NULL """) @@ -469,9 +469,9 @@ SELECT COUNT (DISTINCT p) SELECT COUNT (DISTINCT p) FROM ProgrammingExerciseStudentParticipation p JOIN p.submissions s - WHERE p.exercise.assessmentType <> de.tum.in.www1.artemis.domain.enumeration.AssessmentType.AUTOMATIC + WHERE p.exercise.assessmentType <> de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.AUTOMATIC AND p.exercise.exerciseGroup.exam.id = :examId - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) """) long countLegalSubmissionsByExamIdSubmitted(@Param("examId") long examId); @@ -487,10 +487,10 @@ SELECT COUNT (DISTINCT p) SELECT COUNT (DISTINCT p) FROM ProgrammingExerciseStudentParticipation p JOIN p.submissions s - WHERE p.exercise.assessmentType <> de.tum.in.www1.artemis.domain.enumeration.AssessmentType.AUTOMATIC + WHERE p.exercise.assessmentType <> de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.AUTOMATIC AND p.exercise.id IN :exerciseIds AND s.submitted = TRUE - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) """) long countAllSubmissionsByExerciseIdsSubmitted(@Param("exerciseIds") Set exerciseIds); diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseStudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseStudentParticipationRepository.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseStudentParticipationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseStudentParticipationRepository.java index 2793a9c077a1..4e580da3d340 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseStudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseStudentParticipationRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.time.ZonedDateTime; @@ -16,8 +16,8 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Participation entity. @@ -37,7 +37,7 @@ public interface ProgrammingExerciseStudentParticipationRepository extends Artem AND (pr.id = ( SELECT MAX(prr.id) FROM p.results prr - WHERE (prr.assessmentType = de.tum.in.www1.artemis.domain.enumeration.AssessmentType.AUTOMATIC + WHERE (prr.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.AUTOMATIC OR (prr.completionDate IS NOT NULL AND (p.exercise.assessmentDueDate IS NULL OR p.exercise.assessmentDueDate < :dateTime) ) @@ -210,9 +210,9 @@ default ProgrammingExerciseStudentParticipation findWithTeamStudentsByIdElseThro @Modifying @Query(""" UPDATE ProgrammingExerciseStudentParticipation p - SET p.buildPlanId = NULL, p.initializationState = de.tum.in.www1.artemis.domain.enumeration.InitializationState.INACTIVE + SET p.buildPlanId = NULL, p.initializationState = de.tum.cit.aet.artemis.domain.enumeration.InitializationState.INACTIVE WHERE p.exercise.id = :#{#exerciseId} - AND p.initializationState = de.tum.in.www1.artemis.domain.enumeration.InitializationState.INITIALIZED + AND p.initializationState = de.tum.cit.aet.artemis.domain.enumeration.InitializationState.INITIALIZED """) void unsetBuildPlanIdForExercise(@Param("exerciseId") Long exerciseId); } diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseTestCaseRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseTestCaseRepository.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseTestCaseRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseTestCaseRepository.java index 6e93f0e0967a..200ecc9c5159 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseTestCaseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseTestCaseRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Optional; import java.util.Set; @@ -10,8 +10,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the ProgrammingExerciseTestCase entity. @@ -75,16 +75,16 @@ default ProgrammingExerciseTestCase findByIdWithExerciseElseThrow(long testCaseI Set findByExerciseIdAndActive(long exerciseId, Boolean active); /** - * Returns the number of test cases marked as {@link de.tum.in.www1.artemis.domain.enumeration.Visibility#AFTER_DUE_DATE} for the given exercise. + * Returns the number of test cases marked as {@link de.tum.cit.aet.artemis.domain.enumeration.Visibility#AFTER_DUE_DATE} for the given exercise. * * @param exerciseId the exercise which test cases should be considered. - * @return the number of test cases marked as {@link de.tum.in.www1.artemis.domain.enumeration.Visibility#AFTER_DUE_DATE}. + * @return the number of test cases marked as {@link de.tum.cit.aet.artemis.domain.enumeration.Visibility#AFTER_DUE_DATE}. */ @Query(""" SELECT COUNT(DISTINCT testCase) FROM ProgrammingExerciseTestCase testCase WHERE testCase.exercise.id = :exerciseId - AND testCase.visibility = de.tum.in.www1.artemis.domain.enumeration.Visibility.AFTER_DUE_DATE + AND testCase.visibility = de.tum.cit.aet.artemis.domain.enumeration.Visibility.AFTER_DUE_DATE """) long countAfterDueDateByExerciseId(@Param("exerciseId") long exerciseId); } diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ProgrammingSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionRepository.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/repository/ProgrammingSubmissionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionRepository.java index e913d375a633..dc04290215bf 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ProgrammingSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.Collections; @@ -17,9 +17,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.service.dto.ProgrammingSubmissionIdAndSubmissionDateDTO; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.service.dto.ProgrammingSubmissionIdAndSubmissionDateDTO; /** * Spring Data JPA repository for the ProgrammingSubmission entity. @@ -48,7 +48,7 @@ default ProgrammingSubmission findFirstByParticipationIdAndCommitHashOrderByIdDe } @Query(value = """ - SELECT new de.tum.in.www1.artemis.service.dto.ProgrammingSubmissionIdAndSubmissionDateDTO(ps.id, ps.submissionDate) + SELECT new de.tum.cit.aet.artemis.service.dto.ProgrammingSubmissionIdAndSubmissionDateDTO(ps.id, ps.submissionDate) FROM ProgrammingSubmission ps WHERE ps.participation.id = :participationId ORDER BY ps.submissionDate DESC """) @@ -77,13 +77,13 @@ default Optional findFirstByParticipationIdWithResultsOrd } @Query(""" - SELECT new de.tum.in.www1.artemis.service.dto.ProgrammingSubmissionIdAndSubmissionDateDTO(s.id, s.submissionDate) + SELECT new de.tum.cit.aet.artemis.service.dto.ProgrammingSubmissionIdAndSubmissionDateDTO(s.id, s.submissionDate) FROM ProgrammingSubmission s JOIN s.participation p JOIN p.exercise e WHERE p.id = :participationId - AND (s.type = de.tum.in.www1.artemis.domain.enumeration.SubmissionType.INSTRUCTOR - OR s.type = de.tum.in.www1.artemis.domain.enumeration.SubmissionType.TEST + AND (s.type = de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.INSTRUCTOR + OR s.type = de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.TEST OR e.dueDate IS NULL OR s.submissionDate <= e.dueDate) ORDER BY s.submissionDate DESC diff --git a/src/main/java/de/tum/in/www1/artemis/repository/PushNotificationDeviceConfigurationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/PushNotificationDeviceConfigurationRepository.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/repository/PushNotificationDeviceConfigurationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/PushNotificationDeviceConfigurationRepository.java index 1f8b36b32de3..7332ebe5fdc6 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/PushNotificationDeviceConfigurationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/PushNotificationDeviceConfigurationRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Set; @@ -12,11 +12,11 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.push_notification.PushNotificationDeviceConfiguration; -import de.tum.in.www1.artemis.domain.push_notification.PushNotificationDeviceConfigurationId; -import de.tum.in.www1.artemis.domain.push_notification.PushNotificationDeviceType; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfiguration; +import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfigurationId; +import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceType; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * The Repository used for PushNotificationDeviceConfiguration diff --git a/src/main/java/de/tum/in/www1/artemis/repository/QuizBatchRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/QuizBatchRepository.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/repository/QuizBatchRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/QuizBatchRepository.java index 4859410697c2..fe37598f5dd2 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/QuizBatchRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/QuizBatchRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Optional; import java.util.Set; @@ -10,9 +10,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.quiz.QuizBatch; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the QuizBatch entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/QuizExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/QuizExerciseRepository.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/repository/QuizExerciseRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/QuizExerciseRepository.java index 30633a87b940..021d84abc3c9 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/QuizExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/QuizExerciseRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.time.ZonedDateTime; @@ -17,8 +17,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the QuizExercise entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/QuizGroupRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/QuizGroupRepository.java similarity index 59% rename from src/main/java/de/tum/in/www1/artemis/repository/QuizGroupRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/QuizGroupRepository.java index 7ed1ad585377..3da1b1adda9d 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/QuizGroupRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/QuizGroupRepository.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.quiz.QuizGroup; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.quiz.QuizGroup; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the QuizGroup entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/QuizPointStatisticRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/QuizPointStatisticRepository.java similarity index 58% rename from src/main/java/de/tum/in/www1/artemis/repository/QuizPointStatisticRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/QuizPointStatisticRepository.java index 283849e5d3b4..b41e34c08761 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/QuizPointStatisticRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/QuizPointStatisticRepository.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.quiz.QuizPointStatistic; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.quiz.QuizPointStatistic; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the QuizPointStatistic entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/QuizPoolRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/QuizPoolRepository.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/repository/QuizPoolRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/QuizPoolRepository.java index 4bcd85050d26..ba7f41d980c7 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/QuizPoolRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/QuizPoolRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Optional; @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.quiz.QuizPool; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.quiz.QuizPool; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the QuizPool entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/QuizQuestionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/QuizQuestionRepository.java similarity index 76% rename from src/main/java/de/tum/in/www1/artemis/repository/QuizQuestionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/QuizQuestionRepository.java index 2fc773a7b73f..4ea93f686c5d 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/QuizQuestionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/QuizQuestionRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Optional; import java.util.Set; @@ -10,9 +10,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the QuizQuestion entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/QuizQuestionStatisticRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/QuizQuestionStatisticRepository.java similarity index 59% rename from src/main/java/de/tum/in/www1/artemis/repository/QuizQuestionStatisticRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/QuizQuestionStatisticRepository.java index eec072f1c7fd..276bb12de62e 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/QuizQuestionStatisticRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/QuizQuestionStatisticRepository.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestionStatistic; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestionStatistic; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the QuizQuestionStatistic entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/QuizSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/QuizSubmissionRepository.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/repository/QuizSubmissionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/QuizSubmissionRepository.java index a7b2a5c1d107..bb13922b3e08 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/QuizSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/QuizSubmissionRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.Optional; @@ -12,8 +12,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the QuizSubmission entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/RatingRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/RatingRepository.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/repository/RatingRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/RatingRepository.java index 9f71db5c372f..90e382c55164 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/RatingRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/RatingRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Optional; @@ -12,9 +12,9 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import de.tum.in.www1.artemis.domain.Rating; -import de.tum.in.www1.artemis.domain.assessment.dashboard.ExerciseRatingCount; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.Rating; +import de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseRatingCount; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Rating entity. @@ -38,7 +38,7 @@ public interface RatingRepository extends ArtemisJpaRepository { // Valid JPQL syntax, only SCA is not able to parse it @Query(""" - SELECT new de.tum.in.www1.artemis.domain.assessment.dashboard.ExerciseRatingCount( + SELECT new de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseRatingCount( CAST(SUM(ra.rating) AS double) / SUM(CASE WHEN ra.rating IS NOT NULL THEN 1 ELSE 0 END), SUM(CASE WHEN ra.rating IS NOT NULL THEN 1 ELSE 0 END)) FROM Result r diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ResultRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ResultRepository.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/repository/ResultRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/ResultRepository.java index d0a20634642a..9d82f39b7215 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ResultRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ResultRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static java.util.Arrays.asList; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -21,23 +21,23 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.ExampleSubmission; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.assessment.dashboard.ResultCount; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.leaderboard.tutor.TutorLeaderboardAssessments; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.service.util.RoundingUtil; -import de.tum.in.www1.artemis.web.rest.dto.DueDateStat; -import de.tum.in.www1.artemis.web.rest.dto.ResultWithPointsPerGradingCriterionDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.assessment.dashboard.ResultCount; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardAssessments; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.service.util.RoundingUtil; +import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; +import de.tum.cit.aet.artemis.web.rest.dto.ResultWithPointsPerGradingCriterionDTO; /** * Spring Data JPA repository for the Result entity. @@ -73,7 +73,7 @@ LEFT JOIN TREAT (r.participation AS ProgrammingExerciseStudentParticipation) sp SELECT MAX(rr.completionDate) FROM Result rr LEFT JOIN TREAT (rr.participation AS ProgrammingExerciseStudentParticipation) sp2 - WHERE rr.assessmentType = de.tum.in.www1.artemis.domain.enumeration.AssessmentType.AUTOMATIC + WHERE rr.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.AUTOMATIC AND sp2.exercise.id = :exerciseId AND sp2.student = sp.student ) @@ -238,7 +238,7 @@ default Optional findFirstByParticipationIdAndRatedWithSubmissionOrderBy * @return a list with 3 elements: count of rated (in time) and unrated (late) assessments of a course and count of assessments without rating (null) */ @Query(""" - SELECT new de.tum.in.www1.artemis.domain.assessment.dashboard.ResultCount(r.rated, COUNT(r)) + SELECT new de.tum.cit.aet.artemis.domain.assessment.dashboard.ResultCount(r.rated, COUNT(r)) FROM Result r JOIN r.participation p WHERE r.completionDate IS NOT NULL @@ -392,7 +392,7 @@ SELECT COUNT(DISTINCT p) AND p.student.id = :studentId AND r.score IS NOT NULL AND r.completionDate IS NOT NULL - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) ORDER BY p.id DESC, s.id DESC, r.id DESC """) List getResultsOrderedByParticipationIdLegalSubmissionIdResultIdDescForStudent(@Param("exerciseId") long exerciseId, @Param("studentId") long studentId); @@ -407,7 +407,7 @@ SELECT COUNT(DISTINCT p) AND p.team.id = :teamId AND r.score IS NOT NULL AND r.completionDate IS NOT NULL - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) ORDER BY p.id DESC, s.id DESC, r.id DESC """) List getResultsOrderedByParticipationIdLegalSubmissionIdResultIdDescForTeam(@Param("exerciseId") long exerciseId, @Param("teamId") long teamId); @@ -423,7 +423,7 @@ SELECT COUNT(DISTINCT p) AND r.score IS NOT NULL AND r.completionDate IS NOT NULL AND r.rated = TRUE - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) ORDER BY p.id DESC, s.id DESC, r.id DESC """) List getRatedResultsOrderedByParticipationIdLegalSubmissionIdResultIdDescForStudent(@Param("exerciseId") long exerciseId, @Param("studentId") long studentId); @@ -439,7 +439,7 @@ SELECT COUNT(DISTINCT p) AND r.score IS NOT NULL AND r.completionDate IS NOT NULL AND r.rated = TRUE - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) ORDER BY p.id DESC, s.id DESC, r.id DESC """) List getRatedResultsOrderedByParticipationIdLegalSubmissionIdResultIdDescForTeam(@Param("exerciseId") long exerciseId, @Param("teamId") long teamId); @@ -599,7 +599,7 @@ else if (Boolean.FALSE.equals(ratedCount.rated())) { // Valid JPQL syntax, only SCA is not able to parse it @Query(""" - SELECT new de.tum.in.www1.artemis.domain.leaderboard.tutor.TutorLeaderboardAssessments( + SELECT new de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardAssessments( r.assessor.id, COUNT(r), SUM(e.maxPoints), @@ -622,7 +622,7 @@ else if (Boolean.FALSE.equals(ratedCount.rated())) { // Valid JPQL syntax, only SCA is not able to parse it @Query(""" - SELECT new de.tum.in.www1.artemis.domain.leaderboard.tutor.TutorLeaderboardAssessments( + SELECT new de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardAssessments( r.assessor.id, COUNT(r), SUM(e.maxPoints), @@ -642,7 +642,7 @@ else if (Boolean.FALSE.equals(ratedCount.rated())) { List findTutorLeaderboardAssessmentByExerciseId(@Param("exerciseId") long exerciseId); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.leaderboard.tutor.TutorLeaderboardAssessments( + SELECT new de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardAssessments( r.assessor.id, COUNT(r), SUM(e.maxPoints), diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ShortAnswerMappingRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ShortAnswerMappingRepository.java similarity index 58% rename from src/main/java/de/tum/in/www1/artemis/repository/ShortAnswerMappingRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/ShortAnswerMappingRepository.java index c4fe5287ee9f..107bf2f8a925 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ShortAnswerMappingRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ShortAnswerMappingRepository.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerMapping; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerMapping; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the ShortAnswerMapping entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/SingleUserNotificationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/SingleUserNotificationRepository.java similarity index 58% rename from src/main/java/de/tum/in/www1/artemis/repository/SingleUserNotificationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/SingleUserNotificationRepository.java index 4a1994a11270..2a9212b96b2a 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/SingleUserNotificationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/SingleUserNotificationRepository.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.notification.SingleUserNotification; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.notification.SingleUserNotification; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the Notification entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/SlideRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/SlideRepository.java similarity index 68% rename from src/main/java/de/tum/in/www1/artemis/repository/SlideRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/SlideRepository.java index 7a867f727b50..44c79b814f62 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/SlideRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/SlideRepository.java @@ -1,14 +1,14 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.lecture.Slide; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.lecture.Slide; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Attachment Unit entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/SolutionProgrammingExerciseParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/SolutionProgrammingExerciseParticipationRepository.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/repository/SolutionProgrammingExerciseParticipationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/SolutionProgrammingExerciseParticipationRepository.java index 6f7746473011..6de6f943b2b1 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/SolutionProgrammingExerciseParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/SolutionProgrammingExerciseParticipationRepository.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository.SolutionParticipationFetchOptions; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository.SolutionParticipationFetchOptions; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.Collection; @@ -16,14 +16,14 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.DomainObject_; -import de.tum.in.www1.artemis.domain.Submission_; -import de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation_; -import de.tum.in.www1.artemis.domain.participation.TemplateProgrammingExerciseParticipation_; -import de.tum.in.www1.artemis.repository.base.DynamicSpecificationRepository; -import de.tum.in.www1.artemis.repository.base.FetchOptions; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.DomainObject_; +import de.tum.cit.aet.artemis.domain.Submission_; +import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation_; +import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation_; +import de.tum.cit.aet.artemis.repository.base.DynamicSpecificationRepository; +import de.tum.cit.aet.artemis.repository.base.FetchOptions; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Spring Data JPA repository for the Participation entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/SourceRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/SourceRepository.java similarity index 57% rename from src/main/java/de/tum/in/www1/artemis/repository/SourceRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/SourceRepository.java index 2e370d3555e6..425d0df13bb0 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/SourceRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/SourceRepository.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.competency.Source; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.competency.Source; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the {@link Source} entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/StaticCodeAnalysisCategoryRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/StaticCodeAnalysisCategoryRepository.java similarity index 65% rename from src/main/java/de/tum/in/www1/artemis/repository/StaticCodeAnalysisCategoryRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/StaticCodeAnalysisCategoryRepository.java index ce10f9309a61..489ce53be2af 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/StaticCodeAnalysisCategoryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/StaticCodeAnalysisCategoryRepository.java @@ -1,14 +1,14 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Set; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.StaticCodeAnalysisCategory; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisCategory; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the StaticCodeAnalysisCategory entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/StatisticsRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/StatisticsRepository.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/repository/StatisticsRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/StatisticsRepository.java index d931081cbde8..7dbf711e3d8b 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/StatisticsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/StatisticsRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.DayOfWeek; import java.time.Instant; @@ -25,14 +25,14 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.GraphType; -import de.tum.in.www1.artemis.domain.enumeration.SpanType; -import de.tum.in.www1.artemis.domain.enumeration.StatisticsView; -import de.tum.in.www1.artemis.domain.statistics.CourseStatisticsAverageScore; -import de.tum.in.www1.artemis.domain.statistics.StatisticsEntry; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.GraphType; +import de.tum.cit.aet.artemis.domain.enumeration.SpanType; +import de.tum.cit.aet.artemis.domain.enumeration.StatisticsView; +import de.tum.cit.aet.artemis.domain.statistics.CourseStatisticsAverageScore; +import de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the statistics pages @@ -42,7 +42,7 @@ public interface StatisticsRepository extends ArtemisJpaRepository { @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( s.submissionDate, count(s.id) ) @@ -59,7 +59,7 @@ OR EXISTS (SELECT c FROM Course c WHERE s.participation.exercise.course.testCour List getTotalSubmissions(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( s.submissionDate, count(s.id) ) @@ -74,7 +74,7 @@ List getTotalSubmissionsForCourse(@Param("startDate") ZonedDate @Param("exerciseIds") List exerciseIds); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( s.submissionDate, count(s.id) ) @@ -89,7 +89,7 @@ List getTotalSubmissionsForExercise(@Param("startDate") ZonedDa @Param("exerciseId") long exerciseId); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( submission.submissionDate, p.student.login ) @@ -138,7 +138,7 @@ SELECT COUNT(DISTINCT p.student.id) Long countActiveUsers(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( submission.submissionDate, p.student.login ) @@ -154,7 +154,7 @@ List getActiveUsersForCourse(@Param("startDate") ZonedDateTime @Param("exerciseIds") List exerciseIds); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( submission.submissionDate, p.student.login ) @@ -169,7 +169,7 @@ List getActiveUsersForCourse(@Param("startDate") ZonedDateTime List getActiveUsersForExercise(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate, @Param("exerciseId") long exerciseId); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( e.releaseDate, COUNT(e.id) ) FROM Exercise e @@ -182,7 +182,7 @@ e.releaseDate, COUNT(e.id) List getReleasedExercises(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( e.releaseDate, COUNT(e.id) ) FROM Exercise e @@ -196,7 +196,7 @@ List getReleasedExercisesForCourse(@Param("startDate") ZonedDat @Param("exerciseIds") List exerciseIds); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( e.dueDate, COUNT(e.id) ) FROM Exercise e @@ -209,7 +209,7 @@ e.dueDate, COUNT(e.id) List getExercisesDue(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( e.dueDate, count(e.id) ) FROM Exercise e @@ -223,7 +223,7 @@ List getExercisesDueForCourse(@Param("startDate") ZonedDateTime @Param("exerciseIds") List exerciseIds); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( p.auditEventDate, u.login ) FROM User u @@ -236,7 +236,7 @@ List getExercisesDueForCourse(@Param("startDate") ZonedDateTime List getLoggedInUsers(@Param("startDate") Instant startDate, @Param("endDate") Instant endDate); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( e.endDate, COUNT(e.id) ) FROM Exam e @@ -249,7 +249,7 @@ e.endDate, COUNT(e.id) List getConductedExams(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( e.endDate, COUNT(e.id) ) FROM Exam e @@ -262,7 +262,7 @@ e.endDate, COUNT(e.id) List getConductedExamsForCourse(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate, @Param("courseId") long courseId); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( e.endDate, COUNT(e.id) ) FROM Exam e @@ -277,7 +277,7 @@ e.endDate, COUNT(e.id) List getExamParticipations(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( e.endDate, COUNT(e.id) ) FROM Exam e @@ -292,7 +292,7 @@ e.endDate, COUNT(e.id) List getExamParticipationsForCourse(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate, @Param("courseId") long courseId); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( e.endDate, SUM(SIZE(e.examUsers)) ) FROM Exam e @@ -305,7 +305,7 @@ e.endDate, SUM(SIZE(e.examUsers)) List getExamRegistrations(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( e.endDate, SUM(SIZE(e.examUsers)) ) FROM Exam e @@ -318,7 +318,7 @@ e.endDate, SUM(SIZE(e.examUsers)) List getExamRegistrationsForCourse(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate, @Param("courseId") long courseId); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( r.completionDate, r.assessor.login ) @@ -326,8 +326,8 @@ e.endDate, SUM(SIZE(e.examUsers)) WHERE r.completionDate >= :startDate AND r.completionDate <= :endDate AND ( - r.assessmentType = de.tum.in.www1.artemis.domain.enumeration.AssessmentType.MANUAL - OR r.assessmentType = de.tum.in.www1.artemis.domain.enumeration.AssessmentType.SEMI_AUTOMATIC + r.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.MANUAL + OR r.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.SEMI_AUTOMATIC ) AND r.assessor.login NOT LIKE '%test%' AND ( r.participation.exercise.exerciseGroup IS NOT NULL @@ -337,7 +337,7 @@ OR EXISTS (SELECT c FROM Course c WHERE r.participation.exercise.course.testCour List getActiveTutors(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( r.completionDate, r.assessor.login ) @@ -345,8 +345,8 @@ OR EXISTS (SELECT c FROM Course c WHERE r.participation.exercise.course.testCour WHERE r.completionDate >= :startDate AND r.completionDate <= :endDate AND ( - r.assessmentType = de.tum.in.www1.artemis.domain.enumeration.AssessmentType.MANUAL - OR r.assessmentType = de.tum.in.www1.artemis.domain.enumeration.AssessmentType.SEMI_AUTOMATIC + r.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.MANUAL + OR r.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.SEMI_AUTOMATIC ) AND r.assessor.login NOT LIKE '%test%' AND r.participation.exercise.id IN :exerciseIds """) @@ -354,7 +354,7 @@ List getActiveTutorsForCourse(@Param("startDate") ZonedDateTime @Param("exerciseIds") List exerciseIds); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( r.completionDate, r.assessor.login ) @@ -362,15 +362,15 @@ List getActiveTutorsForCourse(@Param("startDate") ZonedDateTime WHERE r.completionDate >= :startDate AND r.completionDate <= :endDate AND ( - r.assessmentType = de.tum.in.www1.artemis.domain.enumeration.AssessmentType.MANUAL - OR r.assessmentType = de.tum.in.www1.artemis.domain.enumeration.AssessmentType.SEMI_AUTOMATIC + r.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.MANUAL + OR r.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.SEMI_AUTOMATIC ) AND r.assessor.login NOT LIKE '%test%' AND r.participation.exercise.id = :exerciseId """) List getActiveTutorsForExercise(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate, @Param("exerciseId") long exerciseId); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( r.completionDate, COUNT(r.id) ) FROM Result r @@ -386,7 +386,7 @@ OR EXISTS (SELECT c FROM Course c WHERE r.participation.exercise.course.testCour List getCreatedResults(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( r.completionDate, COUNT(r.id) ) FROM Result r @@ -400,7 +400,7 @@ List getCreatedResultsForCourse(@Param("startDate") ZonedDateTi @Param("exerciseIds") List exerciseIds); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( r.completionDate, COUNT(r.id) ) FROM Result r @@ -413,7 +413,7 @@ r.completionDate, COUNT(r.id) List getCreatedResultsForExercise(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate, @Param("exerciseId") long exerciseId); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( r.completionDate, SUM(SIZE(r.feedbacks)) ) FROM Result r @@ -428,7 +428,7 @@ OR EXISTS(SELECT c FROM Course c WHERE r.participation.exercise.course.testCours List getResultFeedbacks(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( r.completionDate, SUM(SIZE(r.feedbacks)) ) FROM Result r @@ -442,7 +442,7 @@ List getResultFeedbacksForCourse(@Param("startDate") ZonedDateT @Param("exerciseIds") List exerciseIds); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( r.completionDate, SUM(SIZE(r.feedbacks)) ) FROM Result r @@ -455,7 +455,7 @@ r.completionDate, SUM(SIZE(r.feedbacks)) List getResultFeedbacksForExercise(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate, @Param("exerciseId") long exerciseId); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( post.creationDate, COUNT(post.id) ) FROM Post post @@ -470,7 +470,7 @@ LEFT JOIN TREAT (post.conversation AS Channel) channel List getPostsForCourseInDateRange(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate, @Param("courseId") long courseId); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( post.creationDate, COUNT(post.id) ) FROM Post post @@ -503,7 +503,7 @@ LEFT JOIN TREAT (post.conversation AS Channel) channel long getNumberOfResolvedExercisePosts(@Param("exerciseId") long exerciseId); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( answer.creationDate, COUNT(answer.id) ) FROM AnswerPost answer @@ -520,7 +520,7 @@ LEFT JOIN TREAT (post.conversation AS Channel) channel List getResolvedCoursePostsInDateRange(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate, @Param("courseId") long courseId); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( answer.creationDate, COUNT(answer.id) ) FROM AnswerPost answer @@ -544,7 +544,7 @@ List getResolvedExercisePostsInDateRange(@Param("startDate") Zo List findExerciseIdsByCourseId(@Param("courseId") long courseId); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.statistics.CourseStatisticsAverageScore( + SELECT new de.tum.cit.aet.artemis.domain.statistics.CourseStatisticsAverageScore( p.exercise.id, p.exercise.title, p.exercise.releaseDate, diff --git a/src/main/java/de/tum/in/www1/artemis/repository/StudentExamRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/StudentExamRepository.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/repository/StudentExamRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/StudentExamRepository.java index 864af9b0a336..663a1dd627d7 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/StudentExamRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/StudentExamRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.security.SecureRandom; @@ -21,16 +21,16 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.service.exam.ExamQuizQuestionsGenerator; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.service.exam.ExamQuizQuestionsGenerator; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Spring Data JPA repository for the StudentExam entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/StudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/StudentParticipationRepository.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/repository/StudentParticipationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/StudentParticipationRepository.java index 83c8b716db94..296426d9bab9 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/StudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/StudentParticipationRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static java.util.stream.Collectors.toMap; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -27,19 +27,19 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.participation.IdToPresentationScoreSum; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmittedAnswerCount; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.web.rest.dto.feedback.FeedbackDetailDTO; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.participation.IdToPresentationScoreSum; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmittedAnswerCount; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.web.rest.dto.feedback.FeedbackDetailDTO; /** * Spring Data JPA repository for the Participation entity. @@ -89,7 +89,7 @@ SELECT COUNT(p.id) > 0 WHERE p.testRun = FALSE AND p.exercise.exerciseGroup.exam.id = :examId AND r.rated = TRUE - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) """) List findByExamIdWithEagerLegalSubmissionsRatedResults(@Param("examId") long examId); @@ -123,7 +123,7 @@ SELECT COUNT(p.id) > 0 LEFT JOIN FETCH p.submissions s WHERE p.exercise.id = :exerciseId AND p.student.login = :username - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) """) Optional findWithEagerLegalSubmissionsByExerciseIdAndStudentLogin(@Param("exerciseId") long exerciseId, @Param("username") String username); @@ -133,7 +133,7 @@ SELECT COUNT(p.id) > 0 LEFT JOIN FETCH p.submissions s WHERE p.exercise.id = :exerciseId AND p.student.login = :username - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) AND p.testRun = :testRun """) Optional findWithEagerLegalSubmissionsByExerciseIdAndStudentLoginAndTestRun(@Param("exerciseId") long exerciseId, @Param("username") String username, @@ -155,7 +155,7 @@ Optional findWithEagerLegalSubmissionsByExerciseIdAndStude LEFT JOIN FETCH t.students WHERE p.exercise.id = :exerciseId AND p.team.id = :teamId - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) """) Optional findWithEagerLegalSubmissionsAndTeamStudentsByExerciseIdAndTeamId(@Param("exerciseId") long exerciseId, @Param("teamId") long teamId); @@ -185,7 +185,7 @@ SELECT COUNT(p) > 0 LEFT JOIN FETCH s.results WHERE p.exercise.id = :exerciseId AND p.testRun = :testRun - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) """) List findByExerciseIdAndTestRunWithEagerLegalSubmissionsResult(@Param("exerciseId") long exerciseId, @Param("testRun") boolean testRun); @@ -245,7 +245,7 @@ Optional findByExerciseIdAndStudentIdAndTestRunWithEagerSu WHERE p.exercise.id = :exerciseId AND ( r.id = (SELECT MAX(p_r.id) FROM p.results p_r) - OR r.assessmentType <> de.tum.in.www1.artemis.domain.enumeration.AssessmentType.AUTOMATIC + OR r.assessmentType <> de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.AUTOMATIC OR r IS NULL ) """) @@ -270,7 +270,7 @@ Optional findByExerciseIdAndStudentIdAndTestRunWithEagerSu WHERE p.exercise.id = :exerciseId AND ( r.id = (SELECT MAX(p_r.id) FROM p.results p_r) - OR r.assessmentType <> de.tum.in.www1.artemis.domain.enumeration.AssessmentType.AUTOMATIC + OR r.assessmentType <> de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.AUTOMATIC OR r IS NULL ) """) @@ -286,7 +286,7 @@ Optional findByExerciseIdAndStudentIdAndTestRunWithEagerSu WHERE p.exercise.id = :exerciseId AND ( r.id = (SELECT MAX(p_r.id) FROM p.results p_r WHERE p_r.rated = TRUE) - OR r.assessmentType <> de.tum.in.www1.artemis.domain.enumeration.AssessmentType.AUTOMATIC + OR r.assessmentType <> de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.AUTOMATIC OR r IS NULL ) """) @@ -299,8 +299,8 @@ Optional findByExerciseIdAndStudentIdAndTestRunWithEagerSu LEFT JOIN FETCH r.submission s WHERE p.exercise.id = :exerciseId AND p.testRun = :testRun - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) - AND r.assessmentType <> de.tum.in.www1.artemis.domain.enumeration.AssessmentType.AUTOMATIC + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND r.assessmentType <> de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.AUTOMATIC AND r.id = (SELECT MAX(r2.id) FROM p.results r2 WHERE r2.completionDate IS NOT NULL) """) Set findByExerciseIdAndTestRunWithEagerLegalSubmissionsAndLatestResultWithCompletionDate(@Param("exerciseId") long exerciseId, @@ -324,9 +324,9 @@ Set findByExerciseIdAndTestRunWithEagerLegalSubmissionsAnd SELECT MAX(pr.id) FROM p.results pr LEFT JOIN pr.submission prs - WHERE pr.assessmentType = de.tum.in.www1.artemis.domain.enumeration.AssessmentType.AUTOMATIC + WHERE pr.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.AUTOMATIC AND ( - prs.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL + prs.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR prs.type IS NULL ) )) @@ -356,9 +356,9 @@ default List findByExerciseIdWithLatestAutomaticResultAndF SELECT MAX(pr.id) FROM p.results pr LEFT JOIN pr.submission prs - WHERE pr.assessmentType = de.tum.in.www1.artemis.domain.enumeration.AssessmentType.AUTOMATIC + WHERE pr.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.AUTOMATIC AND ( - prs.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL + prs.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR prs.type IS NULL ) )) @@ -374,10 +374,10 @@ SELECT MAX(pr.id) LEFT JOIN FETCH f.testCase LEFT JOIN FETCH r.submission s WHERE p.exercise.id = :exerciseId - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) AND ( - r.assessmentType = de.tum.in.www1.artemis.domain.enumeration.AssessmentType.MANUAL - OR r.assessmentType = de.tum.in.www1.artemis.domain.enumeration.AssessmentType.SEMI_AUTOMATIC + r.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.MANUAL + OR r.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.SEMI_AUTOMATIC ) """) List findByExerciseIdWithManualResultAndFeedbacksAndTestCases(@Param("exerciseId") long exerciseId); @@ -394,10 +394,10 @@ default List findByExerciseIdWithManualResultAndFeedbacksA LEFT JOIN FETCH f.testCase LEFT JOIN FETCH r.submission s WHERE p.id = :participationId - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) AND ( - r.assessmentType = de.tum.in.www1.artemis.domain.enumeration.AssessmentType.MANUAL - OR r.assessmentType = de.tum.in.www1.artemis.domain.enumeration.AssessmentType.SEMI_AUTOMATIC + r.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.MANUAL + OR r.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.SEMI_AUTOMATIC ) """) Optional findByIdWithManualResultAndFeedbacks(@Param("participationId") long participationId); @@ -408,7 +408,7 @@ default List findByExerciseIdWithManualResultAndFeedbacksA LEFT JOIN FETCH p.submissions s WHERE p.exercise.id = :exerciseId AND p.student.id = :studentId - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) """) List findByExerciseIdAndStudentIdWithEagerLegalSubmissions(@Param("exerciseId") long exerciseId, @Param("studentId") long studentId); @@ -436,7 +436,7 @@ default List findByExerciseIdWithManualResultAndFeedbacksA LEFT JOIN FETCH p.submissions s WHERE p.exercise.id = :exerciseId AND p.team.id = :teamId - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) """) List findByExerciseIdAndTeamIdWithEagerLegalSubmissions(@Param("exerciseId") long exerciseId, @Param("teamId") long teamId); @@ -460,8 +460,8 @@ default List findByExerciseIdWithManualResultAndFeedbacksA LEFT JOIN FETCH t.students WHERE p.exercise.id = :exerciseId AND p.team.id = :teamId - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) - AND (rs.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR rs.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (rs.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR rs.type IS NULL) """) List findByExerciseIdAndTeamIdWithEagerResultsAndLegalSubmissionsAndTeamStudents(@Param("exerciseId") long exerciseId, @Param("teamId") long teamId); @@ -479,7 +479,7 @@ default List findByExerciseIdWithManualResultAndFeedbacksA SELECT MAX(pr.id) FROM p.results pr LEFT JOIN pr.submission prs - WHERE prs.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL + WHERE prs.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR prs.type IS NULL ) OR r.id IS NULL) """) @@ -490,7 +490,7 @@ Optional findByExerciseIdAndStudentIdAndTestRunWithLatestR * Find all participations of submissions that are submitted and do not already have a manual result and do not belong to test runs. * No manual result means that no user has started an assessment for the corresponding submission yet. *

- * If a student can have multiple submissions per exercise type, the latest not {@link de.tum.in.www1.artemis.domain.enumeration.SubmissionType#ILLEGAL} ILLEGAL submission (by + * If a student can have multiple submissions per exercise type, the latest not {@link de.tum.cit.aet.artemis.domain.enumeration.SubmissionType#ILLEGAL} ILLEGAL submission (by * id) will be returned. * * @param correctionRound the correction round the fetched results should belong to @@ -521,15 +521,15 @@ SELECT COUNT(r) AND r.submission = submission AND r.completionDate IS NOT NULL AND r.assessmentType IN ( - de.tum.in.www1.artemis.domain.enumeration.AssessmentType.MANUAL, - de.tum.in.www1.artemis.domain.enumeration.AssessmentType.SEMI_AUTOMATIC + de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.MANUAL, + de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.SEMI_AUTOMATIC ) AND (p.exercise.dueDate IS NULL OR r.submission.submissionDate <= p.exercise.dueDate) ) AND :correctionRound = ( SELECT COUNT(prs) FROM p.results prs WHERE prs.assessmentType IN ( - de.tum.in.www1.artemis.domain.enumeration.AssessmentType.MANUAL, - de.tum.in.www1.artemis.domain.enumeration.AssessmentType.SEMI_AUTOMATIC + de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.MANUAL, + de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.SEMI_AUTOMATIC ) ) AND submission.submitted = TRUE AND submission.id = (SELECT MAX(s.id) FROM p.submissions s) @@ -553,8 +553,8 @@ AND NOT EXISTS ( SELECT prs FROM p.results prs WHERE prs.assessmentType IN ( - de.tum.in.www1.artemis.domain.enumeration.AssessmentType.MANUAL, - de.tum.in.www1.artemis.domain.enumeration.AssessmentType.SEMI_AUTOMATIC + de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.MANUAL, + de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.SEMI_AUTOMATIC ) ) AND s.submitted = TRUE AND s.id = (SELECT MAX(s.id) FROM p.submissions s) @@ -567,7 +567,7 @@ List findByExerciseIdWithLatestSubmissionWithoutManualResu FROM Participation p LEFT JOIN FETCH p.submissions s WHERE p.id = :participationId - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) """) Optional findWithEagerLegalSubmissionsById(@Param("participationId") long participationId); @@ -589,7 +589,7 @@ List findByExerciseIdWithLatestSubmissionWithoutManualResu LEFT JOIN FETCH r.submission s LEFT JOIN FETCH r.feedbacks WHERE p.id = :participationId - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) """) Optional findWithEagerResultsAndFeedbackById(@Param("participationId") long participationId); @@ -613,8 +613,8 @@ List findByExerciseIdWithLatestSubmissionWithoutManualResu LEFT JOIN FETCH p.team t LEFT JOIN FETCH t.students WHERE p.id = :participationId - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) - AND (rs.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR rs.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (rs.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR rs.type IS NULL) """) Optional findWithEagerLegalSubmissionsResultsFeedbacksById(@Param("participationId") long participationId); @@ -626,8 +626,8 @@ List findByExerciseIdWithLatestSubmissionWithoutManualResu LEFT JOIN FETCH p.submissions s LEFT JOIN FETCH r.assessor WHERE p.id = :participationId - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) - AND (rs.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR rs.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (rs.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR rs.type IS NULL) """) Optional findWithEagerLegalSubmissionsAndResultsAssessorsById(@Param("participationId") long participationId); @@ -699,8 +699,8 @@ default Page findAllWithEagerSubmissionsAndResultsByExerci LEFT JOIN FETCH p.submissions s LEFT JOIN FETCH s.results sr WHERE p.exercise.id = :exerciseId - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) - AND (rs.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR rs.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (rs.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR rs.type IS NULL) """) List findAllWithEagerLegalSubmissionsAndEagerResultsByExerciseId(@Param("exerciseId") long exerciseId); @@ -732,7 +732,7 @@ default Page findAllWithEagerSubmissionsAndResultsByExerci AND p.testRun = FALSE AND s.id = (SELECT MAX(s2.id) FROM p.submissions s2 - WHERE s2.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s2.type IS NULL) + WHERE s2.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s2.type IS NULL) AND r.id = (SELECT MAX(r2.id) FROM s.results r2 WHERE r2.rated = TRUE) @@ -819,7 +819,7 @@ List findTestRunParticipationsByStudentIdAndIndividualExer LEFT JOIN FETCH t.students teamStudent WHERE teamStudent.id = :studentId AND p.exercise IN :exercises - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) """) Set findByStudentIdAndTeamExercisesWithEagerLegalSubmissionsResult(@Param("studentId") long studentId, @Param("exercises") Collection exercises); @@ -832,7 +832,7 @@ Set findByStudentIdAndTeamExercisesWithEagerLegalSubmissio LEFT JOIN FETCH p.team t WHERE p.exercise.course.id = :courseId AND t.shortName = :teamShortName - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) """) List findAllByCourseIdAndTeamShortNameWithEagerLegalSubmissionsResult(@Param("courseId") long courseId, @Param("teamShortName") String teamShortName); @@ -864,7 +864,7 @@ SELECT p.id, COUNT(s) LEFT JOIN p.submissions s WHERE p.team.shortName = :teamShortName AND p.exercise.course.id = :courseId - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) GROUP BY p.id """) List countLegalSubmissionsPerParticipationByCourseIdAndTeamShortName(@Param("courseId") long courseId, @Param("teamShortName") String teamShortName); @@ -1147,7 +1147,7 @@ default void checkTestRunsExist(Exercise exercise) { } @Query(""" - SELECT new de.tum.in.www1.artemis.domain.quiz.QuizSubmittedAnswerCount(COUNT(a.id), s.id, p.id) + SELECT new de.tum.cit.aet.artemis.domain.quiz.QuizSubmittedAnswerCount(COUNT(a.id), s.id, p.id) FROM SubmittedAnswer a LEFT JOIN a.submission s LEFT JOIN s.participation p @@ -1181,7 +1181,7 @@ SELECT COALESCE(SUM(p.presentationScore), 0) * @return a set of id to presentation score sum mappings */ @Query(""" - SELECT new de.tum.in.www1.artemis.domain.participation.IdToPresentationScoreSum( + SELECT new de.tum.cit.aet.artemis.domain.participation.IdToPresentationScoreSum( COALESCE(p.student.id, ts.id), COALESCE(SUM(p.presentationScore), 0) ) @@ -1241,7 +1241,7 @@ SELECT COALESCE(AVG(p.presentationScore), 0) * @return a list of {@link FeedbackDetailDTO} objects, with the relative count and task number set to 0. */ @Query(""" - SELECT new de.tum.in.www1.artemis.web.rest.dto.feedback.FeedbackDetailDTO( + SELECT new de.tum.cit.aet.artemis.web.rest.dto.feedback.FeedbackDetailDTO( COUNT(f.id), 0, f.detailText, diff --git a/src/main/java/de/tum/in/www1/artemis/repository/StudentScoreRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/StudentScoreRepository.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/repository/StudentScoreRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/StudentScoreRepository.java index d7afb0bb7acd..6c9e1112cf2a 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/StudentScoreRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/StudentScoreRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.List; @@ -15,11 +15,11 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.scores.StudentScore; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.web.rest.dto.score.StudentScoreSum; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.scores.StudentScore; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.web.rest.dto.score.StudentScoreSum; @Profile(PROFILE_CORE) @Repository @@ -33,7 +33,7 @@ public interface StudentScoreRepository extends ArtemisJpaRepository findByExercise_IdAndUser_Id(long exerciseId, long userId); @Query(""" - SELECT new de.tum.in.www1.artemis.web.rest.dto.score.StudentScoreSum(u.id, COALESCE(SUM(s.lastRatedPoints), 0)) + SELECT new de.tum.cit.aet.artemis.web.rest.dto.score.StudentScoreSum(u.id, COALESCE(SUM(s.lastRatedPoints), 0)) FROM StudentScore s LEFT JOIN s.user u WHERE s.exercise IN :exercises diff --git a/src/main/java/de/tum/in/www1/artemis/repository/SubmissionPolicyRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/SubmissionPolicyRepository.java similarity index 77% rename from src/main/java/de/tum/in/www1/artemis/repository/SubmissionPolicyRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/SubmissionPolicyRepository.java index db96f3a3bc35..8f00ef86d241 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/SubmissionPolicyRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/SubmissionPolicyRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Collection; import java.util.Set; @@ -10,8 +10,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.submissionpolicy.SubmissionPolicy; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the SubmissionPolicy entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/SubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/SubmissionRepository.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/repository/SubmissionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/SubmissionRepository.java index 0a5d49596525..32507b714263 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/SubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/SubmissionRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.List; @@ -15,25 +15,25 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.FileUploadSubmission; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.assessment.dashboard.ExerciseMapEntry; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.web.rest.dto.DueDateStat; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseMapEntry; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Spring Data repository for the Submission entity. @@ -212,7 +212,7 @@ SELECT COUNT(DISTINCT s) FROM Submission s LEFT JOIN FETCH s.results r WHERE r.assessor.id IS NOT NULL - AND r.assessmentType <> de.tum.in.www1.artemis.domain.enumeration.AssessmentType.AUTOMATIC + AND r.assessmentType <> de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.AUTOMATIC AND r.completionDate IS NULL AND s.participation.exercise.exerciseGroup.exam.id = :examId """) @@ -294,7 +294,7 @@ SELECT COUNT(DISTINCT p) JOIN p.submissions s WHERE e.id = :exerciseId AND s.submitted = TRUE - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) AND (e.dueDate IS NULL OR s.submissionDate <= e.dueDate) """) long countByExerciseIdSubmittedBeforeDueDate(@Param("exerciseId") long exerciseId); @@ -314,7 +314,7 @@ SELECT COUNT(DISTINCT p) WHERE e.id = :exerciseId AND p.testRun = FALSE AND s.submitted = TRUE - AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) AND (e.dueDate IS NULL OR s.submissionDate <= e.dueDate) """) long countByExerciseIdSubmittedBeforeDueDateIgnoreTestRuns(@Param("exerciseId") long exerciseId); @@ -327,7 +327,7 @@ SELECT COUNT(DISTINCT p) * exercise due date at all */ @Query(""" - SELECT new de.tum.in.www1.artemis.domain.assessment.dashboard.ExerciseMapEntry( + SELECT new de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseMapEntry( p.exercise.id, COUNT(DISTINCT p) ) @@ -378,7 +378,7 @@ SELECT COUNT(DISTINCT s) * @return the numbers of submissions belonging to each exercise id, which have the submitted flag set to true and the submission date after the exercise due date */ @Query(""" - SELECT new de.tum.in.www1.artemis.domain.assessment.dashboard.ExerciseMapEntry( + SELECT new de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseMapEntry( e.id, COUNT(DISTINCT p) ) diff --git a/src/main/java/de/tum/in/www1/artemis/repository/SubmissionVersionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/SubmissionVersionRepository.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/repository/SubmissionVersionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/SubmissionVersionRepository.java index e7926f3c9625..00fe5c70b08d 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/SubmissionVersionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/SubmissionVersionRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Optional; @@ -10,8 +10,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.SubmissionVersion; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.SubmissionVersion; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the SubmissionVersion entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/SubmittedAnswerRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/SubmittedAnswerRepository.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/repository/SubmittedAnswerRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/SubmittedAnswerRepository.java index 713e76585ba7..f241a4db9585 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/SubmittedAnswerRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/SubmittedAnswerRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Collection; import java.util.Set; @@ -8,11 +8,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.domain.quiz.SubmittedAnswer; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the SubmittedAnswer entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/SystemNotificationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/SystemNotificationRepository.java similarity index 78% rename from src/main/java/de/tum/in/www1/artemis/repository/SystemNotificationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/SystemNotificationRepository.java index f060fdb74f9c..b4a0c0073277 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/SystemNotificationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/SystemNotificationRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.List; @@ -10,8 +10,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.notification.SystemNotification; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.notification.SystemNotification; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the Notification entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/TeamRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/TeamRepository.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/repository/TeamRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/TeamRepository.java index 357d065b9459..9507e67a304e 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/TeamRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/TeamRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.time.Instant; @@ -16,12 +16,12 @@ import org.springframework.data.util.Pair; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.in.www1.artemis.web.rest.errors.StudentsAlreadyAssignedException; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.rest.errors.StudentsAlreadyAssignedException; /** * Spring Data repository for the Team entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/TeamScoreRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/TeamScoreRepository.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/repository/TeamScoreRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/TeamScoreRepository.java index 83e7146866ea..c83fe5dc4eef 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/TeamScoreRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/TeamScoreRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.List; @@ -15,12 +15,12 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.scores.TeamScore; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.web.rest.dto.score.TeamScoreSum; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.scores.TeamScore; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.web.rest.dto.score.TeamScoreSum; @Profile(PROFILE_CORE) @Repository @@ -34,7 +34,7 @@ public interface TeamScoreRepository extends ArtemisJpaRepository findByExercise_IdAndTeam_Id(Long exerciseId, Long teamId); @Query(""" - SELECT new de.tum.in.www1.artemis.web.rest.dto.score.TeamScoreSum(t.id, COALESCE(SUM(s.lastRatedPoints), 0)) + SELECT new de.tum.cit.aet.artemis.web.rest.dto.score.TeamScoreSum(t.id, COALESCE(SUM(s.lastRatedPoints), 0)) FROM TeamScore s LEFT JOIN s.team t WHERE s.exercise IN :exercises diff --git a/src/main/java/de/tum/in/www1/artemis/repository/TemplateProgrammingExerciseParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/TemplateProgrammingExerciseParticipationRepository.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/repository/TemplateProgrammingExerciseParticipationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/TemplateProgrammingExerciseParticipationRepository.java index ee171c7922d3..4c643661c9d7 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/TemplateProgrammingExerciseParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/TemplateProgrammingExerciseParticipationRepository.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.repository.TemplateProgrammingExerciseParticipationRepository.TemplateParticipationFetchOptions; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository.TemplateParticipationFetchOptions; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.Collection; @@ -16,13 +16,13 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.DomainObject_; -import de.tum.in.www1.artemis.domain.Submission_; -import de.tum.in.www1.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.TemplateProgrammingExerciseParticipation_; -import de.tum.in.www1.artemis.repository.base.DynamicSpecificationRepository; -import de.tum.in.www1.artemis.repository.base.FetchOptions; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.DomainObject_; +import de.tum.cit.aet.artemis.domain.Submission_; +import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation_; +import de.tum.cit.aet.artemis.repository.base.DynamicSpecificationRepository; +import de.tum.cit.aet.artemis.repository.base.FetchOptions; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Spring Data JPA repository for the Participation entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/TextAssessmentEventRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/TextAssessmentEventRepository.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/repository/TextAssessmentEventRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/TextAssessmentEventRepository.java index 83997008937f..55570a938e7b 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/TextAssessmentEventRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/TextAssessmentEventRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static java.util.stream.Collectors.toMap; import java.util.List; @@ -11,8 +11,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.analytics.TextAssessmentEvent; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.analytics.TextAssessmentEvent; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the TextAssessmentEvent entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/TextBlockRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/TextBlockRepository.java similarity index 73% rename from src/main/java/de/tum/in/www1/artemis/repository/TextBlockRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/TextBlockRepository.java index cf9cfd5e44e0..e0e746aec6fc 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/TextBlockRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/TextBlockRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Set; @@ -9,8 +9,8 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import de.tum.in.www1.artemis.domain.TextBlock; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.TextBlock; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the TextBlock entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/TextExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/TextExerciseRepository.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/repository/TextExerciseRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/TextExerciseRepository.java index 07e4550f0b39..b3e5f4dec101 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/TextExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/TextExerciseRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.List; @@ -15,8 +15,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the TextExercise entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/TextSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/TextSubmissionRepository.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/repository/TextSubmissionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/TextSubmissionRepository.java index d3e87c2bd528..85600b1ebba9 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/TextSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/TextSubmissionRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.Optional; @@ -12,8 +12,8 @@ import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the TextSubmission entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/TextUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/TextUnitRepository.java similarity index 75% rename from src/main/java/de/tum/in/www1/artemis/repository/TextUnitRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/TextUnitRepository.java index 7e346d1179b6..8418ca89e835 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/TextUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/TextUnitRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Optional; @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.lecture.TextUnit; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.lecture.TextUnit; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Text Unit entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/TutorParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/TutorParticipationRepository.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/repository/TutorParticipationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/TutorParticipationRepository.java index a98e50f2ec8f..44a2cb51fc74 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/TutorParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/TutorParticipationRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.List; @@ -11,11 +11,11 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.participation.TutorParticipation; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the TutorParticipation entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/UserRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/UserRepository.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/repository/UserRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/UserRepository.java index fe1a76a116af..68132b3120d3 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/UserRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/UserRepository.java @@ -1,14 +1,14 @@ -package de.tum.in.www1.artemis.repository; - -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.repository.specs.UserSpecs.distinct; -import static de.tum.in.www1.artemis.repository.specs.UserSpecs.getActivatedOrDeactivatedSpecification; -import static de.tum.in.www1.artemis.repository.specs.UserSpecs.getAllUsersWithoutUserGroups; -import static de.tum.in.www1.artemis.repository.specs.UserSpecs.getAuthoritySpecification; -import static de.tum.in.www1.artemis.repository.specs.UserSpecs.getInternalOrExternalSpecification; -import static de.tum.in.www1.artemis.repository.specs.UserSpecs.getSearchTermSpecification; -import static de.tum.in.www1.artemis.repository.specs.UserSpecs.getWithOrWithoutRegistrationNumberSpecification; -import static de.tum.in.www1.artemis.repository.specs.UserSpecs.notSoftDeleted; +package de.tum.cit.aet.artemis.repository; + +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.repository.specs.UserSpecs.distinct; +import static de.tum.cit.aet.artemis.repository.specs.UserSpecs.getActivatedOrDeactivatedSpecification; +import static de.tum.cit.aet.artemis.repository.specs.UserSpecs.getAllUsersWithoutUserGroups; +import static de.tum.cit.aet.artemis.repository.specs.UserSpecs.getAuthoritySpecification; +import static de.tum.cit.aet.artemis.repository.specs.UserSpecs.getInternalOrExternalSpecification; +import static de.tum.cit.aet.artemis.repository.specs.UserSpecs.getSearchTermSpecification; +import static de.tum.cit.aet.artemis.repository.specs.UserSpecs.getWithOrWithoutRegistrationNumberSpecification; +import static de.tum.cit.aet.artemis.repository.specs.UserSpecs.notSoftDeleted; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.time.ZonedDateTime; @@ -38,19 +38,19 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; -import de.tum.in.www1.artemis.domain.ConversationNotificationRecipientSummary; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.Organization; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.SortingOrder; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.dto.UserDTO; -import de.tum.in.www1.artemis.service.dto.UserRoleDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.UserPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.ConversationNotificationRecipientSummary; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.Organization; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.dto.UserDTO; +import de.tum.cit.aet.artemis.service.dto.UserRoleDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.UserPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Spring Data JPA repository for the User entity.
@@ -135,9 +135,9 @@ public interface UserRepository extends ArtemisJpaRepository, JpaSpe * @return a list of {@link UserRoleDTO} objects containing the user ID, user login, and role for each user */ @Query(""" - SELECT new de.tum.in.www1.artemis.service.dto.UserRoleDTO(user.id, user.login, + SELECT new de.tum.cit.aet.artemis.service.dto.UserRoleDTO(user.id, user.login, CASE - WHEN :#{T(de.tum.in.www1.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities THEN 'INSTRUCTOR' + WHEN :#{T(de.tum.cit.aet.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities THEN 'INSTRUCTOR' WHEN course.instructorGroupName MEMBER OF user.groups THEN 'INSTRUCTOR' WHEN course.editorGroupName MEMBER OF user.groups THEN 'TUTOR' WHEN course.teachingAssistantGroupName MEMBER OF user.groups THEN 'TUTOR' @@ -197,7 +197,7 @@ OR LOWER(user.login) = LOWER(:searchInput) Set findAllByIsDeletedIsFalseAndGroupsContains(String groupName); @Query(""" - SELECT new de.tum.in.www1.artemis.domain.ConversationNotificationRecipientSummary ( + SELECT new de.tum.cit.aet.artemis.domain.ConversationNotificationRecipientSummary ( user.id, user.login, user.firstName, @@ -824,7 +824,7 @@ void updateUserVcsAccessToken(@Param("userId") long userId, @Param("vcsAccessTok SELECT user.login FROM User user WHERE user.groups IS EMPTY AND NOT user.isDeleted - AND NOT :#{T(de.tum.in.www1.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities + AND NOT :#{T(de.tum.cit.aet.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities ORDER BY user.login """) List findAllNotEnrolledUsers(); @@ -1203,7 +1203,7 @@ default boolean isCurrentUser(String login) { @Query(""" SELECT user.login FROM User user - WHERE :#{T(de.tum.in.www1.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities + WHERE :#{T(de.tum.cit.aet.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities AND user.activated = TRUE AND user.isDeleted = FALSE """) @@ -1213,7 +1213,7 @@ default boolean isCurrentUser(String login) { SELECT COUNT(user) > 0 FROM User user WHERE user.login = :login - AND :#{T(de.tum.in.www1.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities + AND :#{T(de.tum.cit.aet.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities """) boolean isAdmin(@Param("login") String login); @@ -1227,7 +1227,7 @@ SELECT COUNT(user) > 0 OR (course.teachingAssistantGroupName MEMBER OF user.groups) OR (course.editorGroupName MEMBER OF user.groups) OR (course.instructorGroupName MEMBER OF user.groups) - OR (:#{T(de.tum.in.www1.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) + OR (:#{T(de.tum.cit.aet.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) """) boolean isAtLeastStudentInCourse(@Param("login") String login, @Param("courseId") long courseId); @@ -1240,7 +1240,7 @@ SELECT COUNT(user) > 0 WHERE (course.teachingAssistantGroupName MEMBER OF user.groups) OR (course.editorGroupName MEMBER OF user.groups) OR (course.instructorGroupName MEMBER OF user.groups) - OR (:#{T(de.tum.in.www1.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) + OR (:#{T(de.tum.cit.aet.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) """) boolean isAtLeastTeachingAssistantInCourse(@Param("login") String login, @Param("courseId") long courseId); @@ -1252,7 +1252,7 @@ SELECT COUNT(user) > 0 AND course.id = :courseId WHERE (course.editorGroupName MEMBER OF user.groups) OR (course.instructorGroupName MEMBER OF user.groups) - OR (:#{T(de.tum.in.www1.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) + OR (:#{T(de.tum.cit.aet.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) """) boolean isAtLeastEditorInCourse(@Param("login") String login, @Param("courseId") long courseId); @@ -1263,7 +1263,7 @@ SELECT COUNT(user) > 0 ON user.login = :login AND course.id = :courseId WHERE (course.instructorGroupName MEMBER OF user.groups) - OR (:#{T(de.tum.in.www1.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) + OR (:#{T(de.tum.cit.aet.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) """) boolean isAtLeastInstructorInCourse(@Param("login") String login, @Param("courseId") long courseId); @@ -1283,7 +1283,7 @@ SELECT COUNT(user) > 0 OR (examCourse.teachingAssistantGroupName MEMBER OF user.groups) OR (examCourse.editorGroupName MEMBER OF user.groups) OR (examCourse.instructorGroupName MEMBER OF user.groups) - OR (:#{T(de.tum.in.www1.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) + OR (:#{T(de.tum.cit.aet.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) """) boolean isAtLeastStudentInExercise(@Param("login") String login, @Param("exerciseId") long exerciseId); @@ -1301,7 +1301,7 @@ SELECT COUNT(user) > 0 OR (examCourse.teachingAssistantGroupName MEMBER OF user.groups) OR (examCourse.editorGroupName MEMBER OF user.groups) OR (examCourse.instructorGroupName MEMBER OF user.groups) - OR (:#{T(de.tum.in.www1.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) + OR (:#{T(de.tum.cit.aet.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) """) boolean isAtLeastTeachingAssistantInExercise(@Param("login") String login, @Param("exerciseId") long exerciseId); @@ -1317,7 +1317,7 @@ SELECT COUNT(user) > 0 OR (course.instructorGroupName MEMBER OF user.groups) OR (examCourse.editorGroupName MEMBER OF user.groups) OR (examCourse.instructorGroupName MEMBER OF user.groups) - OR (:#{T(de.tum.in.www1.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) + OR (:#{T(de.tum.cit.aet.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) """) boolean isAtLeastEditorInExercise(@Param("login") String login, @Param("exerciseId") long exerciseId); @@ -1331,7 +1331,7 @@ SELECT COUNT(user) > 0 LEFT JOIN exercise.exerciseGroup.exam.course examCourse WHERE (course.instructorGroupName MEMBER OF user.groups) OR (examCourse.instructorGroupName MEMBER OF user.groups) - OR (:#{T(de.tum.in.www1.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) + OR (:#{T(de.tum.cit.aet.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) """) boolean isAtLeastInstructorInExercise(@Param("login") String login, @Param("exerciseId") long exerciseId); } diff --git a/src/main/java/de/tum/in/www1/artemis/repository/VideoUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/VideoUnitRepository.java similarity index 80% rename from src/main/java/de/tum/in/www1/artemis/repository/VideoUnitRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/VideoUnitRepository.java index e936f10fdd8d..863a28c699f2 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/VideoUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/VideoUnitRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Optional; @@ -11,8 +11,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.lecture.VideoUnit; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.lecture.VideoUnit; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Video Unit entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/base/ArtemisJpaRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/base/ArtemisJpaRepository.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/repository/base/ArtemisJpaRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/base/ArtemisJpaRepository.java index 583caebef280..2eae628853e6 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/base/ArtemisJpaRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/base/ArtemisJpaRepository.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.repository.base; +package de.tum.cit.aet.artemis.repository.base; import java.util.Optional; diff --git a/src/main/java/de/tum/in/www1/artemis/repository/base/DynamicSpecificationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/base/DynamicSpecificationRepository.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/repository/base/DynamicSpecificationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/base/DynamicSpecificationRepository.java index 03320a58eb25..192a05f24962 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/base/DynamicSpecificationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/base/DynamicSpecificationRepository.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.repository.base; +package de.tum.cit.aet.artemis.repository.base; import java.util.Collection; import java.util.List; @@ -10,7 +10,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.repository.NoRepositoryBean; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * A repository that provides methods for fetching entities dynamically using {@link FetchOptions}. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/base/FetchOptions.java b/src/main/java/de/tum/cit/aet/artemis/repository/base/FetchOptions.java similarity index 73% rename from src/main/java/de/tum/in/www1/artemis/repository/base/FetchOptions.java rename to src/main/java/de/tum/cit/aet/artemis/repository/base/FetchOptions.java index f06a5eb87d89..a44383e76bdb 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/base/FetchOptions.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/base/FetchOptions.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.repository.base; +package de.tum.cit.aet.artemis.repository.base; /** * Interface for fetch options used in dynamic fetching queries. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/base/RepositoryImpl.java b/src/main/java/de/tum/cit/aet/artemis/repository/base/RepositoryImpl.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/repository/base/RepositoryImpl.java rename to src/main/java/de/tum/cit/aet/artemis/repository/base/RepositoryImpl.java index a1aba8b81ad7..c51592c5ccba 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/base/RepositoryImpl.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/base/RepositoryImpl.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.repository.base; +package de.tum.cit.aet.artemis.repository.base; import java.util.Optional; @@ -12,8 +12,8 @@ import org.springframework.data.jpa.repository.support.JpaEntityInformationSupport; import org.springframework.data.jpa.repository.support.SimpleJpaRepository; -import de.tum.in.www1.artemis.domain.DomainObject_; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.DomainObject_; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; public class RepositoryImpl extends SimpleJpaRepository { diff --git a/src/main/java/de/tum/in/www1/artemis/repository/competency/CompetencyJolRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/competency/CompetencyJolRepository.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/repository/competency/CompetencyJolRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/competency/CompetencyJolRepository.java index 3a3348dc5046..5f0f46a26c2e 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/competency/CompetencyJolRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/competency/CompetencyJolRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository.competency; +package de.tum.cit.aet.artemis.repository.competency; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Optional; import java.util.Set; @@ -10,9 +10,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.competency.CompetencyJol; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyJolDTO; +import de.tum.cit.aet.artemis.domain.competency.CompetencyJol; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO; /** * Spring Data JPA repository for the {@link CompetencyJol} entity. @@ -53,7 +53,7 @@ Optional findLatestByCompetencyIdAndUserIdExceptJolId(@Param("com @Param("jolIdToExclude") long jolIdToExclude); @Query(""" - SELECT new de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyJolDTO(jol.id, jol.competency.id, jol.value, jol.judgementTime, jol.competencyProgress, jol.competencyConfidence) + SELECT new de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO(jol.id, jol.competency.id, jol.value, jol.judgementTime, jol.competencyProgress, jol.competencyConfidence) FROM CompetencyJol jol WHERE jol.user.id = :userId AND jol.competency.course.id = :courseId @@ -67,7 +67,7 @@ SELECT MAX(jol2.judgementTime) Set findLatestJolValuesForUserByCourseId(@Param("userId") long userId, @Param("courseId") long courseId); @Query(""" - SELECT new de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyJolDTO(jol.id, jol.competency.id, jol.value, jol.judgementTime, jol.competencyProgress, jol.competencyConfidence) + SELECT new de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO(jol.id, jol.competency.id, jol.value, jol.judgementTime, jol.competencyProgress, jol.competencyConfidence) FROM CompetencyJol jol WHERE jol.user.id = :userId AND jol.competency.course.id = :courseId diff --git a/src/main/java/de/tum/in/www1/artemis/repository/competency/KnowledgeAreaRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/competency/KnowledgeAreaRepository.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/repository/competency/KnowledgeAreaRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/competency/KnowledgeAreaRepository.java index f214e2705e9d..f03358dd86d4 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/competency/KnowledgeAreaRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/competency/KnowledgeAreaRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository.competency; +package de.tum.cit.aet.artemis.repository.competency; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.List; @@ -14,9 +14,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.competency.KnowledgeArea; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.competency.KnowledgeArea; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Spring Data JPA repository for the {@link KnowledgeArea} entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/competency/StandardizedCompetencyRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/competency/StandardizedCompetencyRepository.java similarity index 59% rename from src/main/java/de/tum/in/www1/artemis/repository/competency/StandardizedCompetencyRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/competency/StandardizedCompetencyRepository.java index d4ceca15f940..4d134277ded3 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/competency/StandardizedCompetencyRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/competency/StandardizedCompetencyRepository.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.repository.competency; +package de.tum.cit.aet.artemis.repository.competency; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.competency.StandardizedCompetency; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the {@link StandardizedCompetency} entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/hestia/CodeHintRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/CodeHintRepository.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/repository/hestia/CodeHintRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/hestia/CodeHintRepository.java index 59a85c6a34a9..7f78460a8161 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/hestia/CodeHintRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/CodeHintRepository.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.repository.hestia; +package de.tum.cit.aet.artemis.repository.hestia; import java.util.Optional; import java.util.Set; @@ -8,9 +8,9 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import de.tum.in.www1.artemis.domain.hestia.CodeHint; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Spring Data repository for the CodeHint entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/hestia/CoverageFileReportRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/CoverageFileReportRepository.java similarity index 51% rename from src/main/java/de/tum/in/www1/artemis/repository/hestia/CoverageFileReportRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/hestia/CoverageFileReportRepository.java index b47887d9b8bb..192326ffdffc 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/hestia/CoverageFileReportRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/CoverageFileReportRepository.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.repository.hestia; +package de.tum.cit.aet.artemis.repository.hestia; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.hestia.CoverageFileReport; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.hestia.CoverageFileReport; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/in/www1/artemis/repository/hestia/CoverageReportRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/CoverageReportRepository.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/repository/hestia/CoverageReportRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/hestia/CoverageReportRepository.java index b093d30782a2..08ff3714d887 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/hestia/CoverageReportRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/CoverageReportRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository.hestia; +package de.tum.cit.aet.artemis.repository.hestia; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.Collections; @@ -16,10 +16,10 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.hestia.CoverageReport; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.service.dto.CoverageReportAndSubmissionDateDTO; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.hestia.CoverageReport; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.service.dto.CoverageReportAndSubmissionDateDTO; /** * Spring Data JPA repository for the CoverageReport entity. @@ -35,12 +35,12 @@ public interface CoverageReportRepository extends ArtemisJpaRepository de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) ORDER BY s.submissionDate DESC """) List findCoverageReportsByProgrammingExerciseId(@Param("programmingExerciseId") Long programmingExerciseId, Pageable pageable); diff --git a/src/main/java/de/tum/in/www1/artemis/repository/hestia/ExerciseHintActivationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ExerciseHintActivationRepository.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/repository/hestia/ExerciseHintActivationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/hestia/ExerciseHintActivationRepository.java index 94e07b36c706..11e16b8a72cf 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/hestia/ExerciseHintActivationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ExerciseHintActivationRepository.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.repository.hestia; +package de.tum.cit.aet.artemis.repository.hestia; import java.util.Optional; import java.util.Set; @@ -6,8 +6,8 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import de.tum.in.www1.artemis.domain.hestia.ExerciseHintActivation; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.hestia.ExerciseHintActivation; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; public interface ExerciseHintActivationRepository extends ArtemisJpaRepository { diff --git a/src/main/java/de/tum/in/www1/artemis/repository/hestia/ExerciseHintRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ExerciseHintRepository.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/repository/hestia/ExerciseHintRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/hestia/ExerciseHintRepository.java index 64d87700eabd..2b5418452b5e 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/hestia/ExerciseHintRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ExerciseHintRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository.hestia; +package de.tum.cit.aet.artemis.repository.hestia; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Optional; import java.util.Set; @@ -12,9 +12,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.hestia.ExerciseHint; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.hestia.ExerciseHint; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Spring Data repository for the ExerciseHint entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/hestia/ProgrammingExerciseGitDiffReportRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ProgrammingExerciseGitDiffReportRepository.java similarity index 80% rename from src/main/java/de/tum/in/www1/artemis/repository/hestia/ProgrammingExerciseGitDiffReportRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/hestia/ProgrammingExerciseGitDiffReportRepository.java index a8c6e7d0a817..453dcee1ed96 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/hestia/ProgrammingExerciseGitDiffReportRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ProgrammingExerciseGitDiffReportRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository.hestia; +package de.tum.cit.aet.artemis.repository.hestia; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; @@ -9,8 +9,8 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the ProgrammingExerciseGitDiffReport entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/hestia/ProgrammingExerciseSolutionEntryRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ProgrammingExerciseSolutionEntryRepository.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/repository/hestia/ProgrammingExerciseSolutionEntryRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/hestia/ProgrammingExerciseSolutionEntryRepository.java index 4f8ded1aab49..35af03ba7004 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/hestia/ProgrammingExerciseSolutionEntryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ProgrammingExerciseSolutionEntryRepository.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.repository.hestia; +package de.tum.cit.aet.artemis.repository.hestia; import java.util.Optional; import java.util.Set; @@ -8,9 +8,9 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Spring Data repository for the ProgrammingExerciseSolutionEntry entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/hestia/ProgrammingExerciseTaskRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ProgrammingExerciseTaskRepository.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/repository/hestia/ProgrammingExerciseTaskRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/hestia/ProgrammingExerciseTaskRepository.java index f74b59fc72cc..7194a9709815 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/hestia/ProgrammingExerciseTaskRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ProgrammingExerciseTaskRepository.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.repository.hestia; +package de.tum.cit.aet.artemis.repository.hestia; import java.util.Optional; import java.util.Set; @@ -8,9 +8,9 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Spring Data repository for the ProgrammingExerciseTask entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/hestia/TestwiseCoverageReportEntryRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/TestwiseCoverageReportEntryRepository.java similarity index 60% rename from src/main/java/de/tum/in/www1/artemis/repository/hestia/TestwiseCoverageReportEntryRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/hestia/TestwiseCoverageReportEntryRepository.java index 9259d53e4a06..c775fc466efe 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/hestia/TestwiseCoverageReportEntryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/TestwiseCoverageReportEntryRepository.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.repository.hestia; +package de.tum.cit.aet.artemis.repository.hestia; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.hestia.TestwiseCoverageReportEntry; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.hestia.TestwiseCoverageReportEntry; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the TestwiseCoverageReportEntry entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/iris/IrisCourseChatSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisCourseChatSessionRepository.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/repository/iris/IrisCourseChatSessionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisCourseChatSessionRepository.java index 6ba1121f72fe..d7a37fc17827 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/iris/IrisCourseChatSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisCourseChatSessionRepository.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.repository.iris; +package de.tum.cit.aet.artemis.repository.iris; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -12,10 +12,10 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.iris.session.IrisCourseChatSession; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.iris.session.IrisCourseChatSession; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Repository interface for managing {@link IrisCourseChatSession} entities. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/iris/IrisExerciseChatSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisExerciseChatSessionRepository.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/repository/iris/IrisExerciseChatSessionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisExerciseChatSessionRepository.java index 20f32d0b36f6..bc0d9c2dd0d6 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/iris/IrisExerciseChatSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisExerciseChatSessionRepository.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.repository.iris; +package de.tum.cit.aet.artemis.repository.iris; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -12,10 +12,10 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.iris.session.IrisExerciseChatSession; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.iris.session.IrisExerciseChatSession; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Repository interface for managing {@link IrisExerciseChatSession} entities. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/iris/IrisHestiaSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisHestiaSessionRepository.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/repository/iris/IrisHestiaSessionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisHestiaSessionRepository.java index d5158b939686..797df73078fc 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/iris/IrisHestiaSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisHestiaSessionRepository.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.repository.iris; +package de.tum.cit.aet.artemis.repository.iris; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -6,8 +6,8 @@ import org.springframework.data.jpa.repository.EntityGraph; -import de.tum.in.www1.artemis.domain.iris.session.IrisHestiaSession; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.iris.session.IrisHestiaSession; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Repository interface for managing {@link IrisHestiaSession} entities. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/iris/IrisMessageRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisMessageRepository.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/repository/iris/IrisMessageRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisMessageRepository.java index 1bf770a0f75b..e1f371fcf755 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/iris/IrisMessageRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisMessageRepository.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.repository.iris; +package de.tum.cit.aet.artemis.repository.iris; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -12,9 +12,9 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import de.tum.in.www1.artemis.domain.iris.message.IrisMessage; -import de.tum.in.www1.artemis.domain.iris.message.IrisMessageSender; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; +import de.tum.cit.aet.artemis.domain.iris.message.IrisMessageSender; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the IrisMessage entity. @@ -36,7 +36,7 @@ SELECT COUNT(DISTINCT m) FROM IrisMessage m JOIN TREAT (m.session AS IrisChatSession) s WHERE s.user.id = :userId - AND m.sender = de.tum.in.www1.artemis.domain.iris.message.IrisMessageSender.LLM + AND m.sender = de.tum.cit.aet.artemis.domain.iris.message.IrisMessageSender.LLM AND m.sentAt BETWEEN :start AND :end """) int countLlmResponsesOfUserWithinTimeframe(@Param("userId") long userId, @Param("start") ZonedDateTime start, @Param("end") ZonedDateTime end); diff --git a/src/main/java/de/tum/in/www1/artemis/repository/iris/IrisSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisSessionRepository.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/repository/iris/IrisSessionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisSessionRepository.java index d173da5214fd..67f4fa062e20 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/iris/IrisSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisSessionRepository.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.repository.iris; +package de.tum.cit.aet.artemis.repository.iris; import java.util.Optional; @@ -7,9 +7,9 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import de.tum.in.www1.artemis.domain.iris.session.IrisSession; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Spring Data repository for the IrisSession entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/iris/IrisSettingsRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisSettingsRepository.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/repository/iris/IrisSettingsRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisSettingsRepository.java index a56d0504e114..8192920e430b 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/iris/IrisSettingsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisSettingsRepository.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.repository.iris; +package de.tum.cit.aet.artemis.repository.iris; import java.util.Comparator; import java.util.Optional; @@ -7,11 +7,11 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import de.tum.in.www1.artemis.domain.iris.settings.IrisCourseSettings; -import de.tum.in.www1.artemis.domain.iris.settings.IrisExerciseSettings; -import de.tum.in.www1.artemis.domain.iris.settings.IrisGlobalSettings; -import de.tum.in.www1.artemis.domain.iris.settings.IrisSettings; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisCourseSettings; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisExerciseSettings; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisGlobalSettings; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisSettings; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the IrisSettings entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/iris/IrisSubSettingsRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisSubSettingsRepository.java similarity index 50% rename from src/main/java/de/tum/in/www1/artemis/repository/iris/IrisSubSettingsRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisSubSettingsRepository.java index ecbeccb34945..545710f96468 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/iris/IrisSubSettingsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisSubSettingsRepository.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.repository.iris; +package de.tum.cit.aet.artemis.repository.iris; -import de.tum.in.www1.artemis.domain.iris.settings.IrisSubSettings; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettings; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the IrisSubSettings entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisTemplateRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisTemplateRepository.java new file mode 100644 index 000000000000..292b3530c66a --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisTemplateRepository.java @@ -0,0 +1,11 @@ +package de.tum.cit.aet.artemis.repository.iris; + +import de.tum.cit.aet.artemis.domain.iris.IrisTemplate; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; + +/** + * Spring Data repository for the IrisTemplate entity. + */ +public interface IrisTemplateRepository extends ArtemisJpaRepository { + +} diff --git a/src/main/java/de/tum/in/www1/artemis/repository/metis/AnswerPostRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/metis/AnswerPostRepository.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/repository/metis/AnswerPostRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/metis/AnswerPostRepository.java index 83fe9accfead..85b8ccdfd4f4 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/metis/AnswerPostRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/metis/AnswerPostRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository.metis; +package de.tum.cit.aet.artemis.repository.metis; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; @@ -9,8 +9,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.metis.AnswerPost; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.metis.AnswerPost; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the AnswerPost entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/metis/ConversationMessageRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/metis/ConversationMessageRepository.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/repository/metis/ConversationMessageRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/metis/ConversationMessageRepository.java index f48c15dd444b..639b80752c07 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/metis/ConversationMessageRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/metis/ConversationMessageRepository.java @@ -1,14 +1,14 @@ -package de.tum.in.www1.artemis.repository.metis; +package de.tum.cit.aet.artemis.repository.metis; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.repository.specs.MessageSpecs.getAnsweredOrReactedSpecification; -import static de.tum.in.www1.artemis.repository.specs.MessageSpecs.getConversationSpecification; -import static de.tum.in.www1.artemis.repository.specs.MessageSpecs.getConversationsSpecification; -import static de.tum.in.www1.artemis.repository.specs.MessageSpecs.getCourseWideChannelsSpecification; -import static de.tum.in.www1.artemis.repository.specs.MessageSpecs.getOwnSpecification; -import static de.tum.in.www1.artemis.repository.specs.MessageSpecs.getSearchTextSpecification; -import static de.tum.in.www1.artemis.repository.specs.MessageSpecs.getSortSpecification; -import static de.tum.in.www1.artemis.repository.specs.MessageSpecs.getUnresolvedSpecification; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.repository.specs.MessageSpecs.getAnsweredOrReactedSpecification; +import static de.tum.cit.aet.artemis.repository.specs.MessageSpecs.getConversationSpecification; +import static de.tum.cit.aet.artemis.repository.specs.MessageSpecs.getConversationsSpecification; +import static de.tum.cit.aet.artemis.repository.specs.MessageSpecs.getCourseWideChannelsSpecification; +import static de.tum.cit.aet.artemis.repository.specs.MessageSpecs.getOwnSpecification; +import static de.tum.cit.aet.artemis.repository.specs.MessageSpecs.getSearchTextSpecification; +import static de.tum.cit.aet.artemis.repository.specs.MessageSpecs.getSortSpecification; +import static de.tum.cit.aet.artemis.repository.specs.MessageSpecs.getUnresolvedSpecification; import java.util.List; import java.util.Map; @@ -26,12 +26,12 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.service.util.TimeLogUtil; -import de.tum.in.www1.artemis.web.rest.dto.PostContextFilterDTO; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Spring Data repository for the Message (Post) entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/metis/ConversationParticipantRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/metis/ConversationParticipantRepository.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/repository/metis/ConversationParticipantRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/metis/ConversationParticipantRepository.java index ac9006562c3b..d6eeea268f34 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/metis/ConversationParticipantRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/metis/ConversationParticipantRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository.metis; +package de.tum.cit.aet.artemis.repository.metis; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Optional; @@ -14,8 +14,8 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import de.tum.in.www1.artemis.domain.metis.ConversationParticipant; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the ConversationParticipant entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/metis/CustomPostRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/metis/CustomPostRepository.java similarity index 75% rename from src/main/java/de/tum/in/www1/artemis/repository/metis/CustomPostRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/metis/CustomPostRepository.java index 196c2e008871..72087e56a3ad 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/metis/CustomPostRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/metis/CustomPostRepository.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.repository.metis; +package de.tum.cit.aet.artemis.repository.metis; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.domain.Specification; -import de.tum.in.www1.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.metis.Post; public interface CustomPostRepository { diff --git a/src/main/java/de/tum/in/www1/artemis/repository/metis/CustomPostRepositoryImpl.java b/src/main/java/de/tum/cit/aet/artemis/repository/metis/CustomPostRepositoryImpl.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/repository/metis/CustomPostRepositoryImpl.java rename to src/main/java/de/tum/cit/aet/artemis/repository/metis/CustomPostRepositoryImpl.java index 7f0a22b32f9a..ab162958e9a3 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/metis/CustomPostRepositoryImpl.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/metis/CustomPostRepositoryImpl.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.repository.metis; +package de.tum.cit.aet.artemis.repository.metis; import java.util.Collections; import java.util.List; @@ -15,8 +15,8 @@ import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.domain.Specification; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.metis.Post_; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.metis.Post_; public class CustomPostRepositoryImpl implements CustomPostRepository { diff --git a/src/main/java/de/tum/in/www1/artemis/repository/metis/PostRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/metis/PostRepository.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/repository/metis/PostRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/metis/PostRepository.java index 60d6496bd049..7c870dcdf03e 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/metis/PostRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/metis/PostRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository.metis; +package de.tum.cit.aet.artemis.repository.metis; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; @@ -12,9 +12,9 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Spring Data repository for the Post entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/metis/ReactionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/metis/ReactionRepository.java similarity index 68% rename from src/main/java/de/tum/in/www1/artemis/repository/metis/ReactionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/metis/ReactionRepository.java index dd79853c847e..557d160e5c56 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/metis/ReactionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/metis/ReactionRepository.java @@ -1,14 +1,14 @@ -package de.tum.in.www1.artemis.repository.metis; +package de.tum.cit.aet.artemis.repository.metis; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.metis.Reaction; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.metis.Reaction; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the Reaction entity. diff --git a/src/main/java/de/tum/in/www1/artemis/repository/metis/conversation/ChannelRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ChannelRepository.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/repository/metis/conversation/ChannelRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ChannelRepository.java index 76266670d8e0..3abf2941fd63 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/metis/conversation/ChannelRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ChannelRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository.metis.conversation; +package de.tum.cit.aet.artemis.repository.metis.conversation; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Set; @@ -10,8 +10,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/in/www1/artemis/repository/metis/conversation/ConversationNotificationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ConversationNotificationRepository.java similarity index 52% rename from src/main/java/de/tum/in/www1/artemis/repository/metis/conversation/ConversationNotificationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ConversationNotificationRepository.java index 0f0903215881..62f24251d0a1 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/metis/conversation/ConversationNotificationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ConversationNotificationRepository.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.repository.metis.conversation; +package de.tum.cit.aet.artemis.repository.metis.conversation; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.notification.ConversationNotification; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.notification.ConversationNotification; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/in/www1/artemis/repository/metis/conversation/ConversationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ConversationRepository.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/repository/metis/conversation/ConversationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ConversationRepository.java index 4e8ea4e9af38..2b5919f8a325 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/metis/conversation/ConversationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ConversationRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository.metis.conversation; +package de.tum.cit.aet.artemis.repository.metis.conversation; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.List; @@ -14,10 +14,10 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import de.tum.in.www1.artemis.domain.metis.conversation.Conversation; -import de.tum.in.www1.artemis.domain.metis.conversation.GeneralConversationInfo; -import de.tum.in.www1.artemis.domain.metis.conversation.UserConversationInfo; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; +import de.tum.cit.aet.artemis.domain.metis.conversation.GeneralConversationInfo; +import de.tum.cit.aet.artemis.domain.metis.conversation.UserConversationInfo; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository @@ -41,7 +41,7 @@ public interface ConversationRepository extends ArtemisJpaRepository= :minScore * @return MapEntryDTO with exercise id and team id */ @Query(""" - SELECT new de.tum.in.www1.artemis.web.rest.dto.metrics.MapEntryLongLong(e.id, t.id) + SELECT new de.tum.cit.aet.artemis.web.rest.dto.metrics.MapEntryLongLong(e.id, t.id) FROM Exercise e LEFT JOIN e.teams t LEFT JOIN t.students u - WHERE e.mode = de.tum.in.www1.artemis.domain.enumeration.ExerciseMode.TEAM + WHERE e.mode = de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode.TEAM AND e.id IN :exerciseIds AND u.id = :userId """) diff --git a/src/main/java/de/tum/in/www1/artemis/repository/metrics/LectureUnitMetricsRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/metrics/LectureUnitMetricsRepository.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/repository/metrics/LectureUnitMetricsRepository.java rename to src/main/java/de/tum/cit/aet/artemis/repository/metrics/LectureUnitMetricsRepository.java index c6a1960f2c1c..57482d6aba56 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/metrics/LectureUnitMetricsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/metrics/LectureUnitMetricsRepository.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository.metrics; +package de.tum.cit.aet.artemis.repository.metrics; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Set; @@ -9,9 +9,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.web.rest.dto.metrics.LectureUnitInformationDTO; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.web.rest.dto.metrics.LectureUnitInformationDTO; /** * Spring Data JPA repository to fetch lecture unit related metrics. @@ -27,7 +27,7 @@ public interface LectureUnitMetricsRepository extends ArtemisJpaRepository createSCAFilter(ProgrammingLanguage programmingLanguage) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/FeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/service/FeedbackService.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/FeedbackService.java rename to src/main/java/de/tum/cit/aet/artemis/service/FeedbackService.java index 3ab2cf3156f6..f7bcb80496f5 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/FeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/FeedbackService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Objects; import java.util.Optional; @@ -9,9 +9,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.LongFeedbackText; -import de.tum.in.www1.artemis.repository.LongFeedbackTextRepository; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.LongFeedbackText; +import de.tum.cit.aet.artemis.repository.LongFeedbackTextRepository; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/FilePathService.java b/src/main/java/de/tum/cit/aet/artemis/service/FilePathService.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/service/FilePathService.java rename to src/main/java/de/tum/cit/aet/artemis/service/FilePathService.java index b32abd98bc7e..b3b3168cd53d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/FilePathService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/FilePathService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.nio.file.Path; @@ -11,9 +11,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.FileUploadSubmission; -import de.tum.in.www1.artemis.exception.FilePathParsingException; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.exception.FilePathParsingException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/FileService.java b/src/main/java/de/tum/cit/aet/artemis/service/FileService.java similarity index 99% rename from src/main/java/de/tum/in/www1/artemis/service/FileService.java rename to src/main/java/de/tum/cit/aet/artemis/service/FileService.java index 1e6d1b90f3e9..39e4f3da2204 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/FileService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/FileService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static java.nio.charset.StandardCharsets.UTF_8; import java.io.BufferedReader; @@ -63,10 +63,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.ibm.icu.text.CharsetDetector; -import de.tum.in.www1.artemis.exception.FilePathParsingException; -import de.tum.in.www1.artemis.service.util.CommonsMultipartFile; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.exception.FilePathParsingException; +import de.tum.cit.aet.artemis.service.util.CommonsMultipartFile; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/FileUploadExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseImportService.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/service/FileUploadExerciseImportService.java rename to src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseImportService.java index 601e8b732bef..8ccfb3ea6440 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/FileUploadExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseImportService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.HashMap; import java.util.Optional; @@ -12,13 +12,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.repository.ExampleSubmissionRepository; -import de.tum.in.www1.artemis.repository.FileUploadExerciseRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; -import de.tum.in.www1.artemis.service.metis.conversation.ChannelService; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.repository.FileUploadExerciseRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/FileUploadExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseService.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/service/FileUploadExerciseService.java rename to src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseService.java index 5e9018923a48..14e09a38423c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/FileUploadExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Collections; @@ -9,12 +9,12 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.FileUploadExerciseRepository; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.util.PageUtil; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.FileUploadExerciseRepository; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.util.PageUtil; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/FileUploadSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadSubmissionService.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/FileUploadSubmissionService.java rename to src/main/java/de/tum/cit/aet/artemis/service/FileUploadSubmissionService.java index 5962623ca584..a391241ad742 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/FileUploadSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadSubmissionService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.File; import java.io.IOException; @@ -19,27 +19,27 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.server.ResponseStatusException; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.FileUploadSubmission; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exception.EmptyFileException; -import de.tum.in.www1.artemis.repository.ComplaintRepository; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.FeedbackRepository; -import de.tum.in.www1.artemis.repository.FileUploadSubmissionRepository; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.connectors.athena.AthenaSubmissionSelectionService; -import de.tum.in.www1.artemis.service.exam.ExamDateService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exception.EmptyFileException; +import de.tum.cit.aet.artemis.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.repository.FileUploadSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.connectors.athena.AthenaSubmissionSelectionService; +import de.tum.cit.aet.artemis.service.exam.ExamDateService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/GradingScaleService.java b/src/main/java/de/tum/cit/aet/artemis/service/GradingScaleService.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/GradingScaleService.java rename to src/main/java/de/tum/cit/aet/artemis/service/GradingScaleService.java index d75d2f3b353c..e0a5be29bfea 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/GradingScaleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/GradingScaleService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Comparator; import java.util.List; @@ -12,14 +12,14 @@ import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.GradeStep; -import de.tum.in.www1.artemis.domain.GradingScale; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.GradingScaleRepository; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.util.PageUtil; +import de.tum.cit.aet.artemis.domain.GradeStep; +import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.util.PageUtil; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/HazelcastPathSerializer.java b/src/main/java/de/tum/cit/aet/artemis/service/HazelcastPathSerializer.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/service/HazelcastPathSerializer.java rename to src/main/java/de/tum/cit/aet/artemis/service/HazelcastPathSerializer.java index 706ff434f9aa..476984b92274 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/HazelcastPathSerializer.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/HazelcastPathSerializer.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.HAZELCAST_PATH_SERIALIZER_ID; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.HAZELCAST_PATH_SERIALIZER_ID; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/de/tum/in/www1/artemis/service/InternalUrlService.java b/src/main/java/de/tum/cit/aet/artemis/service/InternalUrlService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/InternalUrlService.java rename to src/main/java/de/tum/cit/aet/artemis/service/InternalUrlService.java index e145b7f9aa81..638ee53dd4c9 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/InternalUrlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/InternalUrlService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URISyntaxException; import java.net.URL; @@ -14,7 +14,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.util.UriComponentsBuilder; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/LearningObjectService.java b/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/service/LearningObjectService.java rename to src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java index 17e0c0167e27..6e4435363da6 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/LearningObjectService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.MIN_SCORE_GREEN; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.MIN_SCORE_GREEN; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Optional; import java.util.Set; @@ -11,17 +11,17 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.LearningObject; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.domain.lecture.LectureUnitCompletion; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.LectureUnitCompletionRepository; -import de.tum.in.www1.artemis.repository.LectureUnitRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathNavigationObjectDTO.LearningObjectType; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.LearningObject; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnitCompletion; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.LectureUnitCompletionRepository; +import de.tum.cit.aet.artemis.repository.LectureUnitRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationObjectDTO.LearningObjectType; /** * Service implementation for interactions with learning objects. diff --git a/src/main/java/de/tum/in/www1/artemis/service/LectureImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/LectureImportService.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/LectureImportService.java rename to src/main/java/de/tum/cit/aet/artemis/service/LectureImportService.java index baee4273aa21..af3bf6d9c487 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/LectureImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LectureImportService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.nio.file.Path; @@ -16,20 +16,20 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import de.tum.in.www1.artemis.domain.Attachment; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; -import de.tum.in.www1.artemis.domain.lecture.ExerciseUnit; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.domain.lecture.OnlineUnit; -import de.tum.in.www1.artemis.domain.lecture.TextUnit; -import de.tum.in.www1.artemis.domain.lecture.VideoUnit; -import de.tum.in.www1.artemis.repository.AttachmentRepository; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.LectureUnitRepository; -import de.tum.in.www1.artemis.repository.iris.IrisSettingsRepository; -import de.tum.in.www1.artemis.service.connectors.pyris.PyrisWebhookService; +import de.tum.cit.aet.artemis.domain.Attachment; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.domain.lecture.OnlineUnit; +import de.tum.cit.aet.artemis.domain.lecture.TextUnit; +import de.tum.cit.aet.artemis.domain.lecture.VideoUnit; +import de.tum.cit.aet.artemis.repository.AttachmentRepository; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.LectureUnitRepository; +import de.tum.cit.aet.artemis.repository.iris.IrisSettingsRepository; +import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisWebhookService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/LectureService.java b/src/main/java/de/tum/cit/aet/artemis/service/LectureService.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/LectureService.java rename to src/main/java/de/tum/cit/aet/artemis/service/LectureService.java index d722fd2673da..8d4e6a7e74b1 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/LectureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LectureService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -13,22 +13,22 @@ import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Attachment; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; -import de.tum.in.www1.artemis.domain.lecture.ExerciseUnit; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; -import de.tum.in.www1.artemis.service.connectors.pyris.PyrisWebhookService; -import de.tum.in.www1.artemis.service.metis.conversation.ChannelService; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.util.PageUtil; +import de.tum.cit.aet.artemis.domain.Attachment; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisWebhookService; +import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.util.PageUtil; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/LectureUnitProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitProcessingService.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/service/LectureUnitProcessingService.java rename to src/main/java/de/tum/cit/aet/artemis/service/LectureUnitProcessingService.java index af1b4a6dbf04..f840b3e3e547 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/LectureUnitProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitProcessingService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -28,14 +28,14 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import de.tum.in.www1.artemis.domain.Attachment; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.enumeration.AttachmentType; -import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.web.rest.dto.LectureUnitInformationDTO; -import de.tum.in.www1.artemis.web.rest.dto.LectureUnitSplitDTO; -import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.domain.Attachment; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; +import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.web.rest.dto.LectureUnitInformationDTO; +import de.tum.cit.aet.artemis.web.rest.dto.LectureUnitSplitDTO; +import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/LectureUnitService.java b/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitService.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/LectureUnitService.java rename to src/main/java/de/tum/cit/aet/artemis/service/LectureUnitService.java index e09ea847078a..0f0ae640e79c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/LectureUnitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.MalformedURLException; import java.net.URI; @@ -21,23 +21,23 @@ import org.springframework.dao.DataIntegrityViolationException; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; -import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; -import de.tum.in.www1.artemis.domain.lecture.ExerciseUnit; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.domain.lecture.LectureUnitCompletion; -import de.tum.in.www1.artemis.domain.lecture.Slide; -import de.tum.in.www1.artemis.repository.CourseCompetencyRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.LectureUnitCompletionRepository; -import de.tum.in.www1.artemis.repository.LectureUnitRepository; -import de.tum.in.www1.artemis.repository.SlideRepository; -import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; -import de.tum.in.www1.artemis.service.connectors.pyris.PyrisWebhookService; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnitCompletion; +import de.tum.cit.aet.artemis.domain.lecture.Slide; +import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.LectureUnitCompletionRepository; +import de.tum.cit.aet.artemis.repository.LectureUnitRepository; +import de.tum.cit.aet.artemis.repository.SlideRepository; +import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisWebhookService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/LegalDocumentService.java b/src/main/java/de/tum/cit/aet/artemis/service/LegalDocumentService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/LegalDocumentService.java rename to src/main/java/de/tum/cit/aet/artemis/service/LegalDocumentService.java index 83cb2a6b78a3..cec0eac5c9e8 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/LegalDocumentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LegalDocumentService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -15,13 +15,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.enumeration.LegalDocumentType; -import de.tum.in.www1.artemis.web.rest.dto.ImprintDTO; -import de.tum.in.www1.artemis.web.rest.dto.LegalDocument; -import de.tum.in.www1.artemis.web.rest.dto.PrivacyStatementDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.enumeration.LegalDocumentType; +import de.tum.cit.aet.artemis.web.rest.dto.ImprintDTO; +import de.tum.cit.aet.artemis.web.rest.dto.LegalDocument; +import de.tum.cit.aet.artemis.web.rest.dto.PrivacyStatementDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; /** * Service class responsible for providing and managing legal documents (privacy statment, imprint). diff --git a/src/main/java/de/tum/in/www1/artemis/service/ModelingExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseImportService.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/ModelingExerciseImportService.java rename to src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseImportService.java index 87de18c16f4b..1aa29e372849 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/ModelingExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseImportService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.HashMap; import java.util.HashSet; @@ -15,19 +15,19 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.ExampleSubmission; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.GradingInstruction; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.repository.ExampleSubmissionRepository; -import de.tum.in.www1.artemis.repository.ModelingExerciseRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; -import de.tum.in.www1.artemis.service.metis.conversation.ChannelService; +import de.tum.cit.aet.artemis.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.GradingInstruction; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/ModelingExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseService.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/service/ModelingExerciseService.java rename to src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseService.java index b793c43973fc..9e49d63f2d88 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/ModelingExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Collections; import java.util.List; @@ -10,16 +10,16 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.modeling.ModelCluster; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.repository.ModelClusterRepository; -import de.tum.in.www1.artemis.repository.ModelElementRepository; -import de.tum.in.www1.artemis.repository.ModelingExerciseRepository; -import de.tum.in.www1.artemis.service.messaging.InstanceMessageSendService; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.util.PageUtil; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.modeling.ModelCluster; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.repository.ModelClusterRepository; +import de.tum.cit.aet.artemis.repository.ModelElementRepository; +import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.util.PageUtil; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/ModelingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/ModelingSubmissionService.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/ModelingSubmissionService.java rename to src/main/java/de/tum/cit/aet/artemis/service/ModelingSubmissionService.java index e89471238376..4f2235a10641 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/ModelingSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ModelingSubmissionService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -17,29 +17,29 @@ import org.springframework.stereotype.Service; import org.springframework.web.server.ResponseStatusException; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.modeling.SimilarElementCount; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.ComplaintRepository; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.FeedbackRepository; -import de.tum.in.www1.artemis.repository.ModelElementRepository; -import de.tum.in.www1.artemis.repository.ModelingSubmissionRepository; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.compass.CompassService; -import de.tum.in.www1.artemis.service.connectors.athena.AthenaSubmissionSelectionService; -import de.tum.in.www1.artemis.service.exam.ExamDateService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.modeling.SimilarElementCount; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.repository.ModelElementRepository; +import de.tum.cit.aet.artemis.repository.ModelingSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.compass.CompassService; +import de.tum.cit.aet.artemis.service.connectors.athena.AthenaSubmissionSelectionService; +import de.tum.cit.aet.artemis.service.exam.ExamDateService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/OnlineCourseConfigurationService.java b/src/main/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationService.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/OnlineCourseConfigurationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationService.java index 934a6076e6a2..fa506ead0bf2 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/OnlineCourseConfigurationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.LOGIN_REGEX; -import static de.tum.in.www1.artemis.domain.OnlineCourseConfiguration.ENTITY_NAME; +import static de.tum.cit.aet.artemis.config.Constants.LOGIN_REGEX; +import static de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration.ENTITY_NAME; import java.util.List; import java.util.Objects; @@ -17,12 +17,12 @@ import org.springframework.security.oauth2.core.AuthorizationGrantType; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.config.lti.CustomLti13Configurer; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.LtiPlatformConfiguration; -import de.tum.in.www1.artemis.domain.OnlineCourseConfiguration; -import de.tum.in.www1.artemis.repository.LtiPlatformConfigurationRepository; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.config.lti.CustomLti13Configurer; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; +import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; +import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; /** * Service Implementation for OnlineCourseConfiguration. diff --git a/src/main/java/de/tum/in/www1/artemis/service/OrganizationService.java b/src/main/java/de/tum/cit/aet/artemis/service/OrganizationService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/OrganizationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/OrganizationService.java index 5c1d0dfa033d..361d7a2e8c61 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/OrganizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/OrganizationService.java @@ -1,16 +1,16 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Organization; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.OrganizationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.domain.Organization; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.OrganizationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; /** * Service implementation for managing Organization entities diff --git a/src/main/java/de/tum/in/www1/artemis/service/ParticipantScoreService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipantScoreService.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/ParticipantScoreService.java rename to src/main/java/de/tum/cit/aet/artemis/service/ParticipantScoreService.java index a1c12af059f5..2e4af8019bf6 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/ParticipantScoreService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipantScoreService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -18,24 +18,24 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.GradingScale; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.scores.ParticipantScore; -import de.tum.in.www1.artemis.repository.ParticipantScoreRepository; -import de.tum.in.www1.artemis.repository.StudentScoreRepository; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.repository.TeamScoreRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.web.rest.dto.score.ScoreDTO; -import de.tum.in.www1.artemis.web.rest.dto.score.StudentScoreSum; -import de.tum.in.www1.artemis.web.rest.dto.score.TeamScoreSum; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.scores.ParticipantScore; +import de.tum.cit.aet.artemis.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.repository.StudentScoreRepository; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.repository.TeamScoreRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.web.rest.dto.score.ScoreDTO; +import de.tum.cit.aet.artemis.web.rest.dto.score.StudentScoreSum; +import de.tum.cit.aet.artemis.web.rest.dto.score.TeamScoreSum; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile(PROFILE_CORE) @Service @@ -73,7 +73,7 @@ public ParticipantScoreService(UserRepository userRepository, StudentScoreReposi * Currently, both this server based calculation method and the traditional client side calculation method is used * side-by-side in exam-scores.component.ts. *

- * The goal is to switch completely to this much faster server based calculation if the {@link de.tum.in.www1.artemis.service.listeners.ResultListener} + * The goal is to switch completely to this much faster server based calculation if the {@link de.tum.cit.aet.artemis.service.listeners.ResultListener} * has been battle tested enough. * * @param exam the exam with registered students, exercise groups and exercises for which to calculate the scores @@ -99,7 +99,7 @@ public List calculateExamScores(Exam exam) { * Currently, both this server based calculation method and the traditional client side calculation method is used * side-by-side in course-scores.component.ts. *

- * The goal is to switch completely to this much faster server based calculation if the {@link de.tum.in.www1.artemis.service.listeners.ResultListener} + * The goal is to switch completely to this much faster server based calculation if the {@link de.tum.cit.aet.artemis.service.listeners.ResultListener} * has been battle tested enough. * * @param course the course with exercises for which to calculate the course scores diff --git a/src/main/java/de/tum/in/www1/artemis/service/ParticipationAuthorizationCheckService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/ParticipationAuthorizationCheckService.java rename to src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java index 3338e8856e84..d68f883b98da 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/ParticipationAuthorizationCheckService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import jakarta.validation.constraints.NotNull; @@ -9,18 +9,18 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.participation.ParticipationInterface; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.participation.ParticipationInterface; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/ParticipationLifecycleService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleService.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/ParticipationLifecycleService.java rename to src/main/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleService.java index 746655f5cdd1..eb5497741f8e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/ParticipationLifecycleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Optional; @@ -13,9 +13,9 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.enumeration.ParticipationLifecycle; -import de.tum.in.www1.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.enumeration.ParticipationLifecycle; +import de.tum.cit.aet.artemis.domain.participation.Participation; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/ParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/service/ParticipationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java index 23f8b350ca6b..8447867353d1 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/ParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -18,42 +18,42 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.BuildPlanType; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.participation.Participant; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.exception.ContinuousIntegrationException; -import de.tum.in.www1.artemis.exception.VersionControlException; -import de.tum.in.www1.artemis.repository.BuildLogStatisticsEntryRepository; -import de.tum.in.www1.artemis.repository.ParticipantScoreRepository; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.StudentScoreRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.repository.TeamScoreRepository; -import de.tum.in.www1.artemis.repository.hestia.CoverageReportRepository; -import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.in.www1.artemis.service.connectors.localci.SharedQueueManagementService; -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlService; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.participation.Participant; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.exception.VersionControlException; +import de.tum.cit.aet.artemis.repository.BuildLogStatisticsEntryRepository; +import de.tum.cit.aet.artemis.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.StudentScoreRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.repository.TeamScoreRepository; +import de.tum.cit.aet.artemis.repository.hestia.CoverageReportRepository; +import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.service.connectors.localci.SharedQueueManagementService; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Service Implementation for managing Participation. diff --git a/src/main/java/de/tum/in/www1/artemis/service/ParticipationVcsAccessTokenService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationVcsAccessTokenService.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/ParticipationVcsAccessTokenService.java rename to src/main/java/de/tum/cit/aet/artemis/service/ParticipationVcsAccessTokenService.java index 39af6f2ce2bd..3af15bdd30af 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/ParticipationVcsAccessTokenService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationVcsAccessTokenService.java @@ -1,18 +1,18 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.participation.ParticipationVCSAccessToken; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.ParticipationVCSAccessTokenRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCPersonalAccessTokenManagementService; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.participation.ParticipationVCSAccessToken; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.ParticipationVCSAccessTokenRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCPersonalAccessTokenManagementService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/PlantUmlService.java b/src/main/java/de/tum/cit/aet/artemis/service/PlantUmlService.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/service/PlantUmlService.java rename to src/main/java/de/tum/cit/aet/artemis/service/PlantUmlService.java index 1f87b3201b1e..79964e21bad0 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/PlantUmlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/PlantUmlService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/de/tum/in/www1/artemis/service/PresentationPointsCalculationService.java b/src/main/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/PresentationPointsCalculationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationService.java index cf38d9154b5d..353190752045 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/PresentationPointsCalculationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationService.java @@ -1,16 +1,16 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; import java.util.Map; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.GradingScale; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; /** * Service for calculating the presentation points for a course or student. diff --git a/src/main/java/de/tum/in/www1/artemis/service/ProfileService.java b/src/main/java/de/tum/cit/aet/artemis/service/ProfileService.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/ProfileService.java rename to src/main/java/de/tum/cit/aet/artemis/service/ProfileService.java index 3cd0ab0473ab..3d3cb825a440 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/ProfileService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ProfileService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; import java.util.Set; @@ -9,7 +9,7 @@ import org.springframework.core.env.Environment; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.config.Constants; +import de.tum.cit.aet.artemis.config.Constants; import tech.jhipster.config.JHipsterConstants; /** diff --git a/src/main/java/de/tum/in/www1/artemis/service/RatingService.java b/src/main/java/de/tum/cit/aet/artemis/service/RatingService.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/RatingService.java rename to src/main/java/de/tum/cit/aet/artemis/service/RatingService.java index f79222ee6e45..13e1891edba9 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/RatingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/RatingService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Optional; @@ -8,14 +8,14 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Rating; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.assessment.dashboard.ExerciseRatingCount; -import de.tum.in.www1.artemis.repository.RatingRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.domain.Rating; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseRatingCount; +import de.tum.cit.aet.artemis.repository.RatingRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; /** - * Service Implementation for managing {@link de.tum.in.www1.artemis.domain.Rating}. + * Service Implementation for managing {@link de.tum.cit.aet.artemis.domain.Rating}. */ @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/ResourceLoaderService.java b/src/main/java/de/tum/cit/aet/artemis/service/ResourceLoaderService.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/service/ResourceLoaderService.java rename to src/main/java/de/tum/cit/aet/artemis/service/ResourceLoaderService.java index 6ebd27960333..b58e47378a1b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/ResourceLoaderService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ResourceLoaderService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_BUILDAGENT; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.File; import java.io.IOException; diff --git a/src/main/java/de/tum/in/www1/artemis/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/ResultService.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/ResultService.java rename to src/main/java/de/tum/cit/aet/artemis/service/ResultService.java index 139a3b01b01c..69ba3b14b1c6 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ResultService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -23,44 +23,44 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.LongFeedbackText; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.BuildPlanType; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.BuildJobRepository; -import de.tum.in.www1.artemis.repository.ComplaintRepository; -import de.tum.in.www1.artemis.repository.ComplaintResponseRepository; -import de.tum.in.www1.artemis.repository.FeedbackRepository; -import de.tum.in.www1.artemis.repository.LongFeedbackTextRepository; -import de.tum.in.www1.artemis.repository.ParticipantScoreRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.RatingRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.TemplateProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseTaskRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.service.connectors.localci.dto.ResultBuildJob; -import de.tum.in.www1.artemis.service.connectors.lti.LtiNewResultService; -import de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseTaskService; -import de.tum.in.www1.artemis.web.rest.dto.feedback.FeedbackDetailDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.websocket.ResultWebsocketService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.LongFeedbackText; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.BuildJobRepository; +import de.tum.cit.aet.artemis.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.repository.ComplaintResponseRepository; +import de.tum.cit.aet.artemis.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.repository.LongFeedbackTextRepository; +import de.tum.cit.aet.artemis.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.RatingRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.ResultBuildJob; +import de.tum.cit.aet.artemis.service.connectors.lti.LtiNewResultService; +import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; +import de.tum.cit.aet.artemis.web.rest.dto.feedback.FeedbackDetailDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/SlideSplitterService.java b/src/main/java/de/tum/cit/aet/artemis/service/SlideSplitterService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/SlideSplitterService.java rename to src/main/java/de/tum/cit/aet/artemis/service/SlideSplitterService.java index e1cf4315c6c0..d81202d5cf96 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/SlideSplitterService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SlideSplitterService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; @@ -23,10 +23,10 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; -import de.tum.in.www1.artemis.domain.lecture.Slide; -import de.tum.in.www1.artemis.repository.SlideRepository; -import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.domain.lecture.Slide; +import de.tum.cit.aet.artemis.repository.SlideRepository; +import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; /** * Service Implementation for managing the split of AttachmentUnit into single slides and save them as PNG. diff --git a/src/main/java/de/tum/in/www1/artemis/service/StaticCodeAnalysisService.java b/src/main/java/de/tum/cit/aet/artemis/service/StaticCodeAnalysisService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/StaticCodeAnalysisService.java rename to src/main/java/de/tum/cit/aet/artemis/service/StaticCodeAnalysisService.java index 954dcfd0af7d..472647414ad9 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/StaticCodeAnalysisService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/StaticCodeAnalysisService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Collection; import java.util.List; @@ -14,12 +14,12 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.config.StaticCodeAnalysisConfigurer; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.StaticCodeAnalysisCategory; -import de.tum.in.www1.artemis.domain.StaticCodeAnalysisDefaultCategory; -import de.tum.in.www1.artemis.repository.StaticCodeAnalysisCategoryRepository; -import de.tum.in.www1.artemis.service.programming.ProgrammingTriggerService; +import de.tum.cit.aet.artemis.config.StaticCodeAnalysisConfigurer; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisCategory; +import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisDefaultCategory; +import de.tum.cit.aet.artemis.repository.StaticCodeAnalysisCategoryRepository; +import de.tum.cit.aet.artemis.service.programming.ProgrammingTriggerService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/StatisticsService.java b/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/StatisticsService.java rename to src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java index 6d6c71c247b9..bbcb67112eca 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/StatisticsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; import java.time.DayOfWeek; import java.time.LocalDateTime; @@ -23,27 +23,27 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.GradingScale; -import de.tum.in.www1.artemis.domain.enumeration.GraphType; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.in.www1.artemis.domain.enumeration.SpanType; -import de.tum.in.www1.artemis.domain.enumeration.StatisticsView; -import de.tum.in.www1.artemis.domain.statistics.CourseStatisticsAverageScore; -import de.tum.in.www1.artemis.domain.statistics.ScoreDistribution; -import de.tum.in.www1.artemis.domain.statistics.StatisticsEntry; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.GradingScaleRepository; -import de.tum.in.www1.artemis.repository.ParticipantScoreRepository; -import de.tum.in.www1.artemis.repository.StatisticsRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.web.rest.dto.CourseManagementStatisticsDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExerciseManagementStatisticsDTO; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.domain.enumeration.GraphType; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.domain.enumeration.SpanType; +import de.tum.cit.aet.artemis.domain.enumeration.StatisticsView; +import de.tum.cit.aet.artemis.domain.statistics.CourseStatisticsAverageScore; +import de.tum.cit.aet.artemis.domain.statistics.ScoreDistribution; +import de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.repository.StatisticsRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementStatisticsDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExerciseManagementStatisticsDTO; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/SubmissionPolicyService.java b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionPolicyService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/SubmissionPolicyService.java rename to src/main/java/de/tum/cit/aet/artemis/service/SubmissionPolicyService.java index 89e801947e2a..27b5a83cf266 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/SubmissionPolicyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionPolicyService.java @@ -1,31 +1,31 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.apache.commons.lang3.NotImplementedException; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.submissionpolicy.LockRepositoryPolicy; -import de.tum.in.www1.artemis.domain.submissionpolicy.SubmissionPenaltyPolicy; -import de.tum.in.www1.artemis.domain.submissionpolicy.SubmissionPolicy; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionRepository; -import de.tum.in.www1.artemis.repository.SubmissionPolicyRepository; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseParticipationService; -import de.tum.in.www1.artemis.web.rest.SubmissionPolicyResource; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; +import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPenaltyPolicy; +import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.repository.SubmissionPolicyRepository; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseParticipationService; +import de.tum.cit.aet.artemis.web.rest.SubmissionPolicyResource; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/SubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/SubmissionService.java rename to src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java index d0160044a60a..849fa4444283 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/SubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.MAX_NUMBER_OF_LOCKED_SUBMISSIONS_PER_TUTOR; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.MAX_NUMBER_OF_LOCKED_SUBMISSIONS_PER_TUTOR; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -20,39 +20,39 @@ import org.springframework.data.domain.PageImpl; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.AssessmentNote; -import de.tum.in.www1.artemis.domain.Complaint; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.ComplaintType; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.ComplaintRepository; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.FeedbackRepository; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.connectors.athena.AthenaSubmissionSelectionService; -import de.tum.in.www1.artemis.service.exam.ExamDateService; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.in.www1.artemis.web.rest.dto.SubmissionWithComplaintDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.util.PageUtil; +import de.tum.cit.aet.artemis.domain.AssessmentNote; +import de.tum.cit.aet.artemis.domain.Complaint; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.connectors.athena.AthenaSubmissionSelectionService; +import de.tum.cit.aet.artemis.service.exam.ExamDateService; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.SubmissionWithComplaintDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.util.PageUtil; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/SubmissionVersionService.java b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionVersionService.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/SubmissionVersionService.java rename to src/main/java/de/tum/cit/aet/artemis/service/SubmissionVersionService.java index 76778be19215..2ea48f0bf5c5 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/SubmissionVersionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionVersionService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -10,14 +10,14 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.SubmissionVersion; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.repository.SubmissionVersionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.SubmissionVersion; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.repository.SubmissionVersionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/SystemNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/SystemNotificationService.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/SystemNotificationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/SystemNotificationService.java index e29901d33171..da2d1a36c300 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/SystemNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SystemNotificationService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.List; @@ -8,10 +8,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.notification.SystemNotification; -import de.tum.in.www1.artemis.repository.SystemNotificationRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.notification.SystemNotification; +import de.tum.cit.aet.artemis.repository.SystemNotificationRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/TeamService.java b/src/main/java/de/tum/cit/aet/artemis/service/TeamService.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/TeamService.java rename to src/main/java/de/tum/cit/aet/artemis/service/TeamService.java index 4e4a6a4c9e8c..b9cd5e507385 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/TeamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TeamService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.HashSet; @@ -16,24 +16,24 @@ import org.springframework.data.util.Pair; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.TeamImportStrategyType; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlRepositoryPermission; -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlService; -import de.tum.in.www1.artemis.service.dto.TeamSearchUserDTO; -import de.tum.in.www1.artemis.service.team.TeamImportStrategy; -import de.tum.in.www1.artemis.service.team.strategies.CreateOnlyStrategy; -import de.tum.in.www1.artemis.service.team.strategies.PurgeExistingStrategy; -import de.tum.in.www1.artemis.web.rest.TeamResource; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.StudentsAppearMultipleTimesException; -import de.tum.in.www1.artemis.web.rest.errors.StudentsNotFoundException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.TeamImportStrategyType; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlRepositoryPermission; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.service.dto.TeamSearchUserDTO; +import de.tum.cit.aet.artemis.service.team.TeamImportStrategy; +import de.tum.cit.aet.artemis.service.team.strategies.CreateOnlyStrategy; +import de.tum.cit.aet.artemis.service.team.strategies.PurgeExistingStrategy; +import de.tum.cit.aet.artemis.web.rest.TeamResource; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.StudentsAppearMultipleTimesException; +import de.tum.cit.aet.artemis.web.rest.errors.StudentsNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/TextAssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextAssessmentService.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/service/TextAssessmentService.java rename to src/main/java/de/tum/cit/aet/artemis/service/TextAssessmentService.java index 8f79e9708622..6d061302ea43 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/TextAssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextAssessmentService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.hibernate.Hibernate.isInitialized; import java.util.List; @@ -11,21 +11,21 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.repository.ComplaintRepository; -import de.tum.in.www1.artemis.repository.FeedbackRepository; -import de.tum.in.www1.artemis.repository.GradingCriterionRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.connectors.lti.LtiNewResultService; -import de.tum.in.www1.artemis.service.exam.ExamDateService; -import de.tum.in.www1.artemis.service.notifications.SingleUserNotificationService; -import de.tum.in.www1.artemis.web.websocket.ResultWebsocketService; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.connectors.lti.LtiNewResultService; +import de.tum.cit.aet.artemis.service.exam.ExamDateService; +import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; +import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/TextBlockService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextBlockService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/TextBlockService.java rename to src/main/java/de/tum/cit/aet/artemis/service/TextBlockService.java index c65117f7167b..e4e4f20dd567 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/TextBlockService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextBlockService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static java.lang.Integer.compare; import java.text.BreakIterator; @@ -12,9 +12,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.TextBlock; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.repository.TextBlockRepository; +import de.tum.cit.aet.artemis.domain.TextBlock; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.repository.TextBlockRepository; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseFeedbackService.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java rename to src/main/java/de/tum/cit/aet/artemis/service/TextExerciseFeedbackService.java index 844f3cc20016..7a5f0fb59f33 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseFeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseFeedbackService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.List; @@ -12,19 +12,19 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.service.connectors.athena.AthenaFeedbackSuggestionsService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException; -import de.tum.in.www1.artemis.web.websocket.ResultWebsocketService; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.service.connectors.athena.AthenaFeedbackSuggestionsService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseImportService.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/TextExerciseImportService.java rename to src/main/java/de/tum/cit/aet/artemis/service/TextExerciseImportService.java index 89094d3771f9..c6fe359f52b1 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseImportService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.HashMap; import java.util.HashSet; @@ -18,25 +18,25 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.ExampleSubmission; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.GradingInstruction; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextBlock; -import de.tum.in.www1.artemis.domain.TextBlockType; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.repository.ExampleSubmissionRepository; -import de.tum.in.www1.artemis.repository.FeedbackRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.TextBlockRepository; -import de.tum.in.www1.artemis.repository.TextExerciseRepository; -import de.tum.in.www1.artemis.repository.TextSubmissionRepository; -import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; -import de.tum.in.www1.artemis.service.metis.conversation.ChannelService; +import de.tum.cit.aet.artemis.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.GradingInstruction; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextBlock; +import de.tum.cit.aet.artemis.domain.TextBlockType; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.TextBlockRepository; +import de.tum.cit.aet.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseService.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/service/TextExerciseService.java rename to src/main/java/de/tum/cit/aet/artemis/service/TextExerciseService.java index 5cb4f26851cf..a6f919f60a8f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/TextExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Collections; @@ -9,13 +9,13 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.TextExerciseRepository; -import de.tum.in.www1.artemis.service.messaging.InstanceMessageSendService; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.util.PageUtil; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.util.PageUtil; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextSubmissionService.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java rename to src/main/java/de/tum/cit/aet/artemis/service/TextSubmissionService.java index 65e28f3db003..4f41337d1463 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/TextSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextSubmissionService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -13,24 +13,24 @@ import org.springframework.stereotype.Service; import org.springframework.web.server.ResponseStatusException; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.ComplaintRepository; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.FeedbackRepository; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.TextSubmissionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.connectors.athena.AthenaSubmissionSelectionService; -import de.tum.in.www1.artemis.service.exam.ExamDateService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.connectors.athena.AthenaSubmissionSelectionService; +import de.tum.cit.aet.artemis.service.exam.ExamDateService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/TimeService.java b/src/main/java/de/tum/cit/aet/artemis/service/TimeService.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/TimeService.java rename to src/main/java/de/tum/cit/aet/artemis/service/TimeService.java index e21281f227db..d85e25124d53 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/TimeService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TimeService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; diff --git a/src/main/java/de/tum/in/www1/artemis/service/TitleCacheEvictionService.java b/src/main/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionService.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/TitleCacheEvictionService.java rename to src/main/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionService.java index fc0a941737a7..ad5f99978dd5 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/TitleCacheEvictionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import jakarta.persistence.EntityManagerFactory; @@ -22,14 +22,14 @@ import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.Organization; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.hestia.ExerciseHint; -import de.tum.in.www1.artemis.domain.modeling.ApollonDiagram; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.Organization; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.hestia.ExerciseHint; +import de.tum.cit.aet.artemis.domain.modeling.ApollonDiagram; /** * Listens to Hibernate events and invalidates the cached titles of an entity if the title changed. diff --git a/src/main/java/de/tum/in/www1/artemis/service/TutorEffortService.java b/src/main/java/de/tum/cit/aet/artemis/service/TutorEffortService.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/TutorEffortService.java rename to src/main/java/de/tum/cit/aet/artemis/service/TutorEffortService.java index 070487274bb7..8a1326d756b1 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/TutorEffortService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TutorEffortService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static java.lang.Math.toIntExact; import static java.util.stream.Collectors.groupingBy; @@ -13,9 +13,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.analytics.TextAssessmentEvent; -import de.tum.in.www1.artemis.domain.statistics.tutor.effort.TutorEffort; -import de.tum.in.www1.artemis.repository.TextAssessmentEventRepository; +import de.tum.cit.aet.artemis.domain.analytics.TextAssessmentEvent; +import de.tum.cit.aet.artemis.domain.statistics.tutor.effort.TutorEffort; +import de.tum.cit.aet.artemis.repository.TextAssessmentEventRepository; /** * Contains business logic needed to calculate tutor efforts. diff --git a/src/main/java/de/tum/in/www1/artemis/service/TutorLeaderboardService.java b/src/main/java/de/tum/cit/aet/artemis/service/TutorLeaderboardService.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/TutorLeaderboardService.java rename to src/main/java/de/tum/cit/aet/artemis/service/TutorLeaderboardService.java index 55842be26735..aa4971dbe864 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/TutorLeaderboardService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TutorLeaderboardService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.List; @@ -12,19 +12,19 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.leaderboard.tutor.TutorLeaderboardAnsweredMoreFeedbackRequests; -import de.tum.in.www1.artemis.domain.leaderboard.tutor.TutorLeaderboardAssessments; -import de.tum.in.www1.artemis.domain.leaderboard.tutor.TutorLeaderboardComplaintResponses; -import de.tum.in.www1.artemis.domain.leaderboard.tutor.TutorLeaderboardComplaints; -import de.tum.in.www1.artemis.domain.leaderboard.tutor.TutorLeaderboardMoreFeedbackRequests; -import de.tum.in.www1.artemis.repository.ComplaintRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.web.rest.dto.TutorLeaderboardDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardAnsweredMoreFeedbackRequests; +import de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardAssessments; +import de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardComplaintResponses; +import de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardComplaints; +import de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardMoreFeedbackRequests; +import de.tum.cit.aet.artemis.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.web.rest.dto.TutorLeaderboardDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/TutorParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/service/TutorParticipationService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/TutorParticipationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/TutorParticipationService.java index 9f6f387e699a..450e91f5500a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/TutorParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TutorParticipationService.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.domain.enumeration.FeedbackType.MANUAL_UNREFERENCED; -import static de.tum.in.www1.artemis.domain.enumeration.TutorParticipationStatus.NOT_PARTICIPATED; -import static de.tum.in.www1.artemis.domain.enumeration.TutorParticipationStatus.REVIEWED_INSTRUCTIONS; -import static de.tum.in.www1.artemis.domain.enumeration.TutorParticipationStatus.TRAINED; -import static de.tum.in.www1.artemis.service.TutorParticipationService.FeedbackCorrectionErrorType.UNNECESSARY_FEEDBACK; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.domain.enumeration.FeedbackType.MANUAL_UNREFERENCED; +import static de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus.NOT_PARTICIPATED; +import static de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus.REVIEWED_INSTRUCTIONS; +import static de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus.TRAINED; +import static de.tum.cit.aet.artemis.service.TutorParticipationService.FeedbackCorrectionErrorType.UNNECESSARY_FEEDBACK; import java.util.Comparator; import java.util.HashSet; @@ -24,15 +24,15 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.ExampleSubmission; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.participation.TutorParticipation; -import de.tum.in.www1.artemis.repository.ExampleSubmissionRepository; -import de.tum.in.www1.artemis.repository.TutorParticipationRepository; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; +import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.repository.TutorParticipationRepository; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Service Implementation for managing TutorParticipation. diff --git a/src/main/java/de/tum/in/www1/artemis/service/UriService.java b/src/main/java/de/tum/cit/aet/artemis/service/UriService.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/service/UriService.java rename to src/main/java/de/tum/cit/aet/artemis/service/UriService.java index 90ee55c3c7fc..1299ca5c1c10 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/UriService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/UriService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -10,8 +10,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.exception.VersionControlException; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.exception.VersionControlException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/WebsocketMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/service/WebsocketMessagingService.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/service/WebsocketMessagingService.java rename to src/main/java/de/tum/cit/aet/artemis/service/WebsocketMessagingService.java index ba6cba31f021..59619a52a650 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/WebsocketMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/WebsocketMessagingService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; diff --git a/src/main/java/de/tum/in/www1/artemis/service/ZipFileService.java b/src/main/java/de/tum/cit/aet/artemis/service/ZipFileService.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/service/ZipFileService.java rename to src/main/java/de/tum/cit/aet/artemis/service/ZipFileService.java index 0b760cdca1bb..b765b03bdbc6 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/ZipFileService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ZipFileService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.IOException; import java.nio.file.Files; diff --git a/src/main/java/de/tum/in/www1/artemis/service/archival/ArchivalReportEntry.java b/src/main/java/de/tum/cit/aet/artemis/service/archival/ArchivalReportEntry.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/archival/ArchivalReportEntry.java rename to src/main/java/de/tum/cit/aet/artemis/service/archival/ArchivalReportEntry.java index d52c967e21ba..6657a892d717 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/archival/ArchivalReportEntry.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/archival/ArchivalReportEntry.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.archival; +package de.tum.cit.aet.artemis.service.archival; import jakarta.annotation.Nullable; -import de.tum.in.www1.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Exercise; public class ArchivalReportEntry { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/CompassService.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/CompassService.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/compass/CompassService.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/CompassService.java index ea8616c652a7..f070a2877768 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/CompassService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/CompassService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.compass; +package de.tum.cit.aet.artemis.service.compass; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.HashSet; @@ -13,22 +13,22 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.modeling.ModelCluster; -import de.tum.in.www1.artemis.domain.modeling.ModelElement; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.FeedbackRepository; -import de.tum.in.www1.artemis.repository.ModelClusterRepository; -import de.tum.in.www1.artemis.repository.ModelElementRepository; -import de.tum.in.www1.artemis.repository.ModelingSubmissionRepository; -import de.tum.in.www1.artemis.service.compass.controller.FeedbackSelector; -import de.tum.in.www1.artemis.service.compass.controller.ModelClusterFactory; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.modeling.ModelCluster; +import de.tum.cit.aet.artemis.domain.modeling.ModelElement; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.repository.ModelClusterRepository; +import de.tum.cit.aet.artemis.repository.ModelElementRepository; +import de.tum.cit.aet.artemis.repository.ModelingSubmissionRepository; +import de.tum.cit.aet.artemis.service.compass.controller.FeedbackSelector; +import de.tum.cit.aet.artemis.service.compass.controller.ModelClusterFactory; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.util.TimeLogUtil; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/assessment/Context.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/assessment/Context.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/compass/assessment/Context.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/assessment/Context.java index bfab1e5981c3..6e67f36cd6ec 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/assessment/Context.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/assessment/Context.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.compass.assessment; +package de.tum.cit.aet.artemis.service.compass.assessment; import java.io.Serializable; import java.util.Objects; diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/controller/FeedbackSelector.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/controller/FeedbackSelector.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/compass/controller/FeedbackSelector.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/controller/FeedbackSelector.java index 813faea455f7..146825df3bf8 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/controller/FeedbackSelector.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/controller/FeedbackSelector.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.compass.controller; +package de.tum.cit.aet.artemis.service.compass.controller; import java.math.BigDecimal; import java.math.RoundingMode; @@ -10,12 +10,12 @@ import java.util.Objects; import java.util.Set; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.GradingInstruction; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.modeling.ModelElement; -import de.tum.in.www1.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.GradingInstruction; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.modeling.ModelElement; +import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; public class FeedbackSelector { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/controller/ModelClusterFactory.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/controller/ModelClusterFactory.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/compass/controller/ModelClusterFactory.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/controller/ModelClusterFactory.java index fb0cd41c7cba..fc98c5ed9708 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/controller/ModelClusterFactory.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/controller/ModelClusterFactory.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.compass.controller; +package de.tum.cit.aet.artemis.service.compass.controller; import static com.google.gson.JsonParser.parseString; @@ -16,18 +16,18 @@ import com.google.gson.JsonObject; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.modeling.ModelCluster; -import de.tum.in.www1.artemis.domain.modeling.ModelElement; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.service.compass.assessment.Context; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLMethod; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; -import de.tum.in.www1.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.modeling.ModelCluster; +import de.tum.cit.aet.artemis.domain.modeling.ModelElement; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.service.compass.assessment.Context; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLMethod; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; public class ModelClusterFactory { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/strategy/NameSimilarity.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/strategy/NameSimilarity.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/compass/strategy/NameSimilarity.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/strategy/NameSimilarity.java index 0351b627afdf..ea57085e0619 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/strategy/NameSimilarity.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/strategy/NameSimilarity.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.compass.strategy; +package de.tum.cit.aet.artemis.service.compass.strategy; import java.util.Objects; diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/Similarity.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/Similarity.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/Similarity.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/Similarity.java index 3a8016ac86f9..59b32e2f67e7 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/Similarity.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/Similarity.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel; +package de.tum.cit.aet.artemis.service.compass.umlmodel; /** * Similarity is implemented by classes of which an object can calculate the similarity between itself and another similarity object. This interface should be implemented using the diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/UMLContainerElement.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/UMLContainerElement.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/UMLContainerElement.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/UMLContainerElement.java index 425e57ad8839..3a9e4ead7adb 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/UMLContainerElement.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/UMLContainerElement.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel; +package de.tum.cit.aet.artemis.service.compass.umlmodel; import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import de.tum.in.www1.artemis.service.compass.umlmodel.deployment.UMLNode; +import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLNode; public abstract class UMLContainerElement extends UMLElement implements Serializable { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/UMLDiagram.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/UMLDiagram.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/UMLDiagram.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/UMLDiagram.java index dfd91726bf46..58a427d3ded4 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/UMLDiagram.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/UMLDiagram.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel; +package de.tum.cit.aet.artemis.service.compass.umlmodel; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/UMLElement.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/UMLElement.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/UMLElement.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/UMLElement.java index d491411cd50f..87ae38e2dac4 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/UMLElement.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/UMLElement.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel; +package de.tum.cit.aet.artemis.service.compass.umlmodel; import java.io.Serializable; import java.util.List; @@ -6,7 +6,7 @@ import jakarta.annotation.Nullable; -import de.tum.in.www1.artemis.service.compass.assessment.Context; +import de.tum.cit.aet.artemis.service.compass.assessment.Context; public abstract class UMLElement implements Similarity, Serializable { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/activity/UMLActivity.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLActivity.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/activity/UMLActivity.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLActivity.java index 524ea8f84707..464336fa7f39 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/activity/UMLActivity.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLActivity.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.activity; +package de.tum.cit.aet.artemis.service.compass.umlmodel.activity; import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class UMLActivity extends UMLActivityElement implements Serializable { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/activity/UMLActivityDiagram.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLActivityDiagram.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/activity/UMLActivityDiagram.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLActivityDiagram.java index ffdbf127210f..ecc73c2b6cba 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/activity/UMLActivityDiagram.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLActivityDiagram.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.activity; +package de.tum.cit.aet.artemis.service.compass.umlmodel.activity; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class UMLActivityDiagram extends UMLDiagram implements Serializable { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/activity/UMLActivityElement.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLActivityElement.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/activity/UMLActivityElement.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLActivityElement.java index a40fdef5c92a..a1829029a05f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/activity/UMLActivityElement.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLActivityElement.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.activity; +package de.tum.cit.aet.artemis.service.compass.umlmodel.activity; import java.io.Serializable; import java.util.Objects; import jakarta.annotation.Nullable; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public abstract class UMLActivityElement extends UMLElement implements Serializable { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/activity/UMLActivityNode.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLActivityNode.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/activity/UMLActivityNode.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLActivityNode.java index 2d02e5a2c580..aadf420d1150 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/activity/UMLActivityNode.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLActivityNode.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.activity; +package de.tum.cit.aet.artemis.service.compass.umlmodel.activity; import java.io.Serializable; import java.util.Objects; import com.google.common.base.CaseFormat; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class UMLActivityNode extends UMLActivityElement implements Serializable { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/activity/UMLControlFlow.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLControlFlow.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/activity/UMLControlFlow.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLControlFlow.java index fdf4089b65f9..a885f0b8b197 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/activity/UMLControlFlow.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLControlFlow.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.activity; +package de.tum.cit.aet.artemis.service.compass.umlmodel.activity; import java.io.Serializable; import java.util.Objects; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class UMLControlFlow extends UMLElement implements Serializable { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNAnnotation.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNAnnotation.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNAnnotation.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNAnnotation.java index 3f097beff8ab..2da145a7fa3a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNAnnotation.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNAnnotation.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Objects; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; /** * Represents a BPMN annotation diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNCallActivity.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNCallActivity.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNCallActivity.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNCallActivity.java index 5339b753aeeb..1451df7cd2a4 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNCallActivity.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNCallActivity.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Objects; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; /** * Represents a BPMN call activity diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNDataObject.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNDataObject.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNDataObject.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNDataObject.java index f9004f4d5f02..abad8d8d8e0e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNDataObject.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNDataObject.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Objects; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; /** * Represents a BPMN data object diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNDataStore.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNDataStore.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNDataStore.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNDataStore.java index 91fb6a7aaad8..9d26f952c3ae 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNDataStore.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNDataStore.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Objects; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; /** * Represents a BPMN data store diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNDiagram.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNDiagram.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNDiagram.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNDiagram.java index ad6eb0d9900d..1cd545536963 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNDiagram.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNDiagram.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; import java.util.ArrayList; import java.util.List; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; /** * Represents a BPMN diagram diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNEndEvent.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNEndEvent.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNEndEvent.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNEndEvent.java index 8f485b040b71..3f536afb5758 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNEndEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNEndEvent.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Arrays; import java.util.Objects; import java.util.Optional; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; /** * Represents a BPMN end event diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNFlow.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNFlow.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNFlow.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNFlow.java index bce766ee3ad1..48143010ba11 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNFlow.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNFlow.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Arrays; import java.util.Objects; import java.util.Optional; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; /** * Represents a BPMN flow diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNGateway.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNGateway.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNGateway.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNGateway.java index 506bb7dd44d4..88cd96233362 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNGateway.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNGateway.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Arrays; import java.util.Objects; import java.util.Optional; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; /** * Represents a BPMN gateway diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNGroup.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNGroup.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNGroup.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNGroup.java index 73e4fe700ce3..e09cfb9a9fae 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNGroup.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNGroup.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Objects; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLContainerElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLContainerElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; /** * Represents a BPMN group diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNIntermediateEvent.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNIntermediateEvent.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNIntermediateEvent.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNIntermediateEvent.java index f089b0e5eb88..1ee22375d837 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNIntermediateEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNIntermediateEvent.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Arrays; import java.util.Objects; import java.util.Optional; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; /** * Represents a BPMN intermediate event diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNPool.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNPool.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNPool.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNPool.java index 817fee126437..7b50613f5a83 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNPool.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNPool.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Objects; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLContainerElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLContainerElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; /** * Represents a BPMN pool diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNStartEvent.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNStartEvent.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNStartEvent.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNStartEvent.java index d41b8d204f64..dcb49a19da9e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNStartEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNStartEvent.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Arrays; import java.util.Objects; import java.util.Optional; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; /** * Represents a BPMN start event diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNSubprocess.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNSubprocess.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNSubprocess.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNSubprocess.java index 09c0d6ac12b2..b23ecdea1023 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNSubprocess.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNSubprocess.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Objects; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; /** * Represents a BPMN subprocess diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNSwimlane.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNSwimlane.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNSwimlane.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNSwimlane.java index 437ad6d374b0..4931f28ac007 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNSwimlane.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNSwimlane.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Objects; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLContainerElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLContainerElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; /** * Represents a BPMN swimlane diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNTask.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNTask.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNTask.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNTask.java index de5442ae1ad6..33f1e80bd368 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNTask.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNTask.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Arrays; import java.util.Objects; import java.util.Optional; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; /** * Represents a BPMN task diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNTransaction.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNTransaction.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNTransaction.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNTransaction.java index 818048dea126..911594343fd5 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/bpmn/BPMNTransaction.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNTransaction.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Objects; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; /** * Represents a BPMN transaction diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/classdiagram/UMLAttribute.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLAttribute.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/classdiagram/UMLAttribute.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLAttribute.java index a1738250568d..b5870a7a0654 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/classdiagram/UMLAttribute.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLAttribute.java @@ -1,14 +1,14 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram; +package de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram; import java.io.Serializable; import java.util.Objects; import jakarta.validation.constraints.NotNull; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; public class UMLAttribute extends UMLElement implements Serializable { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/classdiagram/UMLClass.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLClass.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/classdiagram/UMLClass.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLClass.java index ffc21541910a..0005b49a8744 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/classdiagram/UMLClass.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLClass.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram; +package de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram; import java.io.Serializable; import java.util.List; @@ -8,10 +8,10 @@ import com.google.common.base.CaseFormat; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; public class UMLClass extends UMLElement implements Serializable { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/classdiagram/UMLClassDiagram.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLClassDiagram.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/classdiagram/UMLClassDiagram.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLClassDiagram.java index 4c3b27e8c05b..22b89c4925df 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/classdiagram/UMLClassDiagram.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLClassDiagram.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram; +package de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class UMLClassDiagram extends UMLDiagram implements Serializable { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/classdiagram/UMLMethod.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLMethod.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/classdiagram/UMLMethod.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLMethod.java index 375e4fc98b4c..b6593b04a67d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/classdiagram/UMLMethod.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLMethod.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram; +package de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram; import java.io.Serializable; import java.util.Collections; @@ -7,10 +7,10 @@ import jakarta.validation.constraints.NotNull; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; public class UMLMethod extends UMLElement implements Serializable { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/classdiagram/UMLPackage.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLPackage.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/classdiagram/UMLPackage.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLPackage.java index e9900cb76278..132f0452b237 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/classdiagram/UMLPackage.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLPackage.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram; +package de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram; import java.io.Serializable; import java.util.List; import java.util.Objects; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLContainerElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLContainerElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class UMLPackage extends UMLContainerElement implements Serializable { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/classdiagram/UMLRelationship.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLRelationship.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/classdiagram/UMLRelationship.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLRelationship.java index 8f593c7ee477..5fcda9494038 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/classdiagram/UMLRelationship.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLRelationship.java @@ -1,17 +1,17 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram; +package de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram; -import static de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity.nameEqualsSimilarity; -import static de.tum.in.www1.artemis.service.compass.utils.CompassConfiguration.RELATION_MULTIPLICITY_WEIGHT; -import static de.tum.in.www1.artemis.service.compass.utils.CompassConfiguration.RELATION_ROLE_WEIGHT; +import static de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity.nameEqualsSimilarity; +import static de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration.RELATION_MULTIPLICITY_WEIGHT; +import static de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration.RELATION_ROLE_WEIGHT; import java.io.Serializable; import java.util.Objects; import com.google.common.base.CaseFormat; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; public class UMLRelationship extends UMLElement implements Serializable { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/communication/Direction.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/communication/Direction.java new file mode 100644 index 000000000000..07919f1be88f --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/communication/Direction.java @@ -0,0 +1,5 @@ +package de.tum.cit.aet.artemis.service.compass.umlmodel.communication; + +public enum Direction { + SOURCE, TARGET +} diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/communication/UMLCommunicationDiagram.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/communication/UMLCommunicationDiagram.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/communication/UMLCommunicationDiagram.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/communication/UMLCommunicationDiagram.java index e8088b24c381..b6360d705fef 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/communication/UMLCommunicationDiagram.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/communication/UMLCommunicationDiagram.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.communication; +package de.tum.cit.aet.artemis.service.compass.umlmodel.communication; import java.util.ArrayList; import java.util.List; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObject; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObject; public class UMLCommunicationDiagram extends UMLDiagram { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/communication/UMLCommunicationLink.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/communication/UMLCommunicationLink.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/communication/UMLCommunicationLink.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/communication/UMLCommunicationLink.java index c52198d7f1b4..0a777bd9ae0a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/communication/UMLCommunicationLink.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/communication/UMLCommunicationLink.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.communication; +package de.tum.cit.aet.artemis.service.compass.umlmodel.communication; import java.util.List; import java.util.Objects; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObject; -import de.tum.in.www1.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObject; +import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; public class UMLCommunicationLink extends UMLElement { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/communication/UMLMessage.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/communication/UMLMessage.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/communication/UMLMessage.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/communication/UMLMessage.java index 22dd024d0b38..789febe5fb73 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/communication/UMLMessage.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/communication/UMLMessage.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.communication; +package de.tum.cit.aet.artemis.service.compass.umlmodel.communication; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; public class UMLMessage { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/component/UMLComponent.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/component/UMLComponent.java similarity index 77% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/component/UMLComponent.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/component/UMLComponent.java index 6a8ee30668b2..8b6979607162 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/component/UMLComponent.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/component/UMLComponent.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.component; +package de.tum.cit.aet.artemis.service.compass.umlmodel.component; import java.util.Objects; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLContainerElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.utils.CompassConfiguration; -import de.tum.in.www1.artemis.service.compass.utils.SimilarityUtils; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLContainerElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.service.compass.utils.SimilarityUtils; public class UMLComponent extends UMLContainerElement { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/component/UMLComponentDiagram.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/component/UMLComponentDiagram.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/component/UMLComponentDiagram.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/component/UMLComponentDiagram.java index 50914698d186..dd77470f9737 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/component/UMLComponentDiagram.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/component/UMLComponentDiagram.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.component; +package de.tum.cit.aet.artemis.service.compass.umlmodel.component; import java.util.ArrayList; import java.util.List; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class UMLComponentDiagram extends UMLDiagram { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/component/UMLComponentInterface.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/component/UMLComponentInterface.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/component/UMLComponentInterface.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/component/UMLComponentInterface.java index 3d7b9bb57c53..9be195be5f84 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/component/UMLComponentInterface.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/component/UMLComponentInterface.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.component; +package de.tum.cit.aet.artemis.service.compass.umlmodel.component; import java.util.Objects; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.utils.CompassConfiguration; -import de.tum.in.www1.artemis.service.compass.utils.SimilarityUtils; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.service.compass.utils.SimilarityUtils; public class UMLComponentInterface extends UMLElement { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/component/UMLComponentRelationship.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/component/UMLComponentRelationship.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/component/UMLComponentRelationship.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/component/UMLComponentRelationship.java index 24818a468ee1..ab566bcebf1b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/component/UMLComponentRelationship.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/component/UMLComponentRelationship.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.component; +package de.tum.cit.aet.artemis.service.compass.umlmodel.component; import java.util.Objects; import com.google.common.base.CaseFormat; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; public class UMLComponentRelationship extends UMLElement { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/deployment/UMLArtifact.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLArtifact.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/deployment/UMLArtifact.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLArtifact.java index 3c8aca0ee730..d5aac39ce959 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/deployment/UMLArtifact.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLArtifact.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.deployment; +package de.tum.cit.aet.artemis.service.compass.umlmodel.deployment; import java.util.Objects; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.utils.CompassConfiguration; -import de.tum.in.www1.artemis.service.compass.utils.SimilarityUtils; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.service.compass.utils.SimilarityUtils; public class UMLArtifact extends UMLElement { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/deployment/UMLDeploymentComponent.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLDeploymentComponent.java similarity index 78% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/deployment/UMLDeploymentComponent.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLDeploymentComponent.java index 888257408b31..487dc61a5ba6 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/deployment/UMLDeploymentComponent.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLDeploymentComponent.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.deployment; +package de.tum.cit.aet.artemis.service.compass.umlmodel.deployment; -import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponent; +import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponent; public class UMLDeploymentComponent extends UMLComponent { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/deployment/UMLDeploymentDiagram.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLDeploymentDiagram.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/deployment/UMLDeploymentDiagram.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLDeploymentDiagram.java index ac4c0a956515..7bb21bcac647 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/deployment/UMLDeploymentDiagram.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLDeploymentDiagram.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.deployment; +package de.tum.cit.aet.artemis.service.compass.umlmodel.deployment; import java.util.List; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponent; -import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentInterface; -import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentRelationship; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponent; +import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentInterface; +import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentRelationship; public class UMLDeploymentDiagram extends UMLComponentDiagram { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/deployment/UMLDeploymentInterface.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLDeploymentInterface.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/deployment/UMLDeploymentInterface.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLDeploymentInterface.java index 30cf7f51784d..b925a4e68f4b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/deployment/UMLDeploymentInterface.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLDeploymentInterface.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.deployment; +package de.tum.cit.aet.artemis.service.compass.umlmodel.deployment; -import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentInterface; +import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentInterface; public class UMLDeploymentInterface extends UMLComponentInterface { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/deployment/UMLNode.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLNode.java similarity index 80% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/deployment/UMLNode.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLNode.java index b8f230a657b3..b566d3c3d960 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/deployment/UMLNode.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLNode.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.deployment; +package de.tum.cit.aet.artemis.service.compass.umlmodel.deployment; import java.util.Objects; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLContainerElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.utils.CompassConfiguration; -import de.tum.in.www1.artemis.service.compass.utils.SimilarityUtils; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLContainerElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.service.compass.utils.SimilarityUtils; public class UMLNode extends UMLContainerElement { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/flowchart/Flowchart.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/Flowchart.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/flowchart/Flowchart.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/Flowchart.java index 49c062f26d43..de12e9398251 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/flowchart/Flowchart.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/Flowchart.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.flowchart; +package de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart; import java.util.ArrayList; import java.util.List; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class Flowchart extends UMLDiagram { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/flowchart/FlowchartDecision.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartDecision.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/flowchart/FlowchartDecision.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartDecision.java index ef41dff3e6e1..e94ce136269d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/flowchart/FlowchartDecision.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartDecision.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.flowchart; +package de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class FlowchartDecision extends UMLElement { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/flowchart/FlowchartFlowline.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartFlowline.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/flowchart/FlowchartFlowline.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartFlowline.java index 8993d15df43f..9bad1b870bf7 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/flowchart/FlowchartFlowline.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartFlowline.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.flowchart; +package de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart; import java.util.Objects; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class FlowchartFlowline extends UMLElement { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/flowchart/FlowchartFunctionCall.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartFunctionCall.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/flowchart/FlowchartFunctionCall.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartFunctionCall.java index 196b0cfa8a69..aa89c2d69da7 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/flowchart/FlowchartFunctionCall.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartFunctionCall.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.flowchart; +package de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class FlowchartFunctionCall extends UMLElement { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/flowchart/FlowchartInputOutput.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartInputOutput.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/flowchart/FlowchartInputOutput.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartInputOutput.java index 5eda3b876803..9e0e853a294f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/flowchart/FlowchartInputOutput.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartInputOutput.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.flowchart; +package de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class FlowchartInputOutput extends UMLElement { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/flowchart/FlowchartProcess.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartProcess.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/flowchart/FlowchartProcess.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartProcess.java index 1c1174ac6896..fc68349cace2 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/flowchart/FlowchartProcess.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartProcess.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.flowchart; +package de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class FlowchartProcess extends UMLElement { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/flowchart/FlowchartTerminal.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartTerminal.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/flowchart/FlowchartTerminal.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartTerminal.java index 2992d98ccd81..00e87d928386 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/flowchart/FlowchartTerminal.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartTerminal.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.flowchart; +package de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class FlowchartTerminal extends UMLElement { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/object/UMLObject.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObject.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/object/UMLObject.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObject.java index 99dee561a97a..c983bf2d9dad 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/object/UMLObject.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObject.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.object; +package de.tum.cit.aet.artemis.service.compass.umlmodel.object; import java.util.List; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class UMLObject extends UMLElement { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/object/UMLObjectAttribute.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObjectAttribute.java similarity index 80% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/object/UMLObjectAttribute.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObjectAttribute.java index 011a0e5350c8..d9a63e57d7ef 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/object/UMLObjectAttribute.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObjectAttribute.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.object; +package de.tum.cit.aet.artemis.service.compass.umlmodel.object; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; public class UMLObjectAttribute extends UMLAttribute { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/object/UMLObjectDiagram.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObjectDiagram.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/object/UMLObjectDiagram.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObjectDiagram.java index f8db1e533f65..da397ef29c30 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/object/UMLObjectDiagram.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObjectDiagram.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.object; +package de.tum.cit.aet.artemis.service.compass.umlmodel.object; import java.util.ArrayList; import java.util.List; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class UMLObjectDiagram extends UMLDiagram { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/object/UMLObjectLink.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObjectLink.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/object/UMLObjectLink.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObjectLink.java index dd1af9108237..1e0089a80ced 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/object/UMLObjectLink.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObjectLink.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.object; +package de.tum.cit.aet.artemis.service.compass.umlmodel.object; import java.util.Objects; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class UMLObjectLink extends UMLElement { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/object/UMLObjectMethod.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObjectMethod.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/object/UMLObjectMethod.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObjectMethod.java index d07495348822..aaf715838d6b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/object/UMLObjectMethod.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObjectMethod.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.object; +package de.tum.cit.aet.artemis.service.compass.umlmodel.object; import java.util.List; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLMethod; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLMethod; public class UMLObjectMethod extends UMLMethod { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/UMLModelParser.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/UMLModelParser.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/UMLModelParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/UMLModelParser.java index 08b4e9e5df33..0396faae9694 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/UMLModelParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/UMLModelParser.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.parsers; +package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.DIAGRAM_VERSION; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_ENDPOINT_ID; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.DIAGRAM_VERSION; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_ENDPOINT_ID; import java.io.IOException; import java.util.HashMap; @@ -10,10 +10,10 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2.UMLModelV2Parser; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3.UMLModelV3Parser; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v2.UMLModelV2Parser; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v3.UMLModelV3Parser; public class UMLModelParser { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/ActivityDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/ActivityDiagramParser.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/ActivityDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/ActivityDiagramParser.java index 527baedcf7a3..0598e4379479 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/ActivityDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/ActivityDiagramParser.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2; +package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v2; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_OWNER; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_OWNER; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; import java.io.IOException; import java.util.ArrayList; @@ -20,12 +20,12 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivity; -import de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityNode; -import de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLControlFlow; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityNode; +import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLControlFlow; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; public class ActivityDiagramParser { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/ClassDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/ClassDiagramParser.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/ClassDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/ClassDiagramParser.java index 06cb649466a2..e51483bc6432 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/ClassDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/ClassDiagramParser.java @@ -1,17 +1,17 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2; - -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_ATTRIBUTES; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_METHODS; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_OWNER; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_ENDPOINT_ID; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_MULTIPLICITY; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_ROLE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TYPE; +package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v2; + +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ATTRIBUTES; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_METHODS; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_OWNER; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_ENDPOINT_ID; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_MULTIPLICITY; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_ROLE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TYPE; import java.io.IOException; import java.util.ArrayList; @@ -30,14 +30,14 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLClass; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLClassDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLMethod; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLPackage; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLRelationship; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClass; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClassDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLMethod; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLPackage; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; public class ClassDiagramParser { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/CommunicationDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/CommunicationDiagramParser.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/CommunicationDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/CommunicationDiagramParser.java index 3379346cd784..a46993ff5580 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/CommunicationDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/CommunicationDiagramParser.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2; +package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v2; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_MESSAGES; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_MESSAGES; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; import java.io.IOException; import java.util.ArrayList; @@ -15,12 +15,12 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.communication.Direction; -import de.tum.in.www1.artemis.service.compass.umlmodel.communication.UMLCommunicationDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.communication.UMLCommunicationLink; -import de.tum.in.www1.artemis.service.compass.umlmodel.communication.UMLMessage; -import de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.service.compass.umlmodel.communication.Direction; +import de.tum.cit.aet.artemis.service.compass.umlmodel.communication.UMLCommunicationDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.communication.UMLCommunicationLink; +import de.tum.cit.aet.artemis.service.compass.umlmodel.communication.UMLMessage; +import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObject; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; public class CommunicationDiagramParser { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/ComponentDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/ComponentDiagramParser.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/ComponentDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/ComponentDiagramParser.java index 91992f6345e4..535ebb3d6683 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/ComponentDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/ComponentDiagramParser.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2; +package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v2; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_OWNER; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TYPE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_OWNER; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TYPE; import java.io.IOException; import java.util.ArrayList; @@ -22,12 +22,12 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponent; -import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentInterface; -import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentRelationship; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponent; +import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentInterface; +import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentRelationship; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; public class ComponentDiagramParser { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/DeploymentDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/DeploymentDiagramParser.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/DeploymentDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/DeploymentDiagramParser.java index 83024457c398..f539b6d43e95 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/DeploymentDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/DeploymentDiagramParser.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2; +package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v2; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.STEREOTYPE_NAME; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.STEREOTYPE_NAME; import java.io.IOException; import java.util.ArrayList; @@ -16,13 +16,13 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentRelationship; -import de.tum.in.www1.artemis.service.compass.umlmodel.deployment.UMLArtifact; -import de.tum.in.www1.artemis.service.compass.umlmodel.deployment.UMLDeploymentComponent; -import de.tum.in.www1.artemis.service.compass.umlmodel.deployment.UMLDeploymentDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.deployment.UMLDeploymentInterface; -import de.tum.in.www1.artemis.service.compass.umlmodel.deployment.UMLNode; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentRelationship; +import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLArtifact; +import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLDeploymentComponent; +import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLDeploymentDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLDeploymentInterface; +import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLNode; public class DeploymentDiagramParser { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/FlowchartParser.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/FlowchartParser.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/FlowchartParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/FlowchartParser.java index 27d3f65da558..47e2c1566f60 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/FlowchartParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/FlowchartParser.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2; +package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v2; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; import java.io.IOException; import java.util.ArrayList; @@ -17,15 +17,15 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.Flowchart; -import de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartDecision; -import de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartFlowline; -import de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartFunctionCall; -import de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartInputOutput; -import de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartProcess; -import de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartTerminal; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.Flowchart; +import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartDecision; +import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartFlowline; +import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartFunctionCall; +import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartInputOutput; +import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartProcess; +import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartTerminal; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; public class FlowchartParser { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/ObjectDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/ObjectDiagramParser.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/ObjectDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/ObjectDiagramParser.java index 11c6df63e94e..b91efc300289 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/ObjectDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/ObjectDiagramParser.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2; +package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v2; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_ATTRIBUTES; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_METHODS; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ATTRIBUTES; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_METHODS; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; import java.io.IOException; import java.util.ArrayList; @@ -21,14 +21,14 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLMethod; -import de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObjectAttribute; -import de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObjectDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObjectLink; -import de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObjectMethod; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLMethod; +import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObject; +import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObjectAttribute; +import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObjectDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObjectLink; +import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObjectMethod; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; public class ObjectDiagramParser { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/PetriNetParser.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/PetriNetParser.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/PetriNetParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/PetriNetParser.java index b46303226dc5..80f2d844e3e0 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/PetriNetParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/PetriNetParser.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2; +package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v2; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; import java.io.IOException; import java.util.ArrayList; @@ -17,12 +17,12 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; -import de.tum.in.www1.artemis.service.compass.umlmodel.petrinet.PetriNet; -import de.tum.in.www1.artemis.service.compass.umlmodel.petrinet.PetriNetArc; -import de.tum.in.www1.artemis.service.compass.umlmodel.petrinet.PetriNetPlace; -import de.tum.in.www1.artemis.service.compass.umlmodel.petrinet.PetriNetTransition; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet.PetriNet; +import de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet.PetriNetArc; +import de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet.PetriNetPlace; +import de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet.PetriNetTransition; public class PetriNetParser { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/SyntaxTreeParser.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/SyntaxTreeParser.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/SyntaxTreeParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/SyntaxTreeParser.java index cc38954e2a3a..9db0efaab28c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/SyntaxTreeParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/SyntaxTreeParser.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2; +package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v2; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; import java.io.IOException; import java.util.ArrayList; @@ -17,12 +17,12 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; -import de.tum.in.www1.artemis.service.compass.umlmodel.syntaxtree.SyntaxTree; -import de.tum.in.www1.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeLink; -import de.tum.in.www1.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeNonterminal; -import de.tum.in.www1.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeTerminal; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree.SyntaxTree; +import de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeLink; +import de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeNonterminal; +import de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeTerminal; public class SyntaxTreeParser { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/UMLModelV2Parser.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/UMLModelV2Parser.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/UMLModelV2Parser.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/UMLModelV2Parser.java index 044801bff436..817a463e3a6b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/UMLModelV2Parser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/UMLModelV2Parser.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2; +package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v2; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.DIAGRAM_TYPE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENTS; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIPS; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.DIAGRAM_TYPE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENTS; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIPS; import java.io.IOException; @@ -11,8 +11,8 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import de.tum.in.www1.artemis.domain.enumeration.DiagramType; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; public class UMLModelV2Parser { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/UseCaseDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/UseCaseDiagramParser.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/UseCaseDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/UseCaseDiagramParser.java index 563bf05e4bd9..f085a1fa5c4b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v2/UseCaseDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/UseCaseDiagramParser.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2; +package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v2; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_OWNER; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TYPE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_OWNER; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TYPE; import java.io.IOException; import java.util.ArrayList; @@ -22,13 +22,13 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; -import de.tum.in.www1.artemis.service.compass.umlmodel.usecase.UMLActor; -import de.tum.in.www1.artemis.service.compass.umlmodel.usecase.UMLSystemBoundary; -import de.tum.in.www1.artemis.service.compass.umlmodel.usecase.UMLUseCase; -import de.tum.in.www1.artemis.service.compass.umlmodel.usecase.UMLUseCaseAssociation; -import de.tum.in.www1.artemis.service.compass.umlmodel.usecase.UMLUseCaseDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLActor; +import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLSystemBoundary; +import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLUseCase; +import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLUseCaseAssociation; +import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLUseCaseDiagram; public class UseCaseDiagramParser { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/ActivityDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/ActivityDiagramParser.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/ActivityDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/ActivityDiagramParser.java index e6c042208f50..51df237ed9a0 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/ActivityDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/ActivityDiagramParser.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3; +package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v3; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_OWNER; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_OWNER; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; import java.io.IOException; import java.util.ArrayList; @@ -18,12 +18,12 @@ import com.google.common.base.CaseFormat; import com.google.gson.JsonObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivity; -import de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityNode; -import de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLControlFlow; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityNode; +import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLControlFlow; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; public class ActivityDiagramParser { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/BPMNDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/BPMNDiagramParser.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/BPMNDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/BPMNDiagramParser.java index d679c2cc82bc..87048fe8dc8c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/BPMNDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/BPMNDiagramParser.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3; +package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v3; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_OWNER; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_OWNER; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; import java.io.IOException; import java.util.ArrayList; @@ -15,25 +15,25 @@ import com.google.gson.JsonObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLContainerElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNAnnotation; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNCallActivity; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNDataObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNDataStore; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNEndEvent; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNFlow; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNGateway; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNGroup; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNIntermediateEvent; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNPool; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNStartEvent; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNSubprocess; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNSwimlane; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNTask; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNTransaction; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLContainerElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNAnnotation; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNCallActivity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNDataObject; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNDataStore; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNEndEvent; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNFlow; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNGateway; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNGroup; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNIntermediateEvent; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNPool; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNStartEvent; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNSubprocess; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNSwimlane; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNTask; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNTransaction; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; public class BPMNDiagramParser { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/ClassDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/ClassDiagramParser.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/ClassDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/ClassDiagramParser.java index 5f18257f23e9..db0faebd9812 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/ClassDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/ClassDiagramParser.java @@ -1,17 +1,17 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3; - -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_ATTRIBUTES; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_METHODS; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_OWNER; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_ENDPOINT_ID; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_MULTIPLICITY; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_ROLE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TYPE; +package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v3; + +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ATTRIBUTES; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_METHODS; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_OWNER; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_ENDPOINT_ID; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_MULTIPLICITY; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_ROLE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TYPE; import java.io.IOException; import java.util.ArrayList; @@ -29,14 +29,14 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLClass; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLClassDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLMethod; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLPackage; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLRelationship; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClass; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClassDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLMethod; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLPackage; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; public class ClassDiagramParser { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/CommunicationDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/CommunicationDiagramParser.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/CommunicationDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/CommunicationDiagramParser.java index c0af408881e7..b0900211eca3 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/CommunicationDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/CommunicationDiagramParser.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3; +package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v3; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_MESSAGES; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_MESSAGES; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; import java.io.IOException; import java.util.ArrayList; @@ -13,12 +13,12 @@ import com.google.gson.JsonObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.communication.Direction; -import de.tum.in.www1.artemis.service.compass.umlmodel.communication.UMLCommunicationDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.communication.UMLCommunicationLink; -import de.tum.in.www1.artemis.service.compass.umlmodel.communication.UMLMessage; -import de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.service.compass.umlmodel.communication.Direction; +import de.tum.cit.aet.artemis.service.compass.umlmodel.communication.UMLCommunicationDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.communication.UMLCommunicationLink; +import de.tum.cit.aet.artemis.service.compass.umlmodel.communication.UMLMessage; +import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObject; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; public class CommunicationDiagramParser { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/ComponentDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/ComponentDiagramParser.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/ComponentDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/ComponentDiagramParser.java index cd36c246f6b9..71513cfb41ff 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/ComponentDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/ComponentDiagramParser.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3; +package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v3; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_OWNER; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TYPE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_OWNER; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TYPE; import java.io.IOException; import java.util.ArrayList; @@ -20,12 +20,12 @@ import com.google.common.base.CaseFormat; import com.google.gson.JsonObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponent; -import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentInterface; -import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentRelationship; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponent; +import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentInterface; +import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentRelationship; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; public class ComponentDiagramParser { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/DeploymentDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/DeploymentDiagramParser.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/DeploymentDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/DeploymentDiagramParser.java index 1d7e6c079561..a45153ff8c0d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/DeploymentDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/DeploymentDiagramParser.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3; +package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v3; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.STEREOTYPE_NAME; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.STEREOTYPE_NAME; import java.io.IOException; import java.util.ArrayList; @@ -14,13 +14,13 @@ import com.google.gson.JsonObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentRelationship; -import de.tum.in.www1.artemis.service.compass.umlmodel.deployment.UMLArtifact; -import de.tum.in.www1.artemis.service.compass.umlmodel.deployment.UMLDeploymentComponent; -import de.tum.in.www1.artemis.service.compass.umlmodel.deployment.UMLDeploymentDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.deployment.UMLDeploymentInterface; -import de.tum.in.www1.artemis.service.compass.umlmodel.deployment.UMLNode; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentRelationship; +import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLArtifact; +import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLDeploymentComponent; +import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLDeploymentDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLDeploymentInterface; +import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLNode; public class DeploymentDiagramParser { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/FlowchartParser.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/FlowchartParser.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/FlowchartParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/FlowchartParser.java index da20cf7b1b78..9dbf73fb09c3 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/FlowchartParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/FlowchartParser.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3; +package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v3; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; import java.io.IOException; import java.util.ArrayList; @@ -15,15 +15,15 @@ import com.google.gson.JsonObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.Flowchart; -import de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartDecision; -import de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartFlowline; -import de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartFunctionCall; -import de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartInputOutput; -import de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartProcess; -import de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartTerminal; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.Flowchart; +import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartDecision; +import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartFlowline; +import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartFunctionCall; +import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartInputOutput; +import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartProcess; +import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartTerminal; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; public class FlowchartParser { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/ObjectDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/ObjectDiagramParser.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/ObjectDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/ObjectDiagramParser.java index b68aff38495e..95bede561eb8 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/ObjectDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/ObjectDiagramParser.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3; +package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v3; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_ATTRIBUTES; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_METHODS; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ATTRIBUTES; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_METHODS; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; import java.io.IOException; import java.util.ArrayList; @@ -20,14 +20,14 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLMethod; -import de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObjectAttribute; -import de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObjectDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObjectLink; -import de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObjectMethod; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLMethod; +import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObject; +import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObjectAttribute; +import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObjectDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObjectLink; +import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObjectMethod; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; public class ObjectDiagramParser { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/PetriNetParser.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/PetriNetParser.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/PetriNetParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/PetriNetParser.java index 68d25440b8ac..fde51e7a4f3c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/PetriNetParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/PetriNetParser.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3; +package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v3; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; import java.io.IOException; import java.util.ArrayList; @@ -15,12 +15,12 @@ import com.google.gson.JsonObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; -import de.tum.in.www1.artemis.service.compass.umlmodel.petrinet.PetriNet; -import de.tum.in.www1.artemis.service.compass.umlmodel.petrinet.PetriNetArc; -import de.tum.in.www1.artemis.service.compass.umlmodel.petrinet.PetriNetPlace; -import de.tum.in.www1.artemis.service.compass.umlmodel.petrinet.PetriNetTransition; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet.PetriNet; +import de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet.PetriNetArc; +import de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet.PetriNetPlace; +import de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet.PetriNetTransition; public class PetriNetParser { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/SyntaxTreeParser.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/SyntaxTreeParser.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/SyntaxTreeParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/SyntaxTreeParser.java index 3b84ffac4015..0764bbec5484 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/SyntaxTreeParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/SyntaxTreeParser.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3; +package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v3; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; import java.io.IOException; import java.util.ArrayList; @@ -15,12 +15,12 @@ import com.google.gson.JsonObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; -import de.tum.in.www1.artemis.service.compass.umlmodel.syntaxtree.SyntaxTree; -import de.tum.in.www1.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeLink; -import de.tum.in.www1.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeNonterminal; -import de.tum.in.www1.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeTerminal; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree.SyntaxTree; +import de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeLink; +import de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeNonterminal; +import de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeTerminal; public class SyntaxTreeParser { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/UMLModelV3Parser.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/UMLModelV3Parser.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/UMLModelV3Parser.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/UMLModelV3Parser.java index a323de73df40..8e90803cda5e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/UMLModelV3Parser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/UMLModelV3Parser.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3; +package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v3; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.DIAGRAM_TYPE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENTS; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIPS; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.DIAGRAM_TYPE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENTS; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIPS; import java.io.IOException; @@ -10,8 +10,8 @@ import com.google.gson.JsonObject; -import de.tum.in.www1.artemis.domain.enumeration.DiagramType; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; public class UMLModelV3Parser { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/UseCaseDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/UseCaseDiagramParser.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/UseCaseDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/UseCaseDiagramParser.java index a550a754e8c8..99205e5559e5 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/parsers/v3/UseCaseDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/UseCaseDiagramParser.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3; +package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v3; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_OWNER; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; -import static de.tum.in.www1.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TYPE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_OWNER; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TYPE; import java.io.IOException; import java.util.ArrayList; @@ -20,13 +20,13 @@ import com.google.common.base.CaseFormat; import com.google.gson.JsonObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; -import de.tum.in.www1.artemis.service.compass.umlmodel.usecase.UMLActor; -import de.tum.in.www1.artemis.service.compass.umlmodel.usecase.UMLSystemBoundary; -import de.tum.in.www1.artemis.service.compass.umlmodel.usecase.UMLUseCase; -import de.tum.in.www1.artemis.service.compass.umlmodel.usecase.UMLUseCaseAssociation; -import de.tum.in.www1.artemis.service.compass.umlmodel.usecase.UMLUseCaseDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLActor; +import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLSystemBoundary; +import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLUseCase; +import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLUseCaseAssociation; +import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLUseCaseDiagram; public class UseCaseDiagramParser { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/petrinet/PetriNet.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/petrinet/PetriNet.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/petrinet/PetriNet.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/petrinet/PetriNet.java index 4772365a02a2..b5a5ea20cd0e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/petrinet/PetriNet.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/petrinet/PetriNet.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.petrinet; +package de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet; import java.util.ArrayList; import java.util.List; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class PetriNet extends UMLDiagram { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/petrinet/PetriNetArc.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/petrinet/PetriNetArc.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/petrinet/PetriNetArc.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/petrinet/PetriNetArc.java index 0e00c633859e..8dff38cc9d68 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/petrinet/PetriNetArc.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/petrinet/PetriNetArc.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.petrinet; +package de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet; import java.util.Objects; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class PetriNetArc extends UMLElement { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/petrinet/PetriNetPlace.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/petrinet/PetriNetPlace.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/petrinet/PetriNetPlace.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/petrinet/PetriNetPlace.java index 1be9e16c663d..a88ef7eeb1ef 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/petrinet/PetriNetPlace.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/petrinet/PetriNetPlace.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.petrinet; +package de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class PetriNetPlace extends UMLElement { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/petrinet/PetriNetTransition.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/petrinet/PetriNetTransition.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/petrinet/PetriNetTransition.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/petrinet/PetriNetTransition.java index 5b95478b668c..dc3b2adc71c9 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/petrinet/PetriNetTransition.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/petrinet/PetriNetTransition.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.petrinet; +package de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class PetriNetTransition extends UMLElement { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/syntaxtree/SyntaxTree.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/syntaxtree/SyntaxTree.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/syntaxtree/SyntaxTree.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/syntaxtree/SyntaxTree.java index 743be7860396..a61dc2008a92 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/syntaxtree/SyntaxTree.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/syntaxtree/SyntaxTree.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.syntaxtree; +package de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree; import java.util.ArrayList; import java.util.List; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class SyntaxTree extends UMLDiagram { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeLink.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeLink.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeLink.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeLink.java index d9b22708863b..19b632c8347b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeLink.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeLink.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.syntaxtree; +package de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree; import java.util.Objects; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class SyntaxTreeLink extends UMLElement { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeNonterminal.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeNonterminal.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeNonterminal.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeNonterminal.java index 573f2fd887f0..2bd2a859d383 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeNonterminal.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeNonterminal.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.syntaxtree; +package de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class SyntaxTreeNonterminal extends UMLElement { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeTerminal.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeTerminal.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeTerminal.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeTerminal.java index f156187ffb40..7695b82b97f8 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeTerminal.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeTerminal.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.syntaxtree; +package de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class SyntaxTreeTerminal extends UMLElement { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/usecase/UMLActor.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLActor.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/usecase/UMLActor.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLActor.java index 497d7358390a..1c1702e87147 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/usecase/UMLActor.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLActor.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.usecase; +package de.tum.cit.aet.artemis.service.compass.umlmodel.usecase; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class UMLActor extends UMLElement { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/usecase/UMLSystemBoundary.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLSystemBoundary.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/usecase/UMLSystemBoundary.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLSystemBoundary.java index 11070a7fec76..67f2ee11eb41 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/usecase/UMLSystemBoundary.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLSystemBoundary.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.usecase; +package de.tum.cit.aet.artemis.service.compass.umlmodel.usecase; import java.util.Objects; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLContainerElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLContainerElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class UMLSystemBoundary extends UMLContainerElement { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/usecase/UMLUseCase.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLUseCase.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/usecase/UMLUseCase.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLUseCase.java index eebdad48b5c3..caf85d819f99 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/usecase/UMLUseCase.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLUseCase.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.usecase; +package de.tum.cit.aet.artemis.service.compass.umlmodel.usecase; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.utils.CompassConfiguration; -import de.tum.in.www1.artemis.service.compass.utils.SimilarityUtils; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.service.compass.utils.SimilarityUtils; public class UMLUseCase extends UMLElement { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/usecase/UMLUseCaseAssociation.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLUseCaseAssociation.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/usecase/UMLUseCaseAssociation.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLUseCaseAssociation.java index 57ebb99ef83c..6438efd1e893 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/usecase/UMLUseCaseAssociation.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLUseCaseAssociation.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.usecase; +package de.tum.cit.aet.artemis.service.compass.umlmodel.usecase; import java.util.Objects; import com.google.common.base.CaseFormat; -import de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; public class UMLUseCaseAssociation extends UMLElement { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/usecase/UMLUseCaseDiagram.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLUseCaseDiagram.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/usecase/UMLUseCaseDiagram.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLUseCaseDiagram.java index c41caa86f485..49117b354112 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/usecase/UMLUseCaseDiagram.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLUseCaseDiagram.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.usecase; +package de.tum.cit.aet.artemis.service.compass.umlmodel.usecase; import java.util.ArrayList; import java.util.List; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class UMLUseCaseDiagram extends UMLDiagram { diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/utils/CompassConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/utils/CompassConfiguration.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/service/compass/utils/CompassConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/utils/CompassConfiguration.java index defffcda0804..841bb8237d4a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/utils/CompassConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/utils/CompassConfiguration.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.compass.utils; +package de.tum.cit.aet.artemis.service.compass.utils; /** * All similarity related parameters diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/utils/JSONMapping.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/utils/JSONMapping.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/service/compass/utils/JSONMapping.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/utils/JSONMapping.java index dda2f0c90ee3..388f29e4cfa7 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/utils/JSONMapping.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/utils/JSONMapping.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.compass.utils; +package de.tum.cit.aet.artemis.service.compass.utils; /** * JSON keywords diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/utils/SimilarityUtils.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/utils/SimilarityUtils.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/compass/utils/SimilarityUtils.java rename to src/main/java/de/tum/cit/aet/artemis/service/compass/utils/SimilarityUtils.java index 52951c8f4d5b..09edc665d37d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/utils/SimilarityUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/utils/SimilarityUtils.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.compass.utils; +package de.tum.cit.aet.artemis.service.compass.utils; import java.util.Objects; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; public class SimilarityUtils { diff --git a/src/main/java/de/tum/in/www1/artemis/service/competency/CompetencyJolService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyJolService.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/competency/CompetencyJolService.java rename to src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyJolService.java index c1d296cf9b53..c90d88b70472 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/competency/CompetencyJolService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyJolService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.competency; +package de.tum.cit.aet.artemis.service.competency; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static java.util.stream.Collectors.toMap; import static java.util.stream.Collectors.toSet; @@ -14,16 +14,16 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.competency.CompetencyJol; -import de.tum.in.www1.artemis.domain.competency.CompetencyProgress; -import de.tum.in.www1.artemis.repository.CompetencyProgressRepository; -import de.tum.in.www1.artemis.repository.CompetencyRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.competency.CompetencyJolRepository; -import de.tum.in.www1.artemis.service.iris.session.IrisCourseChatSessionService; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyJolDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyJolPairDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.competency.CompetencyJol; +import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; +import de.tum.cit.aet.artemis.repository.CompetencyProgressRepository; +import de.tum.cit.aet.artemis.repository.CompetencyRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.competency.CompetencyJolRepository; +import de.tum.cit.aet.artemis.service.iris.session.IrisCourseChatSessionService; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolPairDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; /** * Service Implementation for managing CompetencyJol. diff --git a/src/main/java/de/tum/in/www1/artemis/service/competency/CompetencyProgressService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyProgressService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/competency/CompetencyProgressService.java rename to src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyProgressService.java index ee3cb9808da6..6d6515829531 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/competency/CompetencyProgressService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyProgressService.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.competency; +package de.tum.cit.aet.artemis.service.competency; -import static de.tum.in.www1.artemis.config.Constants.MIN_SCORE_GREEN; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.service.util.TimeUtil.toRelativeTime; +import static de.tum.cit.aet.artemis.config.Constants.MIN_SCORE_GREEN; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.service.util.TimeUtil.toRelativeTime; import java.time.Instant; import java.util.List; @@ -19,27 +19,27 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.LearningObject; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.CompetencyProgress; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; -import de.tum.in.www1.artemis.domain.enumeration.CompetencyProgressConfidenceReason; -import de.tum.in.www1.artemis.domain.enumeration.DifficultyLevel; -import de.tum.in.www1.artemis.domain.lecture.ExerciseUnit; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.domain.participation.Participant; -import de.tum.in.www1.artemis.repository.CompetencyProgressRepository; -import de.tum.in.www1.artemis.repository.CourseCompetencyRepository; -import de.tum.in.www1.artemis.repository.LectureUnitCompletionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.ParticipantScoreService; -import de.tum.in.www1.artemis.service.learningpath.LearningPathService; -import de.tum.in.www1.artemis.service.util.RoundingUtil; -import de.tum.in.www1.artemis.web.rest.dto.CourseCompetencyProgressDTO; -import de.tum.in.www1.artemis.web.rest.dto.metrics.CompetencyExerciseMasteryCalculationDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.LearningObject; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.domain.enumeration.CompetencyProgressConfidenceReason; +import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; +import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.domain.participation.Participant; +import de.tum.cit.aet.artemis.repository.CompetencyProgressRepository; +import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.repository.LectureUnitCompletionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.ParticipantScoreService; +import de.tum.cit.aet.artemis.service.learningpath.LearningPathService; +import de.tum.cit.aet.artemis.service.util.RoundingUtil; +import de.tum.cit.aet.artemis.web.rest.dto.CourseCompetencyProgressDTO; +import de.tum.cit.aet.artemis.web.rest.dto.metrics.CompetencyExerciseMasteryCalculationDTO; /** * Service for calculating the progress of a student in a competency. diff --git a/src/main/java/de/tum/in/www1/artemis/service/competency/CompetencyRelationService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyRelationService.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/competency/CompetencyRelationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyRelationService.java index b8e8782ff6d6..06882253ae01 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/competency/CompetencyRelationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyRelationService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.competency; +package de.tum.cit.aet.artemis.service.competency; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.HashSet; @@ -12,12 +12,12 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.competency.CompetencyRelation; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; -import de.tum.in.www1.artemis.domain.competency.RelationType; -import de.tum.in.www1.artemis.repository.CompetencyRelationRepository; -import de.tum.in.www1.artemis.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.competency.CompetencyRelation; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.domain.competency.RelationType; +import de.tum.cit.aet.artemis.repository.CompetencyRelationRepository; +import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; /** * Service for managing CompetencyRelations. diff --git a/src/main/java/de/tum/in/www1/artemis/service/competency/CompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyService.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/service/competency/CompetencyService.java rename to src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyService.java index 9b28b65cd3b9..8331737e5ba0 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/competency/CompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.competency; +package de.tum.cit.aet.artemis.service.competency; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.Collection; @@ -11,20 +11,20 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.competency.Competency; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; -import de.tum.in.www1.artemis.repository.CompetencyProgressRepository; -import de.tum.in.www1.artemis.repository.CompetencyRelationRepository; -import de.tum.in.www1.artemis.repository.CompetencyRepository; -import de.tum.in.www1.artemis.repository.CourseCompetencyRepository; -import de.tum.in.www1.artemis.repository.LectureUnitCompletionRepository; -import de.tum.in.www1.artemis.repository.competency.StandardizedCompetencyRepository; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ExerciseService; -import de.tum.in.www1.artemis.service.LectureUnitService; -import de.tum.in.www1.artemis.service.learningpath.LearningPathService; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.competency.Competency; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.repository.CompetencyProgressRepository; +import de.tum.cit.aet.artemis.repository.CompetencyRelationRepository; +import de.tum.cit.aet.artemis.repository.CompetencyRepository; +import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.repository.LectureUnitCompletionRepository; +import de.tum.cit.aet.artemis.repository.competency.StandardizedCompetencyRepository; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ExerciseService; +import de.tum.cit.aet.artemis.service.LectureUnitService; +import de.tum.cit.aet.artemis.service.learningpath.LearningPathService; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; /** * Service for managing competencies. diff --git a/src/main/java/de/tum/in/www1/artemis/service/competency/CourseCompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/CourseCompetencyService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/competency/CourseCompetencyService.java rename to src/main/java/de/tum/cit/aet/artemis/service/competency/CourseCompetencyService.java index 407e83237792..603ae1177be8 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/competency/CourseCompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/CourseCompetencyService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.competency; +package de.tum.cit.aet.artemis.service.competency; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.Collection; @@ -19,30 +19,30 @@ import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.Competency; -import de.tum.in.www1.artemis.domain.competency.CompetencyRelation; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; -import de.tum.in.www1.artemis.domain.competency.Prerequisite; -import de.tum.in.www1.artemis.domain.competency.StandardizedCompetency; -import de.tum.in.www1.artemis.repository.CompetencyProgressRepository; -import de.tum.in.www1.artemis.repository.CompetencyRelationRepository; -import de.tum.in.www1.artemis.repository.CourseCompetencyRepository; -import de.tum.in.www1.artemis.repository.LectureUnitCompletionRepository; -import de.tum.in.www1.artemis.repository.competency.StandardizedCompetencyRepository; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ExerciseService; -import de.tum.in.www1.artemis.service.LectureUnitService; -import de.tum.in.www1.artemis.service.learningpath.LearningPathService; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyRelationDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.CompetencyPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.in.www1.artemis.web.rest.util.PageUtil; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.competency.Competency; +import de.tum.cit.aet.artemis.domain.competency.CompetencyRelation; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.domain.competency.Prerequisite; +import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; +import de.tum.cit.aet.artemis.repository.CompetencyProgressRepository; +import de.tum.cit.aet.artemis.repository.CompetencyRelationRepository; +import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.repository.LectureUnitCompletionRepository; +import de.tum.cit.aet.artemis.repository.competency.StandardizedCompetencyRepository; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ExerciseService; +import de.tum.cit.aet.artemis.service.LectureUnitService; +import de.tum.cit.aet.artemis.service.learningpath.LearningPathService; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyRelationDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.CompetencyPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.rest.util.PageUtil; /** * Service for managing competencies. diff --git a/src/main/java/de/tum/in/www1/artemis/service/competency/KnowledgeAreaService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/KnowledgeAreaService.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/competency/KnowledgeAreaService.java rename to src/main/java/de/tum/cit/aet/artemis/service/competency/KnowledgeAreaService.java index 02d6ecbc8bcf..eb32e8dc878d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/competency/KnowledgeAreaService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/KnowledgeAreaService.java @@ -1,16 +1,16 @@ -package de.tum.in.www1.artemis.service.competency; +package de.tum.cit.aet.artemis.service.competency; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import jakarta.ws.rs.BadRequestException; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.competency.KnowledgeArea; -import de.tum.in.www1.artemis.repository.competency.KnowledgeAreaRepository; -import de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaRequestDTO; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.competency.KnowledgeArea; +import de.tum.cit.aet.artemis.repository.competency.KnowledgeAreaRepository; +import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaRequestDTO; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Service for managing {@link KnowledgeArea} entities. diff --git a/src/main/java/de/tum/in/www1/artemis/service/competency/PrerequisiteService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/PrerequisiteService.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/service/competency/PrerequisiteService.java rename to src/main/java/de/tum/cit/aet/artemis/service/competency/PrerequisiteService.java index e010f47d1cef..b42eebf3f16c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/competency/PrerequisiteService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/PrerequisiteService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.competency; +package de.tum.cit.aet.artemis.service.competency; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.Collection; @@ -11,20 +11,20 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; -import de.tum.in.www1.artemis.domain.competency.Prerequisite; -import de.tum.in.www1.artemis.repository.CompetencyProgressRepository; -import de.tum.in.www1.artemis.repository.CompetencyRelationRepository; -import de.tum.in.www1.artemis.repository.CourseCompetencyRepository; -import de.tum.in.www1.artemis.repository.LectureUnitCompletionRepository; -import de.tum.in.www1.artemis.repository.PrerequisiteRepository; -import de.tum.in.www1.artemis.repository.competency.StandardizedCompetencyRepository; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ExerciseService; -import de.tum.in.www1.artemis.service.LectureUnitService; -import de.tum.in.www1.artemis.service.learningpath.LearningPathService; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.domain.competency.Prerequisite; +import de.tum.cit.aet.artemis.repository.CompetencyProgressRepository; +import de.tum.cit.aet.artemis.repository.CompetencyRelationRepository; +import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.repository.LectureUnitCompletionRepository; +import de.tum.cit.aet.artemis.repository.PrerequisiteRepository; +import de.tum.cit.aet.artemis.repository.competency.StandardizedCompetencyRepository; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ExerciseService; +import de.tum.cit.aet.artemis.service.LectureUnitService; +import de.tum.cit.aet.artemis.service.learningpath.LearningPathService; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; /** * Service for managing prerequisites. diff --git a/src/main/java/de/tum/in/www1/artemis/service/competency/StandardizedCompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/StandardizedCompetencyService.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/competency/StandardizedCompetencyService.java rename to src/main/java/de/tum/cit/aet/artemis/service/competency/StandardizedCompetencyService.java index 9fcef2f8a293..deb05073e812 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/competency/StandardizedCompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/StandardizedCompetencyService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.competency; +package de.tum.cit.aet.artemis.service.competency; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.domain.competency.StandardizedCompetency.FIRST_VERSION; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency.FIRST_VERSION; import java.util.ArrayList; import java.util.Collections; @@ -20,19 +20,19 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.competency.KnowledgeArea; -import de.tum.in.www1.artemis.domain.competency.Source; -import de.tum.in.www1.artemis.domain.competency.StandardizedCompetency; -import de.tum.in.www1.artemis.repository.SourceRepository; -import de.tum.in.www1.artemis.repository.competency.KnowledgeAreaRepository; -import de.tum.in.www1.artemis.repository.competency.StandardizedCompetencyRepository; -import de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.SourceDTO; -import de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO; -import de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO.KnowledgeAreaForCatalogDTO; -import de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO.StandardizedCompetencyForCatalogDTO; -import de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyRequestDTO; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.domain.competency.KnowledgeArea; +import de.tum.cit.aet.artemis.domain.competency.Source; +import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; +import de.tum.cit.aet.artemis.repository.SourceRepository; +import de.tum.cit.aet.artemis.repository.competency.KnowledgeAreaRepository; +import de.tum.cit.aet.artemis.repository.competency.StandardizedCompetencyRepository; +import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.SourceDTO; +import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO; +import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO.KnowledgeAreaForCatalogDTO; +import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO.StandardizedCompetencyForCatalogDTO; +import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyRequestDTO; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; /** * Service for managing {@link StandardizedCompetency} entities. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/AbstractGitService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/AbstractGitService.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/AbstractGitService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/AbstractGitService.java index cac9e2189c90..2611f366b45f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/AbstractGitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/AbstractGitService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors; +package de.tum.cit.aet.artemis.service.connectors; import java.io.ByteArrayOutputStream; import java.io.File; @@ -47,9 +47,9 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; public abstract class AbstractGitService { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/BuildScriptGenerationService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/BuildScriptGenerationService.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/BuildScriptGenerationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/BuildScriptGenerationService.java index f2056d4e16f8..929697217a4f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/BuildScriptGenerationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/BuildScriptGenerationService.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.connectors; +package de.tum.cit.aet.artemis.service.connectors; import com.fasterxml.jackson.core.JsonProcessingException; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; /** * Abstract Service for generating build scripts for programming exercises diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/BuildScriptProviderService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/BuildScriptProviderService.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/BuildScriptProviderService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/BuildScriptProviderService.java index 2975cf69b2a4..8585e1cf86bd 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/BuildScriptProviderService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/BuildScriptProviderService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors; +package de.tum.cit.aet.artemis.service.connectors; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -18,12 +18,12 @@ import org.springframework.core.io.Resource; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.service.ResourceLoaderService; -import de.tum.in.www1.artemis.service.connectors.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.service.ResourceLoaderService; +import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; /** * Service for providing build scripts for programming exercises diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/ConnectorHealth.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ConnectorHealth.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/ConnectorHealth.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/ConnectorHealth.java index aabebef8200b..e78d702703b9 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/ConnectorHealth.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ConnectorHealth.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors; +package de.tum.cit.aet.artemis.service.connectors; import java.util.Map; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/GenericBuildScriptGenerationService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/GenericBuildScriptGenerationService.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/GenericBuildScriptGenerationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/GenericBuildScriptGenerationService.java index 4266e63196ae..7d3a31bb8e19 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/GenericBuildScriptGenerationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/GenericBuildScriptGenerationService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors; +package de.tum.cit.aet.artemis.service.connectors; import java.io.IOException; import java.util.Optional; @@ -8,8 +8,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; /** * Service for generating build scripts for programming exercises diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/GitService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/GitService.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/GitService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/GitService.java index 43bfa2f922f2..c4b25df6da6f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/GitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/GitService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.connectors; +package de.tum.cit.aet.artemis.service.connectors; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.IOException; import java.io.UncheckedIOException; @@ -71,24 +71,24 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.File; -import de.tum.in.www1.artemis.domain.FileType; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exception.GitException; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.ProfileService; -import de.tum.in.www1.artemis.service.ZipFileService; -import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCRepositoryUri; -import de.tum.in.www1.artemis.web.rest.dto.CommitInfoDTO; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.File; +import de.tum.cit.aet.artemis.domain.FileType; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exception.GitException; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.ProfileService; +import de.tum.cit.aet.artemis.service.ZipFileService; +import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; +import de.tum.cit.aet.artemis.web.rest.dto.CommitInfoDTO; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/HazelcastHealthIndicator.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/HazelcastHealthIndicator.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/HazelcastHealthIndicator.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/HazelcastHealthIndicator.java index 833ac60b7f83..5ac22608bd5f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/HazelcastHealthIndicator.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/HazelcastHealthIndicator.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.connectors; +package de.tum.cit.aet.artemis.service.connectors; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_BUILDAGENT; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/SAML2Service.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/SAML2Service.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/SAML2Service.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/SAML2Service.java index 6e1e44c48dc2..a998fed4d46a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/SAML2Service.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/SAML2Service.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors; +package de.tum.cit.aet.artemis.service.connectors; import java.util.Collection; import java.util.HashSet; @@ -21,16 +21,16 @@ import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticatedPrincipal; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.config.SAML2Properties; -import de.tum.in.www1.artemis.domain.Authority; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.UserNotActivatedException; -import de.tum.in.www1.artemis.service.notifications.MailService; -import de.tum.in.www1.artemis.service.user.UserCreationService; -import de.tum.in.www1.artemis.service.user.UserService; -import de.tum.in.www1.artemis.web.rest.vm.ManagedUserVM; +import de.tum.cit.aet.artemis.config.SAML2Properties; +import de.tum.cit.aet.artemis.domain.Authority; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.UserNotActivatedException; +import de.tum.cit.aet.artemis.service.notifications.MailService; +import de.tum.cit.aet.artemis.service.user.UserCreationService; +import de.tum.cit.aet.artemis.service.user.UserService; +import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; /** * This class describes a service for SAML2 authentication. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/Action.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/Action.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/Action.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/Action.java index a1440b716282..1ebf15fbeccc 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/Action.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/Action.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.aeolus; +package de.tum.cit.aet.artemis.service.connectors.aeolus; import java.util.List; import java.util.Map; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/ActionDeserializer.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/ActionDeserializer.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/ActionDeserializer.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/ActionDeserializer.java index 77cf816b3015..52dd84efe0bc 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/ActionDeserializer.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/ActionDeserializer.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.aeolus; +package de.tum.cit.aet.artemis.service.connectors.aeolus; import java.io.IOException; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/AeolusBuildPlanService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusBuildPlanService.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/AeolusBuildPlanService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusBuildPlanService.java index 0cda51e442d2..e0466fc0eda4 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/AeolusBuildPlanService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusBuildPlanService.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.service.connectors.aeolus; +package de.tum.cit.aet.artemis.service.connectors.aeolus; -import static de.tum.in.www1.artemis.config.Constants.ASSIGNMENT_REPO_NAME; -import static de.tum.in.www1.artemis.config.Constants.SOLUTION_REPO_NAME; -import static de.tum.in.www1.artemis.config.Constants.TEST_REPO_NAME; -import static de.tum.in.www1.artemis.domain.enumeration.AeolusTarget.JENKINS; +import static de.tum.cit.aet.artemis.config.Constants.ASSIGNMENT_REPO_NAME; +import static de.tum.cit.aet.artemis.config.Constants.SOLUTION_REPO_NAME; +import static de.tum.cit.aet.artemis.config.Constants.TEST_REPO_NAME; +import static de.tum.cit.aet.artemis.domain.enumeration.AeolusTarget.JENKINS; import java.net.URL; import java.util.HashMap; @@ -29,13 +29,13 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.AuxiliaryRepository; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.AeolusTarget; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.service.InternalUrlService; -import de.tum.in.www1.artemis.service.connectors.aeolus.dto.AeolusGenerationResponseDTO; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.AeolusTarget; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.service.InternalUrlService; +import de.tum.cit.aet.artemis.service.connectors.aeolus.dto.AeolusGenerationResponseDTO; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; /** * Service for publishing custom build plans using Aeolus diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/AeolusBuildScriptGenerationService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusBuildScriptGenerationService.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/AeolusBuildScriptGenerationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusBuildScriptGenerationService.java index d16f6139d272..b27e2ddcb99c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/AeolusBuildScriptGenerationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusBuildScriptGenerationService.java @@ -1,15 +1,15 @@ -package de.tum.in.www1.artemis.service.connectors.aeolus; +package de.tum.cit.aet.artemis.service.connectors.aeolus; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; import com.fasterxml.jackson.core.JsonProcessingException; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.enumeration.AeolusTarget; -import de.tum.in.www1.artemis.service.ProfileService; -import de.tum.in.www1.artemis.service.connectors.BuildScriptGenerationService; -import de.tum.in.www1.artemis.service.connectors.BuildScriptProviderService; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.enumeration.AeolusTarget; +import de.tum.cit.aet.artemis.service.ProfileService; +import de.tum.cit.aet.artemis.service.connectors.BuildScriptGenerationService; +import de.tum.cit.aet.artemis.service.connectors.BuildScriptProviderService; /** * Service for generating build scripts for programming exercises using Aeolus diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/AeolusRepository.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusRepository.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/AeolusRepository.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusRepository.java index debf8507436b..277244eee434 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/AeolusRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusRepository.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.aeolus; +package de.tum.cit.aet.artemis.service.connectors.aeolus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/AeolusResult.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusResult.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/AeolusResult.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusResult.java index 612b95aaea1b..efbd34ffc648 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/AeolusResult.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusResult.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.aeolus; +package de.tum.cit.aet.artemis.service.connectors.aeolus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/AeolusTemplateService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusTemplateService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/AeolusTemplateService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusTemplateService.java index ba641b809223..f29c59246557 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/AeolusTemplateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusTemplateService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.aeolus; +package de.tum.cit.aet.artemis.service.connectors.aeolus; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -19,16 +19,16 @@ import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import de.tum.in.www1.artemis.config.ProgrammingLanguageConfiguration; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.service.ResourceLoaderService; -import de.tum.in.www1.artemis.service.connectors.BuildScriptProviderService; +import de.tum.cit.aet.artemis.config.ProgrammingLanguageConfiguration; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.service.ResourceLoaderService; +import de.tum.cit.aet.artemis.service.connectors.BuildScriptProviderService; /** - * Handles the request to {@link de.tum.in.www1.artemis.web.rest.AeolusTemplateResource} and Artemis internal + * Handles the request to {@link de.tum.cit.aet.artemis.web.rest.AeolusTemplateResource} and Artemis internal * requests to fetch aeolus templates for programming exercises. */ @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/DockerConfig.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/DockerConfig.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/DockerConfig.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/DockerConfig.java index 2d4173c3b4c8..4b2b8acad6cc 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/DockerConfig.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/DockerConfig.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.aeolus; +package de.tum.cit.aet.artemis.service.connectors.aeolus; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/PlatformAction.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/PlatformAction.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/PlatformAction.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/PlatformAction.java index 212fe74cb05f..45e4f825137a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/PlatformAction.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/PlatformAction.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.aeolus; +package de.tum.cit.aet.artemis.service.connectors.aeolus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/ScriptAction.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/ScriptAction.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/ScriptAction.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/ScriptAction.java index 23561c81754b..de85ce94e735 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/ScriptAction.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/ScriptAction.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.aeolus; +package de.tum.cit.aet.artemis.service.connectors.aeolus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/Windfile.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/Windfile.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/Windfile.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/Windfile.java index cf4d6ac0fefe..005b2decc510 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/Windfile.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/Windfile.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.aeolus; +package de.tum.cit.aet.artemis.service.connectors.aeolus; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/WindfileMetadata.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/WindfileMetadata.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/WindfileMetadata.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/WindfileMetadata.java index a0e8a2afa1df..1fde5dd261be 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/WindfileMetadata.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/WindfileMetadata.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.aeolus; +package de.tum.cit.aet.artemis.service.connectors.aeolus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/dto/AeolusGenerationResponseDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/dto/AeolusGenerationResponseDTO.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/dto/AeolusGenerationResponseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/dto/AeolusGenerationResponseDTO.java index a0cabf658c5b..bd54de18b26a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/aeolus/dto/AeolusGenerationResponseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/dto/AeolusGenerationResponseDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.aeolus.dto; +package de.tum.cit.aet.artemis.service.connectors.aeolus.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/apollon/ApollonConversionService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/apollon/ApollonConversionService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/apollon/ApollonConversionService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/apollon/ApollonConversionService.java index ac0e02fd65d4..70d185f9d156 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/apollon/ApollonConversionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/apollon/ApollonConversionService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.apollon; +package de.tum.cit.aet.artemis.service.connectors.apollon; import java.io.IOException; import java.io.InputStream; @@ -12,7 +12,7 @@ import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; -import de.tum.in.www1.artemis.service.connectors.apollon.dto.ApollonModelDTO; +import de.tum.cit.aet.artemis.service.connectors.apollon.dto.ApollonModelDTO; @Service @Profile("apollon") diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/apollon/ApollonHealthIndicator.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/apollon/ApollonHealthIndicator.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/apollon/ApollonHealthIndicator.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/apollon/ApollonHealthIndicator.java index c923ef8d77bf..cd1081f9c33f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/apollon/ApollonHealthIndicator.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/apollon/ApollonHealthIndicator.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.apollon; +package de.tum.cit.aet.artemis.service.connectors.apollon; import java.util.Map; @@ -13,7 +13,7 @@ import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; -import de.tum.in.www1.artemis.service.connectors.ConnectorHealth; +import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; @Component @Profile("apollon") diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/apollon/dto/ApollonModelDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/apollon/dto/ApollonModelDTO.java similarity index 76% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/apollon/dto/ApollonModelDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/apollon/dto/ApollonModelDTO.java index 345d77a3e7fd..61465a4003f9 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/apollon/dto/ApollonModelDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/apollon/dto/ApollonModelDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.apollon.dto; +package de.tum.cit.aet.artemis.service.connectors.apollon.dto; import java.io.Serializable; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaConnector.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaConnector.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaConnector.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaConnector.java index 032b9a5ef550..cd57eb0005b5 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaConnector.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaConnector.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.athena; +package de.tum.cit.aet.artemis.service.connectors.athena; import jakarta.validation.constraints.NotNull; @@ -11,8 +11,8 @@ import org.springframework.web.client.ResourceAccessException; import org.springframework.web.client.RestTemplate; -import de.tum.in.www1.artemis.exception.NetworkingException; -import de.tum.in.www1.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.exception.NetworkingException; +import de.tum.cit.aet.artemis.service.util.TimeLogUtil; /** * Connector to Athena, a remote Artemis service that can create semi-automatic feedback suggestions for tutors. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaDTOConverterService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaDTOConverterService.java similarity index 75% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaDTOConverterService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaDTOConverterService.java index a79b65955ed3..20ca8b84114e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaDTOConverterService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaDTOConverterService.java @@ -1,35 +1,35 @@ -package de.tum.in.www1.artemis.service.connectors.athena; +package de.tum.cit.aet.artemis.service.connectors.athena; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextBlock; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.repository.GradingCriterionRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.TextBlockRepository; -import de.tum.in.www1.artemis.repository.TextExerciseRepository; -import de.tum.in.www1.artemis.service.dto.athena.ExerciseBaseDTO; -import de.tum.in.www1.artemis.service.dto.athena.FeedbackBaseDTO; -import de.tum.in.www1.artemis.service.dto.athena.ModelingExerciseDTO; -import de.tum.in.www1.artemis.service.dto.athena.ModelingFeedbackDTO; -import de.tum.in.www1.artemis.service.dto.athena.ModelingSubmissionDTO; -import de.tum.in.www1.artemis.service.dto.athena.ProgrammingExerciseDTO; -import de.tum.in.www1.artemis.service.dto.athena.ProgrammingFeedbackDTO; -import de.tum.in.www1.artemis.service.dto.athena.ProgrammingSubmissionDTO; -import de.tum.in.www1.artemis.service.dto.athena.SubmissionBaseDTO; -import de.tum.in.www1.artemis.service.dto.athena.TextExerciseDTO; -import de.tum.in.www1.artemis.service.dto.athena.TextFeedbackDTO; -import de.tum.in.www1.artemis.service.dto.athena.TextSubmissionDTO; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextBlock; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.TextBlockRepository; +import de.tum.cit.aet.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.service.dto.athena.ExerciseBaseDTO; +import de.tum.cit.aet.artemis.service.dto.athena.FeedbackBaseDTO; +import de.tum.cit.aet.artemis.service.dto.athena.ModelingExerciseDTO; +import de.tum.cit.aet.artemis.service.dto.athena.ModelingFeedbackDTO; +import de.tum.cit.aet.artemis.service.dto.athena.ModelingSubmissionDTO; +import de.tum.cit.aet.artemis.service.dto.athena.ProgrammingExerciseDTO; +import de.tum.cit.aet.artemis.service.dto.athena.ProgrammingFeedbackDTO; +import de.tum.cit.aet.artemis.service.dto.athena.ProgrammingSubmissionDTO; +import de.tum.cit.aet.artemis.service.dto.athena.SubmissionBaseDTO; +import de.tum.cit.aet.artemis.service.dto.athena.TextExerciseDTO; +import de.tum.cit.aet.artemis.service.dto.athena.TextFeedbackDTO; +import de.tum.cit.aet.artemis.service.dto.athena.TextSubmissionDTO; /** * Service to convert exercises, submissions and feedback to DTOs for Athena. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaFeedbackSendingService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingService.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaFeedbackSendingService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingService.java index 8f496ddcf58d..8f8d7a73eb78 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaFeedbackSendingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.athena; +package de.tum.cit.aet.artemis.service.connectors.athena; import java.util.List; @@ -12,13 +12,13 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.exception.NetworkingException; -import de.tum.in.www1.artemis.service.dto.athena.ExerciseBaseDTO; -import de.tum.in.www1.artemis.service.dto.athena.FeedbackBaseDTO; -import de.tum.in.www1.artemis.service.dto.athena.SubmissionBaseDTO; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.exception.NetworkingException; +import de.tum.cit.aet.artemis.service.dto.athena.ExerciseBaseDTO; +import de.tum.cit.aet.artemis.service.dto.athena.FeedbackBaseDTO; +import de.tum.cit.aet.artemis.service.dto.athena.SubmissionBaseDTO; /** * Service for publishing feedback to the Athena service for further processing diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaFeedbackSuggestionsService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsService.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaFeedbackSuggestionsService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsService.java index f5a38de04912..7ff5dbea978a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaFeedbackSuggestionsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.athena; +package de.tum.cit.aet.artemis.service.connectors.athena; import java.util.List; import java.util.Objects; @@ -12,19 +12,19 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.exception.NetworkingException; -import de.tum.in.www1.artemis.service.dto.athena.ExerciseBaseDTO; -import de.tum.in.www1.artemis.service.dto.athena.ModelingFeedbackDTO; -import de.tum.in.www1.artemis.service.dto.athena.ProgrammingFeedbackDTO; -import de.tum.in.www1.artemis.service.dto.athena.SubmissionBaseDTO; -import de.tum.in.www1.artemis.service.dto.athena.TextFeedbackDTO; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.exception.NetworkingException; +import de.tum.cit.aet.artemis.service.dto.athena.ExerciseBaseDTO; +import de.tum.cit.aet.artemis.service.dto.athena.ModelingFeedbackDTO; +import de.tum.cit.aet.artemis.service.dto.athena.ProgrammingFeedbackDTO; +import de.tum.cit.aet.artemis.service.dto.athena.SubmissionBaseDTO; +import de.tum.cit.aet.artemis.service.dto.athena.TextFeedbackDTO; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; /** * Service for receiving feedback suggestions from the Athena service. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaHealthIndicator.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaHealthIndicator.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaHealthIndicator.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaHealthIndicator.java index 55cddc03030a..16ff1df9e9cb 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaHealthIndicator.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaHealthIndicator.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.athena; +package de.tum.cit.aet.artemis.service.connectors.athena; import java.util.HashMap; import java.util.Map; @@ -13,7 +13,7 @@ import com.fasterxml.jackson.databind.JsonNode; -import de.tum.in.www1.artemis.service.connectors.ConnectorHealth; +import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; /** * Service determining the health of the Athena service and its assessment modules. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaModuleService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaModuleService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaModuleService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaModuleService.java index 665ac8c1dd62..2fbf15ffc55e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaModuleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaModuleService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.athena; +package de.tum.cit.aet.artemis.service.connectors.athena; import java.time.ZonedDateTime; import java.util.List; @@ -20,12 +20,12 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseType; -import de.tum.in.www1.artemis.exception.NetworkingException; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.exception.NetworkingException; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; /** * Service to get the URL for an Athena module, depending on the type of exercise. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaRepositoryExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportService.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaRepositoryExportService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportService.java index 88a64ac58223..0c3ab1f3d851 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaRepositoryExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.athena; +package de.tum.cit.aet.artemis.service.connectors.athena; import java.io.File; import java.io.IOException; @@ -12,17 +12,17 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionRepository; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.export.ProgrammingExerciseExportService; -import de.tum.in.www1.artemis.web.rest.dto.RepositoryExportOptionsDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.ServiceUnavailableException; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.export.ProgrammingExerciseExportService; +import de.tum.cit.aet.artemis.web.rest.dto.RepositoryExportOptionsDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.ServiceUnavailableException; /** * Service for exporting programming exercise repositories for Athena. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaSubmissionSelectionService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaSubmissionSelectionService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionService.java index e493ea50fe70..23e3f56d99ac 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaSubmissionSelectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.athena; +package de.tum.cit.aet.artemis.service.connectors.athena; import java.util.List; import java.util.Optional; @@ -15,9 +15,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.exception.NetworkingException; -import de.tum.in.www1.artemis.service.dto.athena.ExerciseBaseDTO; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.exception.NetworkingException; +import de.tum.cit.aet.artemis.service.dto.athena.ExerciseBaseDTO; /** * Service for selecting the "best" submission to assess right now using Athena, e.g. by the highest information gain. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaSubmissionSendingService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaSubmissionSendingService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingService.java index c9e2fe719663..10bbeff77cf9 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaSubmissionSendingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.athena; +package de.tum.cit.aet.artemis.service.connectors.athena; import java.time.ZonedDateTime; import java.util.HashSet; @@ -17,12 +17,12 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.exception.NetworkingException; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.service.dto.athena.ExerciseBaseDTO; -import de.tum.in.www1.artemis.service.dto.athena.SubmissionBaseDTO; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.exception.NetworkingException; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.service.dto.athena.ExerciseBaseDTO; +import de.tum.cit.aet.artemis.service.dto.athena.SubmissionBaseDTO; /** * Service for sending submissions to the Athena service for further processing diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/AbstractBuildPlanCreator.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractBuildPlanCreator.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/ci/AbstractBuildPlanCreator.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractBuildPlanCreator.java index 9441711e1dad..9cb8ca95205d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/AbstractBuildPlanCreator.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractBuildPlanCreator.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.service.connectors.ci; +package de.tum.cit.aet.artemis.service.connectors.ci; import java.net.URL; import java.util.Map; import org.springframework.beans.factory.annotation.Value; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.repository.BuildPlanRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; public abstract class AbstractBuildPlanCreator { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/AbstractContinuousIntegrationResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractContinuousIntegrationResultService.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/ci/AbstractContinuousIntegrationResultService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractContinuousIntegrationResultService.java index 10e916753a0b..6d555f1ebde9 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/AbstractContinuousIntegrationResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractContinuousIntegrationResultService.java @@ -1,23 +1,23 @@ -package de.tum.in.www1.artemis.service.connectors.ci; +package de.tum.cit.aet.artemis.service.connectors.ci; import java.time.ZonedDateTime; import java.util.List; import java.util.function.Predicate; -import de.tum.in.www1.artemis.domain.BuildLogEntry; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.repository.BuildLogStatisticsEntryRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.service.dto.AbstractBuildResultNotificationDTO; -import de.tum.in.www1.artemis.service.dto.BuildJobDTOInterface; -import de.tum.in.www1.artemis.service.hestia.TestwiseCoverageService; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseFeedbackCreationService; +import de.tum.cit.aet.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.repository.BuildLogStatisticsEntryRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; +import de.tum.cit.aet.artemis.service.dto.BuildJobDTOInterface; +import de.tum.cit.aet.artemis.service.hestia.TestwiseCoverageService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseFeedbackCreationService; public abstract class AbstractContinuousIntegrationResultService implements ContinuousIntegrationResultService { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/AbstractContinuousIntegrationService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractContinuousIntegrationService.java similarity index 65% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/ci/AbstractContinuousIntegrationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractContinuousIntegrationService.java index 8e401d6aa780..da8babc5e104 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/AbstractContinuousIntegrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractContinuousIntegrationService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.ci; +package de.tum.cit.aet.artemis.service.connectors.ci; public abstract class AbstractContinuousIntegrationService implements ContinuousIntegrationService { } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/CIPermission.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/CIPermission.java similarity index 59% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/ci/CIPermission.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/CIPermission.java index 7612c286d8fc..e86ac5c850d3 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/CIPermission.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/CIPermission.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.ci; +package de.tum.cit.aet.artemis.service.connectors.ci; public enum CIPermission { READ, EDIT, CREATE, CREATEREPOSITORY, ADMIN diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/CIUserManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/CIUserManagementService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/ci/CIUserManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/CIUserManagementService.java index a0014b122df7..773a623b8241 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/CIUserManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/CIUserManagementService.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.connectors.ci; +package de.tum.cit.aet.artemis.service.connectors.ci; import java.util.Set; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; public interface CIUserManagementService { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/ContinuousIntegrationResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationResultService.java similarity index 80% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/ci/ContinuousIntegrationResultService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationResultService.java index 606914ede152..047b2a1e826b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/ContinuousIntegrationResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationResultService.java @@ -1,14 +1,14 @@ -package de.tum.in.www1.artemis.service.connectors.ci; +package de.tum.cit.aet.artemis.service.connectors.ci; import java.util.List; -import de.tum.in.www1.artemis.domain.BuildLogEntry; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.service.dto.AbstractBuildResultNotificationDTO; +import de.tum.cit.aet.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; /** * Abstract service for managing entities related to continuous integration. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/ContinuousIntegrationServerHealthIndicator.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationServerHealthIndicator.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/ci/ContinuousIntegrationServerHealthIndicator.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationServerHealthIndicator.java index 87d081739dde..343ca13b8676 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/ContinuousIntegrationServerHealthIndicator.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationServerHealthIndicator.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.connectors.ci; +package de.tum.cit.aet.artemis.service.connectors.ci; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Optional; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/ContinuousIntegrationService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/ci/ContinuousIntegrationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationService.java index 2cb70653b3d4..1cf9959d1b9c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/ContinuousIntegrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.connectors.ci; +package de.tum.cit.aet.artemis.service.connectors.ci; -import static de.tum.in.www1.artemis.config.Constants.ASSIGNMENT_DIRECTORY; -import static de.tum.in.www1.artemis.config.Constants.ASSIGNMENT_REPO_NAME; +import static de.tum.cit.aet.artemis.config.Constants.ASSIGNMENT_DIRECTORY; +import static de.tum.cit.aet.artemis.config.Constants.ASSIGNMENT_REPO_NAME; import java.util.List; import java.util.Optional; @@ -11,13 +11,13 @@ import com.fasterxml.jackson.core.JsonProcessingException; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.exception.ContinuousIntegrationException; -import de.tum.in.www1.artemis.service.connectors.ConnectorHealth; -import de.tum.in.www1.artemis.web.rest.dto.CheckoutDirectoriesDTO; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; +import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; /** * Abstract service for managing entities related to continuous integration. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/ContinuousIntegrationTriggerService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationTriggerService.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/ci/ContinuousIntegrationTriggerService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationTriggerService.java index 03d119038251..640e9e7c4a33 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/ContinuousIntegrationTriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationTriggerService.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.connectors.ci; +package de.tum.cit.aet.artemis.service.connectors.ci; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; /** * Abstract service for managing entities related to continuous integration. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/ContinuousIntegrationUpdateService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationUpdateService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/ci/ContinuousIntegrationUpdateService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationUpdateService.java index d0b2c2504818..8fa373f0389c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/ContinuousIntegrationUpdateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationUpdateService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.ci; +package de.tum.cit.aet.artemis.service.connectors.ci; /** * This service manages the update of the Build plan on the Continuous Integration Service depending on the current VCS and CI profiles. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/notification/BuildLogParseUtils.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/BuildLogParseUtils.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/ci/notification/BuildLogParseUtils.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/BuildLogParseUtils.java index b47bab4a3db7..77b7b31a7e14 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/notification/BuildLogParseUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/BuildLogParseUtils.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.ci.notification; +package de.tum.cit.aet.artemis.service.connectors.ci.notification; import java.time.ZonedDateTime; import java.time.format.DateTimeParseException; @@ -7,7 +7,7 @@ import org.apache.commons.lang3.StringUtils; -import de.tum.in.www1.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.domain.BuildLogEntry; public class BuildLogParseUtils { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/notification/dto/CommitDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/CommitDTO.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/ci/notification/dto/CommitDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/CommitDTO.java index 80baaf8d2daa..aa1e4c80dbdb 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/notification/dto/CommitDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/CommitDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.ci.notification.dto; +package de.tum.cit.aet.artemis.service.connectors.ci.notification.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/notification/dto/TestCaseDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestCaseDTO.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/ci/notification/dto/TestCaseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestCaseDTO.java index d0d73ba0ea94..d09b8c9bab58 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/notification/dto/TestCaseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestCaseDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.ci.notification.dto; +package de.tum.cit.aet.artemis.service.connectors.ci.notification.dto; import java.util.Collections; import java.util.List; @@ -13,8 +13,8 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.service.dto.TestCaseBaseDTO; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.service.dto.TestCaseBaseDTO; @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/notification/dto/TestCaseDetailMessageDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestCaseDetailMessageDTO.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/ci/notification/dto/TestCaseDetailMessageDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestCaseDetailMessageDTO.java index 5634daf2cdc6..091ba71eab95 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/notification/dto/TestCaseDetailMessageDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestCaseDetailMessageDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.ci.notification.dto; +package de.tum.cit.aet.artemis.service.connectors.ci.notification.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/notification/dto/TestResultsDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestResultsDTO.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/ci/notification/dto/TestResultsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestResultsDTO.java index d950bf690fc0..26879df429cf 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/notification/dto/TestResultsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestResultsDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.ci.notification.dto; +package de.tum.cit.aet.artemis.service.connectors.ci.notification.dto; import java.time.ZonedDateTime; import java.util.List; @@ -13,12 +13,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import de.tum.in.www1.artemis.domain.BuildLogEntry; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.service.connectors.ci.notification.BuildLogParseUtils; -import de.tum.in.www1.artemis.service.dto.AbstractBuildResultNotificationDTO; -import de.tum.in.www1.artemis.service.dto.BuildJobDTOInterface; -import de.tum.in.www1.artemis.service.dto.StaticCodeAnalysisReportDTO; +import de.tum.cit.aet.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.service.connectors.ci.notification.BuildLogParseUtils; +import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; +import de.tum.cit.aet.artemis.service.dto.BuildJobDTOInterface; +import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/notification/dto/TestSuiteDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestSuiteDTO.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/ci/notification/dto/TestSuiteDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestSuiteDTO.java index d7cc62c407a5..a2f86201e566 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/notification/dto/TestSuiteDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestSuiteDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.ci.notification.dto; +package de.tum.cit.aet.artemis.service.connectors.ci.notification.dto; import java.util.List; @@ -9,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import de.tum.in.www1.artemis.service.dto.BuildJobDTOInterface; -import de.tum.in.www1.artemis.service.dto.TestCaseBaseDTO; +import de.tum.cit.aet.artemis.service.dto.BuildJobDTOInterface; +import de.tum.cit.aet.artemis.service.dto.TestCaseBaseDTO; @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/notification/dto/TestwiseCoverageReportDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestwiseCoverageReportDTO.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/ci/notification/dto/TestwiseCoverageReportDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestwiseCoverageReportDTO.java index b0f73c9ef10a..370432441f0e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/notification/dto/TestwiseCoverageReportDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestwiseCoverageReportDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.ci.notification.dto; +package de.tum.cit.aet.artemis.service.connectors.ci.notification.dto; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/AbstractGitLabAuthorizationInterceptor.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/AbstractGitLabAuthorizationInterceptor.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/AbstractGitLabAuthorizationInterceptor.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/AbstractGitLabAuthorizationInterceptor.java index 1b27d35bd3dd..968e1afb78ff 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/AbstractGitLabAuthorizationInterceptor.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/AbstractGitLabAuthorizationInterceptor.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.gitlab; +package de.tum.cit.aet.artemis.service.connectors.gitlab; import java.io.IOException; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabAuthorizationInterceptor.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabAuthorizationInterceptor.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabAuthorizationInterceptor.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabAuthorizationInterceptor.java index 2e461a5e1106..d3b1f94ea2a5 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabAuthorizationInterceptor.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabAuthorizationInterceptor.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.gitlab; +package de.tum.cit.aet.artemis.service.connectors.gitlab; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabException.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabException.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabException.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabException.java index f217ef874422..1123f2205438 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabException.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabException.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.connectors.gitlab; +package de.tum.cit.aet.artemis.service.connectors.gitlab; -import de.tum.in.www1.artemis.exception.VersionControlException; +import de.tum.cit.aet.artemis.exception.VersionControlException; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java index e903ffe004f5..683cebe148c7 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.gitlab; +package de.tum.cit.aet.artemis.service.connectors.gitlab; import java.time.Duration; import java.time.Instant; @@ -23,10 +23,10 @@ import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.connectors.gitlab.dto.GitLabPersonalAccessTokenListResponseDTO; -import de.tum.in.www1.artemis.service.connectors.vcs.VcsTokenManagementService; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.connectors.gitlab.dto.GitLabPersonalAccessTokenListResponseDTO; +import de.tum.cit.aet.artemis.service.connectors.vcs.VcsTokenManagementService; /** * Provides VCS access token services for GitLab via means of personal access tokens. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabService.java index 4cdddb4cf7a1..81bc020bbb3c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.gitlab; +package de.tum.cit.aet.artemis.service.connectors.gitlab; import static org.gitlab4j.api.models.AccessLevel.DEVELOPER; import static org.gitlab4j.api.models.AccessLevel.MAINTAINER; @@ -45,26 +45,26 @@ import com.fasterxml.jackson.databind.JsonNode; -import de.tum.in.www1.artemis.domain.Commit; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.exception.VersionControlException; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.TemplateProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.UriService; -import de.tum.in.www1.artemis.service.connectors.ConnectorHealth; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.connectors.gitlab.dto.GitLabPushNotificationDTO; -import de.tum.in.www1.artemis.service.connectors.vcs.AbstractVersionControlService; -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlRepositoryPermission; -import de.tum.in.www1.artemis.service.util.UrlUtils; +import de.tum.cit.aet.artemis.domain.Commit; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.exception.VersionControlException; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.UriService; +import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.connectors.gitlab.dto.GitLabPushNotificationDTO; +import de.tum.cit.aet.artemis.service.connectors.vcs.AbstractVersionControlService; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlRepositoryPermission; +import de.tum.cit.aet.artemis.service.util.UrlUtils; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserDoesNotExistException.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabUserDoesNotExistException.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserDoesNotExistException.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabUserDoesNotExistException.java index 36f65cc51902..b20bd749bc01 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserDoesNotExistException.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabUserDoesNotExistException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.gitlab; +package de.tum.cit.aet.artemis.service.connectors.gitlab; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabUserManagementService.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabUserManagementService.java index 0f8f67198b55..fa1b1dacd1d4 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabUserManagementService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.gitlab; +package de.tum.cit.aet.artemis.service.connectors.gitlab; import static org.gitlab4j.api.models.AccessLevel.MAINTAINER; import static org.gitlab4j.api.models.AccessLevel.OWNER; @@ -19,14 +19,14 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.exception.VersionControlException; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.connectors.vcs.VcsTokenManagementService; -import de.tum.in.www1.artemis.service.connectors.vcs.VcsUserManagementService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exception.VersionControlException; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.connectors.vcs.VcsTokenManagementService; +import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitlabInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitlabInfoContributor.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitlabInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitlabInfoContributor.java index 951aafa36d8d..de2b352e3e37 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitlabInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitlabInfoContributor.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.gitlab; +package de.tum.cit.aet.artemis.service.connectors.gitlab; import java.net.URL; import java.util.Optional; @@ -9,7 +9,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.in.www1.artemis.config.Constants; +import de.tum.cit.aet.artemis.config.Constants; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabCommitDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabCommitDTO.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabCommitDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabCommitDTO.java index d937d570bb45..384757ebd0fe 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabCommitDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabCommitDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.gitlab.dto; +package de.tum.cit.aet.artemis.service.connectors.gitlab.dto; import java.time.ZonedDateTime; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java index 0ceec1bc02dc..9043692c6d13 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.gitlab.dto; +package de.tum.cit.aet.artemis.service.connectors.gitlab.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java index 154830c818b3..9d0a131bf4a1 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.gitlab.dto; +package de.tum.cit.aet.artemis.service.connectors.gitlab.dto; import java.util.Date; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java index 6920d3db2bee..a8fb0ff8a0f9 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.gitlab.dto; +package de.tum.cit.aet.artemis.service.connectors.gitlab.dto; import java.util.Date; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabProjectDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabProjectDTO.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabProjectDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabProjectDTO.java index 71353195ac21..3e09f332644d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabProjectDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabProjectDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.gitlab.dto; +package de.tum.cit.aet.artemis.service.connectors.gitlab.dto; import java.net.URL; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java index 917628db09e8..0c8d22a7a113 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.gitlab.dto; +package de.tum.cit.aet.artemis.service.connectors.gitlab.dto; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabRepositoryDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabRepositoryDTO.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabRepositoryDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabRepositoryDTO.java index 245eefed4498..1ef5f4656dd1 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabRepositoryDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabRepositoryDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.gitlab.dto; +package de.tum.cit.aet.artemis.service.connectors.gitlab.dto; import java.net.URL; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java similarity index 78% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java index 258aa2df4269..e8665aab65c0 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.service.connectors.gitlabci; +package de.tum.cit.aet.artemis.service.connectors.gitlabci; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.in.www1.artemis.service.connectors.gitlab.AbstractGitLabAuthorizationInterceptor; +import de.tum.cit.aet.artemis.service.connectors.gitlab.AbstractGitLabAuthorizationInterceptor; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java index 23500df008f1..b005d8b4fb53 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.gitlabci; +package de.tum.cit.aet.artemis.service.connectors.gitlabci; import java.io.IOException; import java.nio.charset.Charset; @@ -12,12 +12,12 @@ import org.springframework.stereotype.Service; import org.springframework.util.StreamUtils; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.repository.BuildPlanRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.service.ResourceLoaderService; -import de.tum.in.www1.artemis.service.connectors.ci.AbstractBuildPlanCreator; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.service.ResourceLoaderService; +import de.tum.cit.aet.artemis.service.connectors.ci.AbstractBuildPlanCreator; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIInfoContributor.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIInfoContributor.java index ee088f9d901a..e4e2dc0986c0 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIInfoContributor.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.gitlabci; +package de.tum.cit.aet.artemis.service.connectors.gitlabci; import java.net.URL; @@ -8,7 +8,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.in.www1.artemis.config.Constants; +import de.tum.cit.aet.artemis.config.Constants; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java similarity index 68% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java index 661824ea06d8..fd279070eb06 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java @@ -1,18 +1,18 @@ -package de.tum.in.www1.artemis.service.connectors.gitlabci; +package de.tum.cit.aet.artemis.service.connectors.gitlabci; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.EMPTY; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.JAVA; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.RUST; -import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.MAVEN_MAVEN; -import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.PLAIN_MAVEN; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.EMPTY; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.JAVA; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.RUST; +import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.MAVEN_MAVEN; +import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.PLAIN_MAVEN; import java.util.List; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeature; -import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeatureService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeature; +import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeatureService; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIResultService.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIResultService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIResultService.java index f71e0fe8253b..d805b91cc075 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIResultService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.gitlabci; +package de.tum.cit.aet.artemis.service.connectors.gitlabci; import java.time.ZonedDateTime; import java.util.List; @@ -8,22 +8,22 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.BuildLogEntry; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.domain.statistics.BuildLogStatisticsEntry; -import de.tum.in.www1.artemis.repository.BuildLogStatisticsEntryRepository; -import de.tum.in.www1.artemis.repository.FeedbackRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionRepository; -import de.tum.in.www1.artemis.service.BuildLogEntryService; -import de.tum.in.www1.artemis.service.connectors.ci.AbstractContinuousIntegrationResultService; -import de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestResultsDTO; -import de.tum.in.www1.artemis.service.dto.AbstractBuildResultNotificationDTO; -import de.tum.in.www1.artemis.service.hestia.TestwiseCoverageService; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseFeedbackCreationService; +import de.tum.cit.aet.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.domain.statistics.BuildLogStatisticsEntry; +import de.tum.cit.aet.artemis.repository.BuildLogStatisticsEntryRepository; +import de.tum.cit.aet.artemis.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.service.BuildLogEntryService; +import de.tum.cit.aet.artemis.service.connectors.ci.AbstractContinuousIntegrationResultService; +import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestResultsDTO; +import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; +import de.tum.cit.aet.artemis.service.hestia.TestwiseCoverageService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseFeedbackCreationService; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIService.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIService.java index 45d66cf19272..ebae5f51783a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.connectors.gitlabci; +package de.tum.cit.aet.artemis.service.connectors.gitlabci; -import static de.tum.in.www1.artemis.config.Constants.NEW_RESULT_RESOURCE_API_PATH; +import static de.tum.cit.aet.artemis.config.Constants.NEW_RESULT_RESOURCE_API_PATH; import java.net.URL; import java.util.Comparator; @@ -23,24 +23,24 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.config.ProgrammingLanguageConfiguration; -import de.tum.in.www1.artemis.domain.BuildPlan; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.exception.ContinuousIntegrationException; -import de.tum.in.www1.artemis.exception.GitLabCIException; -import de.tum.in.www1.artemis.repository.BuildPlanRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.service.UriService; -import de.tum.in.www1.artemis.service.connectors.ConnectorHealth; -import de.tum.in.www1.artemis.service.connectors.ci.AbstractContinuousIntegrationService; -import de.tum.in.www1.artemis.service.connectors.ci.CIPermission; -import de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestResultsDTO; -import de.tum.in.www1.artemis.web.rest.dto.CheckoutDirectoriesDTO; +import de.tum.cit.aet.artemis.config.ProgrammingLanguageConfiguration; +import de.tum.cit.aet.artemis.domain.BuildPlan; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.exception.GitLabCIException; +import de.tum.cit.aet.artemis.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.service.UriService; +import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; +import de.tum.cit.aet.artemis.service.connectors.ci.AbstractContinuousIntegrationService; +import de.tum.cit.aet.artemis.service.connectors.ci.CIPermission; +import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestResultsDTO; +import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCITriggerService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCITriggerService.java similarity index 80% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCITriggerService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCITriggerService.java index d2fe1c62525f..a1cb7d2fe46b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCITriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCITriggerService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.gitlabci; +package de.tum.cit.aet.artemis.service.connectors.gitlabci; import org.gitlab4j.api.GitLabApi; import org.gitlab4j.api.GitLabApiException; @@ -6,14 +6,14 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.exception.ContinuousIntegrationException; -import de.tum.in.www1.artemis.exception.GitLabCIException; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.service.UriService; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.exception.GitLabCIException; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.service.UriService; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java index e15e0dd7038f..b57af6ec0447 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.gitlabci; +package de.tum.cit.aet.artemis.service.connectors.gitlabci; import java.util.Set; @@ -7,10 +7,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.exception.ContinuousIntegrationException; -import de.tum.in.www1.artemis.service.connectors.ci.CIUserManagementService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsAuthorizationInterceptor.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsAuthorizationInterceptor.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsAuthorizationInterceptor.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsAuthorizationInterceptor.java index 2e2284a5486d..3ba7db75f85e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsAuthorizationInterceptor.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsAuthorizationInterceptor.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.jenkins; +package de.tum.cit.aet.artemis.service.connectors.jenkins; import java.io.IOException; import java.net.URL; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsEndpoints.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsEndpoints.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsEndpoints.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsEndpoints.java index 9fcde35ffad7..0e293b407a90 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsEndpoints.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsEndpoints.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.connectors.jenkins; +package de.tum.cit.aet.artemis.service.connectors.jenkins; import java.util.Arrays; import java.util.List; import org.springframework.web.util.UriComponentsBuilder; -import de.tum.in.www1.artemis.service.util.UrlUtils; +import de.tum.cit.aet.artemis.service.util.UrlUtils; public enum JenkinsEndpoints { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsInfoContributor.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsInfoContributor.java index 4e8ff9bd3c5c..2b2f26dd69e3 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsInfoContributor.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.jenkins; +package de.tum.cit.aet.artemis.service.connectors.jenkins; import java.net.URL; @@ -8,7 +8,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.in.www1.artemis.config.Constants; +import de.tum.cit.aet.artemis.config.Constants; @Component @Profile("jenkins") diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsInternalUrlService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsInternalUrlService.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsInternalUrlService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsInternalUrlService.java index 5bc2a957d710..366e062f07b5 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsInternalUrlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsInternalUrlService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.jenkins; +package de.tum.cit.aet.artemis.service.connectors.jenkins; import java.net.URL; import java.util.Optional; @@ -7,7 +7,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.service.InternalUrlService; +import de.tum.cit.aet.artemis.service.InternalUrlService; @Profile("jenkins") @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java similarity index 62% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java index d8a4abd0fea3..803450b15a3e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java @@ -1,29 +1,29 @@ -package de.tum.in.www1.artemis.service.connectors.jenkins; +package de.tum.cit.aet.artemis.service.connectors.jenkins; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.C; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.EMPTY; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.HASKELL; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.JAVA; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.KOTLIN; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.PYTHON; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.RUST; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.SWIFT; -import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.FACT; -import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.GCC; -import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.GRADLE_GRADLE; -import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.MAVEN_BLACKBOX; -import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.MAVEN_MAVEN; -import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.PLAIN; -import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.PLAIN_GRADLE; -import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.PLAIN_MAVEN; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.C; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.EMPTY; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.HASKELL; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.JAVA; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.KOTLIN; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.PYTHON; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.RUST; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.SWIFT; +import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.FACT; +import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.GCC; +import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.GRADLE_GRADLE; +import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.MAVEN_BLACKBOX; +import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.MAVEN_MAVEN; +import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.PLAIN; +import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.PLAIN_GRADLE; +import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.PLAIN_MAVEN; import java.util.List; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeature; -import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeatureService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeature; +import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeatureService; @Service @Profile("jenkins") diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsResultService.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsResultService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsResultService.java index dd9de9664f73..bfd26478d16c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsResultService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.connectors.jenkins; +package de.tum.cit.aet.artemis.service.connectors.jenkins; -import static de.tum.in.www1.artemis.domain.statistics.BuildLogStatisticsEntry.BuildJobPartDuration; +import static de.tum.cit.aet.artemis.domain.statistics.BuildLogStatisticsEntry.BuildJobPartDuration; import java.time.ZonedDateTime; import java.util.List; @@ -10,21 +10,21 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.BuildLogEntry; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.repository.BuildLogStatisticsEntryRepository; -import de.tum.in.www1.artemis.repository.FeedbackRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionRepository; -import de.tum.in.www1.artemis.service.BuildLogEntryService; -import de.tum.in.www1.artemis.service.connectors.ci.AbstractContinuousIntegrationResultService; -import de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestResultsDTO; -import de.tum.in.www1.artemis.service.dto.AbstractBuildResultNotificationDTO; -import de.tum.in.www1.artemis.service.hestia.TestwiseCoverageService; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseFeedbackCreationService; +import de.tum.cit.aet.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.repository.BuildLogStatisticsEntryRepository; +import de.tum.cit.aet.artemis.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.service.BuildLogEntryService; +import de.tum.cit.aet.artemis.service.connectors.ci.AbstractContinuousIntegrationResultService; +import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestResultsDTO; +import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; +import de.tum.cit.aet.artemis.service.hestia.TestwiseCoverageService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseFeedbackCreationService; @Profile("jenkins") @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsService.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsService.java index 6d3fa87d1c48..3f66a7d7665e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.jenkins; +package de.tum.cit.aet.artemis.service.connectors.jenkins; import java.io.IOException; import java.net.URL; @@ -19,25 +19,25 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.offbytwo.jenkins.JenkinsServer; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.BuildPlanType; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.exception.ContinuousIntegrationException; -import de.tum.in.www1.artemis.exception.JenkinsException; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.service.ProfileService; -import de.tum.in.www1.artemis.service.connectors.ConnectorHealth; -import de.tum.in.www1.artemis.service.connectors.aeolus.AeolusTemplateService; -import de.tum.in.www1.artemis.service.connectors.aeolus.Windfile; -import de.tum.in.www1.artemis.service.connectors.ci.AbstractContinuousIntegrationService; -import de.tum.in.www1.artemis.service.connectors.ci.CIPermission; -import de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestResultsDTO; -import de.tum.in.www1.artemis.service.connectors.jenkins.build_plan.JenkinsBuildPlanService; -import de.tum.in.www1.artemis.service.connectors.jenkins.jobs.JenkinsJobService; -import de.tum.in.www1.artemis.web.rest.dto.CheckoutDirectoriesDTO; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.exception.JenkinsException; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.service.ProfileService; +import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; +import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; +import de.tum.cit.aet.artemis.service.connectors.ci.AbstractContinuousIntegrationService; +import de.tum.cit.aet.artemis.service.connectors.ci.CIPermission; +import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestResultsDTO; +import de.tum.cit.aet.artemis.service.connectors.jenkins.build_plan.JenkinsBuildPlanService; +import de.tum.cit.aet.artemis.service.connectors.jenkins.jobs.JenkinsJobService; +import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; @Profile("jenkins") @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsTriggerService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsTriggerService.java similarity index 77% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsTriggerService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsTriggerService.java index f01b64654d90..2da3d3d64bdd 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsTriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsTriggerService.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.connectors.jenkins; +package de.tum.cit.aet.artemis.service.connectors.jenkins; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; -import de.tum.in.www1.artemis.service.connectors.jenkins.build_plan.JenkinsBuildPlanService; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; +import de.tum.cit.aet.artemis.service.connectors.jenkins.build_plan.JenkinsBuildPlanService; @Profile("jenkins") @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsUserManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsUserManagementService.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsUserManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsUserManagementService.java index 42a82bcd96ef..d7dc1d4f9da2 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsUserManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsUserManagementService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.jenkins; +package de.tum.cit.aet.artemis.service.connectors.jenkins; import java.io.IOException; import java.net.URL; @@ -27,18 +27,18 @@ import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.exception.ContinuousIntegrationException; -import de.tum.in.www1.artemis.exception.JenkinsException; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.connectors.ci.CIUserManagementService; -import de.tum.in.www1.artemis.service.connectors.jenkins.dto.JenkinsUserDTO; -import de.tum.in.www1.artemis.service.connectors.jenkins.jobs.JenkinsJobPermission; -import de.tum.in.www1.artemis.service.connectors.jenkins.jobs.JenkinsJobPermissionsService; -import de.tum.in.www1.artemis.service.user.PasswordService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.exception.JenkinsException; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; +import de.tum.cit.aet.artemis.service.connectors.jenkins.dto.JenkinsUserDTO; +import de.tum.cit.aet.artemis.service.connectors.jenkins.jobs.JenkinsJobPermission; +import de.tum.cit.aet.artemis.service.connectors.jenkins.jobs.JenkinsJobPermissionsService; +import de.tum.cit.aet.artemis.service.user.PasswordService; @Service @Profile("jenkins") diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsXmlConfigBuilder.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsXmlConfigBuilder.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsXmlConfigBuilder.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsXmlConfigBuilder.java index f3be82b5d662..5a8b4316e953 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsXmlConfigBuilder.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsXmlConfigBuilder.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.service.connectors.jenkins; +package de.tum.cit.aet.artemis.service.connectors.jenkins; import java.util.Optional; import org.w3c.dom.Document; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; public interface JenkinsXmlConfigBuilder { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsXmlFileUtils.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsXmlFileUtils.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsXmlFileUtils.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsXmlFileUtils.java index dbab8b3a6593..27d2cd0c9d39 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsXmlFileUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsXmlFileUtils.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.jenkins; +package de.tum.cit.aet.artemis.service.connectors.jenkins; import java.io.IOException; import java.io.StringReader; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanCreator.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanCreator.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanCreator.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanCreator.java index d0159b725e61..172dc7733fb0 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanCreator.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanCreator.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.jenkins.build_plan; +package de.tum.cit.aet.artemis.service.connectors.jenkins.build_plan; import java.io.IOException; import java.io.InputStream; @@ -17,14 +17,14 @@ import org.springframework.stereotype.Component; import org.w3c.dom.Document; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.exception.ContinuousIntegrationBuildPlanException; -import de.tum.in.www1.artemis.service.ResourceLoaderService; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsXmlConfigBuilder; -import de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsXmlFileUtils; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.exception.ContinuousIntegrationBuildPlanException; +import de.tum.cit.aet.artemis.service.ResourceLoaderService; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsXmlConfigBuilder; +import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsXmlFileUtils; @Profile("jenkins") @Component diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanLinkInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanLinkInfoContributor.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanLinkInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanLinkInfoContributor.java index e8b0826fd412..f58f4455d619 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanLinkInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanLinkInfoContributor.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.jenkins.build_plan; +package de.tum.cit.aet.artemis.service.connectors.jenkins.build_plan; import java.net.URL; @@ -8,7 +8,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.in.www1.artemis.config.Constants; +import de.tum.cit.aet.artemis.config.Constants; @Component @Profile("jenkins") diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java index 929a9e1e5750..799366ab1779 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.connectors.jenkins.build_plan; +package de.tum.cit.aet.artemis.service.connectors.jenkins.build_plan; -import static de.tum.in.www1.artemis.config.Constants.NEW_RESULT_RESOURCE_API_PATH; +import static de.tum.cit.aet.artemis.config.Constants.NEW_RESULT_RESOURCE_API_PATH; import java.io.IOException; import java.net.URI; @@ -35,33 +35,33 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.offbytwo.jenkins.JenkinsServer; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.AeolusTarget; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.exception.ContinuousIntegrationBuildPlanException; -import de.tum.in.www1.artemis.exception.JenkinsException; -import de.tum.in.www1.artemis.repository.BuildPlanRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.connectors.aeolus.AeolusBuildPlanService; -import de.tum.in.www1.artemis.service.connectors.aeolus.AeolusRepository; -import de.tum.in.www1.artemis.service.connectors.aeolus.Windfile; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestResultsDTO; -import de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsEndpoints; -import de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsInternalUrlService; -import de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsXmlConfigBuilder; -import de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsXmlFileUtils; -import de.tum.in.www1.artemis.service.connectors.jenkins.jobs.JenkinsJobPermissionsService; -import de.tum.in.www1.artemis.service.connectors.jenkins.jobs.JenkinsJobService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.AeolusTarget; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exception.ContinuousIntegrationBuildPlanException; +import de.tum.cit.aet.artemis.exception.JenkinsException; +import de.tum.cit.aet.artemis.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusBuildPlanService; +import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusRepository; +import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestResultsDTO; +import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsEndpoints; +import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsInternalUrlService; +import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsXmlConfigBuilder; +import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsXmlFileUtils; +import de.tum.cit.aet.artemis.service.connectors.jenkins.jobs.JenkinsJobPermissionsService; +import de.tum.cit.aet.artemis.service.connectors.jenkins.jobs.JenkinsJobService; @Service @Profile("jenkins") diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanUtils.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanUtils.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanUtils.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanUtils.java index f4cd04d35e8b..ba2e3570ca12 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanUtils.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.jenkins.build_plan; +package de.tum.cit.aet.artemis.service.connectors.jenkins.build_plan; import org.w3c.dom.Document; import org.w3c.dom.Node; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java index 6e6f3efdfc94..195b4624514e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.connectors.jenkins.build_plan; +package de.tum.cit.aet.artemis.service.connectors.jenkins.build_plan; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.IOException; import java.io.InputStream; @@ -16,15 +16,15 @@ import org.springframework.core.io.Resource; import org.springframework.stereotype.Component; -import de.tum.in.www1.artemis.config.ProgrammingLanguageConfiguration; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.exception.JenkinsException; -import de.tum.in.www1.artemis.repository.BuildPlanRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.service.ResourceLoaderService; -import de.tum.in.www1.artemis.service.connectors.ci.AbstractBuildPlanCreator; +import de.tum.cit.aet.artemis.config.ProgrammingLanguageConfiguration; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.exception.JenkinsException; +import de.tum.cit.aet.artemis.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.service.ResourceLoaderService; +import de.tum.cit.aet.artemis.service.connectors.ci.AbstractBuildPlanCreator; @Profile(PROFILE_CORE) @Component diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/dto/JenkinsUserDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/dto/JenkinsUserDTO.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/dto/JenkinsUserDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/dto/JenkinsUserDTO.java index 167f9747f2a0..fca8fa4dcfc4 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/dto/JenkinsUserDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/dto/JenkinsUserDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.jenkins.dto; +package de.tum.cit.aet.artemis.service.connectors.jenkins.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/jobs/JenkinsJobPermission.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermission.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/jobs/JenkinsJobPermission.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermission.java index f5537e00f97b..b17494a844e1 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/jobs/JenkinsJobPermission.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermission.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.jenkins.jobs; +package de.tum.cit.aet.artemis.service.connectors.jenkins.jobs; import java.util.Set; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsService.java similarity index 99% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsService.java index 9f2a86671f72..ac908d8d0a94 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.jenkins.jobs; +package de.tum.cit.aet.artemis.service.connectors.jenkins.jobs; import java.io.IOException; import java.util.Set; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtils.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtils.java similarity index 99% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtils.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtils.java index 07b456fb6e28..3d0d6243c436 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtils.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.jenkins.jobs; +package de.tum.cit.aet.artemis.service.connectors.jenkins.jobs; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/jobs/JenkinsJobService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobService.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/jobs/JenkinsJobService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobService.java index 5e90ef8c82b2..64e6f4eecf18 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/jobs/JenkinsJobService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.jenkins.jobs; +package de.tum.cit.aet.artemis.service.connectors.jenkins.jobs; import java.io.IOException; @@ -16,8 +16,8 @@ import com.offbytwo.jenkins.model.FolderJob; import com.offbytwo.jenkins.model.JobWithDetails; -import de.tum.in.www1.artemis.exception.JenkinsException; -import de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsXmlFileUtils; +import de.tum.cit.aet.artemis.exception.JenkinsException; +import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsXmlFileUtils; @Service @Profile("jenkins") diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/ldap/LdapAuthenticationProvider.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ldap/LdapAuthenticationProvider.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/ldap/LdapAuthenticationProvider.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/ldap/LdapAuthenticationProvider.java index fed76f831bf5..a1a6f0821cb6 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/ldap/LdapAuthenticationProvider.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ldap/LdapAuthenticationProvider.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.ldap; +package de.tum.cit.aet.artemis.service.connectors.ldap; import java.util.HashSet; import java.util.Locale; @@ -18,22 +18,22 @@ import org.springframework.security.ldap.SpringSecurityLdapTemplate; import org.springframework.stereotype.Component; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.ArtemisAuthenticationProvider; -import de.tum.in.www1.artemis.security.ArtemisAuthenticationProviderImpl; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.ldap.LdapUserDto; -import de.tum.in.www1.artemis.service.ldap.LdapUserService; -import de.tum.in.www1.artemis.service.user.AuthorityService; -import de.tum.in.www1.artemis.service.user.PasswordService; -import de.tum.in.www1.artemis.service.user.UserCreationService; -import de.tum.in.www1.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.ArtemisAuthenticationProvider; +import de.tum.cit.aet.artemis.security.ArtemisAuthenticationProviderImpl; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; +import de.tum.cit.aet.artemis.service.ldap.LdapUserService; +import de.tum.cit.aet.artemis.service.user.AuthorityService; +import de.tum.cit.aet.artemis.service.user.PasswordService; +import de.tum.cit.aet.artemis.service.user.UserCreationService; +import de.tum.cit.aet.artemis.service.util.TimeLogUtil; @Component @Profile("ldap-only") @Primary -@ComponentScan("de.tum.in.www1.artemis.*") +@ComponentScan("de.tum.cit.aet.artemis.*") public class LdapAuthenticationProvider extends ArtemisAuthenticationProviderImpl implements ArtemisAuthenticationProvider { private static final Logger log = LoggerFactory.getLogger(LdapAuthenticationProvider.class); diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIBuildConfigurationService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIBuildConfigurationService.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIBuildConfigurationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIBuildConfigurationService.java index 8a0f499466d8..1af144f0bdff 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIBuildConfigurationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIBuildConfigurationService.java @@ -1,19 +1,19 @@ -package de.tum.in.www1.artemis.service.connectors.localci; +package de.tum.cit.aet.artemis.service.connectors.localci; -import static de.tum.in.www1.artemis.config.Constants.LOCALCI_WORKING_DIRECTORY; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_LOCALCI; +import static de.tum.cit.aet.artemis.config.Constants.LOCALCI_WORKING_DIRECTORY; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALCI; import java.util.List; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.in.www1.artemis.exception.LocalCIException; -import de.tum.in.www1.artemis.service.connectors.aeolus.AeolusTemplateService; -import de.tum.in.www1.artemis.service.connectors.aeolus.ScriptAction; -import de.tum.in.www1.artemis.service.connectors.aeolus.Windfile; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.exception.LocalCIException; +import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.service.connectors.aeolus.ScriptAction; +import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; @Service @Profile(PROFILE_LOCALCI) diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIInfoContributor.java similarity index 76% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIInfoContributor.java index 9a3b8d1f3488..51d150369be5 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIInfoContributor.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.service.connectors.localci; +package de.tum.cit.aet.artemis.service.connectors.localci; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_LOCALCI; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALCI; import org.springframework.boot.actuate.info.Info; import org.springframework.boot.actuate.info.InfoContributor; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.in.www1.artemis.config.Constants; +import de.tum.cit.aet.artemis.config.Constants; @Component @Profile(PROFILE_LOCALCI) diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIPriorityQueueComparator.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIPriorityQueueComparator.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIPriorityQueueComparator.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIPriorityQueueComparator.java index 143dae90287b..0c5f8e63070f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIPriorityQueueComparator.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIPriorityQueueComparator.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.connectors.localci; +package de.tum.cit.aet.artemis.service.connectors.localci; import java.util.Comparator; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; /** * This comparator allows to prioritize build jobs in the shared build queue diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java similarity index 64% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java index 101e0540521f..aa6957868a3d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java @@ -1,31 +1,31 @@ -package de.tum.in.www1.artemis.service.connectors.localci; +package de.tum.cit.aet.artemis.service.connectors.localci; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_LOCALCI; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.ASSEMBLER; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.C; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.HASKELL; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.JAVA; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.KOTLIN; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.OCAML; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.PYTHON; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.RUST; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.SWIFT; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.VHDL; -import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.FACT; -import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.GCC; -import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.GRADLE_GRADLE; -import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.MAVEN_MAVEN; -import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.PLAIN; -import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.PLAIN_GRADLE; -import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.PLAIN_MAVEN; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALCI; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.ASSEMBLER; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.C; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.HASKELL; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.JAVA; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.KOTLIN; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.OCAML; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.PYTHON; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.RUST; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.SWIFT; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.VHDL; +import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.FACT; +import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.GCC; +import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.GRADLE_GRADLE; +import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.MAVEN_MAVEN; +import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.PLAIN; +import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.PLAIN_GRADLE; +import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.PLAIN_MAVEN; import java.util.List; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeature; -import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeatureService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeature; +import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeatureService; /** * Sets the features provided for the different programming languages when using the local CI system. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIQueueWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIQueueWebsocketService.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIQueueWebsocketService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIQueueWebsocketService.java index 307395f6498a..fcfc729581e4 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIQueueWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIQueueWebsocketService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.localci; +package de.tum.cit.aet.artemis.service.connectors.localci; import java.util.List; @@ -19,9 +19,9 @@ import com.hazelcast.map.listener.EntryRemovedListener; import com.hazelcast.map.listener.EntryUpdatedListener; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildAgentInformation; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.in.www1.artemis.web.websocket.localci.LocalCIWebsocketMessagingService; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.web.websocket.localci.LocalCIWebsocketMessagingService; /** * This service is responsible for sending build job queue information over websockets. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIResultProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultProcessingService.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIResultProcessingService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultProcessingService.java index dfc7dcf776c2..9d251188ae99 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIResultProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultProcessingService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.connectors.localci; +package de.tum.cit.aet.artemis.service.connectors.localci; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_LOCALCI; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALCI; import java.util.List; import java.util.Optional; @@ -22,29 +22,29 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.map.IMap; -import de.tum.in.www1.artemis.domain.BuildJob; -import de.tum.in.www1.artemis.domain.BuildLogEntry; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.enumeration.BuildStatus; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.repository.BuildJobRepository; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.BuildLogEntryService; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildAgentInformation; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildResult; -import de.tum.in.www1.artemis.service.connectors.localci.dto.ResultQueueItem; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseGradingService; -import de.tum.in.www1.artemis.service.programming.ProgrammingMessagingService; -import de.tum.in.www1.artemis.service.programming.ProgrammingTriggerService; -import de.tum.in.www1.artemis.web.rest.dto.ResultDTO; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.in.www1.artemis.web.websocket.programmingSubmission.BuildTriggerWebsocketError; +import de.tum.cit.aet.artemis.domain.BuildJob; +import de.tum.cit.aet.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.repository.BuildJobRepository; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.BuildLogEntryService; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildResult; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.ResultQueueItem; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseGradingService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingMessagingService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingTriggerService; +import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.websocket.programmingSubmission.BuildTriggerWebsocketError; @Profile(PROFILE_LOCALCI) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultService.java similarity index 63% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIResultService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultService.java index 46ec59008473..37825e630385 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultService.java @@ -1,25 +1,25 @@ -package de.tum.in.www1.artemis.service.connectors.localci; +package de.tum.cit.aet.artemis.service.connectors.localci; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_LOCALCI; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALCI; import java.util.List; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.BuildLogEntry; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.exception.LocalCIException; -import de.tum.in.www1.artemis.repository.BuildLogStatisticsEntryRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.service.connectors.ci.AbstractContinuousIntegrationResultService; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildResult; -import de.tum.in.www1.artemis.service.dto.AbstractBuildResultNotificationDTO; -import de.tum.in.www1.artemis.service.hestia.TestwiseCoverageService; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseFeedbackCreationService; +import de.tum.cit.aet.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.exception.LocalCIException; +import de.tum.cit.aet.artemis.repository.BuildLogStatisticsEntryRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.service.connectors.ci.AbstractContinuousIntegrationResultService; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildResult; +import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; +import de.tum.cit.aet.artemis.service.hestia.TestwiseCoverageService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseFeedbackCreationService; /** * Service implementation for integrated CI. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIService.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIService.java index 8f3b9c279d83..85c572ddec8d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.connectors.localci; +package de.tum.cit.aet.artemis.service.connectors.localci; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_LOCALCI; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALCI; import java.util.List; import java.util.Map; @@ -16,22 +16,22 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.exception.LocalCIException; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.service.connectors.BuildScriptProviderService; -import de.tum.in.www1.artemis.service.connectors.ConnectorHealth; -import de.tum.in.www1.artemis.service.connectors.aeolus.AeolusTemplateService; -import de.tum.in.www1.artemis.service.connectors.aeolus.Windfile; -import de.tum.in.www1.artemis.service.connectors.ci.AbstractContinuousIntegrationService; -import de.tum.in.www1.artemis.service.connectors.ci.CIPermission; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.in.www1.artemis.web.rest.dto.BuildPlanCheckoutDirectoriesDTO; -import de.tum.in.www1.artemis.web.rest.dto.CheckoutDirectoriesDTO; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exception.LocalCIException; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.service.connectors.BuildScriptProviderService; +import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; +import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; +import de.tum.cit.aet.artemis.service.connectors.ci.AbstractContinuousIntegrationService; +import de.tum.cit.aet.artemis.service.connectors.ci.CIPermission; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.web.rest.dto.BuildPlanCheckoutDirectoriesDTO; +import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; /** * Implementation of ContinuousIntegrationService for local CI. Contains methods for communication with the local CI system. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCITriggerService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCITriggerService.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCITriggerService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCITriggerService.java index 8bca6ec61ec4..17cb5cf6ef3f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCITriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCITriggerService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.connectors.localci; +package de.tum.cit.aet.artemis.service.connectors.localci; -import static de.tum.in.www1.artemis.config.Constants.LOCALCI_WORKING_DIRECTORY; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_LOCALCI; +import static de.tum.cit.aet.artemis.config.Constants.LOCALCI_WORKING_DIRECTORY; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALCI; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -22,33 +22,33 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.map.IMap; -import de.tum.in.www1.artemis.config.ProgrammingLanguageConfiguration; -import de.tum.in.www1.artemis.domain.AuxiliaryRepository; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exception.LocalCIException; -import de.tum.in.www1.artemis.exception.localvc.LocalVCInternalException; -import de.tum.in.www1.artemis.repository.AuxiliaryRepositoryRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.service.ExerciseDateService; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.connectors.aeolus.AeolusResult; -import de.tum.in.www1.artemis.service.connectors.aeolus.AeolusTemplateService; -import de.tum.in.www1.artemis.service.connectors.aeolus.Windfile; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildConfig; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.in.www1.artemis.service.connectors.localci.dto.JobTimingInfo; -import de.tum.in.www1.artemis.service.connectors.localci.dto.RepositoryInfo; -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlService; -import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeature; +import de.tum.cit.aet.artemis.config.ProgrammingLanguageConfiguration; +import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exception.LocalCIException; +import de.tum.cit.aet.artemis.exception.localvc.LocalVCInternalException; +import de.tum.cit.aet.artemis.repository.AuxiliaryRepositoryRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.service.ExerciseDateService; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusResult; +import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildConfig; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.JobTimingInfo; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.RepositoryInfo; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeature; /** * Service for triggering builds on the local CI system. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/SharedQueueManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/SharedQueueManagementService.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/SharedQueueManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/SharedQueueManagementService.java index 5aeffb5e4316..f070ff4c4502 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/SharedQueueManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/SharedQueueManagementService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.connectors.localci; +package de.tum.cit.aet.artemis.service.connectors.localci; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_LOCALCI; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALCI; import java.time.Duration; import java.time.ZonedDateTime; @@ -30,14 +30,14 @@ import com.hazelcast.map.IMap; import com.hazelcast.topic.ITopic; -import de.tum.in.www1.artemis.domain.BuildJob; -import de.tum.in.www1.artemis.domain.enumeration.SortingOrder; -import de.tum.in.www1.artemis.repository.BuildJobRepository; -import de.tum.in.www1.artemis.service.ProfileService; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildAgentInformation; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.in.www1.artemis.service.connectors.localci.dto.DockerImageBuild; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.FinishedBuildJobPageableSearchDTO; +import de.tum.cit.aet.artemis.domain.BuildJob; +import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; +import de.tum.cit.aet.artemis.repository.BuildJobRepository; +import de.tum.cit.aet.artemis.service.ProfileService; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.DockerImageBuild; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.FinishedBuildJobPageableSearchDTO; /** * Includes methods for managing and retrieving the shared build job queue and build agent information. Also contains methods for cancelling build jobs. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildAgentDockerService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildAgentDockerService.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildAgentDockerService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildAgentDockerService.java index dd2885a7827d..b7ee7c8a5cd3 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildAgentDockerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildAgentDockerService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.service.connectors.localci.buildagent; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; import java.io.File; import java.time.Duration; @@ -38,9 +38,9 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.map.IMap; -import de.tum.in.www1.artemis.exception.LocalCIException; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.in.www1.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.exception.LocalCIException; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.service.util.TimeLogUtil; /** * Service for Docker related operations in local CI diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildAgentSshKeyService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildAgentSshKeyService.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildAgentSshKeyService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildAgentSshKeyService.java index 587aa1291dba..ae6aa9852a38 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildAgentSshKeyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildAgentSshKeyService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.service.connectors.localci.buildagent; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobContainerService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobContainerService.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobContainerService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobContainerService.java index 31c38c4ad5fb..5f7596023cd7 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobContainerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobContainerService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.service.connectors.localci.buildagent; -import static de.tum.in.www1.artemis.config.Constants.LOCALCI_WORKING_DIRECTORY; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.config.Constants.LOCALCI_WORKING_DIRECTORY; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -42,10 +42,10 @@ import com.github.dockerjava.api.model.Frame; import com.github.dockerjava.api.model.HostConfig; -import de.tum.in.www1.artemis.domain.BuildLogEntry; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.exception.LocalCIException; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationService.RepositoryCheckoutPath; +import de.tum.cit.aet.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.exception.LocalCIException; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService.RepositoryCheckoutPath; /** * This service contains methods that are used to interact with the Docker containers when executing build jobs in the local CI system. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobExecutionService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobExecutionService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobExecutionService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobExecutionService.java index 305c68a46c9b..f0d5f16b24ff 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobExecutionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobExecutionService.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.service.connectors.localci.buildagent; -import static de.tum.in.www1.artemis.config.Constants.CHECKED_OUT_REPOS_TEMP_DIR; -import static de.tum.in.www1.artemis.config.Constants.LOCALCI_RESULTS_DIRECTORY; -import static de.tum.in.www1.artemis.config.Constants.LOCALCI_WORKING_DIRECTORY; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_BUILDAGENT; -import static de.tum.in.www1.artemis.service.connectors.localci.buildagent.TestResultXmlParser.processTestResultFile; +import static de.tum.cit.aet.artemis.config.Constants.CHECKED_OUT_REPOS_TEMP_DIR; +import static de.tum.cit.aet.artemis.config.Constants.LOCALCI_RESULTS_DIRECTORY; +import static de.tum.cit.aet.artemis.config.Constants.LOCALCI_WORKING_DIRECTORY; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.service.connectors.localci.buildagent.TestResultXmlParser.processTestResultFile; import java.io.IOException; import java.net.URISyntaxException; @@ -33,20 +33,20 @@ import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.exception.NotFoundException; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.enumeration.StaticCodeAnalysisTool; -import de.tum.in.www1.artemis.exception.GitException; -import de.tum.in.www1.artemis.exception.LocalCIException; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildResult; -import de.tum.in.www1.artemis.service.connectors.localci.scaparser.ReportParser; -import de.tum.in.www1.artemis.service.connectors.localci.scaparser.exception.UnsupportedToolException; -import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCRepositoryUri; -import de.tum.in.www1.artemis.service.dto.StaticCodeAnalysisReportDTO; -import de.tum.in.www1.artemis.service.util.TimeLogUtil; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.exception.GitException; +import de.tum.cit.aet.artemis.exception.LocalCIException; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildResult; +import de.tum.cit.aet.artemis.service.connectors.localci.scaparser.ReportParser; +import de.tum.cit.aet.artemis.service.connectors.localci.scaparser.exception.UnsupportedToolException; +import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; +import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; +import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * This service contains the logic to execute a build job for a programming exercise participation in the local CI system. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobGitService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobGitService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobGitService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobGitService.java index b7e97c8fcab2..5d878b13431d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobGitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobGitService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.service.connectors.localci.buildagent; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; import java.io.IOException; import java.net.URI; @@ -28,10 +28,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.exception.GitException; -import de.tum.in.www1.artemis.service.connectors.AbstractGitService; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.exception.GitException; +import de.tum.cit.aet.artemis.service.connectors.AbstractGitService; @Profile(PROFILE_BUILDAGENT) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobManagementService.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobManagementService.java index 3b7d29e0d1c9..ae773f4bd763 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobManagementService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.service.connectors.localci.buildagent; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; import java.io.PrintWriter; import java.io.StringWriter; @@ -31,10 +31,10 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.topic.ITopic; -import de.tum.in.www1.artemis.domain.BuildLogEntry; -import de.tum.in.www1.artemis.exception.LocalCIException; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildResult; +import de.tum.cit.aet.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.exception.LocalCIException; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildResult; /** * This service is responsible for adding build jobs to the Integrated Code Lifecycle executor service. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildLogsMap.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildLogsMap.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildLogsMap.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildLogsMap.java index 6f038ba4fd77..281c973e758a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildLogsMap.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildLogsMap.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.service.connectors.localci.buildagent; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -11,7 +11,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.in.www1.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.domain.BuildLogEntry; @Profile(PROFILE_BUILDAGENT) @Component diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java index d19d0fae96ba..30187bd8f682 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.service.connectors.localci.buildagent; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -34,14 +34,14 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.map.IMap; -import de.tum.in.www1.artemis.domain.BuildLogEntry; -import de.tum.in.www1.artemis.domain.enumeration.BuildStatus; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildAgentInformation; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildResult; -import de.tum.in.www1.artemis.service.connectors.localci.dto.JobTimingInfo; -import de.tum.in.www1.artemis.service.connectors.localci.dto.ResultQueueItem; +import de.tum.cit.aet.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildResult; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.JobTimingInfo; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.ResultQueueItem; /** * Includes functionality for processing build jobs from the shared build job queue. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/TestResultXmlParser.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/TestResultXmlParser.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/TestResultXmlParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/TestResultXmlParser.java index 3c34c756cf9b..5bca17491f2d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/TestResultXmlParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/TestResultXmlParser.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.service.connectors.localci.buildagent; import java.io.IOException; import java.util.Collections; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildResult; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildResult; class TestResultXmlParser { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/BuildAgentInformation.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildAgentInformation.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/BuildAgentInformation.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildAgentInformation.java index e69880c94650..37a6ca414e08 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/BuildAgentInformation.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildAgentInformation.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.localci.dto; +package de.tum.cit.aet.artemis.service.connectors.localci.dto; import java.io.Serial; import java.io.Serializable; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/BuildConfig.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildConfig.java similarity index 80% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/BuildConfig.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildConfig.java index 284b5c383251..4fc3add6c00b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/BuildConfig.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildConfig.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.localci.dto; +package de.tum.cit.aet.artemis.service.connectors.localci.dto; import java.io.Serializable; import java.util.List; @@ -6,8 +6,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/BuildJobQueueItem.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildJobQueueItem.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/BuildJobQueueItem.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildJobQueueItem.java index 4707b62c4ded..defce1e9deb9 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/BuildJobQueueItem.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildJobQueueItem.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.localci.dto; +package de.tum.cit.aet.artemis.service.connectors.localci.dto; import java.io.Serial; import java.io.Serializable; @@ -7,8 +7,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.BuildStatus; -import de.tum.in.www1.artemis.web.rest.dto.ResultDTO; +import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; +import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/BuildResult.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildResult.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/BuildResult.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildResult.java index 67c68d3af8cd..610ab99ba45c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/BuildResult.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildResult.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.localci.dto; +package de.tum.cit.aet.artemis.service.connectors.localci.dto; import java.io.Serializable; import java.time.ZonedDateTime; @@ -11,12 +11,12 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.BuildLogEntry; -import de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestwiseCoverageReportDTO; -import de.tum.in.www1.artemis.service.dto.AbstractBuildResultNotificationDTO; -import de.tum.in.www1.artemis.service.dto.BuildJobDTOInterface; -import de.tum.in.www1.artemis.service.dto.StaticCodeAnalysisReportDTO; -import de.tum.in.www1.artemis.service.dto.TestCaseBaseDTO; +import de.tum.cit.aet.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestwiseCoverageReportDTO; +import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; +import de.tum.cit.aet.artemis.service.dto.BuildJobDTOInterface; +import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; +import de.tum.cit.aet.artemis.service.dto.TestCaseBaseDTO; /** * Represents all the information returned by the local CI system about a build. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/DockerImageBuild.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/DockerImageBuild.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/DockerImageBuild.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/DockerImageBuild.java index 866baa6d169f..6ad3e2f1a6b8 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/DockerImageBuild.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/DockerImageBuild.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.localci.dto; +package de.tum.cit.aet.artemis.service.connectors.localci.dto; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/JobTimingInfo.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/JobTimingInfo.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/JobTimingInfo.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/JobTimingInfo.java index b2667530c964..04e5da5fba60 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/JobTimingInfo.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/JobTimingInfo.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.localci.dto; +package de.tum.cit.aet.artemis.service.connectors.localci.dto; import java.io.Serializable; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/RepositoryInfo.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/RepositoryInfo.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/RepositoryInfo.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/RepositoryInfo.java index db235a679ffe..0490d5b92b86 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/RepositoryInfo.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/RepositoryInfo.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.connectors.localci.dto; +package de.tum.cit.aet.artemis.service.connectors.localci.dto; import java.io.Serializable; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/ResultBuildJob.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/ResultBuildJob.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/ResultBuildJob.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/ResultBuildJob.java index 803050efadc4..ba6fa3a7a011 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/ResultBuildJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/ResultBuildJob.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.localci.dto; +package de.tum.cit.aet.artemis.service.connectors.localci.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/ResultQueueItem.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/ResultQueueItem.java similarity index 73% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/ResultQueueItem.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/ResultQueueItem.java index c63f10717c18..c21506a74bae 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/dto/ResultQueueItem.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/ResultQueueItem.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.connectors.localci.dto; +package de.tum.cit.aet.artemis.service.connectors.localci.dto; import java.io.Serializable; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.domain.BuildLogEntry; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ResultQueueItem(BuildResult buildResult, BuildJobQueueItem buildJobQueueItem, List buildLogs, Throwable exception) implements Serializable { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/ReportParser.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/ReportParser.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/ReportParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/ReportParser.java index a783c1e768f1..1975924741eb 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/ReportParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/ReportParser.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.connectors.localci.scaparser; +package de.tum.cit.aet.artemis.service.connectors.localci.scaparser; -import static de.tum.in.www1.artemis.service.connectors.localci.scaparser.utils.ReportUtils.createErrorReport; -import static de.tum.in.www1.artemis.service.connectors.localci.scaparser.utils.ReportUtils.createFileTooLargeReport; +import static de.tum.cit.aet.artemis.service.connectors.localci.scaparser.utils.ReportUtils.createErrorReport; +import static de.tum.cit.aet.artemis.service.connectors.localci.scaparser.utils.ReportUtils.createFileTooLargeReport; import java.io.File; import java.io.IOException; @@ -9,12 +9,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.service.connectors.localci.scaparser.exception.ParserException; -import de.tum.in.www1.artemis.service.connectors.localci.scaparser.exception.UnsupportedToolException; -import de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.ParserPolicy; -import de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.ParserStrategy; -import de.tum.in.www1.artemis.service.connectors.localci.scaparser.utils.FileUtils; -import de.tum.in.www1.artemis.service.dto.StaticCodeAnalysisReportDTO; +import de.tum.cit.aet.artemis.service.connectors.localci.scaparser.exception.ParserException; +import de.tum.cit.aet.artemis.service.connectors.localci.scaparser.exception.UnsupportedToolException; +import de.tum.cit.aet.artemis.service.connectors.localci.scaparser.strategy.ParserPolicy; +import de.tum.cit.aet.artemis.service.connectors.localci.scaparser.strategy.ParserStrategy; +import de.tum.cit.aet.artemis.service.connectors.localci.scaparser.utils.FileUtils; +import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; /** * Public API for parsing of static code analysis reports diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/exception/ParserException.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/exception/ParserException.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/exception/ParserException.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/exception/ParserException.java index e927a720d522..5601e277b322 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/exception/ParserException.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/exception/ParserException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.localci.scaparser.exception; +package de.tum.cit.aet.artemis.service.connectors.localci.scaparser.exception; /** * Exception thrown when an error occurs during parsing. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/exception/UnsupportedToolException.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/exception/UnsupportedToolException.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/exception/UnsupportedToolException.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/exception/UnsupportedToolException.java index 02a064056d67..e972aa9bf4b1 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/exception/UnsupportedToolException.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/exception/UnsupportedToolException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.localci.scaparser.exception; +package de.tum.cit.aet.artemis.service.connectors.localci.scaparser.exception; /** * Exception thrown if the static code analysis tool which created the report is not supported diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/strategy/CheckstyleParser.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/CheckstyleParser.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/strategy/CheckstyleParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/CheckstyleParser.java index 937c4e890e1b..2ac441babce2 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/strategy/CheckstyleParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/CheckstyleParser.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy; +package de.tum.cit.aet.artemis.service.connectors.localci.scaparser.strategy; import java.io.IOException; import java.util.ArrayList; @@ -9,9 +9,9 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import de.tum.in.www1.artemis.domain.enumeration.StaticCodeAnalysisTool; -import de.tum.in.www1.artemis.service.dto.StaticCodeAnalysisIssue; -import de.tum.in.www1.artemis.service.dto.StaticCodeAnalysisReportDTO; +import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; +import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; @JsonIgnoreProperties(ignoreUnknown = true) record CheckstyleFile(@JacksonXmlProperty(isAttribute = true, localName = "name") String name, diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/strategy/PMDCPDParser.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/PMDCPDParser.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/strategy/PMDCPDParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/PMDCPDParser.java index 4fff57d89ea3..75421604a644 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/strategy/PMDCPDParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/PMDCPDParser.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy; +package de.tum.cit.aet.artemis.service.connectors.localci.scaparser.strategy; import java.io.File; import java.io.IOException; @@ -10,9 +10,9 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import de.tum.in.www1.artemis.domain.enumeration.StaticCodeAnalysisTool; -import de.tum.in.www1.artemis.service.dto.StaticCodeAnalysisIssue; -import de.tum.in.www1.artemis.service.dto.StaticCodeAnalysisReportDTO; +import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; +import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; @JsonIgnoreProperties(ignoreUnknown = true) record PmdCpc(@JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "duplication") List duplications) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/strategy/PMDParser.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/PMDParser.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/strategy/PMDParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/PMDParser.java index ad3e06f80d9e..4a7555dd061c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/strategy/PMDParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/PMDParser.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy; +package de.tum.cit.aet.artemis.service.connectors.localci.scaparser.strategy; import java.io.IOException; import java.util.ArrayList; @@ -10,9 +10,9 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText; -import de.tum.in.www1.artemis.domain.enumeration.StaticCodeAnalysisTool; -import de.tum.in.www1.artemis.service.dto.StaticCodeAnalysisIssue; -import de.tum.in.www1.artemis.service.dto.StaticCodeAnalysisReportDTO; +import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; +import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; @JsonIgnoreProperties(ignoreUnknown = true) record PMDReport(@JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "file") List files) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/strategy/ParserPolicy.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/ParserPolicy.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/strategy/ParserPolicy.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/ParserPolicy.java index 0300d02016e9..0932c49f3efe 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/strategy/ParserPolicy.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/ParserPolicy.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy; +package de.tum.cit.aet.artemis.service.connectors.localci.scaparser.strategy; import java.nio.file.Path; -import de.tum.in.www1.artemis.domain.enumeration.StaticCodeAnalysisTool; -import de.tum.in.www1.artemis.service.connectors.localci.scaparser.exception.UnsupportedToolException; +import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.service.connectors.localci.scaparser.exception.UnsupportedToolException; /** * Policy class for the parser strategies. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/strategy/ParserStrategy.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/ParserStrategy.java similarity index 80% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/strategy/ParserStrategy.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/ParserStrategy.java index 2128d1ab479c..53d32420f87e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/strategy/ParserStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/ParserStrategy.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy; +package de.tum.cit.aet.artemis.service.connectors.localci.scaparser.strategy; -import de.tum.in.www1.artemis.service.dto.StaticCodeAnalysisReportDTO; +import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; /** * Strategy interface for the parser strategies. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/strategy/SpotbugsParser.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/SpotbugsParser.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/strategy/SpotbugsParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/SpotbugsParser.java index b10cf354fa8a..3a0dec001c53 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/strategy/SpotbugsParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/SpotbugsParser.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy; +package de.tum.cit.aet.artemis.service.connectors.localci.scaparser.strategy; import java.io.File; import java.io.IOException; @@ -10,9 +10,9 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import de.tum.in.www1.artemis.domain.enumeration.StaticCodeAnalysisTool; -import de.tum.in.www1.artemis.service.dto.StaticCodeAnalysisIssue; -import de.tum.in.www1.artemis.service.dto.StaticCodeAnalysisReportDTO; +import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; +import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; @JsonIgnoreProperties(ignoreUnknown = true) record BugInstance(@JacksonXmlProperty(isAttribute = true, localName = "type") String type, diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/utils/FileUtils.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/utils/FileUtils.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/utils/FileUtils.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/utils/FileUtils.java index 5a5d78795d56..48ba06621347 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/utils/FileUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/utils/FileUtils.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.localci.scaparser.utils; +package de.tum.cit.aet.artemis.service.connectors.localci.scaparser.utils; import java.io.File; import java.util.Optional; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/utils/ReportUtils.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/utils/ReportUtils.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/utils/ReportUtils.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/utils/ReportUtils.java index fa8a25d55b12..543e70b85b9d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/scaparser/utils/ReportUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/utils/ReportUtils.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.connectors.localci.scaparser.utils; +package de.tum.cit.aet.artemis.service.connectors.localci.scaparser.utils; import java.util.List; -import de.tum.in.www1.artemis.domain.enumeration.StaticCodeAnalysisTool; -import de.tum.in.www1.artemis.service.dto.StaticCodeAnalysisIssue; -import de.tum.in.www1.artemis.service.dto.StaticCodeAnalysisReportDTO; +import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; +import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; public final class ReportUtils { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCFetchFilter.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCFetchFilter.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCFetchFilter.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCFetchFilter.java index 765554309e5c..be7ece5f61a7 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCFetchFilter.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCFetchFilter.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.localvc; +package de.tum.cit.aet.artemis.service.connectors.localvc; import java.io.IOException; @@ -12,10 +12,10 @@ import org.slf4j.LoggerFactory; import org.springframework.web.filter.OncePerRequestFilter; -import de.tum.in.www1.artemis.exception.localvc.LocalVCAuthException; -import de.tum.in.www1.artemis.exception.localvc.LocalVCForbiddenException; -import de.tum.in.www1.artemis.exception.localvc.LocalVCInternalException; -import de.tum.in.www1.artemis.web.rest.repository.RepositoryActionType; +import de.tum.cit.aet.artemis.exception.localvc.LocalVCAuthException; +import de.tum.cit.aet.artemis.exception.localvc.LocalVCForbiddenException; +import de.tum.cit.aet.artemis.exception.localvc.LocalVCInternalException; +import de.tum.cit.aet.artemis.web.rest.repository.RepositoryActionType; /** * Filters incoming fetch requests reaching the local git server implementation. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCInfoContributor.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCInfoContributor.java index 43b9bea1b531..8e133fa2e4e6 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCInfoContributor.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.connectors.localvc; +package de.tum.cit.aet.artemis.service.connectors.localvc; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; import java.net.URI; import java.net.URISyntaxException; @@ -14,7 +14,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.in.www1.artemis.config.Constants; +import de.tum.cit.aet.artemis.config.Constants; @Component @Profile(PROFILE_LOCALVC) diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCPersonalAccessTokenManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPersonalAccessTokenManagementService.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCPersonalAccessTokenManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPersonalAccessTokenManagementService.java index 628046de3825..e9f28c03a7d4 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCPersonalAccessTokenManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPersonalAccessTokenManagementService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.connectors.localvc; +package de.tum.cit.aet.artemis.service.connectors.localvc; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; import java.security.SecureRandom; import java.util.stream.Collectors; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCPostPushHook.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPostPushHook.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCPostPushHook.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPostPushHook.java index 287a3ef4f0a7..28803a7f857c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCPostPushHook.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPostPushHook.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.localvc; +package de.tum.cit.aet.artemis.service.connectors.localvc; import java.util.Collection; import java.util.Iterator; @@ -8,8 +8,8 @@ import org.eclipse.jgit.transport.ReceiveCommand; import org.eclipse.jgit.transport.ReceivePack; -import de.tum.in.www1.artemis.exception.LocalCIException; -import de.tum.in.www1.artemis.exception.VersionControlException; +import de.tum.cit.aet.artemis.exception.LocalCIException; +import de.tum.cit.aet.artemis.exception.VersionControlException; /** * Contains an onPostReceive method that is called by JGit after a push has been received (i.e. after the pushed files were successfully written to disk). diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCPrePushHook.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPrePushHook.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCPrePushHook.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPrePushHook.java index 782a7636e82e..232371a5eb5b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCPrePushHook.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPrePushHook.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.localvc; +package de.tum.cit.aet.artemis.service.connectors.localvc; import java.io.IOException; import java.util.Collection; @@ -12,8 +12,8 @@ import org.eclipse.jgit.transport.ReceiveCommand; import org.eclipse.jgit.transport.ReceivePack; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.exception.localvc.LocalVCInternalException; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exception.localvc.LocalVCInternalException; /** * Contains an onPreReceive method that is called by JGit before a push is received (i.e. before the pushed files are written to disk but after the authorization check was diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCPushFilter.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPushFilter.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCPushFilter.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPushFilter.java index 6e4d1a121cd8..219d1fb70920 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCPushFilter.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPushFilter.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.localvc; +package de.tum.cit.aet.artemis.service.connectors.localvc; import java.io.IOException; @@ -12,10 +12,10 @@ import org.slf4j.LoggerFactory; import org.springframework.web.filter.OncePerRequestFilter; -import de.tum.in.www1.artemis.exception.localvc.LocalVCAuthException; -import de.tum.in.www1.artemis.exception.localvc.LocalVCForbiddenException; -import de.tum.in.www1.artemis.exception.localvc.LocalVCInternalException; -import de.tum.in.www1.artemis.web.rest.repository.RepositoryActionType; +import de.tum.cit.aet.artemis.exception.localvc.LocalVCAuthException; +import de.tum.cit.aet.artemis.exception.localvc.LocalVCForbiddenException; +import de.tum.cit.aet.artemis.exception.localvc.LocalVCInternalException; +import de.tum.cit.aet.artemis.web.rest.repository.RepositoryActionType; /** * Filters incoming push requests reaching the local Version Control implementation. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCRepositoryUri.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCRepositoryUri.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCRepositoryUri.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCRepositoryUri.java index b2be0a17c29c..22b1ee67e1cc 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCRepositoryUri.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCRepositoryUri.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.localvc; +package de.tum.cit.aet.artemis.service.connectors.localvc; import java.net.URI; import java.net.URISyntaxException; @@ -6,8 +6,8 @@ import java.nio.file.Path; import java.nio.file.Paths; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.exception.localvc.LocalVCInternalException; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.exception.localvc.LocalVCInternalException; /** * Represents a URI for a local version control (VC) repository. This class extends {@link VcsRepositoryUri} by adding specific properties diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCService.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCService.java index 8233efc27944..88ea357c1b3c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.connectors.localvc; +package de.tum.cit.aet.artemis.service.connectors.localvc; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; import java.io.IOException; import java.net.URL; @@ -30,22 +30,22 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Commit; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.exception.localvc.LocalVCInternalException; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.TemplateProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.service.UriService; -import de.tum.in.www1.artemis.service.connectors.ConnectorHealth; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.connectors.vcs.AbstractVersionControlService; -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlRepositoryPermission; +import de.tum.cit.aet.artemis.domain.Commit; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.exception.localvc.LocalVCInternalException; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.service.UriService; +import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.connectors.vcs.AbstractVersionControlService; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlRepositoryPermission; /** * Implementation of VersionControlService for the local VC server. @@ -329,7 +329,7 @@ public Commit getLastCommitDetails(Object requestBody) { public ZonedDateTime getPushDate(ProgrammingExerciseParticipation participation, String commitHash, Object eventObject) { // The eventObject is null for every call of this method. Use the commitHash to determine date of the latest commit. - de.tum.in.www1.artemis.domain.Repository repository; + de.tum.cit.aet.artemis.domain.Repository repository; try { repository = gitService.getOrCheckoutRepository(participation); } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCServletService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCServletService.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCServletService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCServletService.java index fcb439a28f25..d70f739faf83 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCServletService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCServletService.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.connectors.localvc; +package de.tum.cit.aet.artemis.service.connectors.localvc; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_LOCALVC; -import static de.tum.in.www1.artemis.service.connectors.localvc.LocalVCPersonalAccessTokenManagementService.TOKEN_PREFIX; -import static de.tum.in.www1.artemis.service.connectors.localvc.LocalVCPersonalAccessTokenManagementService.VCS_ACCESS_TOKEN_LENGTH; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCPersonalAccessTokenManagementService.TOKEN_PREFIX; +import static de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCPersonalAccessTokenManagementService.VCS_ACCESS_TOKEN_LENGTH; import java.io.IOException; import java.net.URL; @@ -37,35 +37,35 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Commit; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.exception.ContinuousIntegrationException; -import de.tum.in.www1.artemis.exception.VersionControlException; -import de.tum.in.www1.artemis.exception.localvc.LocalVCAuthException; -import de.tum.in.www1.artemis.exception.localvc.LocalVCForbiddenException; -import de.tum.in.www1.artemis.exception.localvc.LocalVCInternalException; -import de.tum.in.www1.artemis.repository.ParticipationVCSAccessTokenRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; -import de.tum.in.www1.artemis.service.programming.AuxiliaryRepositoryService; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseParticipationService; -import de.tum.in.www1.artemis.service.programming.ProgrammingMessagingService; -import de.tum.in.www1.artemis.service.programming.ProgrammingSubmissionService; -import de.tum.in.www1.artemis.service.programming.ProgrammingTriggerService; -import de.tum.in.www1.artemis.service.programming.RepositoryAccessService; -import de.tum.in.www1.artemis.service.util.TimeLogUtil; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.in.www1.artemis.web.rest.repository.RepositoryActionType; +import de.tum.cit.aet.artemis.domain.Commit; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.exception.VersionControlException; +import de.tum.cit.aet.artemis.exception.localvc.LocalVCAuthException; +import de.tum.cit.aet.artemis.exception.localvc.LocalVCForbiddenException; +import de.tum.cit.aet.artemis.exception.localvc.LocalVCInternalException; +import de.tum.cit.aet.artemis.repository.ParticipationVCSAccessTokenRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; +import de.tum.cit.aet.artemis.service.programming.AuxiliaryRepositoryService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseParticipationService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingMessagingService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingSubmissionService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingTriggerService; +import de.tum.cit.aet.artemis.service.programming.RepositoryAccessService; +import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.rest.repository.RepositoryActionType; /** * This service is responsible for authenticating and authorizing git requests as well as for retrieving the requested Git repositories from disk. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/ExternalPasswordResetInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/ExternalPasswordResetInfoContributor.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/lti/ExternalPasswordResetInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/ExternalPasswordResetInfoContributor.java index 649faafc2612..93b4dad013f8 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/ExternalPasswordResetInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/ExternalPasswordResetInfoContributor.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.connectors.lti; +package de.tum.cit.aet.artemis.service.connectors.lti; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Map; @@ -12,7 +12,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.in.www1.artemis.config.Constants; +import de.tum.cit.aet.artemis.config.Constants; @Profile(PROFILE_CORE) @Component diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/Lti13Service.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/Lti13Service.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/lti/Lti13Service.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/Lti13Service.java index d57a175dffad..7f12d28bce2d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/Lti13Service.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/Lti13Service.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.lti; +package de.tum.cit.aet.artemis.service.connectors.lti; import java.net.URI; import java.net.URISyntaxException; @@ -31,29 +31,29 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.LtiPlatformConfiguration; -import de.tum.in.www1.artemis.domain.OnlineCourseConfiguration; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.lti.Claims; -import de.tum.in.www1.artemis.domain.lti.Lti13AgsClaim; -import de.tum.in.www1.artemis.domain.lti.Lti13LaunchRequest; -import de.tum.in.www1.artemis.domain.lti.LtiResourceLaunch; -import de.tum.in.www1.artemis.domain.lti.Scopes; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.Lti13ResourceLaunchRepository; -import de.tum.in.www1.artemis.repository.LtiPlatformConfigurationRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.ArtemisAuthenticationProvider; -import de.tum.in.www1.artemis.security.lti.Lti13TokenRetriever; -import de.tum.in.www1.artemis.service.OnlineCourseConfigurationService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; +import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.lti.Claims; +import de.tum.cit.aet.artemis.domain.lti.Lti13AgsClaim; +import de.tum.cit.aet.artemis.domain.lti.Lti13LaunchRequest; +import de.tum.cit.aet.artemis.domain.lti.LtiResourceLaunch; +import de.tum.cit.aet.artemis.domain.lti.Scopes; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.Lti13ResourceLaunchRepository; +import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.ArtemisAuthenticationProvider; +import de.tum.cit.aet.artemis.security.lti.Lti13TokenRetriever; +import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Service @Profile("lti") diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiDeepLinkingService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiDeepLinkingService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingService.java index 946bb4be724d..897a5f95b35a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiDeepLinkingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.lti; +package de.tum.cit.aet.artemis.service.connectors.lti; import java.util.ArrayList; import java.util.HashMap; @@ -13,12 +13,12 @@ import org.springframework.stereotype.Service; import org.springframework.web.util.UriComponentsBuilder; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.in.www1.artemis.domain.lti.Lti13DeepLinkingResponse; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.security.lti.Lti13TokenRetriever; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.domain.lti.Lti13DeepLinkingResponse; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.security.lti.Lti13TokenRetriever; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; /** * Service for handling LTI deep linking functionality. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiDynamicRegistrationService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDynamicRegistrationService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiDynamicRegistrationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDynamicRegistrationService.java index b6b36a36a9b4..54e0cb3e6457 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiDynamicRegistrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDynamicRegistrationService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.lti; +package de.tum.cit.aet.artemis.service.connectors.lti; import java.util.UUID; @@ -15,12 +15,12 @@ import org.springframework.web.client.HttpServerErrorException; import org.springframework.web.client.RestTemplate; -import de.tum.in.www1.artemis.domain.LtiPlatformConfiguration; -import de.tum.in.www1.artemis.domain.lti.Lti13ClientRegistration; -import de.tum.in.www1.artemis.domain.lti.Lti13PlatformConfiguration; -import de.tum.in.www1.artemis.repository.LtiPlatformConfigurationRepository; -import de.tum.in.www1.artemis.security.OAuth2JWKSService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; +import de.tum.cit.aet.artemis.domain.lti.Lti13ClientRegistration; +import de.tum.cit.aet.artemis.domain.lti.Lti13PlatformConfiguration; +import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; +import de.tum.cit.aet.artemis.security.OAuth2JWKSService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Service @Profile("lti") diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiNewResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiNewResultService.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiNewResultService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiNewResultService.java index 950af0a8c1d0..29789ca74f7c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiNewResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiNewResultService.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.service.connectors.lti; +package de.tum.cit.aet.artemis.service.connectors.lti; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; @Service @Profile("lti") diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiService.java index 0dd67f46a739..8e575e699095 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.lti; +package de.tum.cit.aet.artemis.service.connectors.lti; import java.util.Collections; import java.util.HashSet; @@ -24,19 +24,19 @@ import org.springframework.util.StringUtils; import org.springframework.web.util.UriComponentsBuilder; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.exception.LtiEmailAlreadyInUseException; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.ArtemisAuthenticationProvider; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.security.jwt.JWTCookieService; -import de.tum.in.www1.artemis.service.connectors.ci.CIUserManagementService; -import de.tum.in.www1.artemis.service.connectors.vcs.VcsUserManagementService; -import de.tum.in.www1.artemis.service.user.UserCreationService; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exception.LtiEmailAlreadyInUseException; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.ArtemisAuthenticationProvider; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.security.jwt.JWTCookieService; +import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; +import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; +import de.tum.cit.aet.artemis.service.user.UserCreationService; import tech.jhipster.security.RandomUtil; @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisConnectorException.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisConnectorException.java similarity index 72% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisConnectorException.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisConnectorException.java index 8a0845ce1564..3857db946425 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisConnectorException.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisConnectorException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris; +package de.tum.cit.aet.artemis.service.connectors.pyris; public class PyrisConnectorException extends RuntimeException { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisConnectorService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisConnectorService.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisConnectorService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisConnectorService.java index bf241bc28837..de8775d7c5e3 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisConnectorService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisConnectorService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris; +package de.tum.cit.aet.artemis.service.connectors.pyris; import java.util.Arrays; import java.util.List; @@ -17,12 +17,12 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisModelDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; -import de.tum.in.www1.artemis.service.iris.exception.IrisException; -import de.tum.in.www1.artemis.service.iris.exception.IrisForbiddenException; -import de.tum.in.www1.artemis.service.iris.exception.IrisInternalPyrisErrorException; -import de.tum.in.www1.artemis.web.rest.open.PublicPyrisStatusUpdateResource; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisModelDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; +import de.tum.cit.aet.artemis.service.iris.exception.IrisException; +import de.tum.cit.aet.artemis.service.iris.exception.IrisForbiddenException; +import de.tum.cit.aet.artemis.service.iris.exception.IrisInternalPyrisErrorException; +import de.tum.cit.aet.artemis.web.rest.open.PublicPyrisStatusUpdateResource; /** * This service connects to the Python implementation of Iris (called Pyris). diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisDTOService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisDTOService.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisDTOService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisDTOService.java index 4ea48ae3144c..686f47a121da 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisDTOService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisDTOService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.connectors.pyris; +package de.tum.cit.aet.artemis.service.connectors.pyris; -import static de.tum.in.www1.artemis.service.util.TimeUtil.toInstant; +import static de.tum.cit.aet.artemis.service.util.TimeUtil.toInstant; import java.io.IOException; import java.util.List; @@ -15,20 +15,20 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.domain.iris.message.IrisMessage; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.service.ProfileService; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisBuildLogEntryDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisFeedbackDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisMessageDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisProgrammingExerciseDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisResultDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisSubmissionDTO; -import de.tum.in.www1.artemis.service.programming.RepositoryService; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.service.ProfileService; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisBuildLogEntryDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisFeedbackDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisMessageDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisProgrammingExerciseDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisResultDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisSubmissionDTO; +import de.tum.cit.aet.artemis.service.programming.RepositoryService; @Service @Profile("iris") diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisHealthIndicator.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisHealthIndicator.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisHealthIndicator.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisHealthIndicator.java index d08e19e40d43..298b3265727d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisHealthIndicator.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisHealthIndicator.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris; +package de.tum.cit.aet.artemis.service.connectors.pyris; import java.net.URI; @@ -11,8 +11,8 @@ import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; -import de.tum.in.www1.artemis.service.connectors.ConnectorHealth; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisHealthStatusDTO; +import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisHealthStatusDTO; @Component @Profile("iris") diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisJobService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisJobService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisJobService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisJobService.java index 24dc20bffa65..819a65e1db92 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisJobService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisJobService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris; +package de.tum.cit.aet.artemis.service.connectors.pyris; import java.security.SecureRandom; import java.util.concurrent.TimeUnit; @@ -15,12 +15,12 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.map.IMap; -import de.tum.in.www1.artemis.service.connectors.pyris.job.CourseChatJob; -import de.tum.in.www1.artemis.service.connectors.pyris.job.ExerciseChatJob; -import de.tum.in.www1.artemis.service.connectors.pyris.job.IngestionWebhookJob; -import de.tum.in.www1.artemis.service.connectors.pyris.job.PyrisJob; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.service.connectors.pyris.job.CourseChatJob; +import de.tum.cit.aet.artemis.service.connectors.pyris.job.ExerciseChatJob; +import de.tum.cit.aet.artemis.service.connectors.pyris.job.IngestionWebhookJob; +import de.tum.cit.aet.artemis.service.connectors.pyris.job.PyrisJob; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; /** * The PyrisJobService class is responsible for managing Pyris jobs in the Artemis system. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisPipelineService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisPipelineService.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisPipelineService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisPipelineService.java index a2fc3f1c3ce4..59be037b3858 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisPipelineService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisPipelineService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris; +package de.tum.cit.aet.artemis.service.connectors.pyris; import java.util.HashMap; import java.util.HashSet; @@ -15,27 +15,27 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.competency.CompetencyJol; -import de.tum.in.www1.artemis.domain.iris.session.IrisCourseChatSession; -import de.tum.in.www1.artemis.domain.iris.session.IrisExerciseChatSession; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.course.PyrisCourseChatPipelineExecutionDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.exercise.PyrisExerciseChatPipelineExecutionDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisCourseDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisExtendedCourseDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisUserDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.in.www1.artemis.service.iris.exception.IrisException; -import de.tum.in.www1.artemis.service.iris.websocket.IrisChatWebsocketService; -import de.tum.in.www1.artemis.service.metrics.LearningMetricsService; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyJolDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.competency.CompetencyJol; +import de.tum.cit.aet.artemis.domain.iris.session.IrisCourseChatSession; +import de.tum.cit.aet.artemis.domain.iris.session.IrisExerciseChatSession; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.course.PyrisCourseChatPipelineExecutionDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.exercise.PyrisExerciseChatPipelineExecutionDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisCourseDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisExtendedCourseDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisUserDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.service.iris.exception.IrisException; +import de.tum.cit.aet.artemis.service.iris.websocket.IrisChatWebsocketService; +import de.tum.cit.aet.artemis.service.metrics.LearningMetricsService; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO; /** * Service responsible for executing the various Pyris pipelines in a type-safe manner. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisStatusUpdateService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisStatusUpdateService.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisStatusUpdateService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisStatusUpdateService.java index 0966455b3533..36d71d69eba9 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisStatusUpdateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisStatusUpdateService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris; +package de.tum.cit.aet.artemis.service.connectors.pyris; import java.util.List; @@ -7,18 +7,18 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageState; -import de.tum.in.www1.artemis.service.connectors.pyris.job.CompetencyExtractionJob; -import de.tum.in.www1.artemis.service.connectors.pyris.job.CourseChatJob; -import de.tum.in.www1.artemis.service.connectors.pyris.job.ExerciseChatJob; -import de.tum.in.www1.artemis.service.connectors.pyris.job.IngestionWebhookJob; -import de.tum.in.www1.artemis.service.iris.IrisCompetencyGenerationService; -import de.tum.in.www1.artemis.service.iris.session.IrisCourseChatSessionService; -import de.tum.in.www1.artemis.service.iris.session.IrisExerciseChatSessionService; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageState; +import de.tum.cit.aet.artemis.service.connectors.pyris.job.CompetencyExtractionJob; +import de.tum.cit.aet.artemis.service.connectors.pyris.job.CourseChatJob; +import de.tum.cit.aet.artemis.service.connectors.pyris.job.ExerciseChatJob; +import de.tum.cit.aet.artemis.service.connectors.pyris.job.IngestionWebhookJob; +import de.tum.cit.aet.artemis.service.iris.IrisCompetencyGenerationService; +import de.tum.cit.aet.artemis.service.iris.session.IrisCourseChatSessionService; +import de.tum.cit.aet.artemis.service.iris.session.IrisExerciseChatSessionService; @Service @Profile("iris") @@ -56,7 +56,7 @@ public void handleStatusUpdate(ExerciseChatJob job, PyrisChatStatusUpdateDTO sta /** * Handles the status update of a course chat job and forwards it to - * {@link de.tum.in.www1.artemis.service.iris.session.IrisCourseChatSessionService#handleStatusUpdate(CourseChatJob, PyrisChatStatusUpdateDTO)} + * {@link de.tum.cit.aet.artemis.service.iris.session.IrisCourseChatSessionService#handleStatusUpdate(CourseChatJob, PyrisChatStatusUpdateDTO)} * * @param job the job that is updated * @param statusUpdate the status update @@ -69,7 +69,7 @@ public void handleStatusUpdate(CourseChatJob job, PyrisChatStatusUpdateDTO statu /** * Handles the status update of a competency extraction job and forwards it to - * {@link de.tum.in.www1.artemis.service.iris.IrisCompetencyGenerationService#handleStatusUpdate(String, long, PyrisCompetencyStatusUpdateDTO)} + * {@link de.tum.cit.aet.artemis.service.iris.IrisCompetencyGenerationService#handleStatusUpdate(String, long, PyrisCompetencyStatusUpdateDTO)} * * @param job the job that is updated * @param statusUpdate the status update diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisWebhookService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisWebhookService.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisWebhookService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisWebhookService.java index 6d8d18b3ae20..3ec572056c08 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisWebhookService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisWebhookService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris; +package de.tum.cit.aet.artemis.service.connectors.pyris; import java.io.IOException; import java.net.URI; @@ -14,17 +14,17 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.enumeration.AttachmentType; -import de.tum.in.www1.artemis.domain.iris.settings.IrisCourseSettings; -import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; -import de.tum.in.www1.artemis.repository.iris.IrisSettingsRepository; -import de.tum.in.www1.artemis.service.FilePathService; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureUnitWebhookDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; -import de.tum.in.www1.artemis.service.iris.exception.IrisInternalPyrisErrorException; -import de.tum.in.www1.artemis.service.iris.settings.IrisSettingsService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisCourseSettings; +import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.repository.iris.IrisSettingsRepository; +import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureUnitWebhookDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; +import de.tum.cit.aet.artemis.service.iris.exception.IrisInternalPyrisErrorException; +import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; @Service @Profile("iris") diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/PyrisErrorResponseDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisErrorResponseDTO.java similarity index 78% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/PyrisErrorResponseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisErrorResponseDTO.java index ad2ec5a20ea5..6e0f8146d0f9 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/PyrisErrorResponseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisErrorResponseDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/PyrisHealthStatusDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisHealthStatusDTO.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/PyrisHealthStatusDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisHealthStatusDTO.java index e6f70a4eb481..ff4ee3242a0a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/PyrisHealthStatusDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisHealthStatusDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/PyrisModelDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisModelDTO.java similarity index 74% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/PyrisModelDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisModelDTO.java index f13876160d97..0266d0ea1463 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/PyrisModelDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisModelDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/PyrisPipelineExecutionDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisPipelineExecutionDTO.java similarity index 67% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/PyrisPipelineExecutionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisPipelineExecutionDTO.java index 86c5f01c0479..ce77a36164c0 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/PyrisPipelineExecutionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisPipelineExecutionDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisPipelineExecutionDTO(PyrisPipelineExecutionSettingsDTO settings, List initialStages) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/PyrisPipelineExecutionSettingsDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisPipelineExecutionSettingsDTO.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/PyrisPipelineExecutionSettingsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisPipelineExecutionSettingsDTO.java index 55695831e245..b5125836b73d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/PyrisPipelineExecutionSettingsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisPipelineExecutionSettingsDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/chat/PyrisChatPipelineExecutionBaseDataDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/chat/PyrisChatPipelineExecutionBaseDataDTO.java similarity index 55% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/chat/PyrisChatPipelineExecutionBaseDataDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/chat/PyrisChatPipelineExecutionBaseDataDTO.java index 07b817f9653a..75ad6e5a6e21 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/chat/PyrisChatPipelineExecutionBaseDataDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/chat/PyrisChatPipelineExecutionBaseDataDTO.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.chat; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisMessageDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisUserDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisMessageDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisUserDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisChatPipelineExecutionBaseDataDTO(List chatHistory, PyrisUserDTO user, PyrisPipelineExecutionSettingsDTO settings, diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/chat/PyrisChatStatusUpdateDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/chat/PyrisChatStatusUpdateDTO.java similarity index 66% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/chat/PyrisChatStatusUpdateDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/chat/PyrisChatStatusUpdateDTO.java index 15e2b1505b94..81684c6c2b9c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/chat/PyrisChatStatusUpdateDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/chat/PyrisChatStatusUpdateDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.chat; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisChatStatusUpdateDTO(String result, List stages, List suggestions) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java similarity index 51% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java index 9edfe9bc73f7..d4d9426e2166 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java @@ -1,16 +1,16 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.course; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.course; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisExtendedCourseDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisMessageDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisUserDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyJolDTO; -import de.tum.in.www1.artemis.web.rest.dto.metrics.StudentMetricsDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisExtendedCourseDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisMessageDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisUserDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO; +import de.tum.cit.aet.artemis.web.rest.dto.metrics.StudentMetricsDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisCourseChatPipelineExecutionDTO(PyrisExtendedCourseDTO course, StudentMetricsDTO metrics, CompetencyJolDTO competencyJol, List chatHistory, diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/chat/exercise/PyrisExerciseChatPipelineExecutionDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/chat/exercise/PyrisExerciseChatPipelineExecutionDTO.java similarity index 52% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/chat/exercise/PyrisExerciseChatPipelineExecutionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/chat/exercise/PyrisExerciseChatPipelineExecutionDTO.java index a435f46ad4bb..f690c82e62fc 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/chat/exercise/PyrisExerciseChatPipelineExecutionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/chat/exercise/PyrisExerciseChatPipelineExecutionDTO.java @@ -1,16 +1,16 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.exercise; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.exercise; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisCourseDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisMessageDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisProgrammingExerciseDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisSubmissionDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisUserDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisCourseDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisMessageDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisProgrammingExerciseDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisSubmissionDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisUserDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisExerciseChatPipelineExecutionDTO(PyrisSubmissionDTO submission, PyrisProgrammingExerciseDTO exercise, PyrisCourseDTO course, List chatHistory, diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionInputDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionInputDTO.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionInputDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionInputDTO.java index 504fe8aa92fa..225687aa01f2 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionInputDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionInputDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.competency; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java similarity index 80% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java index 64979fa9125d..7fa9cf00d911 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.competency; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionDTO; +import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionDTO; /** * DTO to execute the Iris competency extraction pipeline on Pyris diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java similarity index 80% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java index 897b9b7ca3ce..abf285f1b14d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.competency; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; /** * DTO for the Iris competency generation feature. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyStatusUpdateDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyStatusUpdateDTO.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyStatusUpdateDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyStatusUpdateDTO.java index 967dfcd51906..d3d3f65a886f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyStatusUpdateDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyStatusUpdateDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.competency; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; /** * DTO for the Iris competency generation feature. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisBuildLogEntryDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisBuildLogEntryDTO.java similarity index 76% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisBuildLogEntryDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisBuildLogEntryDTO.java index af090430f652..dfd5afbdf995 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisBuildLogEntryDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisBuildLogEntryDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; import java.time.Instant; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisCompetencyDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisCompetencyDTO.java similarity index 69% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisCompetencyDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisCompetencyDTO.java index a64aae5d3075..de966fbb5045 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisCompetencyDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisCompetencyDTO.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; -import static de.tum.in.www1.artemis.service.util.TimeUtil.toInstant; +import static de.tum.cit.aet.artemis.service.util.TimeUtil.toInstant; import java.time.Instant; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.competency.Competency; -import de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.domain.competency.Competency; +import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisCompetencyDTO(long id, String title, String description, CompetencyTaxonomy taxonomy, Instant softDueDate, boolean optional) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisCourseDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisCourseDTO.java similarity index 73% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisCourseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisCourseDTO.java index 938b3602fe9f..9dbcfc59e64a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisCourseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisCourseDTO.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Course; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisCourseDTO(long id, String name, String description) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisExamDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExamDTO.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisExamDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExamDTO.java index 62b4442061e4..1606ac34eb93 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisExamDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExamDTO.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; -import static de.tum.in.www1.artemis.service.util.TimeUtil.toInstant; +import static de.tum.cit.aet.artemis.service.util.TimeUtil.toInstant; import java.time.Instant; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.Exam; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisExamDTO(long id, String title, boolean isTextExam, Instant startDate, Instant endDate, Instant publishResultsDate, Instant examStudentReviewStart, diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisExerciseWithStudentSubmissionsDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExerciseWithStudentSubmissionsDTO.java similarity index 78% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisExerciseWithStudentSubmissionsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExerciseWithStudentSubmissionsDTO.java index 93da6e73a7fa..7dde521231f3 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisExerciseWithStudentSubmissionsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExerciseWithStudentSubmissionsDTO.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; -import static de.tum.in.www1.artemis.service.util.TimeUtil.toInstant; +import static de.tum.cit.aet.artemis.service.util.TimeUtil.toInstant; import java.time.Instant; import java.util.Optional; @@ -9,12 +9,12 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.enumeration.DifficultyLevel; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseType; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisExerciseWithStudentSubmissionsDTO(long id, String title, ExerciseType type, ExerciseMode mode, double maxPoints, double bonusPoints, diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisExtendedCourseDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExtendedCourseDTO.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisExtendedCourseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExtendedCourseDTO.java index d982942d6d97..333a4a58b720 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisExtendedCourseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExtendedCourseDTO.java @@ -1,14 +1,14 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; -import static de.tum.in.www1.artemis.service.util.TimeUtil.toInstant; +import static de.tum.cit.aet.artemis.service.util.TimeUtil.toInstant; import java.time.Instant; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; /** * An extended course DTO for Pyris so it can better answer diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisFeedbackDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisFeedbackDTO.java similarity index 74% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisFeedbackDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisFeedbackDTO.java index 20b39608260b..b429059cae0c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisFeedbackDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisFeedbackDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisImageMessageContentDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisImageMessageContentDTO.java similarity index 76% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisImageMessageContentDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisImageMessageContentDTO.java index 32e518141972..244242784b48 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisImageMessageContentDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisImageMessageContentDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisJsonMessageContentDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisJsonMessageContentDTO.java similarity index 80% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisJsonMessageContentDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisJsonMessageContentDTO.java index 31661c6dc259..d2fea0ae834c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisJsonMessageContentDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisJsonMessageContentDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonRawValue; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisLectureDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisLectureDTO.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisLectureDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisLectureDTO.java index 1ad40411e8d3..f0b8ddd26c7a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisLectureDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisLectureDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; import java.time.ZonedDateTime; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisLectureUnitDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisLectureUnitDTO.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisLectureUnitDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisLectureUnitDTO.java index a0e8d83ff00a..45361e92755b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisLectureUnitDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisLectureUnitDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; import java.time.Instant; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisMessageContentBaseDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisMessageContentBaseDTO.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisMessageContentBaseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisMessageContentBaseDTO.java index 5c11b259490f..776bfddc92ed 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisMessageContentBaseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisMessageContentBaseDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonSubTypes; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisMessageDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisMessageDTO.java similarity index 76% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisMessageDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisMessageDTO.java index 7e2811b7c042..36d329d2c457 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisMessageDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisMessageDTO.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; -import static de.tum.in.www1.artemis.service.util.TimeUtil.toInstant; +import static de.tum.cit.aet.artemis.service.util.TimeUtil.toInstant; import java.time.Instant; import java.util.List; @@ -8,10 +8,10 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.iris.message.IrisJsonMessageContent; -import de.tum.in.www1.artemis.domain.iris.message.IrisMessage; -import de.tum.in.www1.artemis.domain.iris.message.IrisMessageSender; -import de.tum.in.www1.artemis.domain.iris.message.IrisTextMessageContent; +import de.tum.cit.aet.artemis.domain.iris.message.IrisJsonMessageContent; +import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; +import de.tum.cit.aet.artemis.domain.iris.message.IrisMessageSender; +import de.tum.cit.aet.artemis.domain.iris.message.IrisTextMessageContent; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisMessageDTO(Instant sentAt, IrisMessageSender sender, List contents) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisProgrammingExerciseDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisProgrammingExerciseDTO.java similarity index 77% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisProgrammingExerciseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisProgrammingExerciseDTO.java index abb12fa80ea5..375bc2b210f5 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisProgrammingExerciseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisProgrammingExerciseDTO.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; import java.time.Instant; import java.util.Map; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisProgrammingExerciseDTO(long id, String name, ProgrammingLanguage programmingLanguage, Map templateRepository, diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisResultDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisResultDTO.java similarity index 80% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisResultDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisResultDTO.java index 20b41c6d5e64..896342ae47d1 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisResultDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisResultDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; import java.time.Instant; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisStudentSubmissionDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisStudentSubmissionDTO.java similarity index 76% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisStudentSubmissionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisStudentSubmissionDTO.java index 93266627ce83..70920aa81b29 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisStudentSubmissionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisStudentSubmissionDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; import java.time.Instant; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisSubmissionDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisSubmissionDTO.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisSubmissionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisSubmissionDTO.java index 1130960991c3..38c0af9ada3d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisSubmissionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisSubmissionDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; import java.time.Instant; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisTextMessageContentDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisTextMessageContentDTO.java similarity index 76% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisTextMessageContentDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisTextMessageContentDTO.java index b0aa2ad88c2c..9beda63cf5c8 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisTextMessageContentDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisTextMessageContentDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisUserDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisUserDTO.java similarity index 73% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisUserDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisUserDTO.java index 1368b08995e6..2bf71c239fa1 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/data/PyrisUserDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisUserDTO.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.User; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisUserDTO(long id, String firstName, String lastName) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java similarity index 67% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java index 959862d3f3f2..09dedf5a24d5 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.lectureingestionwebhook; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisLectureIngestionStatusUpdateDTO(String result, List stages) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java index b5a956c2463a..ba2f2c094798 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.lectureingestionwebhook; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureIngestionExecutionDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureIngestionExecutionDTO.java similarity index 67% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureIngestionExecutionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureIngestionExecutionDTO.java index db1741183826..de4c004112a4 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureIngestionExecutionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureIngestionExecutionDTO.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.lectureingestionwebhook; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisWebhookLectureIngestionExecutionDTO(List pyrisLectureUnitWebhookDTOS, PyrisPipelineExecutionSettingsDTO settings, diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/status/PyrisStageDTO.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/status/PyrisStageDTO.java index 3bc3b2f9758a..0a9ce350c4e1 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/status/PyrisStageDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.status; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.status; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageState.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/status/PyrisStageState.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageState.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/status/PyrisStageState.java index 0f2ace2f7e40..d072a96531aa 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageState.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/status/PyrisStageState.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.status; +package de.tum.cit.aet.artemis.service.connectors.pyris.dto.status; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/job/CompetencyExtractionJob.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/CompetencyExtractionJob.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/job/CompetencyExtractionJob.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/CompetencyExtractionJob.java index 2a76f5a3b072..12a400cbb68d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/job/CompetencyExtractionJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/CompetencyExtractionJob.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.job; +package de.tum.cit.aet.artemis.service.connectors.pyris.job; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Course; /** * A pyris job that extracts competencies from a course description. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/job/CourseChatJob.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/CourseChatJob.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/job/CourseChatJob.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/CourseChatJob.java index 814d605fab74..b47ad8b88817 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/job/CourseChatJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/CourseChatJob.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.job; +package de.tum.cit.aet.artemis.service.connectors.pyris.job; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Course; /** * An implementation of a PyrisJob for course chat messages. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/job/ExerciseChatJob.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/ExerciseChatJob.java similarity index 80% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/job/ExerciseChatJob.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/ExerciseChatJob.java index 13dffaab4bc6..5f35d6bf3783 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/job/ExerciseChatJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/ExerciseChatJob.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.job; +package de.tum.cit.aet.artemis.service.connectors.pyris.job; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; /** * An implementation of a PyrisJob for exercise chat messages. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/job/IngestionWebhookJob.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/IngestionWebhookJob.java similarity index 73% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/job/IngestionWebhookJob.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/IngestionWebhookJob.java index 46e03ec35715..e313f7f3cfe7 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/job/IngestionWebhookJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/IngestionWebhookJob.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.job; +package de.tum.cit.aet.artemis.service.connectors.pyris.job; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; /** * An implementation of a PyrisJob for Lecture Ingestion in Pyris. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/job/PyrisJob.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/PyrisJob.java similarity index 78% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/job/PyrisJob.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/PyrisJob.java index d798e2fa364e..f023164d3275 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/job/PyrisJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/PyrisJob.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.job; +package de.tum.cit.aet.artemis.service.connectors.pyris.job; import java.io.Serializable; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; /** * This interface represents a single job that is executed by the Pyris system. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/vcs/AbstractVersionControlService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/AbstractVersionControlService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/vcs/AbstractVersionControlService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/AbstractVersionControlService.java index 9d04a9650407..dea5615fdc37 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/vcs/AbstractVersionControlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/AbstractVersionControlService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.vcs; +package de.tum.cit.aet.artemis.service.connectors.vcs; import java.io.IOException; import java.nio.file.Path; @@ -12,19 +12,19 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.exception.VersionControlException; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.TemplateProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.service.UriService; -import de.tum.in.www1.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.exception.VersionControlException; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.service.UriService; +import de.tum.cit.aet.artemis.service.connectors.GitService; public abstract class AbstractVersionControlService implements VersionControlService { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/vcs/VcsTokenManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenManagementService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/vcs/VcsTokenManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenManagementService.java index b7ded95f3d5d..f9864f166d3e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/vcs/VcsTokenManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenManagementService.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.connectors.vcs; +package de.tum.cit.aet.artemis.service.connectors.vcs; import java.time.Duration; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.User; /** * Provides an interface for managing VCS access tokens. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/vcs/VcsTokenRenewalService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalService.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/vcs/VcsTokenRenewalService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalService.java index 53c115bf12de..c69cfd4569b3 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/vcs/VcsTokenRenewalService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.connectors.vcs; +package de.tum.cit.aet.artemis.service.connectors.vcs; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; import java.time.Duration; import java.time.ZonedDateTime; @@ -14,9 +14,9 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.connectors.gitlab.GitLabException; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabException; /** * Uses the scheduled task {@link #renewAllVcsAccessTokens} to periodically renew all VCS access tokens that have expired or that are about to expire. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/vcs/VcsUserManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsUserManagementService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/vcs/VcsUserManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsUserManagementService.java index 0e5b23445451..aba8820e1d86 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/vcs/VcsUserManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsUserManagementService.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.connectors.vcs; +package de.tum.cit.aet.artemis.service.connectors.vcs; import java.util.Set; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.exception.VersionControlException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exception.VersionControlException; public interface VcsUserManagementService { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/vcs/VersionControlRepositoryPermission.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlRepositoryPermission.java similarity index 58% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/vcs/VersionControlRepositoryPermission.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlRepositoryPermission.java index df4467e44025..61a7e707d20e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/vcs/VersionControlRepositoryPermission.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlRepositoryPermission.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.vcs; +package de.tum.cit.aet.artemis.service.connectors.vcs; public enum VersionControlRepositoryPermission { REPO_READ, REPO_WRITE diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/vcs/VersionControlServerHealthIndicator.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlServerHealthIndicator.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/vcs/VersionControlServerHealthIndicator.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlServerHealthIndicator.java index 1b2bab65d294..7695b98611f6 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/vcs/VersionControlServerHealthIndicator.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlServerHealthIndicator.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.connectors.vcs; +package de.tum.cit.aet.artemis.service.connectors.vcs; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Optional; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/vcs/VersionControlService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/vcs/VersionControlService.java rename to src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlService.java index a6d867d67fea..d59a5ed3a63d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/vcs/VersionControlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlService.java @@ -1,18 +1,18 @@ -package de.tum.in.www1.artemis.service.connectors.vcs; +package de.tum.cit.aet.artemis.service.connectors.vcs; import java.time.ZonedDateTime; import java.util.Set; import jakarta.annotation.Nullable; -import de.tum.in.www1.artemis.domain.Commit; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.exception.VersionControlException; -import de.tum.in.www1.artemis.service.connectors.ConnectorHealth; +import de.tum.cit.aet.artemis.domain.Commit; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.exception.VersionControlException; +import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; public interface VersionControlService { diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/AbstractBuildResultNotificationDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/AbstractBuildResultNotificationDTO.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/dto/AbstractBuildResultNotificationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/AbstractBuildResultNotificationDTO.java index ce93d31bc51d..9b436e203529 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/AbstractBuildResultNotificationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/AbstractBuildResultNotificationDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.dto; +package de.tum.cit.aet.artemis.service.dto; import java.time.ZonedDateTime; import java.util.List; @@ -9,9 +9,9 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.BuildLogEntry; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestwiseCoverageReportDTO; +import de.tum.cit.aet.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestwiseCoverageReportDTO; @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/AuditingEntityDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/AuditingEntityDTO.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/dto/AuditingEntityDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/AuditingEntityDTO.java index ebf312398e7a..34a97fce7e6e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/AuditingEntityDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/AuditingEntityDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.dto; +package de.tum.cit.aet.artemis.service.dto; import java.time.Instant; diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/BuildJobDTOInterface.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/BuildJobDTOInterface.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/dto/BuildJobDTOInterface.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/BuildJobDTOInterface.java index ae4dd3afae2e..9164c088bb02 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/BuildJobDTOInterface.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/BuildJobDTOInterface.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.dto; +package de.tum.cit.aet.artemis.service.dto; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/BuildJobResultCountDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/BuildJobResultCountDTO.java similarity index 62% rename from src/main/java/de/tum/in/www1/artemis/service/dto/BuildJobResultCountDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/BuildJobResultCountDTO.java index 3afbd3437b60..19449ed58f38 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/BuildJobResultCountDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/BuildJobResultCountDTO.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.dto; +package de.tum.cit.aet.artemis.service.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.BuildStatus; +import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record BuildJobResultCountDTO(BuildStatus status, long count) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/BuildJobsStatisticsDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/BuildJobsStatisticsDTO.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/dto/BuildJobsStatisticsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/BuildJobsStatisticsDTO.java index eb8bf9e5da7a..65447956c4ee 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/BuildJobsStatisticsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/BuildJobsStatisticsDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.dto; +package de.tum.cit.aet.artemis.service.dto; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.BuildStatus; +import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record BuildJobsStatisticsDTO(long totalBuilds, long successfulBuilds, long failedBuilds, long cancelledBuilds) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/ComplaintAction.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/ComplaintAction.java similarity index 61% rename from src/main/java/de/tum/in/www1/artemis/service/dto/ComplaintAction.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/ComplaintAction.java index 94a39035e156..3c6fcf7c9fe8 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/ComplaintAction.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/ComplaintAction.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.dto; +package de.tum.cit.aet.artemis.service.dto; public enum ComplaintAction { REFRESH_LOCK, RESOLVE_COMPLAINT diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/ComplaintRequestDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/ComplaintRequestDTO.java similarity index 70% rename from src/main/java/de/tum/in/www1/artemis/service/dto/ComplaintRequestDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/ComplaintRequestDTO.java index 802a10a75407..a5d190c2f87d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/ComplaintRequestDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/ComplaintRequestDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.dto; +package de.tum.cit.aet.artemis.service.dto; import java.util.Optional; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.ComplaintType; +import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ComplaintRequestDTO(long resultId, String complaintText, ComplaintType complaintType, Optional examId) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/ComplaintResponseUpdateDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/ComplaintResponseUpdateDTO.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/service/dto/ComplaintResponseUpdateDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/ComplaintResponseUpdateDTO.java index 75e531aa9a98..422904278f13 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/ComplaintResponseUpdateDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/ComplaintResponseUpdateDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.dto; +package de.tum.cit.aet.artemis.service.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/ConsistencyErrorDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/ConsistencyErrorDTO.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/dto/ConsistencyErrorDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/ConsistencyErrorDTO.java index b59a18cff56c..2072ce8e61e4 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/ConsistencyErrorDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/ConsistencyErrorDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.dto; +package de.tum.cit.aet.artemis.service.dto; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; /** * A DTO representing a consistency error diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/CoverageReportAndSubmissionDateDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/CoverageReportAndSubmissionDateDTO.java similarity index 70% rename from src/main/java/de/tum/in/www1/artemis/service/dto/CoverageReportAndSubmissionDateDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/CoverageReportAndSubmissionDateDTO.java index 404ba4b0d51b..20b41763b304 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/CoverageReportAndSubmissionDateDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/CoverageReportAndSubmissionDateDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.dto; +package de.tum.cit.aet.artemis.service.dto; import java.time.ZonedDateTime; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.hestia.CoverageReport; +import de.tum.cit.aet.artemis.domain.hestia.CoverageReport; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record CoverageReportAndSubmissionDateDTO(CoverageReport coverageReport, ZonedDateTime submissionDate) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/FinishedBuildJobDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/FinishedBuildJobDTO.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/service/dto/FinishedBuildJobDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/FinishedBuildJobDTO.java index 0409d0805686..3b84dfa992e5 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/FinishedBuildJobDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/FinishedBuildJobDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.dto; +package de.tum.cit.aet.artemis.service.dto; import java.time.ZonedDateTime; @@ -6,14 +6,14 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.BuildJob; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.BuildStatus; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.web.rest.dto.ParticipationDTO; -import de.tum.in.www1.artemis.web.rest.dto.ResultDTO; -import de.tum.in.www1.artemis.web.rest.dto.SubmissionDTO; +import de.tum.cit.aet.artemis.domain.BuildJob; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.web.rest.dto.ParticipationDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; +import de.tum.cit.aet.artemis.web.rest.dto.SubmissionDTO; /** * A DTO representing a finished build job diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/GradingCriterionDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/GradingCriterionDTO.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/dto/GradingCriterionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/GradingCriterionDTO.java index d5e56fb7a6ca..4f1ce549bbff 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/GradingCriterionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/GradingCriterionDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.dto; +package de.tum.cit.aet.artemis.service.dto; import java.util.Set; import java.util.stream.Collectors; @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.GradingCriterion; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record GradingCriterionDTO(long id, String title, Set structuredGradingInstructions) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/GradingInstructionDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/GradingInstructionDTO.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/dto/GradingInstructionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/GradingInstructionDTO.java index cb87590a2ddb..87f71bb91456 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/GradingInstructionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/GradingInstructionDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.dto; +package de.tum.cit.aet.artemis.service.dto; import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.GradingInstruction; +import de.tum.cit.aet.artemis.domain.GradingInstruction; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record GradingInstructionDTO(long id, double credits, String gradingScale, String instructionDescription, String feedback, int usageCount) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/MaxAndReachablePoints.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/MaxAndReachablePoints.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/service/dto/MaxAndReachablePoints.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/MaxAndReachablePoints.java index 3487bcab3463..735272aa45f1 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/MaxAndReachablePoints.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/MaxAndReachablePoints.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.dto; +package de.tum.cit.aet.artemis.service.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/PasswordChangeDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/PasswordChangeDTO.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/service/dto/PasswordChangeDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/PasswordChangeDTO.java index e2349e5b859e..ac53b48240e8 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/PasswordChangeDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/PasswordChangeDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.dto; +package de.tum.cit.aet.artemis.service.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/ProgrammingSubmissionIdAndSubmissionDateDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/ProgrammingSubmissionIdAndSubmissionDateDTO.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/service/dto/ProgrammingSubmissionIdAndSubmissionDateDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/ProgrammingSubmissionIdAndSubmissionDateDTO.java index 293c3eac02fc..519cb32f2471 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/ProgrammingSubmissionIdAndSubmissionDateDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/ProgrammingSubmissionIdAndSubmissionDateDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.dto; +package de.tum.cit.aet.artemis.service.dto; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/ResponsibleUserDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/ResponsibleUserDTO.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/service/dto/ResponsibleUserDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/ResponsibleUserDTO.java index a8e9b488757d..a084e54550b7 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/ResponsibleUserDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/ResponsibleUserDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.dto; +package de.tum.cit.aet.artemis.service.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/StaticCodeAnalysisIssue.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/StaticCodeAnalysisIssue.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/service/dto/StaticCodeAnalysisIssue.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/StaticCodeAnalysisIssue.java index 9daa01688822..5b124e64dab7 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/StaticCodeAnalysisIssue.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/StaticCodeAnalysisIssue.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.dto; +package de.tum.cit.aet.artemis.service.dto; import java.io.Serializable; diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/StaticCodeAnalysisReportDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/StaticCodeAnalysisReportDTO.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/service/dto/StaticCodeAnalysisReportDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/StaticCodeAnalysisReportDTO.java index 66345143c128..a68415aaeede 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/StaticCodeAnalysisReportDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/StaticCodeAnalysisReportDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.dto; +package de.tum.cit.aet.artemis.service.dto; import java.io.Serializable; import java.util.List; @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; /** * Record to represent the data transfer object for static code analysis reports. diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/StudentDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/StudentDTO.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/dto/StudentDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/StudentDTO.java index 8a9a707a6550..a216a6ac6e2a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/StudentDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/StudentDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.dto; +package de.tum.cit.aet.artemis.service.dto; import java.util.Objects; @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.User; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record StudentDTO(@Size(max = 50) String login, @Size(max = 50) String firstName, @Size(max = 50) String lastName, @Size(max = 10) String registrationNumber, diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/TeamSearchUserDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/TeamSearchUserDTO.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/service/dto/TeamSearchUserDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/TeamSearchUserDTO.java index 91b698a9b109..3bf393f86fcb 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/TeamSearchUserDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/TeamSearchUserDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.dto; +package de.tum.cit.aet.artemis.service.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; @@ -6,8 +6,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.User; /** * A DTO representing a user returned by searching for a student to add to a team. diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/TestCaseBaseDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/TestCaseBaseDTO.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/dto/TestCaseBaseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/TestCaseBaseDTO.java index 906e9cb6ca31..613f9a12c8e4 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/TestCaseBaseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/TestCaseBaseDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.dto; +package de.tum.cit.aet.artemis.service.dto; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/UserDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/UserDTO.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/dto/UserDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/UserDTO.java index 22c2cccd6546..e4cda4ef41ee 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/UserDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/UserDTO.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.dto; +package de.tum.cit.aet.artemis.service.dto; -import static de.tum.in.www1.artemis.config.Constants.USERNAME_MAX_LENGTH; -import static de.tum.in.www1.artemis.config.Constants.USERNAME_MIN_LENGTH; +import static de.tum.cit.aet.artemis.config.Constants.USERNAME_MAX_LENGTH; +import static de.tum.cit.aet.artemis.config.Constants.USERNAME_MIN_LENGTH; import java.time.Instant; import java.time.ZonedDateTime; @@ -18,11 +18,11 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Authority; -import de.tum.in.www1.artemis.domain.GuidedTourSetting; -import de.tum.in.www1.artemis.domain.Organization; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Authority; +import de.tum.cit.aet.artemis.domain.GuidedTourSetting; +import de.tum.cit.aet.artemis.domain.Organization; +import de.tum.cit.aet.artemis.domain.User; /** * A DTO representing a user, with his authorities. diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/UserInitializationDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/UserInitializationDTO.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/service/dto/UserInitializationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/UserInitializationDTO.java index ff07dcb63aab..0fe621829a34 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/UserInitializationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/UserInitializationDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.dto; +package de.tum.cit.aet.artemis.service.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/UserPublicInfoDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/UserPublicInfoDTO.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/service/dto/UserPublicInfoDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/UserPublicInfoDTO.java index 73f432f608c0..88744310b6b3 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/UserPublicInfoDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/UserPublicInfoDTO.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.dto; +package de.tum.cit.aet.artemis.service.dto; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; /** * A DTO representing a user with the minimal information allowed to be seen by other users in a course diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/UserRoleDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/UserRoleDTO.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/dto/UserRoleDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/UserRoleDTO.java index 54f1ca54f6df..43f837545524 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/UserRoleDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/UserRoleDTO.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.dto; +package de.tum.cit.aet.artemis.service.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.metis.UserRole; +import de.tum.cit.aet.artemis.domain.metis.UserRole; /** * A Data Transfer Object (DTO) representing a user's role within a course. diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/athena/ExerciseBaseDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ExerciseBaseDTO.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/service/dto/athena/ExerciseBaseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ExerciseBaseDTO.java index 27d79041192b..b0cb0e3d5e0a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/athena/ExerciseBaseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ExerciseBaseDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.dto.athena; +package de.tum.cit.aet.artemis.service.dto.athena; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/athena/FeedbackBaseDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/FeedbackBaseDTO.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/service/dto/athena/FeedbackBaseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/athena/FeedbackBaseDTO.java index 2f55321e7235..6231d5906be8 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/athena/FeedbackBaseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/FeedbackBaseDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.dto.athena; +package de.tum.cit.aet.artemis.service.dto.athena; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/athena/ModelingExerciseDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingExerciseDTO.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/dto/athena/ModelingExerciseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingExerciseDTO.java index 32a2124fa04c..f592e25f3e2d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/athena/ModelingExerciseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingExerciseDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.dto.athena; +package de.tum.cit.aet.artemis.service.dto.athena; import java.util.List; @@ -6,8 +6,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.service.dto.GradingCriterionDTO; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.service.dto.GradingCriterionDTO; /** * A DTO representing a ModelingExercise, for transferring data to Athena diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/athena/ModelingFeedbackDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingFeedbackDTO.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/dto/athena/ModelingFeedbackDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingFeedbackDTO.java index 370277249a44..570ee1ef2678 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/athena/ModelingFeedbackDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingFeedbackDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.dto.athena; +package de.tum.cit.aet.artemis.service.dto.athena; import java.util.List; @@ -21,7 +21,7 @@ public record ModelingFeedbackDTO(long id, long exerciseId, long submissionId, S * @param feedback the feedback object * @return the ModelingFeedbackDTO */ - public static ModelingFeedbackDTO of(long exerciseId, long submissionId, @NotNull de.tum.in.www1.artemis.domain.Feedback feedback) { + public static ModelingFeedbackDTO of(long exerciseId, long submissionId, @NotNull de.tum.cit.aet.artemis.domain.Feedback feedback) { Long gradingInstructionId = null; if (feedback.getGradingInstruction() != null) { gradingInstructionId = feedback.getGradingInstruction().getId(); diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/athena/ModelingSubmissionDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingSubmissionDTO.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/dto/athena/ModelingSubmissionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingSubmissionDTO.java index e087bbc72b21..624d57733b29 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/athena/ModelingSubmissionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingSubmissionDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.dto.athena; +package de.tum.cit.aet.artemis.service.dto.athena; import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; /** * A DTO representing a ModelingSubmission, for transferring data to Athena diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/athena/ProgrammingExerciseDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingExerciseDTO.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/dto/athena/ProgrammingExerciseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingExerciseDTO.java index d5367eab79ce..17b17e62ec8a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/athena/ProgrammingExerciseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingExerciseDTO.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.dto.athena; +package de.tum.cit.aet.artemis.service.dto.athena; -import static de.tum.in.www1.artemis.config.Constants.ATHENA_PROGRAMMING_EXERCISE_REPOSITORY_API_PATH; +import static de.tum.cit.aet.artemis.config.Constants.ATHENA_PROGRAMMING_EXERCISE_REPOSITORY_API_PATH; import java.util.List; @@ -8,8 +8,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.service.dto.GradingCriterionDTO; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.service.dto.GradingCriterionDTO; /** * A DTO representing a ProgrammingExercise, for transferring data to Athena diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/athena/ProgrammingFeedbackDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingFeedbackDTO.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/dto/athena/ProgrammingFeedbackDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingFeedbackDTO.java index 762f30a723db..00bec43895ef 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/athena/ProgrammingFeedbackDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingFeedbackDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.dto.athena; +package de.tum.cit.aet.artemis.service.dto.athena; import jakarta.validation.constraints.NotNull; @@ -19,7 +19,7 @@ public record ProgrammingFeedbackDTO(long id, long exerciseId, long submissionId * @param feedback the feedback object * @return the ProgrammingFeedbackDTO */ - public static ProgrammingFeedbackDTO of(long exerciseId, long submissionId, @NotNull de.tum.in.www1.artemis.domain.Feedback feedback) { + public static ProgrammingFeedbackDTO of(long exerciseId, long submissionId, @NotNull de.tum.cit.aet.artemis.domain.Feedback feedback) { // Referenced feedback has a reference looking like this: "file:src/main/java/SomeFile.java_line:42" String filePath = null; Integer lineStart = null; diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/athena/ProgrammingSubmissionDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingSubmissionDTO.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/service/dto/athena/ProgrammingSubmissionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingSubmissionDTO.java index b90fda756fc0..5434357b2057 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/athena/ProgrammingSubmissionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingSubmissionDTO.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.service.dto.athena; +package de.tum.cit.aet.artemis.service.dto.athena; -import static de.tum.in.www1.artemis.config.Constants.ATHENA_PROGRAMMING_EXERCISE_REPOSITORY_API_PATH; +import static de.tum.cit.aet.artemis.config.Constants.ATHENA_PROGRAMMING_EXERCISE_REPOSITORY_API_PATH; import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; /** * A DTO representing a ProgrammingSubmission, for transferring data to Athena diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/athena/SubmissionBaseDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/SubmissionBaseDTO.java similarity index 74% rename from src/main/java/de/tum/in/www1/artemis/service/dto/athena/SubmissionBaseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/athena/SubmissionBaseDTO.java index 84bf0b64390c..e20d9c1d7443 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/athena/SubmissionBaseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/SubmissionBaseDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.dto.athena; +package de.tum.cit.aet.artemis.service.dto.athena; /** * Interface used to type the SubmissionDTOs for Athena: ProgrammingSubmissionDTO and TextSubmissionDTO diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/athena/TextExerciseDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextExerciseDTO.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/dto/athena/TextExerciseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextExerciseDTO.java index b49c261ac42a..3dd302827ef1 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/athena/TextExerciseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextExerciseDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.dto.athena; +package de.tum.cit.aet.artemis.service.dto.athena; import java.util.List; @@ -6,8 +6,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.service.dto.GradingCriterionDTO; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.service.dto.GradingCriterionDTO; /** * A DTO representing a TextExercise, for transferring data to Athena diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/athena/TextFeedbackDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextFeedbackDTO.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/dto/athena/TextFeedbackDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextFeedbackDTO.java index 553513f0312f..9d79d03625f7 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/athena/TextFeedbackDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextFeedbackDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.dto.athena; +package de.tum.cit.aet.artemis.service.dto.athena; import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.TextBlock; +import de.tum.cit.aet.artemis.domain.TextBlock; /** * A DTO representing a Feedback on a TextExercise, for transferring data to Athena and receiving suggestions from Athena @@ -22,7 +22,7 @@ public record TextFeedbackDTO(long id, long exerciseId, long submissionId, Strin * @param feedbackBlock the TextBlock that the feedback is on (must be passed because this record cannot fetch it for itself) * @return the TextFeedbackDTO */ - public static TextFeedbackDTO of(long exerciseId, long submissionId, @NotNull de.tum.in.www1.artemis.domain.Feedback feedback, TextBlock feedbackBlock) { + public static TextFeedbackDTO of(long exerciseId, long submissionId, @NotNull de.tum.cit.aet.artemis.domain.Feedback feedback, TextBlock feedbackBlock) { Integer startIndex = feedbackBlock == null ? null : feedbackBlock.getStartIndex(); Integer endIndex = feedbackBlock == null ? null : feedbackBlock.getEndIndex(); Long gradingInstructionId = null; diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/athena/TextSubmissionDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextSubmissionDTO.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/dto/athena/TextSubmissionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextSubmissionDTO.java index bf433df0504a..a3bf8945babf 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/athena/TextSubmissionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextSubmissionDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.dto.athena; +package de.tum.cit.aet.artemis.service.dto.athena; import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.TextSubmission; /** * A DTO representing a TextSubmission, for transferring data to Athena diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/package-info.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/package-info.java new file mode 100644 index 000000000000..52341c9b0f63 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/package-info.java @@ -0,0 +1,4 @@ +/** + * Data Transfer Objects. + */ +package de.tum.cit.aet.artemis.service.dto; diff --git a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamAccessService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamAccessService.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/exam/ExamAccessService.java rename to src/main/java/de/tum/cit/aet/artemis/service/exam/ExamAccessService.java index f5d3d803d6ed..961922e2a6ca 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamAccessService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamAccessService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.exam; +package de.tum.cit.aet.artemis.service.exam; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Optional; @@ -8,22 +8,22 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Service implementation to check exam access. diff --git a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamDateService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDateService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/exam/ExamDateService.java rename to src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDateService.java index 2241c3a4ea19..882858613170 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamDateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDateService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.exam; +package de.tum.cit.aet.artemis.service.exam; -import static de.tum.in.www1.artemis.config.Constants.EXAM_START_WAIT_TIME_MINUTES; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.EXAM_START_WAIT_TIME_MINUTES; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Objects; @@ -13,14 +13,14 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamDeletionService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDeletionService.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/exam/ExamDeletionService.java rename to src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDeletionService.java index 6311d2b0868d..bdb048c0a651 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamDeletionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDeletionService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.exam; +package de.tum.cit.aet.artemis.service.exam; -import static de.tum.in.www1.artemis.config.Constants.EXAM_EXERCISE_START_STATUS; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.EXAM_EXERCISE_START_STATUS; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.HashSet; import java.util.List; @@ -18,26 +18,26 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.GradingScale; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.quiz.QuizPool; -import de.tum.in.www1.artemis.repository.ExamLiveEventRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.GradingScaleRepository; -import de.tum.in.www1.artemis.repository.QuizPoolRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.in.www1.artemis.service.ExerciseDeletionService; -import de.tum.in.www1.artemis.service.ParticipationService; -import de.tum.in.www1.artemis.service.metis.conversation.ChannelService; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.quiz.QuizPool; +import de.tum.cit.aet.artemis.repository.ExamLiveEventRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.repository.QuizPoolRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.service.ExerciseDeletionService; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamImportService.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/exam/ExamImportService.java rename to src/main/java/de/tum/cit/aet/artemis/service/exam/ExamImportService.java index 4ba3b08130fc..db8c5d350e0f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamImportService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.exam; +package de.tum.cit.aet.artemis.service.exam; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.IOException; import java.util.ArrayList; @@ -12,36 +12,36 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.BaseExercise; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseType; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExerciseGroupRepository; -import de.tum.in.www1.artemis.repository.FileUploadExerciseRepository; -import de.tum.in.www1.artemis.repository.GradingCriterionRepository; -import de.tum.in.www1.artemis.repository.ModelingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.QuizExerciseRepository; -import de.tum.in.www1.artemis.repository.TextExerciseRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseTaskRepository; -import de.tum.in.www1.artemis.service.FileUploadExerciseImportService; -import de.tum.in.www1.artemis.service.ModelingExerciseImportService; -import de.tum.in.www1.artemis.service.TextExerciseImportService; -import de.tum.in.www1.artemis.service.metis.conversation.ChannelService; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseImportService; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseService; -import de.tum.in.www1.artemis.service.quiz.QuizExerciseImportService; -import de.tum.in.www1.artemis.web.rest.errors.ExamConfigurationException; +import de.tum.cit.aet.artemis.domain.BaseExercise; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExerciseGroupRepository; +import de.tum.cit.aet.artemis.repository.FileUploadExerciseRepository; +import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.service.FileUploadExerciseImportService; +import de.tum.cit.aet.artemis.service.ModelingExerciseImportService; +import de.tum.cit.aet.artemis.service.TextExerciseImportService; +import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseImportService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseService; +import de.tum.cit.aet.artemis.service.quiz.QuizExerciseImportService; +import de.tum.cit.aet.artemis.web.rest.errors.ExamConfigurationException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamLiveEventsService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamLiveEventsService.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/exam/ExamLiveEventsService.java rename to src/main/java/de/tum/cit/aet/artemis/service/exam/ExamLiveEventsService.java index 1bfccf9a49c3..11a7ac507616 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamLiveEventsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamLiveEventsService.java @@ -1,24 +1,24 @@ -package de.tum.in.www1.artemis.service.exam; +package de.tum.cit.aet.artemis.service.exam; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.exam.event.ExamAttendanceCheckEvent; -import de.tum.in.www1.artemis.domain.exam.event.ExamLiveEvent; -import de.tum.in.www1.artemis.domain.exam.event.ExamWideAnnouncementEvent; -import de.tum.in.www1.artemis.domain.exam.event.ProblemStatementUpdateEvent; -import de.tum.in.www1.artemis.domain.exam.event.WorkingTimeUpdateEvent; -import de.tum.in.www1.artemis.repository.ExamLiveEventRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.exam.event.ExamAttendanceCheckEvent; +import de.tum.cit.aet.artemis.domain.exam.event.ExamLiveEvent; +import de.tum.cit.aet.artemis.domain.exam.event.ExamWideAnnouncementEvent; +import de.tum.cit.aet.artemis.domain.exam.event.ProblemStatementUpdateEvent; +import de.tum.cit.aet.artemis.domain.exam.event.WorkingTimeUpdateEvent; +import de.tum.cit.aet.artemis.repository.ExamLiveEventRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; /** * This service handles outgoing events during exams, so we can inform the client about a change or something that happened. diff --git a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamQuizQuestionsGenerator.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizQuestionsGenerator.java similarity index 80% rename from src/main/java/de/tum/in/www1/artemis/service/exam/ExamQuizQuestionsGenerator.java rename to src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizQuestionsGenerator.java index 6aa4ae36060b..d1fcef185195 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamQuizQuestionsGenerator.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizQuestionsGenerator.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.exam; +package de.tum.cit.aet.artemis.service.exam; import java.util.List; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; /** * Service Interface for generating quiz questions for an exam diff --git a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamQuizService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizService.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/service/exam/ExamQuizService.java rename to src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizService.java index 669dfc693c7a..6d9ed42210c0 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamQuizService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.exam; +package de.tum.cit.aet.artemis.service.exam; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Set; import java.util.stream.Collectors; @@ -10,20 +10,20 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.repository.QuizExerciseRepository; -import de.tum.in.www1.artemis.repository.QuizSubmissionRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.SubmittedAnswerRepository; -import de.tum.in.www1.artemis.service.ResultService; -import de.tum.in.www1.artemis.service.quiz.QuizStatisticService; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.SubmittedAnswerRepository; +import de.tum.cit.aet.artemis.service.ResultService; +import de.tum.cit.aet.artemis.service.quiz.QuizStatisticService; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamRegistrationService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamRegistrationService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/exam/ExamRegistrationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/exam/ExamRegistrationService.java index 37538aa1b1aa..48870b7d9007 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamRegistrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamRegistrationService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.exam; +package de.tum.cit.aet.artemis.service.exam; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.HashMap; @@ -17,27 +17,27 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExamUser; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExamUserRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ParticipationService; -import de.tum.in.www1.artemis.service.user.UserService; -import de.tum.in.www1.artemis.web.rest.dto.ExamUserDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExamUser; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExamUserRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.service.user.UserService; +import de.tum.cit.aet.artemis.web.rest.dto.ExamUserDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Service Implementation for registering students in the exam. diff --git a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamService.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/exam/ExamService.java rename to src/main/java/de/tum/cit/aet/artemis/service/exam/ExamService.java index 9c53024cc078..592a1770479d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.exam; +package de.tum.cit.aet.artemis.service.exam; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; import static java.time.ZonedDateTime.now; import java.io.IOException; @@ -39,82 +39,82 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.BonusStrategy; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.FileUploadSubmission; -import de.tum.in.www1.artemis.domain.GradeStep; -import de.tum.in.www1.artemis.domain.GradingScale; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.ComplaintType; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.in.www1.artemis.domain.enumeration.NotificationType; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizPool; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmittedAnswerCount; -import de.tum.in.www1.artemis.domain.submissionpolicy.LockRepositoryPolicy; -import de.tum.in.www1.artemis.repository.ComplaintRepository; -import de.tum.in.www1.artemis.repository.ComplaintResponseRepository; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.GradingScaleRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.QuizExerciseRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.SubmittedAnswerRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.BonusService; -import de.tum.in.www1.artemis.service.CourseScoreCalculationService; -import de.tum.in.www1.artemis.service.ExerciseDeletionService; -import de.tum.in.www1.artemis.service.TutorLeaderboardService; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.export.CourseExamExportService; -import de.tum.in.www1.artemis.service.messaging.InstanceMessageSendService; -import de.tum.in.www1.artemis.service.notifications.GroupNotificationService; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismCaseService.PlagiarismMapping; -import de.tum.in.www1.artemis.service.quiz.QuizPoolService; -import de.tum.in.www1.artemis.service.quiz.QuizResultService; -import de.tum.in.www1.artemis.service.util.TimeLogUtil; -import de.tum.in.www1.artemis.web.rest.dto.BonusExampleDTO; -import de.tum.in.www1.artemis.web.rest.dto.BonusResultDTO; -import de.tum.in.www1.artemis.web.rest.dto.BonusSourceResultDTO; -import de.tum.in.www1.artemis.web.rest.dto.DueDateStat; -import de.tum.in.www1.artemis.web.rest.dto.ExamChecklistDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExamScoresDTO; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.in.www1.artemis.web.rest.dto.StatsForDashboardDTO; -import de.tum.in.www1.artemis.web.rest.dto.StudentExamWithGradeDTO; -import de.tum.in.www1.artemis.web.rest.dto.TutorLeaderboardDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.in.www1.artemis.web.rest.util.PageUtil; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.BonusStrategy; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.domain.GradeStep; +import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizPool; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmittedAnswerCount; +import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; +import de.tum.cit.aet.artemis.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.repository.ComplaintResponseRepository; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.SubmittedAnswerRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.BonusService; +import de.tum.cit.aet.artemis.service.CourseScoreCalculationService; +import de.tum.cit.aet.artemis.service.ExerciseDeletionService; +import de.tum.cit.aet.artemis.service.TutorLeaderboardService; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.export.CourseExamExportService; +import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; +import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismCaseService.PlagiarismMapping; +import de.tum.cit.aet.artemis.service.quiz.QuizPoolService; +import de.tum.cit.aet.artemis.service.quiz.QuizResultService; +import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; +import de.tum.cit.aet.artemis.web.rest.dto.BonusResultDTO; +import de.tum.cit.aet.artemis.web.rest.dto.BonusSourceResultDTO; +import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; +import de.tum.cit.aet.artemis.web.rest.dto.ExamChecklistDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExamScoresDTO; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; +import de.tum.cit.aet.artemis.web.rest.dto.StudentExamWithGradeDTO; +import de.tum.cit.aet.artemis.web.rest.dto.TutorLeaderboardDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.rest.util.PageUtil; /** * Service Implementation for managing exams. diff --git a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamSessionService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSessionService.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/service/exam/ExamSessionService.java rename to src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSessionService.java index 62b1b2f0bbda..228e681cfb6e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSessionService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.exam; +package de.tum.cit.aet.artemis.service.exam; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.security.SecureRandom; import java.util.Base64; @@ -18,19 +18,19 @@ import org.springframework.security.web.util.matcher.IpAddressMatcher; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.exam.ExamSession; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.exam.SuspiciousExamSessions; -import de.tum.in.www1.artemis.domain.exam.SuspiciousSessionReason; -import de.tum.in.www1.artemis.domain.exam.SuspiciousSessionsAnalysisOptions; -import de.tum.in.www1.artemis.repository.ExamSessionRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.web.rest.dto.CourseWithIdDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExamSessionDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExamWithIdAndCourseDTO; -import de.tum.in.www1.artemis.web.rest.dto.StudentExamWithIdAndExamAndUserDTO; -import de.tum.in.www1.artemis.web.rest.dto.SuspiciousExamSessionsDTO; -import de.tum.in.www1.artemis.web.rest.dto.UserWithIdAndLoginDTO; +import de.tum.cit.aet.artemis.domain.exam.ExamSession; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.exam.SuspiciousExamSessions; +import de.tum.cit.aet.artemis.domain.exam.SuspiciousSessionReason; +import de.tum.cit.aet.artemis.domain.exam.SuspiciousSessionsAnalysisOptions; +import de.tum.cit.aet.artemis.repository.ExamSessionRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.web.rest.dto.CourseWithIdDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExamSessionDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExamWithIdAndCourseDTO; +import de.tum.cit.aet.artemis.web.rest.dto.StudentExamWithIdAndExamAndUserDTO; +import de.tum.cit.aet.artemis.web.rest.dto.SuspiciousExamSessionsDTO; +import de.tum.cit.aet.artemis.web.rest.dto.UserWithIdAndLoginDTO; import inet.ipaddr.IPAddress; import inet.ipaddr.IPAddressString; diff --git a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionService.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/exam/ExamSubmissionService.java rename to src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionService.java index 443e2d35e233..243ad378dd82 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.exam; +package de.tum.cit.aet.artemis.service.exam; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Comparator; @@ -11,20 +11,20 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ParticipationService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamUserService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamUserService.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/exam/ExamUserService.java rename to src/main/java/de/tum/cit/aet/artemis/service/exam/ExamUserService.java index edac88e32b93..8d33c38239ce 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamUserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamUserService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.exam; +package de.tum.cit.aet.artemis.service.exam; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.awt.Rectangle; import java.io.IOException; @@ -24,15 +24,15 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.exam.ExamUser; -import de.tum.in.www1.artemis.repository.ExamUserRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.FilePathService; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.web.rest.dto.ExamUsersNotFoundDTO; -import de.tum.in.www1.artemis.web.rest.dto.ImageDTO; -import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.exam.ExamUser; +import de.tum.cit.aet.artemis.repository.ExamUserRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.web.rest.dto.ExamUsersNotFoundDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ImageDTO; +import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; /** * Service Implementation for managing Exam Users. diff --git a/src/main/java/de/tum/in/www1/artemis/service/exam/ImageExtractor.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ImageExtractor.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/service/exam/ImageExtractor.java rename to src/main/java/de/tum/cit/aet/artemis/service/exam/ImageExtractor.java index e3d9133ba005..62744c8cd4a5 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/exam/ImageExtractor.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ImageExtractor.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.exam; +package de.tum.cit.aet.artemis.service.exam; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; @@ -25,8 +25,8 @@ import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject; import org.apache.pdfbox.util.Matrix; -import de.tum.in.www1.artemis.web.rest.dto.ImageDTO; -import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.web.rest.dto.ImageDTO; +import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; /** * Processor to extract images from a PDF and get information. diff --git a/src/main/java/de/tum/in/www1/artemis/service/exam/StudentExamAccessService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessService.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/exam/StudentExamAccessService.java rename to src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessService.java index 7dfa5f004fe0..445fbdd65a72 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/exam/StudentExamAccessService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessService.java @@ -1,23 +1,23 @@ -package de.tum.in.www1.artemis.service.exam; +package de.tum.cit.aet.artemis.service.exam; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; /** * Service implementation to check student exam access. diff --git a/src/main/java/de/tum/in/www1/artemis/service/exam/StudentExamService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamService.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/exam/StudentExamService.java rename to src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamService.java index 38fdf510749d..c7ad2187ae07 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/exam/StudentExamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamService.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.exam; +package de.tum.cit.aet.artemis.service.exam; -import static de.tum.in.www1.artemis.config.Constants.EXAM_EXERCISE_START_STATUS; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.service.util.TimeLogUtil.formatDurationFrom; +import static de.tum.cit.aet.artemis.config.Constants.EXAM_EXERCISE_START_STATUS; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.service.util.TimeLogUtil.formatDurationFrom; import java.time.Instant; import java.time.ZonedDateTime; @@ -33,49 +33,49 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.SubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.compare.DnDMapping; -import de.tum.in.www1.artemis.domain.quiz.compare.SAMapping; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ModelingSubmissionRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.QuizSubmissionRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmittedAnswerRepository; -import de.tum.in.www1.artemis.repository.TextSubmissionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.ParticipationService; -import de.tum.in.www1.artemis.service.SubmissionService; -import de.tum.in.www1.artemis.service.SubmissionVersionService; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseParticipationService; -import de.tum.in.www1.artemis.service.programming.ProgrammingTriggerService; -import de.tum.in.www1.artemis.service.quiz.QuizPoolService; -import de.tum.in.www1.artemis.service.util.ExamExerciseStartPreparationStatus; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.compare.DnDMapping; +import de.tum.cit.aet.artemis.domain.quiz.compare.SAMapping; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ModelingSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmittedAnswerRepository; +import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.service.SubmissionService; +import de.tum.cit.aet.artemis.service.SubmissionVersionService; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseParticipationService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingTriggerService; +import de.tum.cit.aet.artemis.service.quiz.QuizPoolService; +import de.tum.cit.aet.artemis.service.util.ExamExerciseStartPreparationStatus; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Service Implementation for managing StudentExam. diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/CourseExamExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/CourseExamExportService.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/service/export/CourseExamExportService.java rename to src/main/java/de/tum/cit/aet/artemis/service/export/CourseExamExportService.java index ed58a36c9ed7..4a32ec228a55 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/export/CourseExamExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/CourseExamExportService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.export; +package de.tum.cit.aet.artemis.service.export; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.FileWriter; import java.io.IOException; @@ -28,23 +28,23 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.CourseExamExportErrorCause; -import de.tum.in.www1.artemis.domain.CourseExamExportState; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; -import de.tum.in.www1.artemis.service.ZipFileService; -import de.tum.in.www1.artemis.service.archival.ArchivalReportEntry; -import de.tum.in.www1.artemis.web.rest.dto.SubmissionExportOptionsDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.CourseExamExportErrorCause; +import de.tum.cit.aet.artemis.domain.CourseExamExportState; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.service.ZipFileService; +import de.tum.cit.aet.artemis.service.archival.ArchivalReportEntry; +import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; /** * Service Implementation for exporting courses and exams. diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/DataExportCommunicationDataService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCommunicationDataService.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/export/DataExportCommunicationDataService.java rename to src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCommunicationDataService.java index df241fb196b8..64ceddefcec7 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/export/DataExportCommunicationDataService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCommunicationDataService.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.service.export; +package de.tum.cit.aet.artemis.service.export; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.service.export.DataExportExerciseCreationService.CSV_FILE_EXTENSION; -import static de.tum.in.www1.artemis.service.export.DataExportUtil.createDirectoryIfNotExistent; -import static de.tum.in.www1.artemis.service.export.DataExportUtil.retrieveCourseDirPath; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.service.export.DataExportExerciseCreationService.CSV_FILE_EXTENSION; +import static de.tum.cit.aet.artemis.service.export.DataExportUtil.createDirectoryIfNotExistent; +import static de.tum.cit.aet.artemis.service.export.DataExportUtil.retrieveCourseDirPath; import java.io.IOException; import java.nio.file.Files; @@ -17,13 +17,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.metis.AnswerPost; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.metis.Reaction; -import de.tum.in.www1.artemis.repository.metis.AnswerPostRepository; -import de.tum.in.www1.artemis.repository.metis.PostRepository; -import de.tum.in.www1.artemis.repository.metis.ReactionRepository; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.metis.AnswerPost; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.metis.Reaction; +import de.tum.cit.aet.artemis.repository.metis.AnswerPostRepository; +import de.tum.cit.aet.artemis.repository.metis.PostRepository; +import de.tum.cit.aet.artemis.repository.metis.ReactionRepository; /** * A service to create the communication data export for users diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/DataExportCreationService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCreationService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/export/DataExportCreationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCreationService.java index 0f7c0967a48a..06f0bff4934c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/export/DataExportCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCreationService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.export; +package de.tum.cit.aet.artemis.service.export; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.service.export.DataExportExerciseCreationService.CSV_FILE_EXTENSION; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.service.export.DataExportExerciseCreationService.CSV_FILE_EXTENSION; import java.io.IOException; import java.net.URISyntaxException; @@ -19,17 +19,17 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.DataExport; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.DataExportState; -import de.tum.in.www1.artemis.exception.ArtemisMailException; -import de.tum.in.www1.artemis.repository.DataExportRepository; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.ResourceLoaderService; -import de.tum.in.www1.artemis.service.ZipFileService; -import de.tum.in.www1.artemis.service.notifications.MailService; -import de.tum.in.www1.artemis.service.notifications.SingleUserNotificationService; -import de.tum.in.www1.artemis.service.user.UserService; +import de.tum.cit.aet.artemis.domain.DataExport; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.DataExportState; +import de.tum.cit.aet.artemis.exception.ArtemisMailException; +import de.tum.cit.aet.artemis.repository.DataExportRepository; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.ResourceLoaderService; +import de.tum.cit.aet.artemis.service.ZipFileService; +import de.tum.cit.aet.artemis.service.notifications.MailService; +import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; +import de.tum.cit.aet.artemis.service.user.UserService; /** * A service to create data exports for users diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/DataExportExamCreationService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExamCreationService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/export/DataExportExamCreationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExamCreationService.java index 955fee316b36..fb48d57a467b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/export/DataExportExamCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExamCreationService.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.service.export; +package de.tum.cit.aet.artemis.service.export; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.service.export.DataExportExerciseCreationService.CSV_FILE_EXTENSION; -import static de.tum.in.www1.artemis.service.export.DataExportUtil.createDirectoryIfNotExistent; -import static de.tum.in.www1.artemis.service.export.DataExportUtil.retrieveCourseDirPath; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.service.export.DataExportExerciseCreationService.CSV_FILE_EXTENSION; +import static de.tum.cit.aet.artemis.service.export.DataExportUtil.createDirectoryIfNotExistent; +import static de.tum.cit.aet.artemis.service.export.DataExportUtil.retrieveCourseDirPath; import java.io.IOException; import java.nio.file.Files; @@ -20,14 +20,14 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.GradingScale; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.repository.GradingScaleRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.service.exam.ExamService; -import de.tum.in.www1.artemis.web.rest.dto.ExamScoresDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.service.exam.ExamService; +import de.tum.cit.aet.artemis.web.rest.dto.ExamScoresDTO; /** * A service to create the data export for exams the user has participated in. diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/DataExportExerciseCreationService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExerciseCreationService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/export/DataExportExerciseCreationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExerciseCreationService.java index c3bfc0978912..1e4c94e4eaf0 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/export/DataExportExerciseCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExerciseCreationService.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.export; +package de.tum.cit.aet.artemis.service.export; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.service.export.DataExportQuizExerciseCreationService.TXT_FILE_EXTENSION; -import static de.tum.in.www1.artemis.service.export.DataExportUtil.createDirectoryIfNotExistent; -import static de.tum.in.www1.artemis.service.export.DataExportUtil.retrieveCourseDirPath; -import static de.tum.in.www1.artemis.service.util.RoundingUtil.roundToNDecimalPlaces; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.service.export.DataExportQuizExerciseCreationService.TXT_FILE_EXTENSION; +import static de.tum.cit.aet.artemis.service.export.DataExportUtil.createDirectoryIfNotExistent; +import static de.tum.cit.aet.artemis.service.export.DataExportUtil.retrieveCourseDirPath; +import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundToNDecimalPlaces; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -26,31 +26,31 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Complaint; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.FileUploadSubmission; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.ComplaintType; -import de.tum.in.www1.artemis.domain.metis.AnswerPost; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.repository.ComplaintRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ExerciseDateService; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.ResultService; -import de.tum.in.www1.artemis.service.connectors.apollon.ApollonConversionService; -import de.tum.in.www1.artemis.web.rest.dto.RepositoryExportOptionsDTO; +import de.tum.cit.aet.artemis.domain.Complaint; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; +import de.tum.cit.aet.artemis.domain.metis.AnswerPost; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ExerciseDateService; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.ResultService; +import de.tum.cit.aet.artemis.service.connectors.apollon.ApollonConversionService; +import de.tum.cit.aet.artemis.web.rest.dto.RepositoryExportOptionsDTO; /** * A service to create the data export for exercise participations of the user. diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/DataExportQuizExerciseCreationService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportQuizExerciseCreationService.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/export/DataExportQuizExerciseCreationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/export/DataExportQuizExerciseCreationService.java index 4124ba900bd8..605e04db385b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/export/DataExportQuizExerciseCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportQuizExerciseCreationService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.export; +package de.tum.cit.aet.artemis.service.export; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -20,22 +20,22 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.quiz.AnswerOption; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.in.www1.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedText; -import de.tum.in.www1.artemis.repository.QuizQuestionRepository; -import de.tum.in.www1.artemis.repository.QuizSubmissionRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.service.DragAndDropQuizAnswerConversionService; -import de.tum.in.www1.artemis.service.archival.ArchivalReportEntry; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.quiz.AnswerOption; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedText; +import de.tum.cit.aet.artemis.repository.QuizQuestionRepository; +import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.service.DragAndDropQuizAnswerConversionService; +import de.tum.cit.aet.artemis.service.archival.ArchivalReportEntry; /** * A service to create the data export for quiz exercise participations. diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/DataExportScienceEventService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportScienceEventService.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/export/DataExportScienceEventService.java rename to src/main/java/de/tum/cit/aet/artemis/service/export/DataExportScienceEventService.java index 6f3c817bf401..325bb135e12a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/export/DataExportScienceEventService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportScienceEventService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.export; +package de.tum.cit.aet.artemis.service.export; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.service.export.DataExportExerciseCreationService.CSV_FILE_EXTENSION; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.service.export.DataExportExerciseCreationService.CSV_FILE_EXTENSION; import java.io.IOException; import java.nio.file.Files; @@ -13,8 +13,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.science.ScienceEvent; -import de.tum.in.www1.artemis.repository.science.ScienceEventRepository; +import de.tum.cit.aet.artemis.domain.science.ScienceEvent; +import de.tum.cit.aet.artemis.repository.science.ScienceEventRepository; /** * A Service to create the science event export data for users. diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/DataExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportService.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/export/DataExportService.java rename to src/main/java/de/tum/cit/aet/artemis/service/export/DataExportService.java index 69694b3afda2..5ebb07218fcc 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/export/DataExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.export; +package de.tum.cit.aet.artemis.service.export; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -18,16 +18,16 @@ import org.springframework.core.io.Resource; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.DataExport; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.DataExportState; -import de.tum.in.www1.artemis.repository.DataExportRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.web.rest.dto.DataExportDTO; -import de.tum.in.www1.artemis.web.rest.dto.RequestDataExportDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.domain.DataExport; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.DataExportState; +import de.tum.cit.aet.artemis.repository.DataExportRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.web.rest.dto.DataExportDTO; +import de.tum.cit.aet.artemis.web.rest.dto.RequestDataExportDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; /** * Service Implementation for managing the data export in accordance with Art. 15 GDPR. @@ -91,8 +91,8 @@ public RequestDataExportDTO requestDataExportForUserAsAdmin(String login) { * * @param dataExport the data export to download * @return the file path where the data export is stored - * @throws de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException if the data export or the user could not be found - * @throws de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException if the user is not allowed to download the data export + * @throws de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException if the data export or the user could not be found + * @throws de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException if the user is not allowed to download the data export */ public Resource downloadDataExport(DataExport dataExport) { dataExport.setDownloadDate(ZonedDateTime.now()); diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/DataExportUtil.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportUtil.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/export/DataExportUtil.java rename to src/main/java/de/tum/cit/aet/artemis/service/export/DataExportUtil.java index 7b27e55e7df7..deef8434ac37 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/export/DataExportUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportUtil.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.export; +package de.tum.cit.aet.artemis.service.export; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import de.tum.in.www1.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Course; /** * A utility class for data export containing helper methods that are frequently used in the different services responsible for creating data exports. diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/ExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/ExerciseWithSubmissionsExportService.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/service/export/ExerciseWithSubmissionsExportService.java rename to src/main/java/de/tum/cit/aet/artemis/service/export/ExerciseWithSubmissionsExportService.java index 6e2f8049118d..ab76feb65edd 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/export/ExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/ExerciseWithSubmissionsExportService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.export; +package de.tum.cit.aet.artemis.service.export; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -23,11 +23,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.service.FilePathService; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.archival.ArchivalReportEntry; -import de.tum.in.www1.artemis.web.rest.dto.SubmissionExportOptionsDTO; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.archival.ArchivalReportEntry; +import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; /** * Service for exporting Exercises with the student submissions. diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/FileUploadExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadExerciseWithSubmissionsExportService.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/service/export/FileUploadExerciseWithSubmissionsExportService.java rename to src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadExerciseWithSubmissionsExportService.java index b3023e22cc72..df00ebe5eb91 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/export/FileUploadExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadExerciseWithSubmissionsExportService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.export; +package de.tum.cit.aet.artemis.service.export; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.nio.file.Path; import java.util.List; @@ -9,10 +9,10 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.archival.ArchivalReportEntry; -import de.tum.in.www1.artemis.web.rest.dto.SubmissionExportOptionsDTO; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.archival.ArchivalReportEntry; +import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; /** * Service for exporting File Upload Exercises with the student submissions. diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/FileUploadSubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadSubmissionExportService.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/service/export/FileUploadSubmissionExportService.java rename to src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadSubmissionExportService.java index 42f8b92189b6..3892d50a9415 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/export/FileUploadSubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadSubmissionExportService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.export; +package de.tum.cit.aet.artemis.service.export; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.File; import java.io.IOException; @@ -14,12 +14,12 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.FileUploadSubmission; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.ZipFileService; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.ZipFileService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/ModelingExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingExerciseWithSubmissionsExportService.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/service/export/ModelingExerciseWithSubmissionsExportService.java rename to src/main/java/de/tum/cit/aet/artemis/service/export/ModelingExerciseWithSubmissionsExportService.java index 87a84991c9e7..721e4bd1eb0d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/export/ModelingExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingExerciseWithSubmissionsExportService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.export; +package de.tum.cit.aet.artemis.service.export; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.nio.file.Path; import java.util.List; @@ -9,10 +9,10 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.archival.ArchivalReportEntry; -import de.tum.in.www1.artemis.web.rest.dto.SubmissionExportOptionsDTO; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.archival.ArchivalReportEntry; +import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; /** * Service for exporting Modeling Exercises with the student submissions. diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/ModelingSubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingSubmissionExportService.java similarity index 74% rename from src/main/java/de/tum/in/www1/artemis/service/export/ModelingSubmissionExportService.java rename to src/main/java/de/tum/cit/aet/artemis/service/export/ModelingSubmissionExportService.java index eeabe1052c86..888194f8efd1 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/export/ModelingSubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingSubmissionExportService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.export; +package de.tum.cit.aet.artemis.service.export; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.BufferedWriter; import java.io.File; @@ -11,12 +11,12 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.ZipFileService; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.ZipFileService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/ProgrammingExerciseExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/ProgrammingExerciseExportService.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/service/export/ProgrammingExerciseExportService.java rename to src/main/java/de/tum/cit/aet/artemis/service/export/ProgrammingExerciseExportService.java index b069d302d538..1d413f7fd57f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/export/ProgrammingExerciseExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/ProgrammingExerciseExportService.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.export; +package de.tum.cit.aet.artemis.service.export; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationService.RepositoryCheckoutPath; -import static de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsXmlFileUtils.getDocumentBuilderFactory; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService.RepositoryCheckoutPath; +import static de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsXmlFileUtils.getDocumentBuilderFactory; import java.io.File; import java.io.IOException; @@ -52,29 +52,29 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import de.tum.in.www1.artemis.domain.AuxiliaryRepository; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exception.GitException; -import de.tum.in.www1.artemis.repository.AuxiliaryRepositoryRepository; -import de.tum.in.www1.artemis.repository.BuildPlanRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.service.ExerciseDateService; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.ZipFileService; -import de.tum.in.www1.artemis.service.archival.ArchivalReportEntry; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseTaskService; -import de.tum.in.www1.artemis.web.rest.dto.RepositoryExportOptionsDTO; +import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exception.GitException; +import de.tum.cit.aet.artemis.repository.AuxiliaryRepositoryRepository; +import de.tum.cit.aet.artemis.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.service.ExerciseDateService; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.ZipFileService; +import de.tum.cit.aet.artemis.service.archival.ArchivalReportEntry; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; +import de.tum.cit.aet.artemis.web.rest.dto.RepositoryExportOptionsDTO; /** * Service for exporting programming exercises. diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/QuizExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/QuizExerciseWithSubmissionsExportService.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/export/QuizExerciseWithSubmissionsExportService.java rename to src/main/java/de/tum/cit/aet/artemis/service/export/QuizExerciseWithSubmissionsExportService.java index 1d4366d9e884..af04fb4a23d1 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/export/QuizExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/QuizExerciseWithSubmissionsExportService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.export; +package de.tum.cit.aet.artemis.service.export; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.IOException; import java.net.URI; @@ -15,12 +15,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.repository.QuizExerciseRepository; -import de.tum.in.www1.artemis.service.FilePathService; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.archival.ArchivalReportEntry; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.archival.ArchivalReportEntry; /** * Service responsible for exporting quiz exercises with their submissions. diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/SubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/SubmissionExportService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/export/SubmissionExportService.java rename to src/main/java/de/tum/cit/aet/artemis/service/export/SubmissionExportService.java index 227485b7d32f..a66b69a94047 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/export/SubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/SubmissionExportService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.export; +package de.tum.cit.aet.artemis.service.export; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.File; import java.io.IOException; @@ -24,18 +24,18 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.service.ExerciseDateService; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.ZipFileService; -import de.tum.in.www1.artemis.service.archival.ArchivalReportEntry; -import de.tum.in.www1.artemis.web.rest.dto.SubmissionExportOptionsDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.service.ExerciseDateService; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.ZipFileService; +import de.tum.cit.aet.artemis.service.archival.ArchivalReportEntry; +import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/TextExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/TextExerciseWithSubmissionsExportService.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/service/export/TextExerciseWithSubmissionsExportService.java rename to src/main/java/de/tum/cit/aet/artemis/service/export/TextExerciseWithSubmissionsExportService.java index 6c2a991996cf..179e5cb92ac8 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/export/TextExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/TextExerciseWithSubmissionsExportService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.export; +package de.tum.cit.aet.artemis.service.export; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.nio.file.Path; import java.util.List; @@ -9,10 +9,10 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.archival.ArchivalReportEntry; -import de.tum.in.www1.artemis.web.rest.dto.SubmissionExportOptionsDTO; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.archival.ArchivalReportEntry; +import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; /** * Service for exporting Text Exercises with the student submissions. diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/TextSubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/TextSubmissionExportService.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/service/export/TextSubmissionExportService.java rename to src/main/java/de/tum/cit/aet/artemis/service/export/TextSubmissionExportService.java index 878615e8086f..93d151c9d966 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/export/TextSubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/TextSubmissionExportService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.export; +package de.tum.cit.aet.artemis.service.export; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.BufferedWriter; import java.io.File; @@ -11,12 +11,12 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.ZipFileService; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.ZipFileService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/feature/Feature.java b/src/main/java/de/tum/cit/aet/artemis/service/feature/Feature.java similarity index 78% rename from src/main/java/de/tum/in/www1/artemis/service/feature/Feature.java rename to src/main/java/de/tum/cit/aet/artemis/service/feature/Feature.java index d0649baa2c25..58f166fcecf6 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/feature/Feature.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/feature/Feature.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.feature; +package de.tum.cit.aet.artemis.service.feature; public enum Feature { ProgrammingExercises, PlagiarismChecks, Exports, TutorialGroups, LearningPaths, Science, StandardizedCompetencies, StudentCourseAnalyticsDashboard diff --git a/src/main/java/de/tum/in/www1/artemis/service/feature/FeatureToggle.java b/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggle.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/feature/FeatureToggle.java rename to src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggle.java index 2a57cd1cf123..68b6e28bd7ca 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/feature/FeatureToggle.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggle.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.feature; +package de.tum.cit.aet.artemis.service.feature; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/de/tum/in/www1/artemis/service/feature/FeatureToggleAspect.java b/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleAspect.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/feature/FeatureToggleAspect.java rename to src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleAspect.java index a6eb7d429730..fb1c36c11b2a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/feature/FeatureToggleAspect.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleAspect.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.feature; +package de.tum.cit.aet.artemis.service.feature; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Arrays; @@ -11,7 +11,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; @Profile(PROFILE_CORE) @Component diff --git a/src/main/java/de/tum/in/www1/artemis/service/feature/FeatureToggleInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleInfoContributor.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/service/feature/FeatureToggleInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleInfoContributor.java index 29e964ae4c54..47940ea719fb 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/feature/FeatureToggleInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleInfoContributor.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.feature; +package de.tum.cit.aet.artemis.service.feature; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.boot.actuate.info.Info; import org.springframework.boot.actuate.info.InfoContributor; diff --git a/src/main/java/de/tum/in/www1/artemis/service/feature/FeatureToggleService.java b/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/feature/FeatureToggleService.java rename to src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleService.java index 9efbdcc982c1..2d6a527b37f8 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/feature/FeatureToggleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.feature; +package de.tum.cit.aet.artemis.service.feature; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Map; @@ -14,7 +14,7 @@ import com.hazelcast.core.HazelcastInstance; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/CodeHintService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/CodeHintService.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/CodeHintService.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/CodeHintService.java index bf577df295f3..a0bc22675c31 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/CodeHintService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/CodeHintService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.hestia; +package de.tum.cit.aet.artemis.service.hestia; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.HashSet; import java.util.List; @@ -12,16 +12,16 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.hestia.CodeHint; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.in.www1.artemis.domain.iris.session.IrisHestiaSession; -import de.tum.in.www1.artemis.repository.hestia.CodeHintRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseTaskRepository; -import de.tum.in.www1.artemis.service.iris.session.IrisHestiaSessionService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.domain.iris.session.IrisHestiaSession; +import de.tum.cit.aet.artemis.repository.hestia.CodeHintRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.service.iris.session.IrisHestiaSessionService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/ExerciseHintService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ExerciseHintService.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/ExerciseHintService.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/ExerciseHintService.java index ed07b788d891..ed251566ef56 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/ExerciseHintService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ExerciseHintService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.hestia; +package de.tum.cit.aet.artemis.service.hestia; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -18,21 +18,21 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.hestia.ExerciseHint; -import de.tum.in.www1.artemis.domain.hestia.ExerciseHintActivation; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.hestia.ExerciseHintActivationRepository; -import de.tum.in.www1.artemis.repository.hestia.ExerciseHintRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.hestia.ExerciseHint; +import de.tum.cit.aet.artemis.domain.hestia.ExerciseHintActivation; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.hestia.ExerciseHintActivationRepository; +import de.tum.cit.aet.artemis.repository.hestia.ExerciseHintRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java index dbd7e90afb51..94e62fa774c1 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.hestia; +package de.tum.cit.aet.artemis.service.hestia; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -20,25 +20,25 @@ import org.springframework.stereotype.Service; import org.springframework.util.FileSystemUtils; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionRepository; -import de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.repository.TemplateProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseGitDiffReportRepository; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.web.rest.GitDiffReportParserService; -import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseGitDiffReportRepository; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.web.rest.GitDiffReportParserService; +import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; /** * The service handling ProgrammingExerciseGitDiffReport and their ProgrammingExerciseGitDiffEntries. diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseTaskService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseTaskService.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseTaskService.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseTaskService.java index d31568b7c2aa..356d8d5c7b41 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseTaskService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseTaskService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.hestia; +package de.tum.cit.aet.artemis.service.hestia; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.HashSet; @@ -19,12 +19,12 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.hestia.ExerciseHintRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.hestia.ExerciseHintRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/TestwiseCoverageService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/TestwiseCoverageService.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/TestwiseCoverageService.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/TestwiseCoverageService.java index 1141f72bbc4b..f45fbbbf4ae4 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/TestwiseCoverageService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/TestwiseCoverageService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.hestia; +package de.tum.cit.aet.artemis.service.hestia; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Arrays; import java.util.Collections; @@ -20,20 +20,20 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.hestia.CoverageFileReport; -import de.tum.in.www1.artemis.domain.hestia.CoverageReport; -import de.tum.in.www1.artemis.domain.hestia.TestwiseCoverageReportEntry; -import de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.hestia.CoverageFileReportRepository; -import de.tum.in.www1.artemis.repository.hestia.CoverageReportRepository; -import de.tum.in.www1.artemis.repository.hestia.TestwiseCoverageReportEntryRepository; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestwiseCoverageReportDTO; -import de.tum.in.www1.artemis.service.programming.RepositoryService; -import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.hestia.CoverageFileReport; +import de.tum.cit.aet.artemis.domain.hestia.CoverageReport; +import de.tum.cit.aet.artemis.domain.hestia.TestwiseCoverageReportEntry; +import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.hestia.CoverageFileReportRepository; +import de.tum.cit.aet.artemis.repository.hestia.CoverageReportRepository; +import de.tum.cit.aet.artemis.repository.hestia.TestwiseCoverageReportEntryRepository; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestwiseCoverageReportDTO; +import de.tum.cit.aet.artemis.service.programming.RepositoryService; +import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; /** * Service for managing testwise coverage data and interacts with both CoverageReport, CoverageFileReport diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/BehavioralBlackboard.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralBlackboard.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/BehavioralBlackboard.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralBlackboard.java index f38fa810fd27..decb226cd953 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/BehavioralBlackboard.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralBlackboard.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.hestia.behavioral; +package de.tum.cit.aet.artemis.service.hestia.behavioral; import java.util.List; import java.util.Map; -import de.tum.in.www1.artemis.domain.hestia.CoverageReport; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.domain.hestia.CoverageReport; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; /** * The blackboard for creating SolutionEntries for behavioral test cases utilizing the git-diff and test-wise coverage report. diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/BehavioralSolutionEntryGenerationException.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralSolutionEntryGenerationException.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/BehavioralSolutionEntryGenerationException.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralSolutionEntryGenerationException.java index 3e2478450dc1..db7f08d10eec 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/BehavioralSolutionEntryGenerationException.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralSolutionEntryGenerationException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.hestia.behavioral; +package de.tum.cit.aet.artemis.service.hestia.behavioral; /** * Exception used for the generation of solution entries for behavioral test cases diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/BehavioralTestCaseService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralTestCaseService.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/BehavioralTestCaseService.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralTestCaseService.java index 785855686a2b..23be162ab45d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/BehavioralTestCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralTestCaseService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.hestia.behavioral; +package de.tum.cit.aet.artemis.service.hestia.behavioral; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Arrays; import java.util.Collections; @@ -14,26 +14,26 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseGitDiffReportService; -import de.tum.in.www1.artemis.service.hestia.TestwiseCoverageService; -import de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.AddUncoveredLinesAsPotentialCodeBlocks; -import de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.BehavioralKnowledgeSource; -import de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.CombineChangeBlocks; -import de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.CreateCommonChangeBlocks; -import de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.CreateSolutionEntries; -import de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.DropRemovedGitDiffEntries; -import de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.ExtractChangedLines; -import de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.ExtractCoveredLines; -import de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.FindCommonLines; -import de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.GroupGitDiffAndCoverageEntriesByFilePathAndTestCase; -import de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.InsertFileContents; -import de.tum.in.www1.artemis.service.programming.RepositoryService; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseGitDiffReportService; +import de.tum.cit.aet.artemis.service.hestia.TestwiseCoverageService; +import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.AddUncoveredLinesAsPotentialCodeBlocks; +import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.BehavioralKnowledgeSource; +import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.CombineChangeBlocks; +import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.CreateCommonChangeBlocks; +import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.CreateSolutionEntries; +import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.DropRemovedGitDiffEntries; +import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.ExtractChangedLines; +import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.ExtractCoveredLines; +import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.FindCommonLines; +import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.GroupGitDiffAndCoverageEntriesByFilePathAndTestCase; +import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.InsertFileContents; +import de.tum.cit.aet.artemis.service.programming.RepositoryService; /** * Service for handling Solution Entries of behavioral Test Cases. diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/GroupedFile.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/GroupedFile.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/GroupedFile.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/GroupedFile.java index 36914fa1ca24..9c2feb5808d1 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/GroupedFile.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/GroupedFile.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.hestia.behavioral; +package de.tum.cit.aet.artemis.service.hestia.behavioral; import java.util.Collection; import java.util.Objects; @@ -6,9 +6,9 @@ import java.util.SortedSet; import java.util.TreeSet; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; -import de.tum.in.www1.artemis.domain.hestia.TestwiseCoverageReportEntry; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; +import de.tum.cit.aet.artemis.domain.hestia.TestwiseCoverageReportEntry; /** * One GroupedFile groups the {@link ProgrammingExerciseGitDiffEntry}s and {@link TestwiseCoverageReportEntry}s together diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/AddUncoveredLinesAsPotentialCodeBlocks.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/AddUncoveredLinesAsPotentialCodeBlocks.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/AddUncoveredLinesAsPotentialCodeBlocks.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/AddUncoveredLinesAsPotentialCodeBlocks.java index 531639d227f8..084f6472cb29 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/AddUncoveredLinesAsPotentialCodeBlocks.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/AddUncoveredLinesAsPotentialCodeBlocks.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource; +package de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource; import java.util.TreeSet; import java.util.regex.Pattern; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.in.www1.artemis.service.hestia.behavioral.GroupedFile; -import de.tum.in.www1.artemis.service.hestia.behavioral.GroupedFile.ChangeBlock; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile.ChangeBlock; /** * For each {@link GroupedFile}: diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/BehavioralKnowledgeSource.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/BehavioralKnowledgeSource.java similarity index 78% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/BehavioralKnowledgeSource.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/BehavioralKnowledgeSource.java index 5625fa92281c..8192466eb087 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/BehavioralKnowledgeSource.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/BehavioralKnowledgeSource.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource; +package de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralSolutionEntryGenerationException; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralSolutionEntryGenerationException; public abstract class BehavioralKnowledgeSource { diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/CombineChangeBlocks.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/CombineChangeBlocks.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/CombineChangeBlocks.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/CombineChangeBlocks.java index ff88833876e3..fc3ad124e28f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/CombineChangeBlocks.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/CombineChangeBlocks.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource; +package de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource; import java.util.ArrayList; import java.util.TreeSet; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.in.www1.artemis.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; /** * For each {@link GroupedFile}: diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/CreateCommonChangeBlocks.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/CreateCommonChangeBlocks.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/CreateCommonChangeBlocks.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/CreateCommonChangeBlocks.java index 24f868f61b5f..3d157ad9fad4 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/CreateCommonChangeBlocks.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/CreateCommonChangeBlocks.java @@ -1,14 +1,14 @@ -package de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource; +package de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource; import java.util.TreeSet; import java.util.stream.IntStream; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.in.www1.artemis.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; /** * For each {@link GroupedFile}: - * Takes the common lines (intersection of covered and changed lines) and creates {@link de.tum.in.www1.artemis.service.hestia.behavioral.GroupedFile.ChangeBlock}s + * Takes the common lines (intersection of covered and changed lines) and creates {@link de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile.ChangeBlock}s * from them. Each ChangeBlock represents one continuous block of common lines. */ public class CreateCommonChangeBlocks extends BehavioralKnowledgeSource { diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/CreateSolutionEntries.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/CreateSolutionEntries.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/CreateSolutionEntries.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/CreateSolutionEntries.java index 7411b2d3e0c2..19eb4f03e642 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/CreateSolutionEntries.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/CreateSolutionEntries.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource; +package de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource; import java.util.ArrayList; import java.util.Arrays; import java.util.stream.Collectors; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.in.www1.artemis.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; /** * For each {@link GroupedFile}: diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/DropRemovedGitDiffEntries.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/DropRemovedGitDiffEntries.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/DropRemovedGitDiffEntries.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/DropRemovedGitDiffEntries.java index 6993b694862e..0827edf539cd 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/DropRemovedGitDiffEntries.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/DropRemovedGitDiffEntries.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource; +package de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource; import java.util.HashSet; import java.util.stream.Collectors; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; /** - * Remove all {@link de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry} from the - * {@link de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffReport} of the {@link BehavioralBlackboard} + * Remove all {@link de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry} from the + * {@link de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffReport} of the {@link BehavioralBlackboard} * that represents consecutive blocks of removed code. * Entries cannot be generated for removed code, therefore we have to drop them from the git diff report of the blackboard. */ diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/ExtractChangedLines.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/ExtractChangedLines.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/ExtractChangedLines.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/ExtractChangedLines.java index 4c0e6b2a8e55..9e8bdb8ab9d4 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/ExtractChangedLines.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/ExtractChangedLines.java @@ -1,15 +1,15 @@ -package de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource; +package de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource; import java.util.stream.Collectors; import java.util.stream.IntStream; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.in.www1.artemis.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; /** * For each {@link GroupedFile}: * Extracts the lines that were changed in the file (of the GroupedFile) from the - * {@link de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry}s + * {@link de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry}s */ public class ExtractChangedLines extends BehavioralKnowledgeSource { diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/ExtractCoveredLines.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/ExtractCoveredLines.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/ExtractCoveredLines.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/ExtractCoveredLines.java index af898d4229dc..40d7df71c9b3 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/ExtractCoveredLines.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/ExtractCoveredLines.java @@ -1,15 +1,15 @@ -package de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource; +package de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource; import java.util.stream.Collectors; import java.util.stream.IntStream; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.in.www1.artemis.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; /** * For each {@link GroupedFile}: * Extracts the lines that were covered by the test case in the file (both of the GroupedFile) from the - * {@link de.tum.in.www1.artemis.domain.hestia.TestwiseCoverageReportEntry}s + * {@link de.tum.cit.aet.artemis.domain.hestia.TestwiseCoverageReportEntry}s */ public class ExtractCoveredLines extends BehavioralKnowledgeSource { diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/FindCommonLines.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/FindCommonLines.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/FindCommonLines.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/FindCommonLines.java index 31f2d46ce3c8..a151e02a8251 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/FindCommonLines.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/FindCommonLines.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource; +package de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource; import java.util.ArrayList; import java.util.List; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.in.www1.artemis.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; /** * For each {@link GroupedFile}: diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/GroupGitDiffAndCoverageEntriesByFilePathAndTestCase.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/GroupGitDiffAndCoverageEntriesByFilePathAndTestCase.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/GroupGitDiffAndCoverageEntriesByFilePathAndTestCase.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/GroupGitDiffAndCoverageEntriesByFilePathAndTestCase.java index e1028f637dba..df8563dbff5e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/GroupGitDiffAndCoverageEntriesByFilePathAndTestCase.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/GroupGitDiffAndCoverageEntriesByFilePathAndTestCase.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource; +package de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource; import java.util.Collections; import java.util.HashSet; @@ -9,11 +9,11 @@ import java.util.TreeSet; import java.util.stream.Collectors; -import de.tum.in.www1.artemis.domain.hestia.CoverageFileReport; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; -import de.tum.in.www1.artemis.domain.hestia.TestwiseCoverageReportEntry; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.in.www1.artemis.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.domain.hestia.CoverageFileReport; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; +import de.tum.cit.aet.artemis.domain.hestia.TestwiseCoverageReportEntry; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; /** * Knowledge source that takes care of creating the {@link GroupedFile}s used by all other knowledge sources. diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/InsertFileContents.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/InsertFileContents.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/InsertFileContents.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/InsertFileContents.java index 143a31952918..185563af2aac 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/behavioral/knowledgesource/InsertFileContents.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/InsertFileContents.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource; +package de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralSolutionEntryGenerationException; -import de.tum.in.www1.artemis.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralSolutionEntryGenerationException; +import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; /** * For each {@link GroupedFile}: diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/structural/StructuralAttribute.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralAttribute.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/structural/StructuralAttribute.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralAttribute.java index 3004e38eb02e..7c72f85f4ece 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/structural/StructuralAttribute.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralAttribute.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.hestia.structural; +package de.tum.cit.aet.artemis.service.hestia.structural; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/structural/StructuralClass.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralClass.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/structural/StructuralClass.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralClass.java index 4838a9e1e0db..3da0641aee0e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/structural/StructuralClass.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralClass.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.hestia.structural; +package de.tum.cit.aet.artemis.service.hestia.structural; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/structural/StructuralClassElements.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralClassElements.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/structural/StructuralClassElements.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralClassElements.java index ee571a128468..325844bcfc78 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/structural/StructuralClassElements.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralClassElements.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.hestia.structural; +package de.tum.cit.aet.artemis.service.hestia.structural; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/structural/StructuralConstructor.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralConstructor.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/structural/StructuralConstructor.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralConstructor.java index d86177eca3bc..80da91e90777 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/structural/StructuralConstructor.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralConstructor.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.hestia.structural; +package de.tum.cit.aet.artemis.service.hestia.structural; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/structural/StructuralElement.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralElement.java similarity index 99% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/structural/StructuralElement.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralElement.java index bb09fb340386..8983b1f68d89 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/structural/StructuralElement.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralElement.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.hestia.structural; +package de.tum.cit.aet.artemis.service.hestia.structural; import java.util.Collections; import java.util.HashSet; diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/structural/StructuralMethod.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralMethod.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/structural/StructuralMethod.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralMethod.java index a9fa7f975bdb..0b2a49f2916e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/structural/StructuralMethod.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralMethod.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.hestia.structural; +package de.tum.cit.aet.artemis.service.hestia.structural; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/structural/StructuralSolutionEntryGenerationException.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralSolutionEntryGenerationException.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/structural/StructuralSolutionEntryGenerationException.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralSolutionEntryGenerationException.java index 0e401eba0155..a89b580e7b32 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/structural/StructuralSolutionEntryGenerationException.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralSolutionEntryGenerationException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.hestia.structural; +package de.tum.cit.aet.artemis.service.hestia.structural; /** * Exception used for the generation of solution entries for structural test cases diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/structural/StructuralTestCaseService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralTestCaseService.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/hestia/structural/StructuralTestCaseService.java rename to src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralTestCaseService.java index 596f1c61a960..b9b4f0986ebc 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/structural/StructuralTestCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralTestCaseService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.hestia.structural; +package de.tum.cit.aet.artemis.service.hestia.structural; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.IOException; import java.net.URISyntaxException; @@ -28,15 +28,15 @@ import com.thoughtworks.qdox.model.JavaClass; import com.thoughtworks.qdox.model.JavaType; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTestCaseType; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; -import de.tum.in.www1.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTestCaseType; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.service.connectors.GitService; /** * Service for handling Solution Entries of structural Test Cases. diff --git a/src/main/java/de/tum/in/www1/artemis/service/icl/ArtemisGitServletService.java b/src/main/java/de/tum/cit/aet/artemis/service/icl/ArtemisGitServletService.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/service/icl/ArtemisGitServletService.java rename to src/main/java/de/tum/cit/aet/artemis/service/icl/ArtemisGitServletService.java index 0042214becac..d8b848d7f6a0 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/icl/ArtemisGitServletService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/icl/ArtemisGitServletService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.icl; +package de.tum.cit.aet.artemis.service.icl; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; import jakarta.annotation.PostConstruct; @@ -9,12 +9,12 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCFetchFilter; -import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCPostPushHook; -import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCPrePushHook; -import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCPushFilter; -import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCServletService; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCFetchFilter; +import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCPostPushHook; +import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCPrePushHook; +import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCPushFilter; +import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCServletService; /** * This class configures the JGit Servlet, which is used to receive Git push and fetch requests for local VC. diff --git a/src/main/java/de/tum/in/www1/artemis/service/icl/GitPublickeyAuthenticatorService.java b/src/main/java/de/tum/cit/aet/artemis/service/icl/GitPublickeyAuthenticatorService.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/icl/GitPublickeyAuthenticatorService.java rename to src/main/java/de/tum/cit/aet/artemis/service/icl/GitPublickeyAuthenticatorService.java index 2d2c14155dc7..daa27faaec9e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/icl/GitPublickeyAuthenticatorService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/icl/GitPublickeyAuthenticatorService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.icl; +package de.tum.cit.aet.artemis.service.icl; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; import java.io.IOException; import java.security.GeneralSecurityException; @@ -16,11 +16,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.config.icl.ssh.HashUtils; -import de.tum.in.www1.artemis.config.icl.ssh.SshConstants; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.connectors.localci.SharedQueueManagementService; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.config.icl.ssh.HashUtils; +import de.tum.cit.aet.artemis.config.icl.ssh.SshConstants; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.connectors.localci.SharedQueueManagementService; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; @Profile(PROFILE_LOCALVC) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/icl/SshGitCommandFactoryService.java b/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitCommandFactoryService.java similarity index 76% rename from src/main/java/de/tum/in/www1/artemis/service/icl/SshGitCommandFactoryService.java rename to src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitCommandFactoryService.java index 910125221cdb..34e0577fedf0 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/icl/SshGitCommandFactoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitCommandFactoryService.java @@ -1,14 +1,14 @@ -package de.tum.in.www1.artemis.service.icl; +package de.tum.cit.aet.artemis.service.icl; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; import org.apache.sshd.git.pack.GitPackCommand; import org.apache.sshd.git.pack.GitPackCommandFactory; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.config.icl.ssh.SshGitCommand; -import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCServletService; +import de.tum.cit.aet.artemis.config.icl.ssh.SshGitCommand; +import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCServletService; @Profile(PROFILE_LOCALVC) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/icl/SshGitLocationResolverService.java b/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitLocationResolverService.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/service/icl/SshGitLocationResolverService.java rename to src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitLocationResolverService.java index 886c509792f5..03990d7734b3 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/icl/SshGitLocationResolverService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitLocationResolverService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.icl; +package de.tum.cit.aet.artemis.service.icl; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; import java.io.IOException; import java.net.URL; @@ -18,15 +18,15 @@ import org.springframework.security.access.AccessDeniedException; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.config.icl.ssh.SshConstants; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.exception.localvc.LocalVCForbiddenException; -import de.tum.in.www1.artemis.exception.localvc.LocalVCInternalException; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCRepositoryUri; -import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCServletService; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.in.www1.artemis.web.rest.repository.RepositoryActionType; +import de.tum.cit.aet.artemis.config.icl.ssh.SshConstants; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.exception.localvc.LocalVCForbiddenException; +import de.tum.cit.aet.artemis.exception.localvc.LocalVCInternalException; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; +import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCServletService; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.rest.repository.RepositoryActionType; @Profile(PROFILE_LOCALVC) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/IrisCompetencyGenerationService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisCompetencyGenerationService.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/service/iris/IrisCompetencyGenerationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/iris/IrisCompetencyGenerationService.java index 07be63259336..0a32f05aee56 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/IrisCompetencyGenerationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisCompetencyGenerationService.java @@ -1,18 +1,18 @@ -package de.tum.in.www1.artemis.service.iris; +package de.tum.cit.aet.artemis.service.iris; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy; -import de.tum.in.www1.artemis.service.connectors.pyris.PyrisJobService; -import de.tum.in.www1.artemis.service.connectors.pyris.PyrisPipelineService; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionPipelineExecutionDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyRecommendationDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.job.CompetencyExtractionJob; -import de.tum.in.www1.artemis.service.iris.websocket.IrisWebsocketService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisJobService; +import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisPipelineService; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionPipelineExecutionDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyRecommendationDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.job.CompetencyExtractionJob; +import de.tum.cit.aet.artemis.service.iris.websocket.IrisWebsocketService; /** * Service to handle the Competency generation subsytem of Iris. diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/IrisDefaultTemplateService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisDefaultTemplateService.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/iris/IrisDefaultTemplateService.java rename to src/main/java/de/tum/cit/aet/artemis/service/iris/IrisDefaultTemplateService.java index 57dcd2210360..83b1b4ecda18 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/IrisDefaultTemplateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisDefaultTemplateService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.iris; +package de.tum.cit.aet.artemis.service.iris; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -14,8 +14,8 @@ import org.springframework.core.io.Resource; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.iris.IrisTemplate; -import de.tum.in.www1.artemis.service.ResourceLoaderService; +import de.tum.cit.aet.artemis.domain.iris.IrisTemplate; +import de.tum.cit.aet.artemis.service.ResourceLoaderService; /** * Service that loads default Iris templates from the resources/templates/iris folder. diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/IrisMessageService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisMessageService.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/iris/IrisMessageService.java rename to src/main/java/de/tum/cit/aet/artemis/service/iris/IrisMessageService.java index 32a1a93ca8a9..f18883a1a0da 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/IrisMessageService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisMessageService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.iris; +package de.tum.cit.aet.artemis.service.iris; import java.time.ZonedDateTime; @@ -8,10 +8,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.iris.message.IrisMessage; -import de.tum.in.www1.artemis.domain.iris.message.IrisMessageSender; -import de.tum.in.www1.artemis.domain.iris.session.IrisSession; -import de.tum.in.www1.artemis.repository.iris.IrisSessionRepository; +import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; +import de.tum.cit.aet.artemis.domain.iris.message.IrisMessageSender; +import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; +import de.tum.cit.aet.artemis.repository.iris.IrisSessionRepository; /** * Service for managing Iris messages. diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/IrisRateLimitService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisRateLimitService.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/iris/IrisRateLimitService.java rename to src/main/java/de/tum/cit/aet/artemis/service/iris/IrisRateLimitService.java index bbaa8ca8f66f..74097355b18a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/IrisRateLimitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisRateLimitService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.iris; +package de.tum.cit.aet.artemis.service.iris; import java.time.ZonedDateTime; import java.util.Objects; @@ -6,10 +6,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.iris.IrisMessageRepository; -import de.tum.in.www1.artemis.service.iris.exception.IrisRateLimitExceededException; -import de.tum.in.www1.artemis.service.iris.settings.IrisSettingsService; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.iris.IrisMessageRepository; +import de.tum.cit.aet.artemis.service.iris.exception.IrisRateLimitExceededException; +import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; /** * Service for the rate limit of the iris chatbot. diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/IrisSessionService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisSessionService.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/service/iris/IrisSessionService.java rename to src/main/java/de/tum/cit/aet/artemis/service/iris/IrisSessionService.java index f455b13979fe..f62d6f5faac5 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/IrisSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisSessionService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.iris; +package de.tum.cit.aet.artemis.service.iris; import jakarta.annotation.Nullable; import jakarta.ws.rs.BadRequestException; @@ -6,20 +6,20 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.iris.message.IrisMessage; -import de.tum.in.www1.artemis.domain.iris.session.IrisCourseChatSession; -import de.tum.in.www1.artemis.domain.iris.session.IrisExerciseChatSession; -import de.tum.in.www1.artemis.domain.iris.session.IrisHestiaSession; -import de.tum.in.www1.artemis.domain.iris.session.IrisSession; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.iris.session.IrisChatBasedFeatureInterface; -import de.tum.in.www1.artemis.service.iris.session.IrisCourseChatSessionService; -import de.tum.in.www1.artemis.service.iris.session.IrisExerciseChatSessionService; -import de.tum.in.www1.artemis.service.iris.session.IrisHestiaSessionService; -import de.tum.in.www1.artemis.service.iris.session.IrisRateLimitedFeatureInterface; -import de.tum.in.www1.artemis.service.iris.session.IrisSubFeatureInterface; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; +import de.tum.cit.aet.artemis.domain.iris.session.IrisCourseChatSession; +import de.tum.cit.aet.artemis.domain.iris.session.IrisExerciseChatSession; +import de.tum.cit.aet.artemis.domain.iris.session.IrisHestiaSession; +import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.iris.session.IrisChatBasedFeatureInterface; +import de.tum.cit.aet.artemis.service.iris.session.IrisCourseChatSessionService; +import de.tum.cit.aet.artemis.service.iris.session.IrisExerciseChatSessionService; +import de.tum.cit.aet.artemis.service.iris.session.IrisHestiaSessionService; +import de.tum.cit.aet.artemis.service.iris.session.IrisRateLimitedFeatureInterface; +import de.tum.cit.aet.artemis.service.iris.session.IrisSubFeatureInterface; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; /** * Service for managing Iris sessions. diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisChatWebsocketDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisChatWebsocketDTO.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisChatWebsocketDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisChatWebsocketDTO.java index 12fa282a3012..a5e0995bedce 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisChatWebsocketDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisChatWebsocketDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.iris.dto; +package de.tum.cit.aet.artemis.service.iris.dto; import java.util.List; import java.util.Objects; @@ -7,9 +7,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.iris.message.IrisMessage; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.in.www1.artemis.service.iris.IrisRateLimitService; +import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; /** * A DTO for sending status updates of Iris to the client via the websocket diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedChatSubSettingsDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedChatSubSettingsDTO.java similarity index 78% rename from src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedChatSubSettingsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedChatSubSettingsDTO.java index c98fdb1663a0..0fbdeb4f8948 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedChatSubSettingsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedChatSubSettingsDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.iris.dto; +package de.tum.cit.aet.artemis.service.iris.dto; import java.util.Set; @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.iris.IrisTemplate; +import de.tum.cit.aet.artemis.domain.iris.IrisTemplate; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record IrisCombinedChatSubSettingsDTO(boolean enabled, Integer rateLimit, Integer rateLimitTimeframeHours, @Nullable Set allowedModels, diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java similarity index 77% rename from src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java index e924be92e773..d0fffd9fc6a0 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.iris.dto; +package de.tum.cit.aet.artemis.service.iris.dto; import java.util.Set; @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.iris.IrisTemplate; +import de.tum.cit.aet.artemis.domain.iris.IrisTemplate; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record IrisCombinedCompetencyGenerationSubSettingsDTO(boolean enabled, @Nullable Set allowedModels, @Nullable String preferredModel, diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedHestiaSubSettingsDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedHestiaSubSettingsDTO.java similarity index 75% rename from src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedHestiaSubSettingsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedHestiaSubSettingsDTO.java index 315fb572194c..feb583fa0779 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedHestiaSubSettingsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedHestiaSubSettingsDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.iris.dto; +package de.tum.cit.aet.artemis.service.iris.dto; import java.util.Set; @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.iris.IrisTemplate; +import de.tum.cit.aet.artemis.domain.iris.IrisTemplate; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record IrisCombinedHestiaSubSettingsDTO(boolean enabled, @Nullable Set allowedModels, @Nullable String preferredModel, @Nullable IrisTemplate template) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedLectureIngestionSubSettingsDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedLectureIngestionSubSettingsDTO.java similarity index 78% rename from src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedLectureIngestionSubSettingsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedLectureIngestionSubSettingsDTO.java index 5b7abd193784..6698b1fb134e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedLectureIngestionSubSettingsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedLectureIngestionSubSettingsDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.iris.dto; +package de.tum.cit.aet.artemis.service.iris.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedSettingsDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedSettingsDTO.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedSettingsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedSettingsDTO.java index 80c662d9d6a1..ae59dd858343 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedSettingsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedSettingsDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.iris.dto; +package de.tum.cit.aet.artemis.service.iris.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/exception/IrisException.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/exception/IrisException.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/iris/exception/IrisException.java rename to src/main/java/de/tum/cit/aet/artemis/service/iris/exception/IrisException.java index 136f96aea364..3d4a329658ed 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/exception/IrisException.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/exception/IrisException.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.service.iris.exception; +package de.tum.cit.aet.artemis.service.iris.exception; import java.util.HashMap; import java.util.Map; import org.zalando.problem.Status; -import de.tum.in.www1.artemis.web.rest.errors.ErrorConstants; -import de.tum.in.www1.artemis.web.rest.errors.HttpStatusException; +import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; +import de.tum.cit.aet.artemis.web.rest.errors.HttpStatusException; public class IrisException extends HttpStatusException { diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/exception/IrisForbiddenException.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/exception/IrisForbiddenException.java similarity index 78% rename from src/main/java/de/tum/in/www1/artemis/service/iris/exception/IrisForbiddenException.java rename to src/main/java/de/tum/cit/aet/artemis/service/iris/exception/IrisForbiddenException.java index a2044bf041b2..86029e0e6eff 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/exception/IrisForbiddenException.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/exception/IrisForbiddenException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.iris.exception; +package de.tum.cit.aet.artemis.service.iris.exception; import java.util.Map; diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/exception/IrisInternalPyrisErrorException.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/exception/IrisInternalPyrisErrorException.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/service/iris/exception/IrisInternalPyrisErrorException.java rename to src/main/java/de/tum/cit/aet/artemis/service/iris/exception/IrisInternalPyrisErrorException.java index 229c03a27f71..1964cd3a230f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/exception/IrisInternalPyrisErrorException.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/exception/IrisInternalPyrisErrorException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.iris.exception; +package de.tum.cit.aet.artemis.service.iris.exception; import java.util.Map; diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/exception/IrisRateLimitExceededException.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/exception/IrisRateLimitExceededException.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/iris/exception/IrisRateLimitExceededException.java rename to src/main/java/de/tum/cit/aet/artemis/service/iris/exception/IrisRateLimitExceededException.java index 68978d1e0812..6bd7e59d33b8 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/exception/IrisRateLimitExceededException.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/exception/IrisRateLimitExceededException.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.iris.exception; +package de.tum.cit.aet.artemis.service.iris.exception; import java.util.Map; import org.zalando.problem.Status; -import de.tum.in.www1.artemis.service.iris.IrisRateLimitService; +import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; /** * Exception that is thrown when the rate limit of Iris is exceeded. diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/session/AbstractIrisChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/AbstractIrisChatSessionService.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/iris/session/AbstractIrisChatSessionService.java rename to src/main/java/de/tum/cit/aet/artemis/service/iris/session/AbstractIrisChatSessionService.java index d68ae16ba774..dacf9623bd54 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/session/AbstractIrisChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/AbstractIrisChatSessionService.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.service.iris.session; +package de.tum.cit.aet.artemis.service.iris.session; import java.util.List; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.iris.session.IrisChatSession; -import de.tum.in.www1.artemis.repository.iris.IrisSessionRepository; +import de.tum.cit.aet.artemis.domain.iris.session.IrisChatSession; +import de.tum.cit.aet.artemis.repository.iris.IrisSessionRepository; public abstract class AbstractIrisChatSessionService implements IrisChatBasedFeatureInterface, IrisRateLimitedFeatureInterface { diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisButtonBasedFeatureInterface.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisButtonBasedFeatureInterface.java similarity index 74% rename from src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisButtonBasedFeatureInterface.java rename to src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisButtonBasedFeatureInterface.java index 4bd1c2db6c67..029042705460 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisButtonBasedFeatureInterface.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisButtonBasedFeatureInterface.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.iris.session; +package de.tum.cit.aet.artemis.service.iris.session; -import de.tum.in.www1.artemis.domain.iris.session.IrisSession; +import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; public interface IrisButtonBasedFeatureInterface extends IrisSubFeatureInterface { diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisChatBasedFeatureInterface.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisChatBasedFeatureInterface.java similarity index 76% rename from src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisChatBasedFeatureInterface.java rename to src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisChatBasedFeatureInterface.java index 2001cb7077b8..4b6ede5ecce4 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisChatBasedFeatureInterface.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisChatBasedFeatureInterface.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.iris.session; +package de.tum.cit.aet.artemis.service.iris.session; -import de.tum.in.www1.artemis.domain.iris.message.IrisMessage; -import de.tum.in.www1.artemis.domain.iris.session.IrisSession; +import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; +import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; public interface IrisChatBasedFeatureInterface extends IrisSubFeatureInterface { diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisCourseChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisCourseChatSessionService.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisCourseChatSessionService.java rename to src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisCourseChatSessionService.java index bd5a4c25887b..6bebcb5ae7c7 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisCourseChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisCourseChatSessionService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.iris.session; +package de.tum.cit.aet.artemis.service.iris.session; import java.time.LocalDate; import java.time.ZoneId; @@ -11,26 +11,26 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.CompetencyJol; -import de.tum.in.www1.artemis.domain.iris.message.IrisMessage; -import de.tum.in.www1.artemis.domain.iris.message.IrisMessageSender; -import de.tum.in.www1.artemis.domain.iris.message.IrisTextMessageContent; -import de.tum.in.www1.artemis.domain.iris.session.IrisCourseChatSession; -import de.tum.in.www1.artemis.domain.iris.settings.IrisSubSettingsType; -import de.tum.in.www1.artemis.repository.iris.IrisCourseChatSessionRepository; -import de.tum.in.www1.artemis.repository.iris.IrisSessionRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.connectors.pyris.PyrisPipelineService; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.job.CourseChatJob; -import de.tum.in.www1.artemis.service.iris.IrisMessageService; -import de.tum.in.www1.artemis.service.iris.IrisRateLimitService; -import de.tum.in.www1.artemis.service.iris.settings.IrisSettingsService; -import de.tum.in.www1.artemis.service.iris.websocket.IrisChatWebsocketService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.competency.CompetencyJol; +import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; +import de.tum.cit.aet.artemis.domain.iris.message.IrisMessageSender; +import de.tum.cit.aet.artemis.domain.iris.message.IrisTextMessageContent; +import de.tum.cit.aet.artemis.domain.iris.session.IrisCourseChatSession; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettingsType; +import de.tum.cit.aet.artemis.repository.iris.IrisCourseChatSessionRepository; +import de.tum.cit.aet.artemis.repository.iris.IrisSessionRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisPipelineService; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.job.CourseChatJob; +import de.tum.cit.aet.artemis.service.iris.IrisMessageService; +import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; +import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; +import de.tum.cit.aet.artemis.service.iris.websocket.IrisChatWebsocketService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; /** * Service to handle the course chat subsystem of Iris. diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisExerciseChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisExerciseChatSessionService.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisExerciseChatSessionService.java rename to src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisExerciseChatSessionService.java index 36508d8b0934..d04f5f75d3f4 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisExerciseChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisExerciseChatSessionService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.iris.session; +package de.tum.cit.aet.artemis.service.iris.session; import java.util.Objects; import java.util.Optional; @@ -8,30 +8,30 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.iris.message.IrisMessage; -import de.tum.in.www1.artemis.domain.iris.message.IrisMessageSender; -import de.tum.in.www1.artemis.domain.iris.message.IrisTextMessageContent; -import de.tum.in.www1.artemis.domain.iris.session.IrisExerciseChatSession; -import de.tum.in.www1.artemis.domain.iris.settings.IrisSubSettingsType; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionRepository; -import de.tum.in.www1.artemis.repository.iris.IrisSessionRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.connectors.pyris.PyrisPipelineService; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.job.ExerciseChatJob; -import de.tum.in.www1.artemis.service.iris.IrisMessageService; -import de.tum.in.www1.artemis.service.iris.IrisRateLimitService; -import de.tum.in.www1.artemis.service.iris.settings.IrisSettingsService; -import de.tum.in.www1.artemis.service.iris.websocket.IrisChatWebsocketService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; +import de.tum.cit.aet.artemis.domain.iris.message.IrisMessageSender; +import de.tum.cit.aet.artemis.domain.iris.message.IrisTextMessageContent; +import de.tum.cit.aet.artemis.domain.iris.session.IrisExerciseChatSession; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettingsType; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.repository.iris.IrisSessionRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisPipelineService; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.job.ExerciseChatJob; +import de.tum.cit.aet.artemis.service.iris.IrisMessageService; +import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; +import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; +import de.tum.cit.aet.artemis.service.iris.websocket.IrisChatWebsocketService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; /** * Service to handle the chat subsystem of Iris. diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisHestiaSessionService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisHestiaSessionService.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisHestiaSessionService.java rename to src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisHestiaSessionService.java index 3115be52e1b5..591f7f6f8529 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisHestiaSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisHestiaSessionService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.iris.session; +package de.tum.cit.aet.artemis.service.iris.session; import java.time.ZonedDateTime; @@ -9,17 +9,17 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.hestia.CodeHint; -import de.tum.in.www1.artemis.domain.iris.session.IrisHestiaSession; -import de.tum.in.www1.artemis.domain.iris.settings.IrisSubSettingsType; -import de.tum.in.www1.artemis.repository.iris.IrisHestiaSessionRepository; -import de.tum.in.www1.artemis.repository.iris.IrisSessionRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.connectors.pyris.PyrisConnectorService; -import de.tum.in.www1.artemis.service.iris.settings.IrisSettingsService; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.domain.iris.session.IrisHestiaSession; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettingsType; +import de.tum.cit.aet.artemis.repository.iris.IrisHestiaSessionRepository; +import de.tum.cit.aet.artemis.repository.iris.IrisSessionRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisConnectorService; +import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; /** * Service to handle the Hestia integration of Iris. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisRateLimitedFeatureInterface.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisRateLimitedFeatureInterface.java new file mode 100644 index 000000000000..86fe4e65eedc --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisRateLimitedFeatureInterface.java @@ -0,0 +1,8 @@ +package de.tum.cit.aet.artemis.service.iris.session; + +import de.tum.cit.aet.artemis.domain.User; + +public interface IrisRateLimitedFeatureInterface { + + void checkRateLimit(User user); +} diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisSubFeatureInterface.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisSubFeatureInterface.java similarity index 76% rename from src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisSubFeatureInterface.java rename to src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisSubFeatureInterface.java index f1e2145dcf93..4682d4096aaa 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisSubFeatureInterface.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisSubFeatureInterface.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.iris.session; +package de.tum.cit.aet.artemis.service.iris.session; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.iris.session.IrisSession; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; public interface IrisSubFeatureInterface { diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/settings/IrisSettingsService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSettingsService.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/iris/settings/IrisSettingsService.java rename to src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSettingsService.java index 0024704cf0d0..b80e3bc6a9bb 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/settings/IrisSettingsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSettingsService.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.service.iris.settings; +package de.tum.cit.aet.artemis.service.iris.settings; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_SCHEDULING; -import static de.tum.in.www1.artemis.domain.iris.settings.IrisSettingsType.COURSE; -import static de.tum.in.www1.artemis.domain.iris.settings.IrisSettingsType.EXERCISE; -import static de.tum.in.www1.artemis.domain.iris.settings.IrisSettingsType.GLOBAL; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.domain.iris.settings.IrisSettingsType.COURSE; +import static de.tum.cit.aet.artemis.domain.iris.settings.IrisSettingsType.EXERCISE; +import static de.tum.cit.aet.artemis.domain.iris.settings.IrisSettingsType.GLOBAL; import java.util.ArrayList; import java.util.Comparator; @@ -16,27 +16,27 @@ import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.iris.IrisTemplate; -import de.tum.in.www1.artemis.domain.iris.settings.IrisChatSubSettings; -import de.tum.in.www1.artemis.domain.iris.settings.IrisCompetencyGenerationSubSettings; -import de.tum.in.www1.artemis.domain.iris.settings.IrisCourseSettings; -import de.tum.in.www1.artemis.domain.iris.settings.IrisExerciseSettings; -import de.tum.in.www1.artemis.domain.iris.settings.IrisGlobalSettings; -import de.tum.in.www1.artemis.domain.iris.settings.IrisHestiaSubSettings; -import de.tum.in.www1.artemis.domain.iris.settings.IrisLectureIngestionSubSettings; -import de.tum.in.www1.artemis.domain.iris.settings.IrisSettings; -import de.tum.in.www1.artemis.domain.iris.settings.IrisSubSettings; -import de.tum.in.www1.artemis.domain.iris.settings.IrisSubSettingsType; -import de.tum.in.www1.artemis.repository.iris.IrisSettingsRepository; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.iris.IrisDefaultTemplateService; -import de.tum.in.www1.artemis.service.iris.dto.IrisCombinedSettingsDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenAlertException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.iris.IrisTemplate; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisChatSubSettings; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisCompetencyGenerationSubSettings; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisCourseSettings; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisExerciseSettings; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisGlobalSettings; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisHestiaSubSettings; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisLectureIngestionSubSettings; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisSettings; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettings; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettingsType; +import de.tum.cit.aet.artemis.repository.iris.IrisSettingsRepository; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.iris.IrisDefaultTemplateService; +import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedSettingsDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; /** * Service for managing {@link IrisSettings}. diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/settings/IrisSubSettingsService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSubSettingsService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/iris/settings/IrisSubSettingsService.java rename to src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSubSettingsService.java index e4a609a23b56..ff7a6d755bd1 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/settings/IrisSubSettingsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSubSettingsService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.iris.settings; +package de.tum.cit.aet.artemis.service.iris.settings; import java.util.ArrayList; import java.util.Comparator; @@ -12,20 +12,20 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.iris.IrisTemplate; -import de.tum.in.www1.artemis.domain.iris.settings.IrisChatSubSettings; -import de.tum.in.www1.artemis.domain.iris.settings.IrisCompetencyGenerationSubSettings; -import de.tum.in.www1.artemis.domain.iris.settings.IrisExerciseSettings; -import de.tum.in.www1.artemis.domain.iris.settings.IrisHestiaSubSettings; -import de.tum.in.www1.artemis.domain.iris.settings.IrisLectureIngestionSubSettings; -import de.tum.in.www1.artemis.domain.iris.settings.IrisSettings; -import de.tum.in.www1.artemis.domain.iris.settings.IrisSettingsType; -import de.tum.in.www1.artemis.domain.iris.settings.IrisSubSettings; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.iris.dto.IrisCombinedChatSubSettingsDTO; -import de.tum.in.www1.artemis.service.iris.dto.IrisCombinedCompetencyGenerationSubSettingsDTO; -import de.tum.in.www1.artemis.service.iris.dto.IrisCombinedHestiaSubSettingsDTO; -import de.tum.in.www1.artemis.service.iris.dto.IrisCombinedLectureIngestionSubSettingsDTO; +import de.tum.cit.aet.artemis.domain.iris.IrisTemplate; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisChatSubSettings; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisCompetencyGenerationSubSettings; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisExerciseSettings; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisHestiaSubSettings; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisLectureIngestionSubSettings; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisSettings; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisSettingsType; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettings; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedChatSubSettingsDTO; +import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedCompetencyGenerationSubSettingsDTO; +import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedHestiaSubSettingsDTO; +import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedLectureIngestionSubSettingsDTO; /** * Service for handling {@link IrisSubSettings} objects. diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisChatWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/websocket/IrisChatWebsocketService.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisChatWebsocketService.java rename to src/main/java/de/tum/cit/aet/artemis/service/iris/websocket/IrisChatWebsocketService.java index 21bfc4449228..4394a074912d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisChatWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/websocket/IrisChatWebsocketService.java @@ -1,15 +1,15 @@ -package de.tum.in.www1.artemis.service.iris.websocket; +package de.tum.cit.aet.artemis.service.iris.websocket; import java.util.List; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.iris.message.IrisMessage; -import de.tum.in.www1.artemis.domain.iris.session.IrisChatSession; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.in.www1.artemis.service.iris.IrisRateLimitService; -import de.tum.in.www1.artemis.service.iris.dto.IrisChatWebsocketDTO; +import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; +import de.tum.cit.aet.artemis.domain.iris.session.IrisChatSession; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; +import de.tum.cit.aet.artemis.service.iris.dto.IrisChatWebsocketDTO; @Service @Profile("iris") diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/websocket/IrisWebsocketService.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisWebsocketService.java rename to src/main/java/de/tum/cit/aet/artemis/service/iris/websocket/IrisWebsocketService.java index 3fcd949be7b8..be68e264680e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/websocket/IrisWebsocketService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.iris.websocket; +package de.tum.cit.aet.artemis.service.iris.websocket; import java.util.concurrent.ExecutionException; @@ -7,7 +7,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; /** * A service to send a message over the websocket to a specific user diff --git a/src/main/java/de/tum/in/www1/artemis/service/ldap/LdapConfig.java b/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapConfig.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/service/ldap/LdapConfig.java rename to src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapConfig.java index b30b0093350a..45d857301e7d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/ldap/LdapConfig.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapConfig.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.ldap; +package de.tum.cit.aet.artemis.service.ldap; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/de/tum/in/www1/artemis/service/ldap/LdapUserDto.java b/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserDto.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/ldap/LdapUserDto.java rename to src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserDto.java index 06cae7b11d8a..827b91b99c66 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/ldap/LdapUserDto.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserDto.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.ldap; +package de.tum.cit.aet.artemis.service.ldap; -import static de.tum.in.www1.artemis.config.Constants.TUM_LDAP_MAIN_EMAIL; -import static de.tum.in.www1.artemis.config.Constants.TUM_LDAP_MATRIKEL_NUMBER; +import static de.tum.cit.aet.artemis.config.Constants.TUM_LDAP_MAIN_EMAIL; +import static de.tum.cit.aet.artemis.config.Constants.TUM_LDAP_MATRIKEL_NUMBER; import javax.naming.Name; diff --git a/src/main/java/de/tum/in/www1/artemis/service/ldap/LdapUserService.java b/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserService.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/ldap/LdapUserService.java rename to src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserService.java index a4f632c27061..491afacfb69f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/ldap/LdapUserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserService.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.ldap; +package de.tum.cit.aet.artemis.service.ldap; -import static de.tum.in.www1.artemis.config.Constants.TUM_LDAP_EMAILS; -import static de.tum.in.www1.artemis.config.Constants.TUM_LDAP_MAIN_EMAIL; -import static de.tum.in.www1.artemis.config.Constants.TUM_LDAP_MATRIKEL_NUMBER; +import static de.tum.cit.aet.artemis.config.Constants.TUM_LDAP_EMAILS; +import static de.tum.cit.aet.artemis.config.Constants.TUM_LDAP_MAIN_EMAIL; +import static de.tum.cit.aet.artemis.config.Constants.TUM_LDAP_MATRIKEL_NUMBER; import static org.springframework.ldap.query.LdapQueryBuilder.query; import java.util.Optional; @@ -18,8 +18,8 @@ import org.springframework.ldap.query.SearchScope; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.LdapUserRepository; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.LdapUserRepository; @Service @Profile("ldap | ldap-only") diff --git a/src/main/java/de/tum/in/www1/artemis/service/learningpath/LearningPathNavigationService.java b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNavigationService.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/learningpath/LearningPathNavigationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNavigationService.java index 25981beefa32..f5d7feceda08 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/learningpath/LearningPathNavigationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNavigationService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.learningpath; +package de.tum.cit.aet.artemis.service.learningpath; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Comparator; import java.util.List; @@ -9,16 +9,16 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.LearningObject; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; -import de.tum.in.www1.artemis.domain.competency.LearningPath; -import de.tum.in.www1.artemis.service.LearningObjectService; -import de.tum.in.www1.artemis.service.learningpath.LearningPathRecommendationService.RecommendationState; -import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathNavigationDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathNavigationObjectDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathNavigationObjectDTO.LearningObjectType; -import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathNavigationOverviewDTO; +import de.tum.cit.aet.artemis.domain.LearningObject; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.domain.competency.LearningPath; +import de.tum.cit.aet.artemis.service.LearningObjectService; +import de.tum.cit.aet.artemis.service.learningpath.LearningPathRecommendationService.RecommendationState; +import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationObjectDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationObjectDTO.LearningObjectType; +import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationOverviewDTO; /** * Service for navigating through a learning path. diff --git a/src/main/java/de/tum/in/www1/artemis/service/learningpath/LearningPathNgxService.java b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNgxService.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/service/learningpath/LearningPathNgxService.java rename to src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNgxService.java index 14f53b277f26..e857a24f60aa 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/learningpath/LearningPathNgxService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNgxService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.learningpath; +package de.tum.cit.aet.artemis.service.learningpath; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.HashMap; import java.util.HashSet; @@ -17,16 +17,16 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.LearningObject; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.CompetencyRelation; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; -import de.tum.in.www1.artemis.domain.competency.LearningPath; -import de.tum.in.www1.artemis.domain.competency.RelationType; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.repository.CompetencyRelationRepository; -import de.tum.in.www1.artemis.web.rest.dto.competency.NgxLearningPathDTO; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.LearningObject; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.competency.CompetencyRelation; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.domain.competency.LearningPath; +import de.tum.cit.aet.artemis.domain.competency.RelationType; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.repository.CompetencyRelationRepository; +import de.tum.cit.aet.artemis.web.rest.dto.competency.NgxLearningPathDTO; /** * Service Implementation for the generation of ngx representations of learning paths. diff --git a/src/main/java/de/tum/in/www1/artemis/service/learningpath/LearningPathRecommendationService.java b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathRecommendationService.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/service/learningpath/LearningPathRecommendationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathRecommendationService.java index 462cdc51827f..c7769ab4919e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/learningpath/LearningPathRecommendationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathRecommendationService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.learningpath; +package de.tum.cit.aet.artemis.service.learningpath; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.time.temporal.ChronoUnit; @@ -22,23 +22,23 @@ import com.google.common.util.concurrent.AtomicDouble; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.LearningObject; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.CompetencyProgress; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; -import de.tum.in.www1.artemis.domain.competency.LearningPath; -import de.tum.in.www1.artemis.domain.competency.Prerequisite; -import de.tum.in.www1.artemis.domain.competency.RelationType; -import de.tum.in.www1.artemis.domain.enumeration.DifficultyLevel; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.repository.CompetencyProgressRepository; -import de.tum.in.www1.artemis.repository.CompetencyRelationRepository; -import de.tum.in.www1.artemis.repository.CourseCompetencyRepository; -import de.tum.in.www1.artemis.service.LearningObjectService; -import de.tum.in.www1.artemis.service.ParticipantScoreService; -import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.LearningObject; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.domain.competency.LearningPath; +import de.tum.cit.aet.artemis.domain.competency.Prerequisite; +import de.tum.cit.aet.artemis.domain.competency.RelationType; +import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.repository.CompetencyProgressRepository; +import de.tum.cit.aet.artemis.repository.CompetencyRelationRepository; +import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.service.LearningObjectService; +import de.tum.cit.aet.artemis.service.ParticipantScoreService; +import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; /** * Service Implementation for the recommendation of competencies and learning objects in learning paths. diff --git a/src/main/java/de/tum/in/www1/artemis/service/learningpath/LearningPathService.java b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathService.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/learningpath/LearningPathService.java rename to src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathService.java index 14640c73b79b..cfb59854b3e5 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/learningpath/LearningPathService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.learningpath; +package de.tum.cit.aet.artemis.service.learningpath; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Collections; import java.util.HashSet; @@ -18,37 +18,37 @@ import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.CompetencyProgress; -import de.tum.in.www1.artemis.domain.competency.CompetencyRelation; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; -import de.tum.in.www1.artemis.domain.competency.LearningPath; -import de.tum.in.www1.artemis.domain.lecture.ExerciseUnit; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.domain.lecture.LectureUnitCompletion; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.CompetencyProgressRepository; -import de.tum.in.www1.artemis.repository.CompetencyRelationRepository; -import de.tum.in.www1.artemis.repository.CompetencyRepository; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.LearningPathRepository; -import de.tum.in.www1.artemis.repository.LectureUnitCompletionRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyGraphEdgeDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyGraphNodeDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathCompetencyGraphDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathHealthDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathInformationDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathNavigationOverviewDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.NgxLearningPathDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.util.PageUtil; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; +import de.tum.cit.aet.artemis.domain.competency.CompetencyRelation; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.domain.competency.LearningPath; +import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnitCompletion; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.CompetencyProgressRepository; +import de.tum.cit.aet.artemis.repository.CompetencyRelationRepository; +import de.tum.cit.aet.artemis.repository.CompetencyRepository; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.LearningPathRepository; +import de.tum.cit.aet.artemis.repository.LectureUnitCompletionRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyGraphEdgeDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyGraphNodeDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathCompetencyGraphDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathHealthDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathInformationDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationOverviewDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.NgxLearningPathDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.util.PageUtil; /** * Service Implementation for managing Learning Paths. diff --git a/src/main/java/de/tum/in/www1/artemis/service/linkpreview/LinkPreviewService.java b/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/LinkPreviewService.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/service/linkpreview/LinkPreviewService.java rename to src/main/java/de/tum/cit/aet/artemis/service/linkpreview/LinkPreviewService.java index 470f46caaab8..8c95bfca38cf 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/linkpreview/LinkPreviewService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/LinkPreviewService.java @@ -1,17 +1,17 @@ -package de.tum.in.www1.artemis.service.linkpreview; +package de.tum.cit.aet.artemis.service.linkpreview; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.service.linkpreview.ogparser.Content; -import de.tum.in.www1.artemis.service.linkpreview.ogparser.OgParser; -import de.tum.in.www1.artemis.service.linkpreview.ogparser.OpenGraph; -import de.tum.in.www1.artemis.service.linkpreview.ogparser.htmlparser.OgMetaElementHtmlParser; -import de.tum.in.www1.artemis.web.rest.dto.LinkPreviewDTO; +import de.tum.cit.aet.artemis.service.linkpreview.ogparser.Content; +import de.tum.cit.aet.artemis.service.linkpreview.ogparser.OgParser; +import de.tum.cit.aet.artemis.service.linkpreview.ogparser.OpenGraph; +import de.tum.cit.aet.artemis.service.linkpreview.ogparser.htmlparser.OgMetaElementHtmlParser; +import de.tum.cit.aet.artemis.web.rest.dto.LinkPreviewDTO; /** * Service for retrieving meta information from a given url. diff --git a/src/main/java/de/tum/in/www1/artemis/service/linkpreview/ogparser/Content.java b/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/Content.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/linkpreview/ogparser/Content.java rename to src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/Content.java index 8574cbe43689..21b9cfdc260b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/linkpreview/ogparser/Content.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/Content.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.linkpreview.ogparser; +package de.tum.cit.aet.artemis.service.linkpreview.ogparser; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/de/tum/in/www1/artemis/service/linkpreview/ogparser/OgParser.java b/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/OgParser.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/linkpreview/ogparser/OgParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/OgParser.java index 231ad693fb6a..f958749a4ca4 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/linkpreview/ogparser/OgParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/OgParser.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.service.linkpreview.ogparser; +package de.tum.cit.aet.artemis.service.linkpreview.ogparser; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import de.tum.in.www1.artemis.service.linkpreview.ogparser.htmlparser.OgMetaElement; -import de.tum.in.www1.artemis.service.linkpreview.ogparser.htmlparser.OgMetaElementHtmlParser; +import de.tum.cit.aet.artemis.service.linkpreview.ogparser.htmlparser.OgMetaElement; +import de.tum.cit.aet.artemis.service.linkpreview.ogparser.htmlparser.OgMetaElementHtmlParser; /** * Parses the Open Graph meta tags of a website. diff --git a/src/main/java/de/tum/in/www1/artemis/service/linkpreview/ogparser/OpenGraph.java b/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/OpenGraph.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/linkpreview/ogparser/OpenGraph.java rename to src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/OpenGraph.java index 344dfeeea73c..d0871384309e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/linkpreview/ogparser/OpenGraph.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/OpenGraph.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.linkpreview.ogparser; +package de.tum.cit.aet.artemis.service.linkpreview.ogparser; import java.util.List; import java.util.Map; diff --git a/src/main/java/de/tum/in/www1/artemis/service/linkpreview/ogparser/htmlparser/OgMetaElement.java b/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/htmlparser/OgMetaElement.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/linkpreview/ogparser/htmlparser/OgMetaElement.java rename to src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/htmlparser/OgMetaElement.java index ba61b32cbeb9..6ccf48d35918 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/linkpreview/ogparser/htmlparser/OgMetaElement.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/htmlparser/OgMetaElement.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.linkpreview.ogparser.htmlparser; +package de.tum.cit.aet.artemis.service.linkpreview.ogparser.htmlparser; /** * Represents single og meta element. diff --git a/src/main/java/de/tum/in/www1/artemis/service/linkpreview/ogparser/htmlparser/OgMetaElementHtmlParser.java b/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/htmlparser/OgMetaElementHtmlParser.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/service/linkpreview/ogparser/htmlparser/OgMetaElementHtmlParser.java rename to src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/htmlparser/OgMetaElementHtmlParser.java index 17321fe75775..22540c9bc2b8 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/linkpreview/ogparser/htmlparser/OgMetaElementHtmlParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/htmlparser/OgMetaElementHtmlParser.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.linkpreview.ogparser.htmlparser; +package de.tum.cit.aet.artemis.service.linkpreview.ogparser.htmlparser; import java.io.IOException; import java.util.Collections; diff --git a/src/main/java/de/tum/in/www1/artemis/service/listeners/ResultListener.java b/src/main/java/de/tum/cit/aet/artemis/service/listeners/ResultListener.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/service/listeners/ResultListener.java rename to src/main/java/de/tum/cit/aet/artemis/service/listeners/ResultListener.java index 577a99c104bb..3527ad9b335c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/listeners/ResultListener.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/listeners/ResultListener.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.listeners; +package de.tum.cit.aet.artemis.service.listeners; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import jakarta.persistence.PostPersist; import jakarta.persistence.PostUpdate; @@ -11,13 +11,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.service.messaging.InstanceMessageSendService; -import de.tum.in.www1.artemis.service.scheduled.ParticipantScoreScheduleService; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; /** - * Listener for updates on {@link Result} entities to update the {@link de.tum.in.www1.artemis.domain.scores.ParticipantScore}. + * Listener for updates on {@link Result} entities to update the {@link de.tum.cit.aet.artemis.domain.scores.ParticipantScore}. * * @see ParticipantScoreScheduleService */ diff --git a/src/main/java/de/tum/in/www1/artemis/service/messaging/DistributedInstanceMessageSendService.java b/src/main/java/de/tum/cit/aet/artemis/service/messaging/DistributedInstanceMessageSendService.java similarity index 99% rename from src/main/java/de/tum/in/www1/artemis/service/messaging/DistributedInstanceMessageSendService.java rename to src/main/java/de/tum/cit/aet/artemis/service/messaging/DistributedInstanceMessageSendService.java index 1e6e89a28fd2..2b907df19023 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/messaging/DistributedInstanceMessageSendService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/messaging/DistributedInstanceMessageSendService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.messaging; +package de.tum.cit.aet.artemis.service.messaging; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; diff --git a/src/main/java/de/tum/in/www1/artemis/service/messaging/InstanceMessageReceiveService.java b/src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageReceiveService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/messaging/InstanceMessageReceiveService.java rename to src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageReceiveService.java index 339c19922c6a..92335abad655 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/messaging/InstanceMessageReceiveService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageReceiveService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.messaging; +package de.tum.cit.aet.artemis.service.messaging; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; import java.util.Optional; @@ -14,22 +14,22 @@ import com.hazelcast.core.HazelcastInstance; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.ModelingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.quiz.QuizScheduleService; -import de.tum.in.www1.artemis.service.scheduled.AthenaScheduleService; -import de.tum.in.www1.artemis.service.scheduled.ModelingExerciseScheduleService; -import de.tum.in.www1.artemis.service.scheduled.NotificationScheduleService; -import de.tum.in.www1.artemis.service.scheduled.ParticipantScoreScheduleService; -import de.tum.in.www1.artemis.service.scheduled.ProgrammingExerciseScheduleService; -import de.tum.in.www1.artemis.service.scheduled.UserScheduleService; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.quiz.QuizScheduleService; +import de.tum.cit.aet.artemis.service.scheduled.AthenaScheduleService; +import de.tum.cit.aet.artemis.service.scheduled.ModelingExerciseScheduleService; +import de.tum.cit.aet.artemis.service.scheduled.NotificationScheduleService; +import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; +import de.tum.cit.aet.artemis.service.scheduled.ProgrammingExerciseScheduleService; +import de.tum.cit.aet.artemis.service.scheduled.UserScheduleService; /** * This service is only available on a node with the 'scheduling' profile. diff --git a/src/main/java/de/tum/in/www1/artemis/service/messaging/InstanceMessageSendService.java b/src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageSendService.java similarity index 99% rename from src/main/java/de/tum/in/www1/artemis/service/messaging/InstanceMessageSendService.java rename to src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageSendService.java index 9fa5cb502d3f..aa5a1eee9baa 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/messaging/InstanceMessageSendService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageSendService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.messaging; +package de.tum.cit.aet.artemis.service.messaging; /** * This interface offers a service that will send messages to the node that runs the scheduling. diff --git a/src/main/java/de/tum/in/www1/artemis/service/messaging/MainInstanceMessageSendService.java b/src/main/java/de/tum/cit/aet/artemis/service/messaging/MainInstanceMessageSendService.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/service/messaging/MainInstanceMessageSendService.java rename to src/main/java/de/tum/cit/aet/artemis/service/messaging/MainInstanceMessageSendService.java index 4bc4a9678b66..8acf83d146a6 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/messaging/MainInstanceMessageSendService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/messaging/MainInstanceMessageSendService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.messaging; +package de.tum.cit.aet.artemis.service.messaging; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; diff --git a/src/main/java/de/tum/in/www1/artemis/service/messaging/MessageTopic.java b/src/main/java/de/tum/cit/aet/artemis/service/messaging/MessageTopic.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/service/messaging/MessageTopic.java rename to src/main/java/de/tum/cit/aet/artemis/service/messaging/MessageTopic.java index e926cb8c193f..3229b0aed8df 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/messaging/MessageTopic.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/messaging/MessageTopic.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.messaging; +package de.tum.cit.aet.artemis.service.messaging; /** * Topic identifiers for Hazelcast messages between instances. diff --git a/src/main/java/de/tum/in/www1/artemis/service/metis/AnswerMessageService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/AnswerMessageService.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/metis/AnswerMessageService.java rename to src/main/java/de/tum/cit/aet/artemis/service/metis/AnswerMessageService.java index 6e8f36b8fc63..83a803954a33 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/metis/AnswerMessageService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/AnswerMessageService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.metis; +package de.tum.cit.aet.artemis.service.metis; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Objects; @@ -10,32 +10,32 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.metis.AnswerPost; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.metis.conversation.Conversation; -import de.tum.in.www1.artemis.domain.notification.SingleUserNotification; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.AnswerPostRepository; -import de.tum.in.www1.artemis.repository.metis.ConversationMessageRepository; -import de.tum.in.www1.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.in.www1.artemis.repository.metis.PostRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ConversationRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; -import de.tum.in.www1.artemis.service.metis.conversation.ConversationService; -import de.tum.in.www1.artemis.service.metis.conversation.auth.ChannelAuthorizationService; -import de.tum.in.www1.artemis.service.notifications.SingleUserNotificationService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.websocket.dto.metis.MetisCrudAction; -import de.tum.in.www1.artemis.web.websocket.dto.metis.PostDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.metis.AnswerPost; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; +import de.tum.cit.aet.artemis.domain.notification.SingleUserNotification; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.AnswerPostRepository; +import de.tum.cit.aet.artemis.repository.metis.ConversationMessageRepository; +import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.repository.metis.PostRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ConversationRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; +import de.tum.cit.aet.artemis.service.metis.conversation.auth.ChannelAuthorizationService; +import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; +import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/metis/ConversationMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/ConversationMessagingService.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/metis/ConversationMessagingService.java rename to src/main/java/de/tum/cit/aet/artemis/service/metis/ConversationMessagingService.java index 4ff115936f8f..0904c218a696 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/metis/ConversationMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/ConversationMessagingService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.metis; +package de.tum.cit.aet.artemis.service.metis; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Comparator; @@ -26,42 +26,42 @@ import com.google.common.collect.Lists; -import de.tum.in.www1.artemis.domain.ConversationNotificationRecipientSummary; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.DisplayPriority; -import de.tum.in.www1.artemis.domain.enumeration.NotificationType; -import de.tum.in.www1.artemis.domain.metis.CreatedConversationMessage; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.metis.conversation.Conversation; -import de.tum.in.www1.artemis.domain.metis.conversation.GroupChat; -import de.tum.in.www1.artemis.domain.metis.conversation.OneToOneChat; -import de.tum.in.www1.artemis.domain.notification.ConversationNotification; -import de.tum.in.www1.artemis.domain.notification.NotificationConstants; -import de.tum.in.www1.artemis.domain.notification.SingleUserNotification; -import de.tum.in.www1.artemis.domain.notification.SingleUserNotificationFactory; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.SingleUserNotificationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.ConversationMessageRepository; -import de.tum.in.www1.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; -import de.tum.in.www1.artemis.service.metis.conversation.ConversationService; -import de.tum.in.www1.artemis.service.metis.conversation.auth.ChannelAuthorizationService; -import de.tum.in.www1.artemis.service.metis.similarity.PostSimilarityComparisonStrategy; -import de.tum.in.www1.artemis.service.notifications.ConversationNotificationService; -import de.tum.in.www1.artemis.service.notifications.GroupNotificationService; -import de.tum.in.www1.artemis.web.rest.dto.PostContextFilterDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.websocket.dto.metis.MetisCrudAction; -import de.tum.in.www1.artemis.web.websocket.dto.metis.PostDTO; +import de.tum.cit.aet.artemis.domain.ConversationNotificationRecipientSummary; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.domain.metis.CreatedConversationMessage; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; +import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; +import de.tum.cit.aet.artemis.domain.metis.conversation.OneToOneChat; +import de.tum.cit.aet.artemis.domain.notification.ConversationNotification; +import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; +import de.tum.cit.aet.artemis.domain.notification.SingleUserNotification; +import de.tum.cit.aet.artemis.domain.notification.SingleUserNotificationFactory; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.SingleUserNotificationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.ConversationMessageRepository; +import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; +import de.tum.cit.aet.artemis.service.metis.conversation.auth.ChannelAuthorizationService; +import de.tum.cit.aet.artemis.service.metis.similarity.PostSimilarityComparisonStrategy; +import de.tum.cit.aet.artemis.service.notifications.ConversationNotificationService; +import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; +import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; +import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/metis/PostingService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/PostingService.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/metis/PostingService.java rename to src/main/java/de/tum/cit/aet/artemis/service/metis/PostingService.java index 36a5bd4624bc..e6524cf855d7 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/metis/PostingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/PostingService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.metis; +package de.tum.cit.aet.artemis.service.metis; import java.util.HashMap; import java.util.HashSet; @@ -17,30 +17,30 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tum.in.www1.artemis.domain.ConversationNotificationRecipientSummary; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.in.www1.artemis.domain.metis.AnswerPost; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.metis.Posting; -import de.tum.in.www1.artemis.domain.metis.UserRole; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.metis.conversation.Conversation; -import de.tum.in.www1.artemis.domain.notification.ConversationNotification; -import de.tum.in.www1.artemis.domain.notification.Notification; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; -import de.tum.in.www1.artemis.service.dto.UserRoleDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.websocket.dto.metis.MetisCrudAction; -import de.tum.in.www1.artemis.web.websocket.dto.metis.PostDTO; +import de.tum.cit.aet.artemis.domain.ConversationNotificationRecipientSummary; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.domain.metis.AnswerPost; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.metis.Posting; +import de.tum.cit.aet.artemis.domain.metis.UserRole; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; +import de.tum.cit.aet.artemis.domain.notification.ConversationNotification; +import de.tum.cit.aet.artemis.domain.notification.Notification; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.service.dto.UserRoleDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; +import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; public abstract class PostingService { diff --git a/src/main/java/de/tum/in/www1/artemis/service/metis/ReactionService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/ReactionService.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/metis/ReactionService.java rename to src/main/java/de/tum/cit/aet/artemis/service/metis/ReactionService.java index 79962bd58f85..f9240f230fb4 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/metis/ReactionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/ReactionService.java @@ -1,30 +1,30 @@ -package de.tum.in.www1.artemis.service.metis; +package de.tum.cit.aet.artemis.service.metis; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Optional; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.metis.AnswerPost; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.metis.Posting; -import de.tum.in.www1.artemis.domain.metis.Reaction; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.AnswerPostRepository; -import de.tum.in.www1.artemis.repository.metis.PostRepository; -import de.tum.in.www1.artemis.repository.metis.ReactionRepository; -import de.tum.in.www1.artemis.service.metis.conversation.ConversationService; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismAnswerPostService; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismPostService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.websocket.dto.metis.MetisCrudAction; -import de.tum.in.www1.artemis.web.websocket.dto.metis.PostDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.metis.AnswerPost; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.metis.Posting; +import de.tum.cit.aet.artemis.domain.metis.Reaction; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.AnswerPostRepository; +import de.tum.cit.aet.artemis.repository.metis.PostRepository; +import de.tum.cit.aet.artemis.repository.metis.ReactionRepository; +import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; +import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismAnswerPostService; +import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismPostService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; +import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/metis/conversation/ChannelService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ChannelService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/metis/conversation/ChannelService.java rename to src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ChannelService.java index 080b229ab691..3abbf71cb091 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/metis/conversation/ChannelService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ChannelService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.metis.conversation; +package de.tum.cit.aet.artemis.service.metis.conversation; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.HashSet; import java.util.List; @@ -16,20 +16,20 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.metis.ConversationParticipant; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.in.www1.artemis.service.metis.conversation.errors.ChannelNameDuplicateException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.ChannelDTO; -import de.tum.in.www1.artemis.web.websocket.dto.metis.MetisCrudAction; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.service.metis.conversation.errors.ChannelNameDuplicateException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; +import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/metis/conversation/ConversationDTOService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationDTOService.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/metis/conversation/ConversationDTOService.java rename to src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationDTOService.java index 8005429740b5..d44ba8da3f84 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/metis/conversation/ConversationDTOService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationDTOService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.metis.conversation; +package de.tum.cit.aet.artemis.service.metis.conversation; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Optional; import java.util.Set; @@ -12,26 +12,26 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.metis.ConversationParticipant; -import de.tum.in.www1.artemis.domain.metis.ConversationParticipantSettingsView; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.metis.conversation.Conversation; -import de.tum.in.www1.artemis.domain.metis.conversation.ConversationSummary; -import de.tum.in.www1.artemis.domain.metis.conversation.GroupChat; -import de.tum.in.www1.artemis.domain.metis.conversation.OneToOneChat; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupRepository; -import de.tum.in.www1.artemis.service.dto.UserPublicInfoDTO; -import de.tum.in.www1.artemis.service.metis.conversation.auth.ChannelAuthorizationService; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.ChannelDTO; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.ConversationDTO; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.ConversationUserDTO; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.GroupChatDTO; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.OneToOneChatDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; +import de.tum.cit.aet.artemis.domain.metis.ConversationParticipantSettingsView; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; +import de.tum.cit.aet.artemis.domain.metis.conversation.ConversationSummary; +import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; +import de.tum.cit.aet.artemis.domain.metis.conversation.OneToOneChat; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRepository; +import de.tum.cit.aet.artemis.service.dto.UserPublicInfoDTO; +import de.tum.cit.aet.artemis.service.metis.conversation.auth.ChannelAuthorizationService; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ConversationDTO; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ConversationUserDTO; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.GroupChatDTO; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.OneToOneChatDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/metis/conversation/ConversationService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationService.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/metis/conversation/ConversationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationService.java index fcc75c920e2b..3c94910f9dd6 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/metis/conversation/ConversationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.metis.conversation; +package de.tum.cit.aet.artemis.service.metis.conversation; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -20,30 +20,30 @@ import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestBody; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.metis.ConversationParticipant; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.metis.conversation.Conversation; -import de.tum.in.www1.artemis.domain.metis.conversation.ConversationSummary; -import de.tum.in.www1.artemis.domain.metis.conversation.GeneralConversationInfo; -import de.tum.in.www1.artemis.domain.metis.conversation.GroupChat; -import de.tum.in.www1.artemis.domain.metis.conversation.UserConversationInfo; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.in.www1.artemis.repository.metis.PostRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ConversationRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.GroupChatRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.OneToOneChatRepository; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.ConversationDTO; -import de.tum.in.www1.artemis.web.websocket.dto.metis.ConversationWebsocketDTO; -import de.tum.in.www1.artemis.web.websocket.dto.metis.MetisCrudAction; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; +import de.tum.cit.aet.artemis.domain.metis.conversation.ConversationSummary; +import de.tum.cit.aet.artemis.domain.metis.conversation.GeneralConversationInfo; +import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; +import de.tum.cit.aet.artemis.domain.metis.conversation.UserConversationInfo; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.repository.metis.PostRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ConversationRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.GroupChatRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.OneToOneChatRepository; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ConversationDTO; +import de.tum.cit.aet.artemis.web.websocket.dto.metis.ConversationWebsocketDTO; +import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/metis/conversation/GroupChatService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/GroupChatService.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/service/metis/conversation/GroupChatService.java rename to src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/GroupChatService.java index 47676ceb545c..9093f7abd436 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/metis/conversation/GroupChatService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/GroupChatService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.metis.conversation; +package de.tum.cit.aet.artemis.service.metis.conversation; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Set; @@ -9,15 +9,15 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.metis.ConversationParticipant; -import de.tum.in.www1.artemis.domain.metis.conversation.GroupChat; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.GroupChatRepository; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.GroupChatDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; +import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.GroupChatRepository; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.GroupChatDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/metis/conversation/OneToOneChatService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/OneToOneChatService.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/service/metis/conversation/OneToOneChatService.java rename to src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/OneToOneChatService.java index 1c465a421346..9e88fa6fb009 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/metis/conversation/OneToOneChatService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/OneToOneChatService.java @@ -1,19 +1,19 @@ -package de.tum.in.www1.artemis.service.metis.conversation; +package de.tum.cit.aet.artemis.service.metis.conversation; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.metis.ConversationParticipant; -import de.tum.in.www1.artemis.domain.metis.conversation.OneToOneChat; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.OneToOneChatRepository; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; +import de.tum.cit.aet.artemis.domain.metis.conversation.OneToOneChat; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.OneToOneChatRepository; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/metis/conversation/auth/ChannelAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ChannelAuthorizationService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/metis/conversation/auth/ChannelAuthorizationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ChannelAuthorizationService.java index 148b087e5cd3..e0d1a9dd3d95 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/metis/conversation/auth/ChannelAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ChannelAuthorizationService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.metis.conversation.auth; +package de.tum.cit.aet.artemis.service.metis.conversation.auth; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.List; @@ -13,16 +13,16 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.metis.ConversationParticipantSettingsView; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.metis.ConversationParticipantSettingsView; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/metis/conversation/auth/ConversationAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ConversationAuthorizationService.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/service/metis/conversation/auth/ConversationAuthorizationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ConversationAuthorizationService.java index 11454cffc6ca..d6bfbf6248cb 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/metis/conversation/auth/ConversationAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ConversationAuthorizationService.java @@ -1,16 +1,16 @@ -package de.tum.in.www1.artemis.service.metis.conversation.auth; +package de.tum.cit.aet.artemis.service.metis.conversation.auth; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import jakarta.persistence.Persistence; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/metis/conversation/auth/GroupChatAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/GroupChatAuthorizationService.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/service/metis/conversation/auth/GroupChatAuthorizationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/GroupChatAuthorizationService.java index befea1df2c9d..d6d778684f15 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/metis/conversation/auth/GroupChatAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/GroupChatAuthorizationService.java @@ -1,22 +1,22 @@ -package de.tum.in.www1.artemis.service.metis.conversation.auth; +package de.tum.cit.aet.artemis.service.metis.conversation.auth; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.domain.metis.conversation.ConversationSettings.MAX_GROUP_CHATS_PER_USER_PER_COURSE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.domain.metis.conversation.ConversationSettings.MAX_GROUP_CHATS_PER_USER_PER_COURSE; import jakarta.validation.constraints.NotNull; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.metis.conversation.GroupChat; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.GroupChatRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.GroupChatRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/metis/conversation/auth/OneToOneChatAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/OneToOneChatAuthorizationService.java similarity index 73% rename from src/main/java/de/tum/in/www1/artemis/service/metis/conversation/auth/OneToOneChatAuthorizationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/OneToOneChatAuthorizationService.java index 031e8ca012e2..d9780f861d26 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/metis/conversation/auth/OneToOneChatAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/OneToOneChatAuthorizationService.java @@ -1,21 +1,21 @@ -package de.tum.in.www1.artemis.service.metis.conversation.auth; +package de.tum.cit.aet.artemis.service.metis.conversation.auth; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.domain.metis.conversation.ConversationSettings.MAX_ONE_TO_ONE_CHATS_PER_USER_PER_COURSE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.domain.metis.conversation.ConversationSettings.MAX_ONE_TO_ONE_CHATS_PER_USER_PER_COURSE; import jakarta.validation.constraints.NotNull; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.OneToOneChatRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.OneToOneChatRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/metis/conversation/errors/ChannelNameDuplicateException.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/errors/ChannelNameDuplicateException.java similarity index 78% rename from src/main/java/de/tum/in/www1/artemis/service/metis/conversation/errors/ChannelNameDuplicateException.java rename to src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/errors/ChannelNameDuplicateException.java index 0ed8f5e31de0..aa542428e1ad 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/metis/conversation/errors/ChannelNameDuplicateException.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/errors/ChannelNameDuplicateException.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.service.metis.conversation.errors; +package de.tum.cit.aet.artemis.service.metis.conversation.errors; -import static de.tum.in.www1.artemis.service.metis.conversation.ChannelService.CHANNEL_ENTITY_NAME; +import static de.tum.cit.aet.artemis.service.metis.conversation.ChannelService.CHANNEL_ENTITY_NAME; import java.io.Serial; import java.util.HashMap; import java.util.Map; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.ErrorConstants; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; public class ChannelNameDuplicateException extends BadRequestAlertException { diff --git a/src/main/java/de/tum/in/www1/artemis/service/metis/similarity/PostSimilarityComparisonStrategy.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/similarity/PostSimilarityComparisonStrategy.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/metis/similarity/PostSimilarityComparisonStrategy.java rename to src/main/java/de/tum/cit/aet/artemis/service/metis/similarity/PostSimilarityComparisonStrategy.java index f1c005567d11..c6e67c57bf6f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/metis/similarity/PostSimilarityComparisonStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/similarity/PostSimilarityComparisonStrategy.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.metis.similarity; +package de.tum.cit.aet.artemis.service.metis.similarity; -import de.tum.in.www1.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.metis.Post; /** * This interface offers a method that performs a similarity check on two posts that are compared to each other. diff --git a/src/main/java/de/tum/in/www1/artemis/service/metis/similarity/TitleJaccardSimilarityCompareStrategy.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/similarity/TitleJaccardSimilarityCompareStrategy.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/metis/similarity/TitleJaccardSimilarityCompareStrategy.java rename to src/main/java/de/tum/cit/aet/artemis/service/metis/similarity/TitleJaccardSimilarityCompareStrategy.java index 9d5ae30da588..b3ae2e6da5e9 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/metis/similarity/TitleJaccardSimilarityCompareStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/similarity/TitleJaccardSimilarityCompareStrategy.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.service.metis.similarity; +package de.tum.cit.aet.artemis.service.metis.similarity; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.apache.commons.text.similarity.JaccardSimilarity; import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.in.www1.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.metis.Post; /** * Implementation of a PostSimilarityComparisonStrategy to be used when searching for duplicates during post creation. diff --git a/src/main/java/de/tum/in/www1/artemis/service/metrics/LearningMetricsService.java b/src/main/java/de/tum/cit/aet/artemis/service/metrics/LearningMetricsService.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/metrics/LearningMetricsService.java rename to src/main/java/de/tum/cit/aet/artemis/service/metrics/LearningMetricsService.java index 4dad8f652b0a..d7910a5199fb 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/metrics/LearningMetricsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metrics/LearningMetricsService.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.metrics; +package de.tum.cit.aet.artemis.service.metrics; -import static de.tum.in.www1.artemis.config.Constants.MIN_SCORE_GREEN; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.service.util.TimeUtil.toRelativeTime; +import static de.tum.cit.aet.artemis.config.Constants.MIN_SCORE_GREEN; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.service.util.TimeUtil.toRelativeTime; import static java.util.function.Function.identity; import static java.util.stream.Collectors.averagingDouble; import static java.util.stream.Collectors.groupingBy; @@ -18,21 +18,21 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.repository.metrics.CompetencyMetricsRepository; -import de.tum.in.www1.artemis.repository.metrics.ExerciseMetricsRepository; -import de.tum.in.www1.artemis.repository.metrics.LectureUnitMetricsRepository; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyJolDTO; -import de.tum.in.www1.artemis.web.rest.dto.metrics.CompetencyInformationDTO; -import de.tum.in.www1.artemis.web.rest.dto.metrics.CompetencyProgressDTO; -import de.tum.in.www1.artemis.web.rest.dto.metrics.CompetencyStudentMetricsDTO; -import de.tum.in.www1.artemis.web.rest.dto.metrics.ExerciseInformationDTO; -import de.tum.in.www1.artemis.web.rest.dto.metrics.ExerciseStudentMetricsDTO; -import de.tum.in.www1.artemis.web.rest.dto.metrics.LectureUnitInformationDTO; -import de.tum.in.www1.artemis.web.rest.dto.metrics.LectureUnitStudentMetricsDTO; -import de.tum.in.www1.artemis.web.rest.dto.metrics.MapEntryLongLong; -import de.tum.in.www1.artemis.web.rest.dto.metrics.ResourceTimestampDTO; -import de.tum.in.www1.artemis.web.rest.dto.metrics.ScoreDTO; -import de.tum.in.www1.artemis.web.rest.dto.metrics.StudentMetricsDTO; +import de.tum.cit.aet.artemis.repository.metrics.CompetencyMetricsRepository; +import de.tum.cit.aet.artemis.repository.metrics.ExerciseMetricsRepository; +import de.tum.cit.aet.artemis.repository.metrics.LectureUnitMetricsRepository; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO; +import de.tum.cit.aet.artemis.web.rest.dto.metrics.CompetencyInformationDTO; +import de.tum.cit.aet.artemis.web.rest.dto.metrics.CompetencyProgressDTO; +import de.tum.cit.aet.artemis.web.rest.dto.metrics.CompetencyStudentMetricsDTO; +import de.tum.cit.aet.artemis.web.rest.dto.metrics.ExerciseInformationDTO; +import de.tum.cit.aet.artemis.web.rest.dto.metrics.ExerciseStudentMetricsDTO; +import de.tum.cit.aet.artemis.web.rest.dto.metrics.LectureUnitInformationDTO; +import de.tum.cit.aet.artemis.web.rest.dto.metrics.LectureUnitStudentMetricsDTO; +import de.tum.cit.aet.artemis.web.rest.dto.metrics.MapEntryLongLong; +import de.tum.cit.aet.artemis.web.rest.dto.metrics.ResourceTimestampDTO; +import de.tum.cit.aet.artemis.web.rest.dto.metrics.ScoreDTO; +import de.tum.cit.aet.artemis.web.rest.dto.metrics.StudentMetricsDTO; /** * Service class to access metrics regarding students' learning progress. diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/ConversationNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationService.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/service/notifications/ConversationNotificationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationService.java index 7cbea985507a..b9e8864ca4eb 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/notifications/ConversationNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationService.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.notifications; +package de.tum.cit.aet.artemis.service.notifications; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_MESSAGE; -import static de.tum.in.www1.artemis.domain.notification.ConversationNotificationFactory.createConversationMessageNotification; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.NEW_MESSAGE_CHANNEL_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.NEW_MESSAGE_DIRECT_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.NEW_MESSAGE_GROUP_CHAT_TEXT; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_MESSAGE; +import static de.tum.cit.aet.artemis.domain.notification.ConversationNotificationFactory.createConversationMessageNotification; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_MESSAGE_CHANNEL_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_MESSAGE_DIRECT_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_MESSAGE_GROUP_CHAT_TEXT; import java.util.Set; import java.util.stream.Collectors; @@ -13,19 +13,19 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.NotificationType; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.metis.conversation.Conversation; -import de.tum.in.www1.artemis.domain.metis.conversation.GroupChat; -import de.tum.in.www1.artemis.domain.notification.ConversationNotification; -import de.tum.in.www1.artemis.domain.notification.NotificationPlaceholderCreator; -import de.tum.in.www1.artemis.domain.notification.SingleUserNotification; -import de.tum.in.www1.artemis.domain.notification.SingleUserNotificationFactory; -import de.tum.in.www1.artemis.repository.SingleUserNotificationRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ConversationNotificationRepository; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; +import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; +import de.tum.cit.aet.artemis.domain.notification.ConversationNotification; +import de.tum.cit.aet.artemis.domain.notification.NotificationPlaceholderCreator; +import de.tum.cit.aet.artemis.domain.notification.SingleUserNotification; +import de.tum.cit.aet.artemis.domain.notification.SingleUserNotificationFactory; +import de.tum.cit.aet.artemis.repository.SingleUserNotificationRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ConversationNotificationRepository; /** * Service for sending notifications about new messages in conversations. diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/GeneralInstantNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationService.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/notifications/GeneralInstantNotificationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationService.java index 0596e3ca1e7b..54a4e0ccad5c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/notifications/GeneralInstantNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationService.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.notifications; +package de.tum.cit.aet.artemis.service.notifications; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsCommunicationChannel.EMAIL; -import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsCommunicationChannel.PUSH; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel.EMAIL; +import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel.PUSH; import java.util.Set; @@ -11,13 +11,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.NotificationType; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.notification.Notification; -import de.tum.in.www1.artemis.domain.notification.NotificationConstants; -import de.tum.in.www1.artemis.service.notifications.push_notifications.ApplePushNotificationService; -import de.tum.in.www1.artemis.service.notifications.push_notifications.FirebasePushNotificationService; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.notification.Notification; +import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; +import de.tum.cit.aet.artemis.service.notifications.push_notifications.ApplePushNotificationService; +import de.tum.cit.aet.artemis.service.notifications.push_notifications.FirebasePushNotificationService; /** * A Handler for InstantNotifications such as MailService and PushNotifications. diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/GroupNotificationScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationScheduleService.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/service/notifications/GroupNotificationScheduleService.java rename to src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationScheduleService.java index ac7f31bf8004..f99615161466 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/notifications/GroupNotificationScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationScheduleService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.notifications; +package de.tum.cit.aet.artemis.service.notifications; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; @@ -8,10 +8,10 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.ExerciseDateService; -import de.tum.in.www1.artemis.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.ExerciseDateService; +import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/GroupNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationService.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/notifications/GroupNotificationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationService.java index c4c0d8898009..a13f1b8d7dcb 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/notifications/GroupNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationService.java @@ -1,25 +1,25 @@ -package de.tum.in.www1.artemis.service.notifications; - -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.domain.enumeration.GroupNotificationType.EDITOR; -import static de.tum.in.www1.artemis.domain.enumeration.GroupNotificationType.INSTRUCTOR; -import static de.tum.in.www1.artemis.domain.enumeration.GroupNotificationType.STUDENT; -import static de.tum.in.www1.artemis.domain.enumeration.GroupNotificationType.TA; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.ATTACHMENT_CHANGE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.DUPLICATE_TEST_CASE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXERCISE_PRACTICE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXERCISE_RELEASED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXERCISE_UPDATED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.ILLEGAL_SUBMISSION; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_ANNOUNCEMENT_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_MANUAL_FEEDBACK_REQUEST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.PROGRAMMING_BUILD_RUN_UPDATE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.PROGRAMMING_REPOSITORY_LOCKS; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.PROGRAMMING_TEST_CASES_CHANGED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.QUIZ_EXERCISE_STARTED; -import static de.tum.in.www1.artemis.domain.notification.GroupNotificationFactory.createAnnouncementNotification; -import static de.tum.in.www1.artemis.domain.notification.GroupNotificationFactory.createNotification; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.LIVE_EXAM_EXERCISE_UPDATE_NOTIFICATION_TITLE; +package de.tum.cit.aet.artemis.service.notifications; + +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.EDITOR; +import static de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.INSTRUCTOR; +import static de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.STUDENT; +import static de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.TA; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.ATTACHMENT_CHANGE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DUPLICATE_TEST_CASE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_PRACTICE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_RELEASED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_UPDATED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.ILLEGAL_SUBMISSION; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_ANNOUNCEMENT_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_MANUAL_FEEDBACK_REQUEST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PROGRAMMING_BUILD_RUN_UPDATE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PROGRAMMING_REPOSITORY_LOCKS; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PROGRAMMING_TEST_CASES_CHANGED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.QUIZ_EXERCISE_STARTED; +import static de.tum.cit.aet.artemis.domain.notification.GroupNotificationFactory.createAnnouncementNotification; +import static de.tum.cit.aet.artemis.domain.notification.GroupNotificationFactory.createNotification; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.LIVE_EXAM_EXERCISE_UPDATE_NOTIFICATION_TITLE; import java.time.ZonedDateTime; import java.util.Collections; @@ -31,22 +31,22 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Attachment; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.GroupNotificationType; -import de.tum.in.www1.artemis.domain.enumeration.NotificationType; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.notification.GroupNotification; -import de.tum.in.www1.artemis.domain.notification.NotificationConstants; -import de.tum.in.www1.artemis.domain.notification.NotificationTarget; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.repository.GroupNotificationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.domain.Attachment; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.notification.GroupNotification; +import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; +import de.tum.cit.aet.artemis.domain.notification.NotificationTarget; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.repository.GroupNotificationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/InstantNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/InstantNotificationService.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/notifications/InstantNotificationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/notifications/InstantNotificationService.java index 530fe8a11698..c16da4c7526d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/notifications/InstantNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/InstantNotificationService.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.service.notifications; +package de.tum.cit.aet.artemis.service.notifications; import java.util.Set; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.notification.Notification; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.notification.Notification; /** * The Interface which should be used for InstantNotifications such as Mails and PushNotifications. diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/MailSendingService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailSendingService.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/notifications/MailSendingService.java rename to src/main/java/de/tum/cit/aet/artemis/service/notifications/MailSendingService.java index cbd120411614..ce1d2aa4c0f2 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/notifications/MailSendingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailSendingService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.notifications; +package de.tum.cit.aet.artemis.service.notifications; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.nio.charset.StandardCharsets; @@ -16,7 +16,7 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.User; import tech.jhipster.config.JHipsterProperties; /** diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/MailService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/notifications/MailService.java rename to src/main/java/de/tum/cit/aet/artemis/service/notifications/MailService.java index 85b626dff83e..ab41af662a19 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/notifications/MailService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailService.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.notifications; +package de.tum.cit.aet.artemis.service.notifications; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXERCISE_SUBMISSION_ASSESSED; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.extractNotificationUrl; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_SUBMISSION_ASSESSED; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.extractNotificationUrl; import java.net.URL; import java.util.Locale; @@ -18,17 +18,17 @@ import org.thymeleaf.context.Context; import org.thymeleaf.spring6.SpringTemplateEngine; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.DataExport; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.NotificationType; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.notification.Notification; -import de.tum.in.www1.artemis.domain.notification.NotificationConstants; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.in.www1.artemis.service.TimeService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.DataExport; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.notification.Notification; +import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.service.TimeService; /** * Service for preparing and sending emails. diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/NotificationSettingsCommunicationChannel.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsCommunicationChannel.java similarity index 77% rename from src/main/java/de/tum/in/www1/artemis/service/notifications/NotificationSettingsCommunicationChannel.java rename to src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsCommunicationChannel.java index 86786cbb824a..08b869d690b5 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/notifications/NotificationSettingsCommunicationChannel.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsCommunicationChannel.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.notifications; +package de.tum.cit.aet.artemis.service.notifications; /** * Enumeration for the communication channels used in the notification system and settings diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/NotificationSettingsService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsService.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/notifications/NotificationSettingsService.java rename to src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsService.java index c2ea32679fb8..5423d68df82c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/notifications/NotificationSettingsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsService.java @@ -1,48 +1,48 @@ -package de.tum.in.www1.artemis.service.notifications; - -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.ATTACHMENT_CHANGE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_CHANNEL; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_GROUP_CHAT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_CREATE_GROUP_CHAT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_CREATE_ONE_TO_ONE_CHAT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_MESSAGE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_REPLY_MESSAGE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_REMOVE_USER_CHANNEL; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_REMOVE_USER_GROUP_CHAT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_USER_MENTIONED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_STARTED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.DATA_EXPORT_CREATED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.DATA_EXPORT_FAILED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.DUPLICATE_TEST_CASE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_STARTED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXERCISE_PRACTICE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXERCISE_RELEASED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXERCISE_SUBMISSION_ASSESSED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.FILE_SUBMISSION_SUCCESSFUL; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_ANNOUNCEMENT_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_COURSE_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_CPC_PLAGIARISM_CASE_STUDENT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_EXAM_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_EXERCISE_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_LECTURE_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_PLAGIARISM_CASE_STUDENT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_COURSE_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_EXERCISE_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_LECTURE_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.PLAGIARISM_CASE_VERDICT_STUDENT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.PROGRAMMING_TEST_CASES_CHANGED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.QUIZ_EXERCISE_STARTED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_ASSIGNED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DELETED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_STUDENT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_TUTOR; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_MULTIPLE_REGISTRATION_TUTOR; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_STUDENT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_TUTOR; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UNASSIGNED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UPDATED; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.findCorrespondingNotificationType; +package de.tum.cit.aet.artemis.service.notifications; + +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.ATTACHMENT_CHANGE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_CHANNEL; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_GROUP_CHAT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_CREATE_GROUP_CHAT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_CREATE_ONE_TO_ONE_CHAT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_MESSAGE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_REPLY_MESSAGE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_REMOVE_USER_CHANNEL; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_REMOVE_USER_GROUP_CHAT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_USER_MENTIONED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_STARTED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DATA_EXPORT_CREATED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DATA_EXPORT_FAILED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DUPLICATE_TEST_CASE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_STARTED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_PRACTICE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_RELEASED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_SUBMISSION_ASSESSED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.FILE_SUBMISSION_SUCCESSFUL; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_ANNOUNCEMENT_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_COURSE_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_CPC_PLAGIARISM_CASE_STUDENT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_EXAM_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_EXERCISE_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_LECTURE_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_PLAGIARISM_CASE_STUDENT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_COURSE_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_EXERCISE_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_LECTURE_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PLAGIARISM_CASE_VERDICT_STUDENT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PROGRAMMING_TEST_CASES_CHANGED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.QUIZ_EXERCISE_STARTED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_ASSIGNED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DELETED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_STUDENT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_MULTIPLE_REGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_STUDENT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UNASSIGNED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UPDATED; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.findCorrespondingNotificationType; import java.util.Arrays; import java.util.HashMap; @@ -54,13 +54,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.NotificationSetting; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.NotificationType; -import de.tum.in.www1.artemis.domain.notification.Notification; -import de.tum.in.www1.artemis.domain.notification.NotificationConstants; -import de.tum.in.www1.artemis.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.NotificationSetting; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.domain.notification.Notification; +import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; +import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/SingleUserNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/SingleUserNotificationService.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/notifications/SingleUserNotificationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/notifications/SingleUserNotificationService.java index 7680c6c30c78..d7f3548e14ed 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/notifications/SingleUserNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/SingleUserNotificationService.java @@ -1,42 +1,42 @@ -package de.tum.in.www1.artemis.service.notifications; - -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_REPLY_MESSAGE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_USER_MENTIONED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.DATA_EXPORT_CREATED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.DATA_EXPORT_FAILED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXERCISE_SUBMISSION_ASSESSED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.FILE_SUBMISSION_SUCCESSFUL; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_CPC_PLAGIARISM_CASE_STUDENT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_PLAGIARISM_CASE_STUDENT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_COURSE_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_EXAM_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_EXERCISE_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_LECTURE_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.PLAGIARISM_CASE_VERDICT_STUDENT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_ASSIGNED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_STUDENT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_TUTOR; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_MULTIPLE_REGISTRATION_TUTOR; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_STUDENT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_TUTOR; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UNASSIGNED; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_CHANNEL_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_GROUP_CHAT_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.CONVERSATION_CREATE_GROUP_CHAT_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.CONVERSATION_CREATE_ONE_TO_ONE_CHAT_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.CONVERSATION_DELETE_CHANNEL_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.CONVERSATION_REMOVE_USER_CHANNEL_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.CONVERSATION_REMOVE_USER_GROUP_CHAT_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.MENTIONED_IN_MESSAGE_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.MESSAGE_REPLY_IN_CONVERSATION_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.NEW_REPLY_FOR_COURSE_POST_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.NEW_REPLY_FOR_EXAM_POST_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.NEW_REPLY_FOR_EXERCISE_POST_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.NEW_REPLY_FOR_LECTURE_POST_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.findCorrespondingNotificationTitleOrThrow; -import static de.tum.in.www1.artemis.domain.notification.SingleUserNotificationFactory.createNotification; -import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsCommunicationChannel.WEBAPP; +package de.tum.cit.aet.artemis.service.notifications; + +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_REPLY_MESSAGE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_USER_MENTIONED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DATA_EXPORT_CREATED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DATA_EXPORT_FAILED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_SUBMISSION_ASSESSED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.FILE_SUBMISSION_SUCCESSFUL; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_CPC_PLAGIARISM_CASE_STUDENT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_PLAGIARISM_CASE_STUDENT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_COURSE_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_EXAM_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_EXERCISE_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_LECTURE_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PLAGIARISM_CASE_VERDICT_STUDENT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_ASSIGNED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_STUDENT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_MULTIPLE_REGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_STUDENT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UNASSIGNED; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_CHANNEL_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_GROUP_CHAT_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_CREATE_GROUP_CHAT_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_CREATE_ONE_TO_ONE_CHAT_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_DELETE_CHANNEL_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_REMOVE_USER_CHANNEL_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_REMOVE_USER_GROUP_CHAT_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.MENTIONED_IN_MESSAGE_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.MESSAGE_REPLY_IN_CONVERSATION_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_REPLY_FOR_COURSE_POST_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_REPLY_FOR_EXAM_POST_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_REPLY_FOR_EXERCISE_POST_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_REPLY_FOR_LECTURE_POST_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.findCorrespondingNotificationTitleOrThrow; +import static de.tum.cit.aet.artemis.domain.notification.SingleUserNotificationFactory.createNotification; +import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel.WEBAPP; import java.util.Objects; import java.util.Set; @@ -47,31 +47,31 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.DataExport; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.NotificationType; -import de.tum.in.www1.artemis.domain.metis.AnswerPost; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.metis.conversation.Conversation; -import de.tum.in.www1.artemis.domain.notification.NotificationConstants; -import de.tum.in.www1.artemis.domain.notification.SingleUserNotification; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.in.www1.artemis.repository.SingleUserNotificationRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.ConversationMessageRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ExerciseDateService; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; -import de.tum.in.www1.artemis.service.metis.conversation.ConversationService; +import de.tum.cit.aet.artemis.domain.DataExport; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.domain.metis.AnswerPost; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; +import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; +import de.tum.cit.aet.artemis.domain.notification.SingleUserNotification; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.repository.SingleUserNotificationRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.ConversationMessageRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ExerciseDateService; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/TutorialGroupNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationService.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/service/notifications/TutorialGroupNotificationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationService.java index 770516d3bff4..743588abb107 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/notifications/TutorialGroupNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationService.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.service.notifications; +package de.tum.cit.aet.artemis.service.notifications; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DELETED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UPDATED; -import static de.tum.in.www1.artemis.domain.notification.TutorialGroupNotificationFactory.createTutorialGroupNotification; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DELETED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UPDATED; +import static de.tum.cit.aet.artemis.domain.notification.TutorialGroupNotificationFactory.createTutorialGroupNotification; import java.util.Set; import java.util.stream.Collectors; @@ -13,14 +13,14 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; -import de.tum.in.www1.artemis.domain.notification.TutorialGroupNotification; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupRegistration; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupNotificationRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupRegistrationRepository; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; +import de.tum.cit.aet.artemis.domain.notification.TutorialGroupNotification; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupRegistration; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupNotificationRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRegistrationRepository; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/push_notifications/ApplePushNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/ApplePushNotificationService.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/notifications/push_notifications/ApplePushNotificationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/ApplePushNotificationService.java index 3136e9ae016d..b0a0ba204f3b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/notifications/push_notifications/ApplePushNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/ApplePushNotificationService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.notifications.push_notifications; +package de.tum.cit.aet.artemis.service.notifications.push_notifications; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Optional; @@ -13,8 +13,8 @@ import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; -import de.tum.in.www1.artemis.domain.push_notification.PushNotificationDeviceType; -import de.tum.in.www1.artemis.repository.PushNotificationDeviceConfigurationRepository; +import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceType; +import de.tum.cit.aet.artemis.repository.PushNotificationDeviceConfigurationRepository; /** * Handles the sending of iOS Notifications to the Relay Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/push_notifications/FirebasePushNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/FirebasePushNotificationService.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/notifications/push_notifications/FirebasePushNotificationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/FirebasePushNotificationService.java index 3052f5ee84d3..05545486955f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/notifications/push_notifications/FirebasePushNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/FirebasePushNotificationService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.notifications.push_notifications; +package de.tum.cit.aet.artemis.service.notifications.push_notifications; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Optional; @@ -17,8 +17,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.google.common.collect.Lists; -import de.tum.in.www1.artemis.domain.push_notification.PushNotificationDeviceType; -import de.tum.in.www1.artemis.repository.PushNotificationDeviceConfigurationRepository; +import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceType; +import de.tum.cit.aet.artemis.repository.PushNotificationDeviceConfigurationRepository; /** * Handles the sending of Android Notifications to the Relay Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/push_notifications/FirebaseRelayNotificationRequests.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/FirebaseRelayNotificationRequests.java similarity index 67% rename from src/main/java/de/tum/in/www1/artemis/service/notifications/push_notifications/FirebaseRelayNotificationRequests.java rename to src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/FirebaseRelayNotificationRequests.java index d4a7e40a8bb6..867b29a80893 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/notifications/push_notifications/FirebaseRelayNotificationRequests.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/FirebaseRelayNotificationRequests.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.notifications.push_notifications; +package de.tum.cit.aet.artemis.service.notifications.push_notifications; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/push_notifications/PushNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/PushNotificationService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/notifications/push_notifications/PushNotificationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/PushNotificationService.java index 945ea3d59166..f99dc78a16c3 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/notifications/push_notifications/PushNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/PushNotificationService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.notifications.push_notifications; +package de.tum.cit.aet.artemis.service.notifications.push_notifications; import java.nio.charset.StandardCharsets; import java.security.InvalidAlgorithmParameterException; @@ -37,15 +37,15 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.NotificationType; -import de.tum.in.www1.artemis.domain.notification.Notification; -import de.tum.in.www1.artemis.domain.notification.NotificationConstants; -import de.tum.in.www1.artemis.domain.push_notification.PushNotificationDeviceConfiguration; -import de.tum.in.www1.artemis.domain.push_notification.PushNotificationDeviceType; -import de.tum.in.www1.artemis.repository.PushNotificationDeviceConfigurationRepository; -import de.tum.in.www1.artemis.service.notifications.InstantNotificationService; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.domain.notification.Notification; +import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; +import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfiguration; +import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceType; +import de.tum.cit.aet.artemis.repository.PushNotificationDeviceConfigurationRepository; +import de.tum.cit.aet.artemis.service.notifications.InstantNotificationService; /** * Wraps the sending of iOS and Android Notifications to the Relay Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/push_notifications/RelayNotificationRequest.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/RelayNotificationRequest.java similarity index 65% rename from src/main/java/de/tum/in/www1/artemis/service/notifications/push_notifications/RelayNotificationRequest.java rename to src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/RelayNotificationRequest.java index b842db1f7b3e..926033b0e813 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/notifications/push_notifications/RelayNotificationRequest.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/RelayNotificationRequest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.notifications.push_notifications; +package de.tum.cit.aet.artemis.service.notifications.push_notifications; public record RelayNotificationRequest(String initializationVector, String payloadCipherText, String token) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/service/package-info.java b/src/main/java/de/tum/cit/aet/artemis/service/package-info.java new file mode 100644 index 000000000000..ec59da99736b --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/service/package-info.java @@ -0,0 +1,4 @@ +/** + * Service layer beans. + */ +package de.tum.cit.aet.artemis.service; diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlPostContentProvider.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlPostContentProvider.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlPostContentProvider.java rename to src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlPostContentProvider.java index 606444ee02c6..48a70a9f6af8 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlPostContentProvider.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlPostContentProvider.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.plagiarism; +package de.tum.cit.aet.artemis.service.plagiarism; import java.util.Locale; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; public class ContinuousPlagiarismControlPostContentProvider { diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlService.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java rename to src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlService.java index 64cbbcf9faad..9ea8f47548ed 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.plagiarism; +package de.tum.cit.aet.artemis.service.plagiarism; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; import java.time.ZonedDateTime; import java.util.Set; @@ -13,23 +13,23 @@ import org.springframework.stereotype.Service; import de.jplag.exceptions.ExitException; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.enumeration.DisplayPriority; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismResult; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismStatus; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmissionElement; -import de.tum.in.www1.artemis.exception.ArtemisMailException; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismComparisonRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismResultRepository; -import de.tum.in.www1.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismResult; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmissionElement; +import de.tum.cit.aet.artemis.exception.ArtemisMailException; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.service.util.TimeLogUtil; /** * Manages continuous plagiarism control. diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ModelingPlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ModelingPlagiarismDetectionService.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/plagiarism/ModelingPlagiarismDetectionService.java rename to src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ModelingPlagiarismDetectionService.java index 6b931d893098..7de4fdd78172 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ModelingPlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ModelingPlagiarismDetectionService.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.plagiarism; +package de.tum.cit.aet.artemis.service.plagiarism; import static com.google.gson.JsonParser.parseString; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.service.plagiarism.PlagiarismService.hasMinimumScore; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.service.plagiarism.PlagiarismService.hasMinimumScore; import java.io.IOException; import java.util.ArrayList; @@ -19,18 +19,18 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.PlagiarismCheckState; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; -import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingSubmissionElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; -import de.tum.in.www1.artemis.service.plagiarism.cache.PlagiarismCacheService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.PlagiarismCheckState; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; +import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; +import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingSubmissionElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.service.plagiarism.cache.PlagiarismCacheService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismAnswerPostService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismAnswerPostService.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismAnswerPostService.java rename to src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismAnswerPostService.java index 4d6b9ccad37a..a5639a3ee6d3 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismAnswerPostService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismAnswerPostService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.plagiarism; +package de.tum.cit.aet.artemis.service.plagiarism; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Objects; @@ -8,25 +8,25 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.metis.AnswerPost; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.AnswerPostRepository; -import de.tum.in.www1.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.in.www1.artemis.repository.metis.PostRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; -import de.tum.in.www1.artemis.service.metis.PostingService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.websocket.dto.metis.MetisCrudAction; -import de.tum.in.www1.artemis.web.websocket.dto.metis.PostDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.metis.AnswerPost; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.AnswerPostRepository; +import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.repository.metis.PostRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.service.metis.PostingService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; +import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismCaseService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismCaseService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismCaseService.java rename to src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismCaseService.java index 2cae05c668da..4bf8b92f3e88 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismCaseService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.plagiarism; +package de.tum.cit.aet.artemis.service.plagiarism; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Collection; @@ -12,19 +12,19 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismComparisonRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismSubmissionRepository; -import de.tum.in.www1.artemis.service.notifications.SingleUserNotificationService; -import de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; -import de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismVerdictDTO; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismSubmissionRepository; +import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; +import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; +import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismVerdictDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java rename to src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java index cbf46602b079..d1d518cf846d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.plagiarism; +package de.tum.cit.aet.artemis.service.plagiarism; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.jpa.repository.JpaRepository; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismDetectionConfig; /** * A config class containing logic for filling missing PlagiarismDetectionConfig for exercises created before deployment of the cpc. diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionService.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionService.java rename to src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionService.java index fea83393c28e..6b6dd36ad2c1 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.plagiarism; +package de.tum.cit.aet.artemis.service.plagiarism; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.File; import java.io.IOException; @@ -13,14 +13,14 @@ import org.springframework.stereotype.Service; import de.jplag.exceptions.ExitException; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismResult; -import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; -import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismResultRepository; -import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeatureService; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismResult; +import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; +import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeatureService; /** * Service for triggering plagiarism checks. diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismPostService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismPostService.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismPostService.java rename to src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismPostService.java index d10ed5caca7e..5770f0773da0 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismPostService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismPostService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.plagiarism; +package de.tum.cit.aet.artemis.service.plagiarism; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.List; @@ -9,27 +9,27 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.DisplayPriority; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.in.www1.artemis.repository.metis.PostRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; -import de.tum.in.www1.artemis.service.metis.PostingService; -import de.tum.in.www1.artemis.web.rest.dto.PostContextFilterDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.websocket.dto.metis.MetisCrudAction; -import de.tum.in.www1.artemis.web.websocket.dto.metis.PostDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.repository.metis.PostRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.service.metis.PostingService; +import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; +import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismService.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismService.java rename to src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismService.java index 546f873d8210..ff838d90de93 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.plagiarism; +package de.tum.cit.aet.artemis.service.plagiarism; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static java.util.function.Predicate.isEqual; import static java.util.function.Predicate.not; @@ -15,19 +15,19 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismStatus; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismComparisonRepository; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ExerciseDateService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ExerciseDateService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismWebsocketService.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismWebsocketService.java rename to src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismWebsocketService.java index f4010310cf72..adf7201fe69d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismWebsocketService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.plagiarism; +package de.tum.cit.aet.artemis.service.plagiarism; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.IOException; import java.util.HashMap; @@ -14,8 +14,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.PlagiarismCheckState; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.domain.PlagiarismCheckState; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingLanguageNotSupportedForPlagiarismDetectionException.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingLanguageNotSupportedForPlagiarismDetectionException.java similarity index 73% rename from src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingLanguageNotSupportedForPlagiarismDetectionException.java rename to src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingLanguageNotSupportedForPlagiarismDetectionException.java index 756feb454337..ee8e588f551c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingLanguageNotSupportedForPlagiarismDetectionException.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingLanguageNotSupportedForPlagiarismDetectionException.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.plagiarism; +package de.tum.cit.aet.artemis.service.plagiarism; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; public class ProgrammingLanguageNotSupportedForPlagiarismDetectionException extends Exception { diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java rename to src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java index 68d63b1f49e7..4471692a66f7 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.plagiarism; +package de.tum.cit.aet.artemis.service.plagiarism; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.service.plagiarism.PlagiarismService.filterParticipationMinimumScore; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.service.plagiarism.PlagiarismService.filterParticipationMinimumScore; import java.io.File; import java.io.IOException; @@ -37,23 +37,23 @@ import de.jplag.python3.PythonLanguage; import de.jplag.reporting.reportobject.ReportObjectFactory; import de.jplag.swift.SwiftLanguage; -import de.tum.in.www1.artemis.domain.PlagiarismCheckState; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult; -import de.tum.in.www1.artemis.exception.GitException; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.UriService; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.export.ProgrammingExerciseExportService; -import de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseGitDiffReportService; -import de.tum.in.www1.artemis.service.plagiarism.cache.PlagiarismCacheService; -import de.tum.in.www1.artemis.service.util.TimeLogUtil; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.PlagiarismCheckState; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.exception.GitException; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.UriService; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.export.ProgrammingExerciseExportService; +import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseGitDiffReportService; +import de.tum.cit.aet.artemis.service.plagiarism.cache.PlagiarismCacheService; +import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/TextPlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/TextPlagiarismDetectionService.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/plagiarism/TextPlagiarismDetectionService.java rename to src/main/java/de/tum/cit/aet/artemis/service/plagiarism/TextPlagiarismDetectionService.java index 8dc8cf991cd8..d85434050163 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/TextPlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/TextPlagiarismDetectionService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.plagiarism; +package de.tum.cit.aet.artemis.service.plagiarism; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.service.plagiarism.PlagiarismService.hasMinimumScore; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.service.plagiarism.PlagiarismService.hasMinimumScore; import java.io.File; import java.io.IOException; @@ -24,16 +24,16 @@ import de.jplag.exceptions.ExitException; import de.jplag.options.JPlagOptions; import de.jplag.text.NaturalLanguage; -import de.tum.in.www1.artemis.domain.PlagiarismCheckState; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult; -import de.tum.in.www1.artemis.service.export.TextSubmissionExportService; -import de.tum.in.www1.artemis.service.plagiarism.cache.PlagiarismCacheService; -import de.tum.in.www1.artemis.service.util.TimeLogUtil; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.PlagiarismCheckState; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.service.export.TextSubmissionExportService; +import de.tum.cit.aet.artemis.service.plagiarism.cache.PlagiarismCacheService; +import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/cache/PlagiarismCacheService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/cache/PlagiarismCacheService.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/plagiarism/cache/PlagiarismCacheService.java rename to src/main/java/de/tum/cit/aet/artemis/service/plagiarism/cache/PlagiarismCacheService.java index 97da6c76dfb9..0edd9e57262d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/cache/PlagiarismCacheService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/cache/PlagiarismCacheService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.plagiarism.cache; +package de.tum.cit.aet.artemis.service.plagiarism.cache; -import static de.tum.in.www1.artemis.config.Constants.HAZELCAST_ACTIVE_PLAGIARISM_CHECKS_PER_COURSE_CACHE; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.HAZELCAST_ACTIVE_PLAGIARISM_CHECKS_PER_COURSE_CACHE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/AuxiliaryRepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/AuxiliaryRepositoryService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/programming/AuxiliaryRepositoryService.java rename to src/main/java/de/tum/cit/aet/artemis/service/programming/AuxiliaryRepositoryService.java index 21de5410e181..3a8c23f91f2b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/AuxiliaryRepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/AuxiliaryRepositoryService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.programming; +package de.tum.cit.aet.artemis.service.programming; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.List; @@ -12,14 +12,14 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.AuxiliaryRepository; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.repository.AuxiliaryRepositoryRepository; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.programming.ProgrammingExerciseResourceErrorKeys; +import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.repository.AuxiliaryRepositoryRepository; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.programming.ProgrammingExerciseResourceErrorKeys; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/CommitHistoryService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/CommitHistoryService.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/programming/CommitHistoryService.java rename to src/main/java/de/tum/cit/aet/artemis/service/programming/CommitHistoryService.java index 5825ca4df4b3..2128b138d991 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/CommitHistoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/CommitHistoryService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.programming; +package de.tum.cit.aet.artemis.service.programming; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -18,13 +18,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; -import de.tum.in.www1.artemis.service.ProfileService; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.web.rest.GitDiffReportParserService; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; +import de.tum.cit.aet.artemis.service.ProfileService; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.web.rest.GitDiffReportParserService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/DefaultTemplateUpgradeService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/DefaultTemplateUpgradeService.java similarity index 65% rename from src/main/java/de/tum/in/www1/artemis/service/programming/DefaultTemplateUpgradeService.java rename to src/main/java/de/tum/cit/aet/artemis/service/programming/DefaultTemplateUpgradeService.java index 7452001fc5c0..5d0beb2eb173 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/DefaultTemplateUpgradeService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/DefaultTemplateUpgradeService.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.programming; +package de.tum.cit.aet.artemis.service.programming; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/JavaTemplateUpgradeService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/JavaTemplateUpgradeService.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/service/programming/JavaTemplateUpgradeService.java rename to src/main/java/de/tum/cit/aet/artemis/service/programming/JavaTemplateUpgradeService.java index a4ea308c262a..e5e9c74b0f8c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/JavaTemplateUpgradeService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/JavaTemplateUpgradeService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.programming; +package de.tum.cit.aet.artemis.service.programming; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -28,14 +28,14 @@ import org.springframework.core.io.Resource; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.File; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.ResourceLoaderService; -import de.tum.in.www1.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.domain.File; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.ResourceLoaderService; +import de.tum.cit.aet.artemis.service.connectors.GitService; /** * Service for upgrading of Java template files diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingAssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingAssessmentService.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingAssessmentService.java rename to src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingAssessmentService.java index e39e2ebfcd03..5af1bd35c669 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingAssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingAssessmentService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.programming; +package de.tum.cit.aet.artemis.service.programming; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.List; @@ -9,32 +9,32 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.AssessmentNote; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.ComplaintRepository; -import de.tum.in.www1.artemis.repository.FeedbackRepository; -import de.tum.in.www1.artemis.repository.GradingCriterionRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.AssessmentService; -import de.tum.in.www1.artemis.service.ComplaintResponseService; -import de.tum.in.www1.artemis.service.ExerciseDateService; -import de.tum.in.www1.artemis.service.ResultService; -import de.tum.in.www1.artemis.service.SubmissionService; -import de.tum.in.www1.artemis.service.connectors.athena.AthenaFeedbackSendingService; -import de.tum.in.www1.artemis.service.connectors.lti.LtiNewResultService; -import de.tum.in.www1.artemis.service.exam.ExamDateService; -import de.tum.in.www1.artemis.service.notifications.SingleUserNotificationService; -import de.tum.in.www1.artemis.web.websocket.ResultWebsocketService; +import de.tum.cit.aet.artemis.domain.AssessmentNote; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.AssessmentService; +import de.tum.cit.aet.artemis.service.ComplaintResponseService; +import de.tum.cit.aet.artemis.service.ExerciseDateService; +import de.tum.cit.aet.artemis.service.ResultService; +import de.tum.cit.aet.artemis.service.SubmissionService; +import de.tum.cit.aet.artemis.service.connectors.athena.AthenaFeedbackSendingService; +import de.tum.cit.aet.artemis.service.connectors.lti.LtiNewResultService; +import de.tum.cit.aet.artemis.service.exam.ExamDateService; +import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; +import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseCodeReviewFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseCodeReviewFeedbackService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseCodeReviewFeedbackService.java rename to src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseCodeReviewFeedbackService.java index b4bb5ed5fcd6..eec47af35150 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseCodeReviewFeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseCodeReviewFeedbackService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.programming; +package de.tum.cit.aet.artemis.service.programming; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static java.time.ZonedDateTime.now; import java.time.ZonedDateTime; @@ -14,20 +14,20 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.service.ResultService; -import de.tum.in.www1.artemis.service.SubmissionService; -import de.tum.in.www1.artemis.service.connectors.athena.AthenaFeedbackSuggestionsService; -import de.tum.in.www1.artemis.service.notifications.GroupNotificationService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.service.ResultService; +import de.tum.cit.aet.artemis.service.SubmissionService; +import de.tum.cit.aet.artemis.service.connectors.athena.AthenaFeedbackSuggestionsService; +import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; /** * Service class for managing code review feedback on programming exercises. diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseFeedbackCreationService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationService.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseFeedbackCreationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationService.java index 82ac64ede684..4c2e886611f7 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseFeedbackCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.programming; +package de.tum.cit.aet.artemis.service.programming; -import static de.tum.in.www1.artemis.config.Constants.FEEDBACK_DETAIL_TEXT_DATABASE_MAX_LENGTH; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.FEEDBACK_DETAIL_TEXT_DATABASE_MAX_LENGTH; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.Arrays; @@ -27,28 +27,28 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.config.StaticCodeAnalysisConfigurer; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.StaticCodeAnalysisCategory; -import de.tum.in.www1.artemis.domain.StaticCodeAnalysisDefaultCategory; -import de.tum.in.www1.artemis.domain.enumeration.CategoryState; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.StaticCodeAnalysisTool; -import de.tum.in.www1.artemis.domain.enumeration.Visibility; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTestCaseType; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.StaticCodeAnalysisCategoryRepository; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; -import de.tum.in.www1.artemis.service.dto.AbstractBuildResultNotificationDTO; -import de.tum.in.www1.artemis.service.dto.StaticCodeAnalysisIssue; -import de.tum.in.www1.artemis.service.dto.StaticCodeAnalysisReportDTO; -import de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseTaskService; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.config.StaticCodeAnalysisConfigurer; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisCategory; +import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisDefaultCategory; +import de.tum.cit.aet.artemis.domain.enumeration.CategoryState; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTestCaseType; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.StaticCodeAnalysisCategoryRepository; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; +import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; +import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; +import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; /** * Service for creating feedback for programming exercises. diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseGradingService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseGradingService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseGradingService.java rename to src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseGradingService.java index af1e9e150a89..cef7a2ed7fcc 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseGradingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseGradingService.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.programming; +package de.tum.cit.aet.artemis.service.programming; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.config.Constants.TEST_CASES_DUPLICATE_NOTIFICATION; -import static de.tum.in.www1.artemis.domain.ProgrammingSubmission.createFallbackSubmission; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.TEST_CASES_DUPLICATE_NOTIFICATION; +import static de.tum.cit.aet.artemis.domain.ProgrammingSubmission.createFallbackSubmission; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -30,49 +30,49 @@ import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.StaticCodeAnalysisCategory; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.CategoryState; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.submissionpolicy.LockRepositoryPolicy; -import de.tum.in.www1.artemis.domain.submissionpolicy.SubmissionPenaltyPolicy; -import de.tum.in.www1.artemis.domain.submissionpolicy.SubmissionPolicy; -import de.tum.in.www1.artemis.exception.ContinuousIntegrationException; -import de.tum.in.www1.artemis.exception.VersionControlException; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.repository.StaticCodeAnalysisCategoryRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.TemplateProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.service.BuildLogEntryService; -import de.tum.in.www1.artemis.service.ExerciseDateService; -import de.tum.in.www1.artemis.service.FeedbackService; -import de.tum.in.www1.artemis.service.ResultService; -import de.tum.in.www1.artemis.service.SubmissionPolicyService; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationResultService; -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlService; -import de.tum.in.www1.artemis.service.dto.AbstractBuildResultNotificationDTO; -import de.tum.in.www1.artemis.service.notifications.GroupNotificationService; -import de.tum.in.www1.artemis.web.rest.dto.ProgrammingExerciseGradingStatisticsDTO; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisCategory; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.CategoryState; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; +import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPenaltyPolicy; +import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.exception.VersionControlException; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.repository.StaticCodeAnalysisCategoryRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.service.BuildLogEntryService; +import de.tum.cit.aet.artemis.service.ExerciseDateService; +import de.tum.cit.aet.artemis.service.FeedbackService; +import de.tum.cit.aet.artemis.service.ResultService; +import de.tum.cit.aet.artemis.service.SubmissionPolicyService; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationResultService; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; +import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; +import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseGradingStatisticsDTO; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile(PROFILE_CORE) @Service @@ -342,7 +342,7 @@ private Result processNewProgrammingExerciseResult(final ProgrammingExercisePart // Finally, save the new result once and make sure the order column between submission and result is maintained - // workaround to avoid org.hibernate.HibernateException: null index column for collection: de.tum.in.www1.artemis.domain.Submission.results + // workaround to avoid org.hibernate.HibernateException: null index column for collection: de.tum.cit.aet.artemis.domain.Submission.results processedResult.setSubmission(null); // workaround to avoid scheduling the participant score update twice. The update will only run when a participation is present. processedResult.setParticipation(null); diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseImportBasicService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportBasicService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseImportBasicService.java rename to src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportBasicService.java index 34ea5b9fc8c4..8e50b8b0889c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseImportBasicService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportBasicService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.programming; +package de.tum.cit.aet.artemis.service.programming; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.HashMap; @@ -15,32 +15,32 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import de.tum.in.www1.artemis.domain.AuxiliaryRepository; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.StaticCodeAnalysisCategory; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.hestia.CodeHint; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig; -import de.tum.in.www1.artemis.domain.submissionpolicy.SubmissionPolicy; -import de.tum.in.www1.artemis.repository.AuxiliaryRepositoryRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.StaticCodeAnalysisCategoryRepository; -import de.tum.in.www1.artemis.repository.SubmissionPolicyRepository; -import de.tum.in.www1.artemis.repository.hestia.ExerciseHintRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseTaskRepository; -import de.tum.in.www1.artemis.service.StaticCodeAnalysisService; -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlService; -import de.tum.in.www1.artemis.service.hestia.ExerciseHintService; -import de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseTaskService; -import de.tum.in.www1.artemis.service.metis.conversation.ChannelService; +import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisCategory; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismDetectionConfig; +import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.repository.AuxiliaryRepositoryRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.StaticCodeAnalysisCategoryRepository; +import de.tum.cit.aet.artemis.repository.SubmissionPolicyRepository; +import de.tum.cit.aet.artemis.repository.hestia.ExerciseHintRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.service.hestia.ExerciseHintService; +import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; +import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseImportFromFileService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportFromFileService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseImportFromFileService.java rename to src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportFromFileService.java index 4778bc0e45bf..35e5f01d52cf 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseImportFromFileService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportFromFileService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.programming; +package de.tum.cit.aet.artemis.service.programming; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.service.export.ProgrammingExerciseExportService.BUILD_PLAN_FILE_NAME; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.service.export.ProgrammingExerciseExportService.BUILD_PLAN_FILE_NAME; import java.io.IOException; import java.net.URISyntaxException; @@ -26,20 +26,20 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.repository.BuildPlanRepository; -import de.tum.in.www1.artemis.service.FilePathService; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.ProfileService; -import de.tum.in.www1.artemis.service.StaticCodeAnalysisService; -import de.tum.in.www1.artemis.service.ZipFileService; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.ProfileService; +import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; +import de.tum.cit.aet.artemis.service.ZipFileService; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseImportService.java rename to src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportService.java index 135661c2cf82..20e346900292 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportService.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.programming; +package de.tum.cit.aet.artemis.service.programming; -import static de.tum.in.www1.artemis.config.Constants.ASSIGNMENT_REPO_NAME; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.config.Constants.TEST_REPO_NAME; +import static de.tum.cit.aet.artemis.config.Constants.ASSIGNMENT_REPO_NAME; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.TEST_REPO_NAME; import java.io.IOException; import java.util.HashMap; @@ -20,25 +20,25 @@ import com.fasterxml.jackson.core.JsonProcessingException; -import de.tum.in.www1.artemis.domain.AuxiliaryRepository; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.BuildPlanType; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.enumeration.Visibility; -import de.tum.in.www1.artemis.repository.AuxiliaryRepositoryRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.UriService; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlService; -import de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseTaskService; +import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.repository.AuxiliaryRepositoryRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.UriService; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseParticipationService.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseParticipationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseParticipationService.java index 703f4c3d3799..69ea438a2622 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseParticipationService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.programming; +package de.tum.cit.aet.artemis.service.programming; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.FilenameFilter; import java.io.IOException; @@ -19,34 +19,34 @@ import org.springframework.stereotype.Service; import org.springframework.util.FileSystemUtils; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.BuildPlanType; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.exception.VersionControlException; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.repository.TemplateProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlRepositoryPermission; -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlService; -import de.tum.in.www1.artemis.web.rest.dto.CommitInfoDTO; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exception.VersionControlException; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlRepositoryPermission; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.web.rest.dto.CommitInfoDTO; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseRepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseRepositoryService.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseRepositoryService.java rename to src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseRepositoryService.java index c4a771825205..3230e0e03b96 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseRepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseRepositoryService.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.programming; +package de.tum.cit.aet.artemis.service.programming; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.config.Constants.SETUP_COMMIT_MESSAGE; -import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.isMavenProject; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.SETUP_COMMIT_MESSAGE; +import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.isMavenProject; import java.io.FileNotFoundException; import java.io.IOException; @@ -24,22 +24,22 @@ import org.springframework.core.io.Resource; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.AuxiliaryRepository; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.submissionpolicy.SubmissionPolicy; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.ResourceLoaderService; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlService; -import de.tum.in.www1.artemis.service.messaging.InstanceMessageSendService; -import de.tum.in.www1.artemis.web.rest.SubmissionPolicyResource; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.ResourceLoaderService; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.web.rest.SubmissionPolicyResource; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseService.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseService.java rename to src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseService.java index 973f049b2e4d..4a0565d17956 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseService.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.service.programming; +package de.tum.cit.aet.artemis.service.programming; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.domain.enumeration.BuildPlanType.SOLUTION; -import static de.tum.in.www1.artemis.domain.enumeration.BuildPlanType.TEMPLATE; -import static de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository.ProgrammingExerciseFetchOptions.AuxiliaryRepositories; -import static de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository.ProgrammingExerciseFetchOptions.GradingCriteria; -import static de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository.SolutionParticipationFetchOptions; -import static de.tum.in.www1.artemis.repository.TemplateProgrammingExerciseParticipationRepository.TemplateParticipationFetchOptions; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.SOLUTION; +import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.TEMPLATE; +import static de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository.ProgrammingExerciseFetchOptions.AuxiliaryRepositories; +import static de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository.ProgrammingExerciseFetchOptions.GradingCriteria; +import static de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository.SolutionParticipationFetchOptions; +import static de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository.TemplateParticipationFetchOptions; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -42,59 +42,59 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.AuxiliaryRepository; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.repository.AuxiliaryRepositoryRepository; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.repository.TemplateProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseGitDiffReportRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseTaskRepository; -import de.tum.in.www1.artemis.service.ExerciseService; -import de.tum.in.www1.artemis.service.ExerciseSpecificationService; -import de.tum.in.www1.artemis.service.ParticipationService; -import de.tum.in.www1.artemis.service.ProfileService; -import de.tum.in.www1.artemis.service.SubmissionPolicyService; -import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; -import de.tum.in.www1.artemis.service.connectors.BuildScriptGenerationService; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.connectors.aeolus.AeolusTemplateService; -import de.tum.in.www1.artemis.service.connectors.aeolus.Windfile; -import de.tum.in.www1.artemis.service.connectors.ci.CIPermission; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlService; -import de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseTaskService; -import de.tum.in.www1.artemis.service.iris.settings.IrisSettingsService; -import de.tum.in.www1.artemis.service.messaging.InstanceMessageSendService; -import de.tum.in.www1.artemis.service.metis.conversation.ChannelService; -import de.tum.in.www1.artemis.service.notifications.GroupNotificationScheduleService; -import de.tum.in.www1.artemis.service.util.structureoraclegenerator.OracleGenerator; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.in.www1.artemis.web.rest.util.PageUtil; +import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.repository.AuxiliaryRepositoryRepository; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseGitDiffReportRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.service.ExerciseService; +import de.tum.cit.aet.artemis.service.ExerciseSpecificationService; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.service.ProfileService; +import de.tum.cit.aet.artemis.service.SubmissionPolicyService; +import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.service.connectors.BuildScriptGenerationService; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; +import de.tum.cit.aet.artemis.service.connectors.ci.CIPermission; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; +import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; +import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; +import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; +import de.tum.cit.aet.artemis.service.util.structureoraclegenerator.OracleGenerator; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.rest.util.PageUtil; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseTestCaseService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseTestCaseService.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseTestCaseService.java rename to src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseTestCaseService.java index c6b40bd2ac55..0022717b263b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseTestCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseTestCaseService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.programming; +package de.tum.cit.aet.artemis.service.programming; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.HashSet; import java.util.List; @@ -16,18 +16,18 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseTaskService; -import de.tum.in.www1.artemis.web.rest.dto.ProgrammingExerciseTestCaseDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.in.www1.artemis.web.rest.errors.ErrorConstants; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; +import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseTestCaseDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingLanguageFeature.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingLanguageFeature.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingLanguageFeature.java rename to src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingLanguageFeature.java index 68b5e589ef94..11c491afec13 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingLanguageFeature.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingLanguageFeature.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.programming; +package de.tum.cit.aet.artemis.service.programming; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; /** * Store configuration of a specific programming language. diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingLanguageFeatureService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingLanguageFeatureService.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingLanguageFeatureService.java rename to src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingLanguageFeatureService.java index 06438c539561..9b4fb0658a5e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingLanguageFeatureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingLanguageFeatureService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.programming; +package de.tum.cit.aet.artemis.service.programming; import java.util.HashMap; import java.util.Map; @@ -8,7 +8,7 @@ import org.springframework.boot.actuate.info.Info; import org.springframework.boot.actuate.info.InfoContributor; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; /** * This service provides information about features the different ProgrammingLanguages support. diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingMessagingService.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingMessagingService.java rename to src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingMessagingService.java index d6b6835f6aee..b7b7f2a5e69c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingMessagingService.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.service.programming; +package de.tum.cit.aet.artemis.service.programming; -import static de.tum.in.www1.artemis.config.Constants.BUILD_RUN_COMPLETE_FOR_PROGRAMMING_EXERCISE; -import static de.tum.in.www1.artemis.config.Constants.BUILD_RUN_STARTED_FOR_PROGRAMMING_EXERCISE; -import static de.tum.in.www1.artemis.config.Constants.EXERCISE_TOPIC_ROOT; -import static de.tum.in.www1.artemis.config.Constants.NEW_SUBMISSION_TOPIC; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.config.Constants.PROGRAMMING_SUBMISSION_TOPIC; -import static de.tum.in.www1.artemis.config.Constants.TEST_CASES_CHANGED_RUN_COMPLETED_NOTIFICATION; +import static de.tum.cit.aet.artemis.config.Constants.BUILD_RUN_COMPLETE_FOR_PROGRAMMING_EXERCISE; +import static de.tum.cit.aet.artemis.config.Constants.BUILD_RUN_STARTED_FOR_PROGRAMMING_EXERCISE; +import static de.tum.cit.aet.artemis.config.Constants.EXERCISE_TOPIC_ROOT; +import static de.tum.cit.aet.artemis.config.Constants.NEW_SUBMISSION_TOPIC; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROGRAMMING_SUBMISSION_TOPIC; +import static de.tum.cit.aet.artemis.config.Constants.TEST_CASES_CHANGED_RUN_COMPLETED_NOTIFICATION; import java.util.Optional; @@ -15,22 +15,22 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.BuildRunState; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; -import de.tum.in.www1.artemis.service.connectors.lti.LtiNewResultService; -import de.tum.in.www1.artemis.service.notifications.GroupNotificationService; -import de.tum.in.www1.artemis.web.rest.dto.SubmissionDTO; -import de.tum.in.www1.artemis.web.websocket.ResultWebsocketService; -import de.tum.in.www1.artemis.web.websocket.programmingSubmission.BuildTriggerWebsocketError; +import de.tum.cit.aet.artemis.domain.BuildRunState; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.service.connectors.lti.LtiNewResultService; +import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; +import de.tum.cit.aet.artemis.web.rest.dto.SubmissionDTO; +import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; +import de.tum.cit.aet.artemis.web.websocket.programmingSubmission.BuildTriggerWebsocketError; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingSubmissionService.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingSubmissionService.java rename to src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingSubmissionService.java index a14ff5f906e9..c361081fe910 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingSubmissionService.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.programming; +package de.tum.cit.aet.artemis.service.programming; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.config.Constants.PROGRAMMING_GRACE_PERIOD_SECONDS; -import static de.tum.in.www1.artemis.config.Constants.SETUP_COMMIT_MESSAGE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROGRAMMING_GRACE_PERIOD_SECONDS; +import static de.tum.cit.aet.artemis.config.Constants.SETUP_COMMIT_MESSAGE; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -21,54 +21,54 @@ import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Commit; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.participation.AbstractBaseProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.submissionpolicy.LockRepositoryPolicy; -import de.tum.in.www1.artemis.domain.submissionpolicy.SubmissionPolicy; -import de.tum.in.www1.artemis.exception.ContinuousIntegrationException; -import de.tum.in.www1.artemis.exception.VersionControlException; -import de.tum.in.www1.artemis.repository.ComplaintRepository; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.FeedbackRepository; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionPolicyRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ExerciseDateService; -import de.tum.in.www1.artemis.service.FeedbackService; -import de.tum.in.www1.artemis.service.ParticipationAuthorizationCheckService; -import de.tum.in.www1.artemis.service.ParticipationService; -import de.tum.in.www1.artemis.service.SubmissionService; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.connectors.athena.AthenaSubmissionSelectionService; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlService; -import de.tum.in.www1.artemis.service.exam.ExamDateService; -import de.tum.in.www1.artemis.service.exam.ExamSubmissionService; -import de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseGitDiffReportService; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.Commit; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.participation.AbstractBaseProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; +import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.exception.VersionControlException; +import de.tum.cit.aet.artemis.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionPolicyRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ExerciseDateService; +import de.tum.cit.aet.artemis.service.FeedbackService; +import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.service.SubmissionService; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.connectors.athena.AthenaSubmissionSelectionService; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.service.exam.ExamDateService; +import de.tum.cit.aet.artemis.service.exam.ExamSubmissionService; +import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseGitDiffReportService; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; // TODO: this class has too many dependencies to other services. We should reduce this @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingTriggerService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingTriggerService.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingTriggerService.java rename to src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingTriggerService.java index 901f25d03311..e30688a8b0bb 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingTriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingTriggerService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.programming; +package de.tum.cit.aet.artemis.service.programming; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.config.Constants.TRIGGER_INSTRUCTOR_BUILD; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.TRIGGER_INSTRUCTOR_BUILD; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -17,31 +17,31 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.exception.ContinuousIntegrationException; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.repository.TemplateProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.ParticipationService; -import de.tum.in.www1.artemis.service.ProfileService; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.in.www1.artemis.web.websocket.programmingSubmission.BuildTriggerWebsocketError; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.service.ProfileService; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.websocket.programmingSubmission.BuildTriggerWebsocketError; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/RepositoryAccessService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryAccessService.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/programming/RepositoryAccessService.java rename to src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryAccessService.java index a11ad1d8cb04..32be58b3c052 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/RepositoryAccessService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryAccessService.java @@ -1,20 +1,20 @@ -package de.tum.in.www1.artemis.service.programming; +package de.tum.cit.aet.artemis.service.programming; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ExerciseDateService; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.repository.RepositoryActionType; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ExerciseDateService; +import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.repository.RepositoryActionType; /** * Service for checking if a user has access to a repository. diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/RepositoryParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryParticipationService.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/service/programming/RepositoryParticipationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryParticipationService.java index 5423acfaae9a..b888b2c996e9 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/RepositoryParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryParticipationService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.programming; +package de.tum.cit.aet.artemis.service.programming; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Optional; @@ -8,15 +8,15 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.repository.RepositoryActionType; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.repository.RepositoryActionType; /** * Service for managing programming exercise repositories and participations diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/RepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryService.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/service/programming/RepositoryService.java rename to src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryService.java index fd88f0a10e03..39c6687ebda3 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/RepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.programming; +package de.tum.cit.aet.artemis.service.programming; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -34,20 +34,20 @@ import org.springframework.stereotype.Service; import org.springframework.util.FileSystemUtils; -import de.tum.in.www1.artemis.domain.File; -import de.tum.in.www1.artemis.domain.FileType; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.ProfileService; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.web.rest.dto.FileMove; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.domain.File; +import de.tum.cit.aet.artemis.domain.FileType; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.ProfileService; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.web.rest.dto.FileMove; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; /** * Service that provides utilities for managing files in a git repository. diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/TemplateUpgradePolicyService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/TemplateUpgradePolicyService.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/programming/TemplateUpgradePolicyService.java rename to src/main/java/de/tum/cit/aet/artemis/service/programming/TemplateUpgradePolicyService.java index a836f81a4982..f2c8a604f88d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/TemplateUpgradePolicyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/TemplateUpgradePolicyService.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.programming; +package de.tum.cit.aet.artemis.service.programming; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; /** * The policy for choosing the appropriate service for upgrading of template files diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/TemplateUpgradeService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/TemplateUpgradeService.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/service/programming/TemplateUpgradeService.java rename to src/main/java/de/tum/cit/aet/artemis/service/programming/TemplateUpgradeService.java index 1cb436b3be01..070d7aa34068 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/TemplateUpgradeService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/TemplateUpgradeService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.programming; +package de.tum.cit.aet.artemis.service.programming; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; public interface TemplateUpgradeService { diff --git a/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizBatchService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizBatchService.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/quiz/QuizBatchService.java rename to src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizBatchService.java index 250e3bed05d0..62e6dd2c1a87 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizBatchService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizBatchService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.quiz; +package de.tum.cit.aet.artemis.service.quiz; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.security.SecureRandom; import java.time.ZonedDateTime; @@ -16,17 +16,17 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.QuizMode; -import de.tum.in.www1.artemis.domain.quiz.QuizBatch; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.exception.QuizJoinException; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.QuizBatchRepository; -import de.tum.in.www1.artemis.repository.QuizSubmissionRepository; -import de.tum.in.www1.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; +import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.exception.QuizJoinException; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.QuizBatchRepository; +import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; +import de.tum.cit.aet.artemis.service.ParticipationService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseImportService.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/quiz/QuizExerciseImportService.java rename to src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseImportService.java index 539a5e9a29af..5c894c2fa4a6 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseImportService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.quiz; +package de.tum.cit.aet.artemis.service.quiz; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.IOException; import java.net.URI; @@ -20,28 +20,28 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import de.tum.in.www1.artemis.domain.quiz.AnswerOption; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropMapping; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.in.www1.artemis.domain.quiz.DragItem; -import de.tum.in.www1.artemis.domain.quiz.DropLocation; -import de.tum.in.www1.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.in.www1.artemis.domain.quiz.QuizBatch; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerMapping; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSolution; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSpot; -import de.tum.in.www1.artemis.repository.ExampleSubmissionRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.service.ExerciseImportService; -import de.tum.in.www1.artemis.service.FeedbackService; -import de.tum.in.www1.artemis.service.FilePathService; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; -import de.tum.in.www1.artemis.service.metis.conversation.ChannelService; +import de.tum.cit.aet.artemis.domain.quiz.AnswerOption; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropMapping; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; +import de.tum.cit.aet.artemis.domain.quiz.DragItem; +import de.tum.cit.aet.artemis.domain.quiz.DropLocation; +import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerMapping; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSolution; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSpot; +import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.service.ExerciseImportService; +import de.tum.cit.aet.artemis.service.FeedbackService; +import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/quiz/QuizExerciseService.java rename to src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseService.java index 677134796bfd..bf1439dcc0cd 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.quiz; +package de.tum.cit.aet.artemis.service.quiz; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.IOException; import java.net.URI; @@ -31,33 +31,33 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.QuizMode; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.in.www1.artemis.domain.quiz.DragItem; -import de.tum.in.www1.artemis.domain.quiz.QuizBatch; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizPointStatistic; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.domain.quiz.SubmittedAnswer; -import de.tum.in.www1.artemis.exception.FilePathParsingException; -import de.tum.in.www1.artemis.repository.DragAndDropMappingRepository; -import de.tum.in.www1.artemis.repository.QuizExerciseRepository; -import de.tum.in.www1.artemis.repository.QuizSubmissionRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.ShortAnswerMappingRepository; -import de.tum.in.www1.artemis.service.ExerciseSpecificationService; -import de.tum.in.www1.artemis.service.FilePathService; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.messaging.InstanceMessageSendService; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.util.PageUtil; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; +import de.tum.cit.aet.artemis.domain.quiz.DragItem; +import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizPointStatistic; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.exception.FilePathParsingException; +import de.tum.cit.aet.artemis.repository.DragAndDropMappingRepository; +import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.ShortAnswerMappingRepository; +import de.tum.cit.aet.artemis.service.ExerciseSpecificationService; +import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.util.PageUtil; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizMessagingService.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/quiz/QuizMessagingService.java rename to src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizMessagingService.java index 1f6d579a238f..12e6f916a02e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizMessagingService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.quiz; +package de.tum.cit.aet.artemis.service.quiz; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.domain.enumeration.QuizAction.START_BATCH; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.domain.enumeration.QuizAction.START_BATCH; import jakarta.annotation.Nullable; @@ -15,11 +15,11 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.enumeration.QuizAction; -import de.tum.in.www1.artemis.domain.quiz.QuizBatch; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; -import de.tum.in.www1.artemis.service.notifications.GroupNotificationService; +import de.tum.cit.aet.artemis.domain.enumeration.QuizAction; +import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizPoolService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizPoolService.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/service/quiz/QuizPoolService.java rename to src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizPoolService.java index fa47d0cd568e..e5ce2f0caa4c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizPoolService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizPoolService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.quiz; +package de.tum.cit.aet.artemis.service.quiz; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.security.SecureRandom; import java.util.ArrayList; @@ -18,18 +18,18 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.quiz.QuizGroup; -import de.tum.in.www1.artemis.domain.quiz.QuizPool; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.repository.DragAndDropMappingRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.QuizGroupRepository; -import de.tum.in.www1.artemis.repository.QuizPoolRepository; -import de.tum.in.www1.artemis.repository.ShortAnswerMappingRepository; -import de.tum.in.www1.artemis.service.exam.ExamQuizQuestionsGenerator; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.quiz.QuizGroup; +import de.tum.cit.aet.artemis.domain.quiz.QuizPool; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.repository.DragAndDropMappingRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.QuizGroupRepository; +import de.tum.cit.aet.artemis.repository.QuizPoolRepository; +import de.tum.cit.aet.artemis.repository.ShortAnswerMappingRepository; +import de.tum.cit.aet.artemis.service.exam.ExamQuizQuestionsGenerator; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * This service contains the functions to manage QuizPool entity. diff --git a/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizResultService.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/quiz/QuizResultService.java rename to src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizResultService.java index e730a6b8fc33..c7713225539e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizResultService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.quiz; +package de.tum.cit.aet.artemis.service.quiz; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Comparator; @@ -15,20 +15,20 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.repository.QuizExerciseRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.SubmittedAnswerRepository; -import de.tum.in.www1.artemis.service.ResultService; -import de.tum.in.www1.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.SubmittedAnswerRepository; +import de.tum.cit.aet.artemis.service.ResultService; +import de.tum.cit.aet.artemis.service.util.TimeLogUtil; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizScheduleService.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/service/quiz/QuizScheduleService.java rename to src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizScheduleService.java index 2ec50b0f2686..47c9815ede7d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizScheduleService.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.quiz; +package de.tum.cit.aet.artemis.service.quiz; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_SCHEDULING; -import static de.tum.in.www1.artemis.config.StartupDelayConfig.QUIZ_EXERCISE_SCHEDULE_DELAY_SEC; -import static de.tum.in.www1.artemis.domain.enumeration.QuizAction.START_NOW; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.config.StartupDelayConfig.QUIZ_EXERCISE_SCHEDULE_DELAY_SEC; +import static de.tum.cit.aet.artemis.domain.enumeration.QuizAction.START_NOW; import java.time.Instant; import java.time.ZonedDateTime; @@ -18,16 +18,16 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseLifecycle; -import de.tum.in.www1.artemis.domain.enumeration.QuizMode; -import de.tum.in.www1.artemis.domain.quiz.QuizBatch; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.repository.QuizBatchRepository; -import de.tum.in.www1.artemis.repository.QuizExerciseRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.ProfileService; -import de.tum.in.www1.artemis.service.scheduled.ScheduleService; -import de.tum.in.www1.artemis.service.util.Tuple; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; +import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; +import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.repository.QuizBatchRepository; +import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.ProfileService; +import de.tum.cit.aet.artemis.service.scheduled.ScheduleService; +import de.tum.cit.aet.artemis.service.util.Tuple; @Profile(PROFILE_SCHEDULING) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizService.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/quiz/QuizService.java rename to src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizService.java index 5b4d0f967091..cdee2903b25f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.quiz; +package de.tum.cit.aet.artemis.service.quiz; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.Collection; @@ -12,21 +12,21 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropMapping; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropQuestionStatistic; -import de.tum.in.www1.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.in.www1.artemis.domain.quiz.MultipleChoiceQuestionStatistic; -import de.tum.in.www1.artemis.domain.quiz.QuizConfiguration; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestionComponent; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestionStatistic; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestionStatisticComponent; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerMapping; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerQuestionStatistic; -import de.tum.in.www1.artemis.repository.DragAndDropMappingRepository; -import de.tum.in.www1.artemis.repository.ShortAnswerMappingRepository; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropMapping; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestionStatistic; +import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestionStatistic; +import de.tum.cit.aet.artemis.domain.quiz.QuizConfiguration; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestionComponent; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestionStatistic; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestionStatisticComponent; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerMapping; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestionStatistic; +import de.tum.cit.aet.artemis.repository.DragAndDropMappingRepository; +import de.tum.cit.aet.artemis.repository.ShortAnswerMappingRepository; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizStatisticService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizStatisticService.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/quiz/QuizStatisticService.java rename to src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizStatisticService.java index d68d2b80cd23..aa6f94a77047 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizStatisticService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizStatisticService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.quiz; +package de.tum.cit.aet.artemis.service.quiz; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.List; @@ -12,19 +12,19 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizPointStatistic; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestionStatistic; -import de.tum.in.www1.artemis.repository.QuizPointStatisticRepository; -import de.tum.in.www1.artemis.repository.QuizQuestionStatisticRepository; -import de.tum.in.www1.artemis.repository.QuizSubmissionRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; -import de.tum.in.www1.artemis.service.connectors.lti.LtiNewResultService; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizPointStatistic; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestionStatistic; +import de.tum.cit.aet.artemis.repository.QuizPointStatisticRepository; +import de.tum.cit.aet.artemis.repository.QuizQuestionStatisticRepository; +import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.service.connectors.lti.LtiNewResultService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizSubmissionService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/quiz/QuizSubmissionService.java rename to src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizSubmissionService.java index 494da0a3a689..041e48e224fe 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizSubmissionService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.quiz; +package de.tum.cit.aet.artemis.service.quiz; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Optional; @@ -11,30 +11,30 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.QuizMode; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.quiz.AbstractQuizSubmission; -import de.tum.in.www1.artemis.domain.quiz.QuizBatch; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.domain.quiz.SubmittedAnswer; -import de.tum.in.www1.artemis.exception.QuizSubmissionException; -import de.tum.in.www1.artemis.repository.QuizExerciseRepository; -import de.tum.in.www1.artemis.repository.QuizSubmissionRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.service.AbstractQuizSubmissionService; -import de.tum.in.www1.artemis.service.ParticipationService; -import de.tum.in.www1.artemis.service.SubmissionVersionService; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; -import de.tum.in.www1.artemis.service.util.TimeLogUtil; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.quiz.AbstractQuizSubmission; +import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.exception.QuizSubmissionException; +import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.service.AbstractQuizSubmissionService; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.service.SubmissionVersionService; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/scheduled/AthenaScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AthenaScheduleService.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/scheduled/AthenaScheduleService.java rename to src/main/java/de/tum/cit/aet/artemis/service/scheduled/AthenaScheduleService.java index b08f6d4e2c94..e7b3b3015f46 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/scheduled/AthenaScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AthenaScheduleService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.scheduled; +package de.tum.cit.aet.artemis.service.scheduled; -import static de.tum.in.www1.artemis.config.StartupDelayConfig.ATHENA_SCHEDULE_DELAY_SEC; +import static de.tum.cit.aet.artemis.config.StartupDelayConfig.ATHENA_SCHEDULE_DELAY_SEC; import java.time.Instant; import java.time.ZonedDateTime; @@ -20,13 +20,13 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseLifecycle; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.ExerciseLifecycleService; -import de.tum.in.www1.artemis.service.ProfileService; -import de.tum.in.www1.artemis.service.connectors.athena.AthenaSubmissionSendingService; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.ExerciseLifecycleService; +import de.tum.cit.aet.artemis.service.ProfileService; +import de.tum.cit.aet.artemis.service.connectors.athena.AthenaSubmissionSendingService; @Service @Profile("athena & scheduling") diff --git a/src/main/java/de/tum/in/www1/artemis/service/scheduled/AutomaticProgrammingExerciseCleanupService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AutomaticProgrammingExerciseCleanupService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/scheduled/AutomaticProgrammingExerciseCleanupService.java rename to src/main/java/de/tum/cit/aet/artemis/service/scheduled/AutomaticProgrammingExerciseCleanupService.java index 7d2f0cbca9f2..8dfa65de79db 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/scheduled/AutomaticProgrammingExerciseCleanupService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AutomaticProgrammingExerciseCleanupService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.scheduled; +package de.tum.cit.aet.artemis.service.scheduled; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; import static java.time.ZonedDateTime.now; import java.time.ZonedDateTime; @@ -19,15 +19,15 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.ParticipationService; -import de.tum.in.www1.artemis.service.ProfileService; -import de.tum.in.www1.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.service.ProfileService; +import de.tum.cit.aet.artemis.service.connectors.GitService; @Service @Profile(PROFILE_SCHEDULING) diff --git a/src/main/java/de/tum/in/www1/artemis/service/scheduled/DataExportScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleService.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/scheduled/DataExportScheduleService.java rename to src/main/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleService.java index f5b45c820c76..f6a7a16736a7 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/scheduled/DataExportScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.scheduled; +package de.tum.cit.aet.artemis.service.scheduled; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; import java.time.ZonedDateTime; import java.util.Collections; @@ -16,15 +16,15 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.DataExport; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.DataExportRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.ProfileService; -import de.tum.in.www1.artemis.service.export.DataExportCreationService; -import de.tum.in.www1.artemis.service.export.DataExportService; -import de.tum.in.www1.artemis.service.notifications.MailService; -import de.tum.in.www1.artemis.service.user.UserService; +import de.tum.cit.aet.artemis.domain.DataExport; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.DataExportRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.ProfileService; +import de.tum.cit.aet.artemis.service.export.DataExportCreationService; +import de.tum.cit.aet.artemis.service.export.DataExportService; +import de.tum.cit.aet.artemis.service.notifications.MailService; +import de.tum.cit.aet.artemis.service.user.UserService; /** * Service responsible for scheduling data exports. diff --git a/src/main/java/de/tum/in/www1/artemis/service/scheduled/IExerciseScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/IExerciseScheduleService.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/service/scheduled/IExerciseScheduleService.java rename to src/main/java/de/tum/cit/aet/artemis/service/scheduled/IExerciseScheduleService.java index eccc14fd3ac5..2cd2bc98595b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/scheduled/IExerciseScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/IExerciseScheduleService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.scheduled; +package de.tum.cit.aet.artemis.service.scheduled; -import de.tum.in.www1.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Exercise; /** * Interface for exercise specific schedulers. diff --git a/src/main/java/de/tum/in/www1/artemis/service/scheduled/ModelingExerciseScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ModelingExerciseScheduleService.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/scheduled/ModelingExerciseScheduleService.java rename to src/main/java/de/tum/cit/aet/artemis/service/scheduled/ModelingExerciseScheduleService.java index 50ea9a870b8e..23ba99ef7312 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/scheduled/ModelingExerciseScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ModelingExerciseScheduleService.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.scheduled; +package de.tum.cit.aet.artemis.service.scheduled; -import static de.tum.in.www1.artemis.config.Constants.EXAM_END_WAIT_TIME_FOR_COMPASS_MINUTES; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_SCHEDULING; -import static de.tum.in.www1.artemis.config.StartupDelayConfig.MODELING_EXERCISE_SCHEDULE_DELAY_SEC; +import static de.tum.cit.aet.artemis.config.Constants.EXAM_END_WAIT_TIME_FOR_COMPASS_MINUTES; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.config.StartupDelayConfig.MODELING_EXERCISE_SCHEDULE_DELAY_SEC; import static java.time.Instant.now; import java.time.Instant; @@ -24,14 +24,14 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseLifecycle; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.repository.ModelingExerciseRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.compass.CompassService; -import de.tum.in.www1.artemis.service.exam.ExamDateService; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.compass.CompassService; +import de.tum.cit.aet.artemis.service.exam.ExamDateService; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; import tech.jhipster.config.JHipsterConstants; @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/scheduled/NotificationScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/NotificationScheduleService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/scheduled/NotificationScheduleService.java rename to src/main/java/de/tum/cit/aet/artemis/service/scheduled/NotificationScheduleService.java index 43f296587782..93df237a1e99 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/scheduled/NotificationScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/NotificationScheduleService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.scheduled; +package de.tum.cit.aet.artemis.service.scheduled; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_SCHEDULING; -import static de.tum.in.www1.artemis.config.StartupDelayConfig.NOTIFICATION_SCHEDULE_DELAY_SEC; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.config.StartupDelayConfig.NOTIFICATION_SCHEDULE_DELAY_SEC; import java.time.Instant; import java.time.ZonedDateTime; @@ -16,14 +16,14 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseLifecycle; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.ExerciseDateService; -import de.tum.in.www1.artemis.service.ProfileService; -import de.tum.in.www1.artemis.service.notifications.GroupNotificationService; -import de.tum.in.www1.artemis.service.notifications.SingleUserNotificationService; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.ExerciseDateService; +import de.tum.cit.aet.artemis.service.ProfileService; +import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; +import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; @Service @Profile(PROFILE_SCHEDULING) diff --git a/src/main/java/de/tum/in/www1/artemis/service/scheduled/ParticipantScoreScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ParticipantScoreScheduleService.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/scheduled/ParticipantScoreScheduleService.java rename to src/main/java/de/tum/cit/aet/artemis/service/scheduled/ParticipantScoreScheduleService.java index 3ce5c86aba16..1f8ad8edc295 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/scheduled/ParticipantScoreScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ParticipantScoreScheduleService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.scheduled; +package de.tum.cit.aet.artemis.service.scheduled; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_SCHEDULING; -import static de.tum.in.www1.artemis.config.StartupDelayConfig.PARTICIPATION_SCORES_SCHEDULE_DELAY_SEC; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.config.StartupDelayConfig.PARTICIPATION_SCORES_SCHEDULE_DELAY_SEC; import java.time.Instant; import java.time.ZonedDateTime; @@ -28,25 +28,25 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.participation.Participant; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.scores.ParticipantScore; -import de.tum.in.www1.artemis.domain.scores.StudentScore; -import de.tum.in.www1.artemis.domain.scores.TeamScore; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.ParticipantScoreRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.StudentScoreRepository; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.repository.TeamScoreRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; -import de.tum.in.www1.artemis.service.util.RoundingUtil; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.participation.Participant; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.scores.ParticipantScore; +import de.tum.cit.aet.artemis.domain.scores.StudentScore; +import de.tum.cit.aet.artemis.domain.scores.TeamScore; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.StudentScoreRepository; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.repository.TeamScoreRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.service.util.RoundingUtil; /** * Scheduled service for the calculation of the participant scores. @@ -57,7 +57,7 @@ * This method is fast, but not 100% reliable. Therefore, a cron job regularly checks for invalid participant scores and updates them. * In all cases, using asynchronous scheduled tasks speeds up all requests that modify results. * - * @see de.tum.in.www1.artemis.service.listeners.ResultListener + * @see de.tum.cit.aet.artemis.service.listeners.ResultListener */ @Service @Profile(PROFILE_SCHEDULING) diff --git a/src/main/java/de/tum/in/www1/artemis/service/scheduled/ProgrammingExerciseScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ProgrammingExerciseScheduleService.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/service/scheduled/ProgrammingExerciseScheduleService.java rename to src/main/java/de/tum/cit/aet/artemis/service/scheduled/ProgrammingExerciseScheduleService.java index b8b7ae94d1c4..6753be623ff8 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/scheduled/ProgrammingExerciseScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ProgrammingExerciseScheduleService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.scheduled; +package de.tum.cit.aet.artemis.service.scheduled; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_SCHEDULING; -import static de.tum.in.www1.artemis.config.StartupDelayConfig.PROGRAMMING_EXERCISE_SCHEDULE_DELAY_SEC; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.config.StartupDelayConfig.PROGRAMMING_EXERCISE_SCHEDULE_DELAY_SEC; import java.time.Instant; import java.time.ZonedDateTime; @@ -34,33 +34,33 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseLifecycle; -import de.tum.in.www1.artemis.domain.enumeration.ParticipationLifecycle; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.ExerciseDateService; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.exam.ExamDateService; -import de.tum.in.www1.artemis.service.notifications.GroupNotificationService; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseGradingService; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseParticipationService; -import de.tum.in.www1.artemis.service.programming.ProgrammingTriggerService; -import de.tum.in.www1.artemis.service.util.Tuple; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; +import de.tum.cit.aet.artemis.domain.enumeration.ParticipationLifecycle; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.ExerciseDateService; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.exam.ExamDateService; +import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseGradingService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseParticipationService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingTriggerService; +import de.tum.cit.aet.artemis.service.util.Tuple; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; import tech.jhipster.config.JHipsterConstants; @Service @@ -557,7 +557,7 @@ public Runnable lockStudentRepositoriesAndParticipationsRegularDueDate(Programmi * individual due date is set. *

* This might be needed for an exercise that has test cases marked with - * {@link de.tum.in.www1.artemis.domain.enumeration.Visibility#AFTER_DUE_DATE}. + * {@link de.tum.cit.aet.artemis.domain.enumeration.Visibility#AFTER_DUE_DATE}. *

* Those test cases might already have been run in the continuous integration * service and their feedbacks are therefore stored in the database. diff --git a/src/main/java/de/tum/in/www1/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupService.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupService.java rename to src/main/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupService.java index 42acb0faad82..d5cf5bbe1100 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.scheduled; +package de.tum.cit.aet.artemis.service.scheduled; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; import java.util.Arrays; import java.util.Collection; @@ -10,7 +10,7 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.repository.PushNotificationDeviceConfigurationRepository; +import de.tum.cit.aet.artemis.repository.PushNotificationDeviceConfigurationRepository; import tech.jhipster.config.JHipsterConstants; @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/scheduled/ScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ScheduleService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/scheduled/ScheduleService.java rename to src/main/java/de/tum/cit/aet/artemis/service/scheduled/ScheduleService.java index 375b74c43ba8..e821bcdd5bc2 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/scheduled/ScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ScheduleService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.scheduled; +package de.tum.cit.aet.artemis.service.scheduled; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Objects; @@ -16,15 +16,15 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseLifecycle; -import de.tum.in.www1.artemis.domain.enumeration.ParticipationLifecycle; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.quiz.QuizBatch; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.service.ExerciseLifecycleService; -import de.tum.in.www1.artemis.service.ParticipationLifecycleService; -import de.tum.in.www1.artemis.service.util.Tuple; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; +import de.tum.cit.aet.artemis.domain.enumeration.ParticipationLifecycle; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.service.ExerciseLifecycleService; +import de.tum.cit.aet.artemis.service.ParticipationLifecycleService; +import de.tum.cit.aet.artemis.service.util.Tuple; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/scheduled/UserScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/UserScheduleService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/scheduled/UserScheduleService.java rename to src/main/java/de/tum/cit/aet/artemis/service/scheduled/UserScheduleService.java index 67015dd4da7f..a49f5a4aa9f0 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/scheduled/UserScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/UserScheduleService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.scheduled; +package de.tum.cit.aet.artemis.service.scheduled; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; import java.util.Map; import java.util.Optional; @@ -17,10 +17,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.exception.VersionControlException; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.connectors.vcs.VcsUserManagementService; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exception.VersionControlException; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; @Service @Profile(PROFILE_SCHEDULING) diff --git a/src/main/java/de/tum/in/www1/artemis/service/scheduled/WeeklyEmailSummaryScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/WeeklyEmailSummaryScheduleService.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/service/scheduled/WeeklyEmailSummaryScheduleService.java rename to src/main/java/de/tum/cit/aet/artemis/service/scheduled/WeeklyEmailSummaryScheduleService.java index 37bebf4a7dd2..98a78e5cae12 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/scheduled/WeeklyEmailSummaryScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/WeeklyEmailSummaryScheduleService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.scheduled; +package de.tum.cit.aet.artemis.service.scheduled; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_SCHEDULING; -import static de.tum.in.www1.artemis.config.StartupDelayConfig.EMAIL_SUMMARY_SCHEDULE_DELAY_SEC; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.config.StartupDelayConfig.EMAIL_SUMMARY_SCHEDULE_DELAY_SEC; import java.time.DayOfWeek; import java.time.Duration; @@ -19,9 +19,9 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.EmailSummaryService; -import de.tum.in.www1.artemis.service.ProfileService; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.EmailSummaryService; +import de.tum.cit.aet.artemis.service.ProfileService; @Service @Profile(PROFILE_SCHEDULING) diff --git a/src/main/java/de/tum/in/www1/artemis/service/science/ScienceEventService.java b/src/main/java/de/tum/cit/aet/artemis/service/science/ScienceEventService.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/science/ScienceEventService.java rename to src/main/java/de/tum/cit/aet/artemis/service/science/ScienceEventService.java index 1877d5a028e9..8741978b5cad 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/science/ScienceEventService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/science/ScienceEventService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.science; +package de.tum.cit.aet.artemis.service.science; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; @@ -9,9 +9,9 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.science.ScienceEvent; -import de.tum.in.www1.artemis.repository.science.ScienceEventRepository; -import de.tum.in.www1.artemis.web.rest.dto.science.ScienceEventDTO; +import de.tum.cit.aet.artemis.domain.science.ScienceEvent; +import de.tum.cit.aet.artemis.repository.science.ScienceEventRepository; +import de.tum.cit.aet.artemis.web.rest.dto.science.ScienceEventDTO; /** * Service class for {@link ScienceEvent}. diff --git a/src/main/java/de/tum/in/www1/artemis/service/team/TeamImportStrategy.java b/src/main/java/de/tum/cit/aet/artemis/service/team/TeamImportStrategy.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/service/team/TeamImportStrategy.java rename to src/main/java/de/tum/cit/aet/artemis/service/team/TeamImportStrategy.java index 44276b319b33..2c7a1defa4f3 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/team/TeamImportStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/team/TeamImportStrategy.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.service.team; +package de.tum.cit.aet.artemis.service.team; import java.util.List; import org.hibernate.Hibernate; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.repository.TeamRepository; public abstract class TeamImportStrategy { diff --git a/src/main/java/de/tum/in/www1/artemis/service/team/strategies/CreateOnlyStrategy.java b/src/main/java/de/tum/cit/aet/artemis/service/team/strategies/CreateOnlyStrategy.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/team/strategies/CreateOnlyStrategy.java rename to src/main/java/de/tum/cit/aet/artemis/service/team/strategies/CreateOnlyStrategy.java index d1c874c91d3c..f00240ff0ecd 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/team/strategies/CreateOnlyStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/team/strategies/CreateOnlyStrategy.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.team.strategies; +package de.tum.cit.aet.artemis.service.team.strategies; import java.util.Collections; import java.util.List; @@ -6,11 +6,11 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.service.team.TeamImportStrategy; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.service.team.TeamImportStrategy; public class CreateOnlyStrategy extends TeamImportStrategy { diff --git a/src/main/java/de/tum/in/www1/artemis/service/team/strategies/PurgeExistingStrategy.java b/src/main/java/de/tum/cit/aet/artemis/service/team/strategies/PurgeExistingStrategy.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/service/team/strategies/PurgeExistingStrategy.java rename to src/main/java/de/tum/cit/aet/artemis/service/team/strategies/PurgeExistingStrategy.java index 99323d158f67..4000b29f3485 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/team/strategies/PurgeExistingStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/team/strategies/PurgeExistingStrategy.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.service.team.strategies; +package de.tum.cit.aet.artemis.service.team.strategies; import java.util.List; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.service.ParticipationService; -import de.tum.in.www1.artemis.service.team.TeamImportStrategy; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.service.team.TeamImportStrategy; public class PurgeExistingStrategy extends TeamImportStrategy { diff --git a/src/main/java/de/tum/in/www1/artemis/service/telemetry/TelemetryService.java b/src/main/java/de/tum/cit/aet/artemis/service/telemetry/TelemetryService.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/service/telemetry/TelemetryService.java rename to src/main/java/de/tum/cit/aet/artemis/service/telemetry/TelemetryService.java index 7e49653d99d9..e5461b557ac0 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/telemetry/TelemetryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/telemetry/TelemetryService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.telemetry; +package de.tum.cit.aet.artemis.service.telemetry; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; import java.util.Arrays; import java.util.List; @@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; -import de.tum.in.www1.artemis.service.ProfileService; +import de.tum.cit.aet.artemis.service.ProfileService; @Service @Profile(PROFILE_SCHEDULING) diff --git a/src/main/java/de/tum/in/www1/artemis/service/theia/TheiaInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/service/theia/TheiaInfoContributor.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/service/theia/TheiaInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/service/theia/TheiaInfoContributor.java index 6df09afb63ef..486e6fe9f180 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/theia/TheiaInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/theia/TheiaInfoContributor.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.theia; +package de.tum.cit.aet.artemis.service.theia; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_THEIA; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_THEIA; import java.net.URL; @@ -10,7 +10,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.in.www1.artemis.config.Constants; +import de.tum.cit.aet.artemis.config.Constants; @Profile(PROFILE_THEIA) @Component diff --git a/src/main/java/de/tum/in/www1/artemis/service/tutorialgroups/TutorialGroupChannelManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupChannelManagementService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/tutorialgroups/TutorialGroupChannelManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupChannelManagementService.java index 3ee7dbcd8328..35af67ff9149 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/tutorialgroups/TutorialGroupChannelManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupChannelManagementService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.tutorialgroups; +package de.tum.cit.aet.artemis.service.tutorialgroups; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static jakarta.persistence.Persistence.getPersistenceUtil; import java.util.Optional; @@ -14,16 +14,16 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupRegistration; -import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupRegistrationRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupRepository; -import de.tum.in.www1.artemis.service.metis.conversation.ChannelService; -import de.tum.in.www1.artemis.service.metis.conversation.ConversationService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupRegistration; +import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRegistrationRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRepository; +import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; +import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; /** * Service for managing the channel connected to a tutorial group. diff --git a/src/main/java/de/tum/in/www1/artemis/service/tutorialgroups/TutorialGroupFreePeriodService.java b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupFreePeriodService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/service/tutorialgroups/TutorialGroupFreePeriodService.java rename to src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupFreePeriodService.java index 7c84345d5a28..783ce76410e5 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/tutorialgroups/TutorialGroupFreePeriodService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupFreePeriodService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.tutorialgroups; +package de.tum.cit.aet.artemis.service.tutorialgroups; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Optional; import java.util.Set; @@ -9,12 +9,12 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.enumeration.TutorialGroupSessionStatus; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupSession; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupFreePeriodRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupSessionRepository; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupFreePeriodRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupSessionRepository; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/tutorialgroups/TutorialGroupScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupScheduleService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/tutorialgroups/TutorialGroupScheduleService.java rename to src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupScheduleService.java index ea6f04796a25..fb136becb284 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/tutorialgroups/TutorialGroupScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupScheduleService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.tutorialgroups; +package de.tum.cit.aet.artemis.service.tutorialgroups; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.web.rest.util.DateUtil.getFirstDateOfWeekDay; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.web.rest.util.DateUtil.getFirstDateOfWeekDay; import java.time.LocalDate; import java.time.LocalTime; @@ -18,17 +18,17 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.enumeration.TutorialGroupSessionStatus; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupSchedule; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupSession; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupScheduleRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupSessionRepository; -import de.tum.in.www1.artemis.web.rest.tutorialgroups.errors.ScheduleOverlapsWithSessionException; -import de.tum.in.www1.artemis.web.rest.util.DateUtil; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSchedule; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupScheduleRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupSessionRepository; +import de.tum.cit.aet.artemis.web.rest.tutorialgroups.errors.ScheduleOverlapsWithSessionException; +import de.tum.cit.aet.artemis.web.rest.util.DateUtil; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/tutorialgroups/TutorialGroupService.java b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupService.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/service/tutorialgroups/TutorialGroupService.java rename to src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupService.java index d0824d6c009d..e80c25163423 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/tutorialgroups/TutorialGroupService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupService.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.tutorialgroups; +package de.tum.cit.aet.artemis.service.tutorialgroups; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.web.rest.tutorialgroups.TutorialGroupResource.TutorialGroupImportErrors.MULTIPLE_REGISTRATIONS; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupResource.TutorialGroupImportErrors.MULTIPLE_REGISTRATIONS; import static jakarta.persistence.Persistence.getPersistenceUtil; import java.io.IOException; @@ -33,26 +33,26 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.enumeration.TutorialGroupSessionStatus; -import de.tum.in.www1.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupRegistration; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupSession; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupRegistrationRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupSessionRepository; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.dto.StudentDTO; -import de.tum.in.www1.artemis.service.metis.conversation.ConversationDTOService; -import de.tum.in.www1.artemis.service.notifications.SingleUserNotificationService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.tutorialgroups.TutorialGroupResource.TutorialGroupImportErrors; -import de.tum.in.www1.artemis.web.rest.tutorialgroups.TutorialGroupResource.TutorialGroupRegistrationImportDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; +import de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupRegistration; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRegistrationRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupSessionRepository; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.dto.StudentDTO; +import de.tum.cit.aet.artemis.service.metis.conversation.ConversationDTOService; +import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupResource.TutorialGroupImportErrors; +import de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupResource.TutorialGroupRegistrationImportDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/tutorialgroups/TutorialGroupsConfigurationService.java b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupsConfigurationService.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/service/tutorialgroups/TutorialGroupsConfigurationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupsConfigurationService.java index ad4cee69a7c0..946645322798 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/tutorialgroups/TutorialGroupsConfigurationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupsConfigurationService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.tutorialgroups; +package de.tum.cit.aet.artemis.service.tutorialgroups; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.Set; @@ -9,14 +9,14 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupSchedule; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupSession; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupFreePeriodRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupScheduleRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupSessionRepository; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSchedule; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupFreePeriodRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupScheduleRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupSessionRepository; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/user/AuthorityService.java b/src/main/java/de/tum/cit/aet/artemis/service/user/AuthorityService.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/service/user/AuthorityService.java rename to src/main/java/de/tum/cit/aet/artemis/service/user/AuthorityService.java index 90b7dd18d1ad..abc5b08760e3 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/user/AuthorityService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/user/AuthorityService.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.service.user; +package de.tum.cit.aet.artemis.service.user; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.domain.Authority.ADMIN_AUTHORITY; -import static de.tum.in.www1.artemis.security.Role.EDITOR; -import static de.tum.in.www1.artemis.security.Role.INSTRUCTOR; -import static de.tum.in.www1.artemis.security.Role.STUDENT; -import static de.tum.in.www1.artemis.security.Role.TEACHING_ASSISTANT; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.domain.Authority.ADMIN_AUTHORITY; +import static de.tum.cit.aet.artemis.security.Role.EDITOR; +import static de.tum.cit.aet.artemis.security.Role.INSTRUCTOR; +import static de.tum.cit.aet.artemis.security.Role.STUDENT; +import static de.tum.cit.aet.artemis.security.Role.TEACHING_ASSISTANT; import java.util.HashSet; import java.util.Optional; @@ -15,9 +15,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Authority; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.domain.Authority; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.CourseRepository; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/service/user/PasswordService.java b/src/main/java/de/tum/cit/aet/artemis/service/user/PasswordService.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/user/PasswordService.java rename to src/main/java/de/tum/cit/aet/artemis/service/user/PasswordService.java index 7123ac5e504b..ec9ba7c34238 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/user/PasswordService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/user/PasswordService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.user; +package de.tum.cit.aet.artemis.service.user; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; @@ -8,7 +8,7 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.config.SecurityConfiguration; +import de.tum.cit.aet.artemis.config.SecurityConfiguration; /** * This service is a simple delegate to break the circular structure we would get when defining diff --git a/src/main/java/de/tum/in/www1/artemis/service/user/UserCreationService.java b/src/main/java/de/tum/cit/aet/artemis/service/user/UserCreationService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/user/UserCreationService.java rename to src/main/java/de/tum/cit/aet/artemis/service/user/UserCreationService.java index 7d97eb892bf7..9de3ff8826b1 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/user/UserCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/user/UserCreationService.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.service.user; +package de.tum.cit.aet.artemis.service.user; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.security.Role.EDITOR; -import static de.tum.in.www1.artemis.security.Role.INSTRUCTOR; -import static de.tum.in.www1.artemis.security.Role.STUDENT; -import static de.tum.in.www1.artemis.security.Role.TEACHING_ASSISTANT; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.security.Role.EDITOR; +import static de.tum.cit.aet.artemis.security.Role.INSTRUCTOR; +import static de.tum.cit.aet.artemis.security.Role.STUDENT; +import static de.tum.cit.aet.artemis.security.Role.TEACHING_ASSISTANT; import java.time.Instant; import java.util.HashSet; @@ -23,18 +23,18 @@ import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Authority; -import de.tum.in.www1.artemis.domain.Organization; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.AuthorityRepository; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.OrganizationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.connectors.ci.CIUserManagementService; -import de.tum.in.www1.artemis.service.connectors.vcs.VcsUserManagementService; -import de.tum.in.www1.artemis.web.rest.vm.ManagedUserVM; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Authority; +import de.tum.cit.aet.artemis.domain.Organization; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.AuthorityRepository; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.OrganizationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; +import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; +import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; import tech.jhipster.security.RandomUtil; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/in/www1/artemis/service/user/UserManagementInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/service/user/UserManagementInfoContributor.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/service/user/UserManagementInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/service/user/UserManagementInfoContributor.java index 29e56bffe0d1..2cb6a1eb9fef 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/user/UserManagementInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/user/UserManagementInfoContributor.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.user; +package de.tum.cit.aet.artemis.service.user; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Optional; import java.util.regex.Pattern; @@ -11,7 +11,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.in.www1.artemis.config.Constants; +import de.tum.cit.aet.artemis.config.Constants; @Profile(PROFILE_CORE) @Component diff --git a/src/main/java/de/tum/in/www1/artemis/service/user/UserService.java b/src/main/java/de/tum/cit/aet/artemis/service/user/UserService.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/user/UserService.java rename to src/main/java/de/tum/cit/aet/artemis/service/user/UserService.java index e1f1895553aa..e2132c4543cc 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/user/UserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/user/UserService.java @@ -1,16 +1,16 @@ -package de.tum.in.www1.artemis.service.user; - -import static de.tum.in.www1.artemis.config.Constants.PASSWORD_MAX_LENGTH; -import static de.tum.in.www1.artemis.config.Constants.PASSWORD_MIN_LENGTH; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.config.Constants.USERNAME_MAX_LENGTH; -import static de.tum.in.www1.artemis.config.Constants.USERNAME_MIN_LENGTH; -import static de.tum.in.www1.artemis.config.Constants.USER_EMAIL_DOMAIN_AFTER_SOFT_DELETE; -import static de.tum.in.www1.artemis.config.Constants.USER_FIRST_NAME_AFTER_SOFT_DELETE; -import static de.tum.in.www1.artemis.config.Constants.USER_LAST_NAME_AFTER_SOFT_DELETE; -import static de.tum.in.www1.artemis.domain.Authority.ADMIN_AUTHORITY; -import static de.tum.in.www1.artemis.security.Role.ADMIN; -import static de.tum.in.www1.artemis.security.Role.STUDENT; +package de.tum.cit.aet.artemis.service.user; + +import static de.tum.cit.aet.artemis.config.Constants.PASSWORD_MAX_LENGTH; +import static de.tum.cit.aet.artemis.config.Constants.PASSWORD_MIN_LENGTH; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.USERNAME_MAX_LENGTH; +import static de.tum.cit.aet.artemis.config.Constants.USERNAME_MIN_LENGTH; +import static de.tum.cit.aet.artemis.config.Constants.USER_EMAIL_DOMAIN_AFTER_SOFT_DELETE; +import static de.tum.cit.aet.artemis.config.Constants.USER_FIRST_NAME_AFTER_SOFT_DELETE; +import static de.tum.cit.aet.artemis.config.Constants.USER_LAST_NAME_AFTER_SOFT_DELETE; +import static de.tum.cit.aet.artemis.domain.Authority.ADMIN_AUTHORITY; +import static de.tum.cit.aet.artemis.security.Role.ADMIN; +import static de.tum.cit.aet.artemis.security.Role.STUDENT; import static org.apache.commons.lang3.StringUtils.lowerCase; import java.net.URI; @@ -38,33 +38,33 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import de.tum.in.www1.artemis.domain.Authority; -import de.tum.in.www1.artemis.domain.GuidedTourSetting; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.participation.ParticipationVCSAccessToken; -import de.tum.in.www1.artemis.exception.AccountRegistrationBlockedException; -import de.tum.in.www1.artemis.exception.UsernameAlreadyUsedException; -import de.tum.in.www1.artemis.exception.VersionControlException; -import de.tum.in.www1.artemis.repository.AuthorityRepository; -import de.tum.in.www1.artemis.repository.GuidedTourSettingsRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.science.ScienceEventRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.FilePathService; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.ParticipationVcsAccessTokenService; -import de.tum.in.www1.artemis.service.connectors.ci.CIUserManagementService; -import de.tum.in.www1.artemis.service.connectors.ldap.LdapAuthenticationProvider; -import de.tum.in.www1.artemis.service.connectors.vcs.VcsUserManagementService; -import de.tum.in.www1.artemis.service.dto.StudentDTO; -import de.tum.in.www1.artemis.service.dto.UserDTO; -import de.tum.in.www1.artemis.service.ldap.LdapUserDto; -import de.tum.in.www1.artemis.service.ldap.LdapUserService; -import de.tum.in.www1.artemis.service.messaging.InstanceMessageSendService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.EmailAlreadyUsedException; -import de.tum.in.www1.artemis.web.rest.errors.PasswordViolatesRequirementsException; -import de.tum.in.www1.artemis.web.rest.vm.ManagedUserVM; +import de.tum.cit.aet.artemis.domain.Authority; +import de.tum.cit.aet.artemis.domain.GuidedTourSetting; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.participation.ParticipationVCSAccessToken; +import de.tum.cit.aet.artemis.exception.AccountRegistrationBlockedException; +import de.tum.cit.aet.artemis.exception.UsernameAlreadyUsedException; +import de.tum.cit.aet.artemis.exception.VersionControlException; +import de.tum.cit.aet.artemis.repository.AuthorityRepository; +import de.tum.cit.aet.artemis.repository.GuidedTourSettingsRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.science.ScienceEventRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.ParticipationVcsAccessTokenService; +import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; +import de.tum.cit.aet.artemis.service.connectors.ldap.LdapAuthenticationProvider; +import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; +import de.tum.cit.aet.artemis.service.dto.StudentDTO; +import de.tum.cit.aet.artemis.service.dto.UserDTO; +import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; +import de.tum.cit.aet.artemis.service.ldap.LdapUserService; +import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.EmailAlreadyUsedException; +import de.tum.cit.aet.artemis.web.rest.errors.PasswordViolatesRequirementsException; +import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; import tech.jhipster.security.RandomUtil; /** diff --git a/src/main/java/de/tum/in/www1/artemis/service/util/CommonsMultipartFile.java b/src/main/java/de/tum/cit/aet/artemis/service/util/CommonsMultipartFile.java similarity index 99% rename from src/main/java/de/tum/in/www1/artemis/service/util/CommonsMultipartFile.java rename to src/main/java/de/tum/cit/aet/artemis/service/util/CommonsMultipartFile.java index 3abacd229bc1..c5ae95e20e47 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/util/CommonsMultipartFile.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/util/CommonsMultipartFile.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.util; +package de.tum.cit.aet.artemis.service.util; import java.io.File; import java.io.IOException; diff --git a/src/main/java/de/tum/in/www1/artemis/service/util/ExamExerciseStartPreparationStatus.java b/src/main/java/de/tum/cit/aet/artemis/service/util/ExamExerciseStartPreparationStatus.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/service/util/ExamExerciseStartPreparationStatus.java rename to src/main/java/de/tum/cit/aet/artemis/service/util/ExamExerciseStartPreparationStatus.java index 6783738a5f55..944965673139 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/util/ExamExerciseStartPreparationStatus.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/util/ExamExerciseStartPreparationStatus.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.util; +package de.tum.cit.aet.artemis.service.util; import java.io.Serial; import java.io.Serializable; diff --git a/src/main/java/de/tum/in/www1/artemis/service/util/HttpRequestUtils.java b/src/main/java/de/tum/cit/aet/artemis/service/util/HttpRequestUtils.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/service/util/HttpRequestUtils.java rename to src/main/java/de/tum/cit/aet/artemis/service/util/HttpRequestUtils.java index 9378737ee920..1177bd531e21 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/util/HttpRequestUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/util/HttpRequestUtils.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.util; +package de.tum.cit.aet.artemis.service.util; import java.util.Optional; diff --git a/src/main/java/de/tum/in/www1/artemis/service/util/RoundingUtil.java b/src/main/java/de/tum/cit/aet/artemis/service/util/RoundingUtil.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/service/util/RoundingUtil.java rename to src/main/java/de/tum/cit/aet/artemis/service/util/RoundingUtil.java index 191b2c3f391f..cc3c89db239f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/util/RoundingUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/util/RoundingUtil.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.service.util; +package de.tum.cit.aet.artemis.service.util; import java.math.BigDecimal; import java.math.RoundingMode; -import de.tum.in.www1.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Course; public class RoundingUtil { diff --git a/src/main/java/de/tum/in/www1/artemis/service/util/TimeLogUtil.java b/src/main/java/de/tum/cit/aet/artemis/service/util/TimeLogUtil.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/service/util/TimeLogUtil.java rename to src/main/java/de/tum/cit/aet/artemis/service/util/TimeLogUtil.java index af572313539f..29ac6f6d562b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/util/TimeLogUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/util/TimeLogUtil.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.util; +package de.tum.cit.aet.artemis.service.util; import org.apache.commons.lang.time.DurationFormatUtils; diff --git a/src/main/java/de/tum/in/www1/artemis/service/util/TimeUtil.java b/src/main/java/de/tum/cit/aet/artemis/service/util/TimeUtil.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/service/util/TimeUtil.java rename to src/main/java/de/tum/cit/aet/artemis/service/util/TimeUtil.java index 5be76e7034cd..507c5659dbf3 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/util/TimeUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/util/TimeUtil.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.util; +package de.tum.cit.aet.artemis.service.util; import java.time.Instant; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/in/www1/artemis/service/util/Tuple.java b/src/main/java/de/tum/cit/aet/artemis/service/util/Tuple.java similarity index 74% rename from src/main/java/de/tum/in/www1/artemis/service/util/Tuple.java rename to src/main/java/de/tum/cit/aet/artemis/service/util/Tuple.java index 0b36f1bc1b77..dbf05330de0d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/util/Tuple.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/util/Tuple.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.util; +package de.tum.cit.aet.artemis.service.util; /** * Immutable tuple object. diff --git a/src/main/java/de/tum/in/www1/artemis/service/util/UrlUtils.java b/src/main/java/de/tum/cit/aet/artemis/service/util/UrlUtils.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/service/util/UrlUtils.java rename to src/main/java/de/tum/cit/aet/artemis/service/util/UrlUtils.java index 7076e08d4bc6..2901aca8e1aa 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/util/UrlUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/util/UrlUtils.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.util; +package de.tum.cit.aet.artemis.service.util; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/de/tum/in/www1/artemis/service/util/structureoraclegenerator/JavaClassDiff.java b/src/main/java/de/tum/cit/aet/artemis/service/util/structureoraclegenerator/JavaClassDiff.java similarity index 99% rename from src/main/java/de/tum/in/www1/artemis/service/util/structureoraclegenerator/JavaClassDiff.java rename to src/main/java/de/tum/cit/aet/artemis/service/util/structureoraclegenerator/JavaClassDiff.java index 4cb112c8ffa5..fff3db4d9b27 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/util/structureoraclegenerator/JavaClassDiff.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/util/structureoraclegenerator/JavaClassDiff.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.util.structureoraclegenerator; +package de.tum.cit.aet.artemis.service.util.structureoraclegenerator; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/main/java/de/tum/in/www1/artemis/service/util/structureoraclegenerator/JavaClassDiffSerializer.java b/src/main/java/de/tum/cit/aet/artemis/service/util/structureoraclegenerator/JavaClassDiffSerializer.java similarity index 99% rename from src/main/java/de/tum/in/www1/artemis/service/util/structureoraclegenerator/JavaClassDiffSerializer.java rename to src/main/java/de/tum/cit/aet/artemis/service/util/structureoraclegenerator/JavaClassDiffSerializer.java index 4e62d4f67432..3106219c2546 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/util/structureoraclegenerator/JavaClassDiffSerializer.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/util/structureoraclegenerator/JavaClassDiffSerializer.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.util.structureoraclegenerator; +package de.tum.cit.aet.artemis.service.util.structureoraclegenerator; import java.util.HashSet; diff --git a/src/main/java/de/tum/in/www1/artemis/service/util/structureoraclegenerator/OracleGenerator.java b/src/main/java/de/tum/cit/aet/artemis/service/util/structureoraclegenerator/OracleGenerator.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/service/util/structureoraclegenerator/OracleGenerator.java rename to src/main/java/de/tum/cit/aet/artemis/service/util/structureoraclegenerator/OracleGenerator.java index 42476a9e8db6..6336bbfd367e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/util/structureoraclegenerator/OracleGenerator.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/util/structureoraclegenerator/OracleGenerator.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.util.structureoraclegenerator; +package de.tum.cit.aet.artemis.service.util.structureoraclegenerator; import java.io.IOException; import java.nio.file.FileSystems; @@ -23,7 +23,7 @@ import com.thoughtworks.qdox.model.JavaClass; import com.thoughtworks.qdox.model.JavaType; -import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; /** * This generator is used to parse the structure of a programming exercise to be then assessed from Artemis. diff --git a/src/main/java/de/tum/in/www1/artemis/service/util/structureoraclegenerator/SerializerUtil.java b/src/main/java/de/tum/cit/aet/artemis/service/util/structureoraclegenerator/SerializerUtil.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/service/util/structureoraclegenerator/SerializerUtil.java rename to src/main/java/de/tum/cit/aet/artemis/service/util/structureoraclegenerator/SerializerUtil.java index 4f1d4db58f37..5076e8b0e1b6 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/util/structureoraclegenerator/SerializerUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/util/structureoraclegenerator/SerializerUtil.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.util.structureoraclegenerator; +package de.tum.cit.aet.artemis.service.util.structureoraclegenerator; import java.util.List; import java.util.Set; diff --git a/src/main/java/de/tum/in/www1/artemis/validation/InetSocketAddressValidator.java b/src/main/java/de/tum/cit/aet/artemis/validation/InetSocketAddressValidator.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/validation/InetSocketAddressValidator.java rename to src/main/java/de/tum/cit/aet/artemis/validation/InetSocketAddressValidator.java index bc26fab5f367..acdf94da9117 100644 --- a/src/main/java/de/tum/in/www1/artemis/validation/InetSocketAddressValidator.java +++ b/src/main/java/de/tum/cit/aet/artemis/validation/InetSocketAddressValidator.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.validation; +package de.tum.cit.aet.artemis.validation; import java.net.InetSocketAddress; import java.net.URI; diff --git a/src/main/java/de/tum/in/www1/artemis/validation/TeamAssignmentConfigValidator.java b/src/main/java/de/tum/cit/aet/artemis/validation/TeamAssignmentConfigValidator.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/validation/TeamAssignmentConfigValidator.java rename to src/main/java/de/tum/cit/aet/artemis/validation/TeamAssignmentConfigValidator.java index e4141512b01b..55470a33b578 100644 --- a/src/main/java/de/tum/in/www1/artemis/validation/TeamAssignmentConfigValidator.java +++ b/src/main/java/de/tum/cit/aet/artemis/validation/TeamAssignmentConfigValidator.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.validation; +package de.tum.cit.aet.artemis.validation; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; -import de.tum.in.www1.artemis.domain.TeamAssignmentConfig; -import de.tum.in.www1.artemis.validation.constraints.TeamAssignmentConfigConstraints; +import de.tum.cit.aet.artemis.domain.TeamAssignmentConfig; +import de.tum.cit.aet.artemis.validation.constraints.TeamAssignmentConfigConstraints; /** * Validates a team assignment configuration by checking that these criteria are fulfilled: diff --git a/src/main/java/de/tum/in/www1/artemis/validation/constraints/TeamAssignmentConfigConstraints.java b/src/main/java/de/tum/cit/aet/artemis/validation/constraints/TeamAssignmentConfigConstraints.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/validation/constraints/TeamAssignmentConfigConstraints.java rename to src/main/java/de/tum/cit/aet/artemis/validation/constraints/TeamAssignmentConfigConstraints.java index 66bf8a871f29..3ff9d1ce162c 100644 --- a/src/main/java/de/tum/in/www1/artemis/validation/constraints/TeamAssignmentConfigConstraints.java +++ b/src/main/java/de/tum/cit/aet/artemis/validation/constraints/TeamAssignmentConfigConstraints.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.validation.constraints; +package de.tum.cit.aet.artemis.validation.constraints; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -8,7 +8,7 @@ import jakarta.validation.Constraint; import jakarta.validation.Payload; -import de.tum.in.www1.artemis.validation.TeamAssignmentConfigValidator; +import de.tum.cit.aet.artemis.validation.TeamAssignmentConfigValidator; /** * Custom constraint annotation for team assignment configurations @@ -22,7 +22,7 @@ /** * @return the message of the violated constraint */ - String message() default "{de.tum.in.www1.artemis.validation.constraints.TeamAssignmentConfigConstraints}"; + String message() default "{de.tum.cit.aet.artemis.validation.constraints.TeamAssignmentConfigConstraints}"; /** * @return the groups, default is empty diff --git a/src/main/java/de/tum/in/www1/artemis/web/filter/ApiVersionFilter.java b/src/main/java/de/tum/cit/aet/artemis/web/filter/ApiVersionFilter.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/web/filter/ApiVersionFilter.java rename to src/main/java/de/tum/cit/aet/artemis/web/filter/ApiVersionFilter.java index c9e0c68db68a..4a244bceb574 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/filter/ApiVersionFilter.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/filter/ApiVersionFilter.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.filter; +package de.tum.cit.aet.artemis.web.filter; import static tech.jhipster.config.JHipsterConstants.SPRING_PROFILE_PRODUCTION; import static tech.jhipster.config.JHipsterConstants.SPRING_PROFILE_TEST; diff --git a/src/main/java/de/tum/in/www1/artemis/web/filter/CachingHttpHeadersFilter.java b/src/main/java/de/tum/cit/aet/artemis/web/filter/CachingHttpHeadersFilter.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/web/filter/CachingHttpHeadersFilter.java rename to src/main/java/de/tum/cit/aet/artemis/web/filter/CachingHttpHeadersFilter.java index 9e3a19654bea..94a7569bf7ac 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/filter/CachingHttpHeadersFilter.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/filter/CachingHttpHeadersFilter.java @@ -5,7 +5,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -package de.tum.in.www1.artemis.web.filter; +package de.tum.cit.aet.artemis.web.filter; import java.io.IOException; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/de/tum/in/www1/artemis/web/filter/Lti13LaunchFilter.java b/src/main/java/de/tum/cit/aet/artemis/web/filter/Lti13LaunchFilter.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/web/filter/Lti13LaunchFilter.java rename to src/main/java/de/tum/cit/aet/artemis/web/filter/Lti13LaunchFilter.java index 5748cd646450..262c3d2fb543 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/filter/Lti13LaunchFilter.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/filter/Lti13LaunchFilter.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.filter; +package de.tum.cit.aet.artemis.web.filter; import java.io.IOException; import java.io.PrintWriter; @@ -21,12 +21,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.config.lti.CustomLti13Configurer; -import de.tum.in.www1.artemis.domain.lti.Claims; -import de.tum.in.www1.artemis.domain.lti.LtiAuthenticationResponse; -import de.tum.in.www1.artemis.exception.LtiEmailAlreadyInUseException; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.connectors.lti.Lti13Service; +import de.tum.cit.aet.artemis.config.lti.CustomLti13Configurer; +import de.tum.cit.aet.artemis.domain.lti.Claims; +import de.tum.cit.aet.artemis.domain.lti.LtiAuthenticationResponse; +import de.tum.cit.aet.artemis.exception.LtiEmailAlreadyInUseException; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.connectors.lti.Lti13Service; import uk.ac.ox.ctl.lti13.security.oauth2.client.lti.authentication.OidcAuthenticationToken; import uk.ac.ox.ctl.lti13.security.oauth2.client.lti.web.OAuth2LoginAuthenticationFilter; diff --git a/src/main/java/de/tum/in/www1/artemis/web/filter/SpaWebFilter.java b/src/main/java/de/tum/cit/aet/artemis/web/filter/SpaWebFilter.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/web/filter/SpaWebFilter.java rename to src/main/java/de/tum/cit/aet/artemis/web/filter/SpaWebFilter.java index 8423fcc49b75..577199f12593 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/filter/SpaWebFilter.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/filter/SpaWebFilter.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.filter; +package de.tum.cit.aet.artemis.web.filter; import java.io.IOException; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/AbstractSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AbstractSubmissionResource.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/web/rest/AbstractSubmissionResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/AbstractSubmissionResource.java index 21d2324ee4bc..a04717b746c8 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/AbstractSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AbstractSubmissionResource.java @@ -1,19 +1,19 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; import java.util.List; import org.springframework.http.ResponseEntity; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.SubmissionService; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.SubmissionService; /** * Abstract class that allows reuse diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/AccountResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AccountResource.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/AccountResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/AccountResource.java index 1e3cffc3f397..a8b379e42857 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/AccountResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AccountResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.IOException; import java.net.URI; @@ -31,22 +31,22 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import de.tum.in.www1.artemis.config.icl.ssh.HashUtils; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.AccountService; -import de.tum.in.www1.artemis.service.FilePathService; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCPersonalAccessTokenManagementService; -import de.tum.in.www1.artemis.service.dto.PasswordChangeDTO; -import de.tum.in.www1.artemis.service.dto.UserDTO; -import de.tum.in.www1.artemis.service.user.UserCreationService; -import de.tum.in.www1.artemis.service.user.UserService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EmailAlreadyUsedException; -import de.tum.in.www1.artemis.web.rest.errors.PasswordViolatesRequirementsException; +import de.tum.cit.aet.artemis.config.icl.ssh.HashUtils; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.AccountService; +import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCPersonalAccessTokenManagementService; +import de.tum.cit.aet.artemis.service.dto.PasswordChangeDTO; +import de.tum.cit.aet.artemis.service.dto.UserDTO; +import de.tum.cit.aet.artemis.service.user.UserCreationService; +import de.tum.cit.aet.artemis.service.user.UserService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EmailAlreadyUsedException; +import de.tum.cit.aet.artemis.web.rest.errors.PasswordViolatesRequirementsException; /** * REST controller for managing the current user's account. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/AeolusTemplateResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AeolusTemplateResource.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/web/rest/AeolusTemplateResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/AeolusTemplateResource.java index 6fd9e7312ca7..34766d155468 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/AeolusTemplateResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AeolusTemplateResource.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; import java.io.IOException; import java.util.Optional; @@ -18,12 +18,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.service.connectors.BuildScriptProviderService; -import de.tum.in.www1.artemis.service.connectors.aeolus.AeolusTemplateService; -import de.tum.in.www1.artemis.service.connectors.aeolus.Windfile; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.service.connectors.BuildScriptProviderService; +import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; /** * Service for retrieving aeolus template files based on the programming language, project type, and diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/AndroidAppSiteAssociationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AndroidAppSiteAssociationResource.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/web/rest/AndroidAppSiteAssociationResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/AndroidAppSiteAssociationResource.java index 4fd5d9214308..1b81240f7890 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/AndroidAppSiteAssociationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AndroidAppSiteAssociationResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.security.annotations.ManualConfig; +import de.tum.cit.aet.artemis.security.annotations.ManualConfig; /** * REST controller for the android assetlink.json diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ApollonConversionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonConversionResource.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/web/rest/ApollonConversionResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonConversionResource.java index 6aaefd9d7085..9e0097beceef 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ApollonConversionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonConversionResource.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; import java.io.InputStream; @@ -13,9 +13,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.connectors.apollon.ApollonConversionService; -import de.tum.in.www1.artemis.service.connectors.apollon.dto.ApollonModelDTO; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.connectors.apollon.ApollonConversionService; +import de.tum.cit.aet.artemis.service.connectors.apollon.dto.ApollonModelDTO; /** * REST controller for managing ApollonDiagram. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ApollonDiagramResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonDiagramResource.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/web/rest/ApollonDiagramResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonDiagramResource.java index 9c3f9277695c..5308ac25b19e 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ApollonDiagramResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonDiagramResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -20,17 +20,17 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.modeling.ApollonDiagram; -import de.tum.in.www1.artemis.repository.ApollonDiagramRepository; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.modeling.ApollonDiagram; +import de.tum.cit.aet.artemis.repository.ApollonDiagramRepository; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; /** * REST controller for managing ApollonDiagram. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/AppleAppSiteAssociationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AppleAppSiteAssociationResource.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/web/rest/AppleAppSiteAssociationResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/AppleAppSiteAssociationResource.java index 6c2924cd99a3..105557ffa1d8 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/AppleAppSiteAssociationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AppleAppSiteAssociationResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.security.annotations.ManualConfig; +import de.tum.cit.aet.artemis.security.annotations.ManualConfig; /** * REST controller for the apple-app-site-association json diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/AssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AssessmentResource.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/web/rest/AssessmentResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/AssessmentResource.java index 8478943d8628..e226c1dd0fc7 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/AssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AssessmentResource.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; import java.util.List; @@ -7,26 +7,26 @@ import org.springframework.http.ResponseEntity; import org.springframework.util.StringUtils; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.ExampleSubmissionRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.service.AssessmentService; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.service.AssessmentService; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; public abstract class AssessmentResource { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/AthenaResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AthenaResource.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/web/rest/AthenaResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/AthenaResource.java index 6b7b78747f66..60167a846dae 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/AthenaResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AthenaResource.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; import java.io.IOException; import java.util.List; @@ -17,34 +17,34 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseType; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.exception.NetworkingException; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ModelingExerciseRepository; -import de.tum.in.www1.artemis.repository.ModelingSubmissionRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionRepository; -import de.tum.in.www1.artemis.repository.TextExerciseRepository; -import de.tum.in.www1.artemis.repository.TextSubmissionRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.security.annotations.EnforceNothing; -import de.tum.in.www1.artemis.security.annotations.ManualConfig; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.connectors.athena.AthenaFeedbackSuggestionsService; -import de.tum.in.www1.artemis.service.connectors.athena.AthenaModuleService; -import de.tum.in.www1.artemis.service.connectors.athena.AthenaRepositoryExportService; -import de.tum.in.www1.artemis.service.dto.athena.ModelingFeedbackDTO; -import de.tum.in.www1.artemis.service.dto.athena.ProgrammingFeedbackDTO; -import de.tum.in.www1.artemis.service.dto.athena.TextFeedbackDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException; -import de.tum.in.www1.artemis.web.rest.util.ResponseUtil; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.exception.NetworkingException; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ModelingSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.security.annotations.ManualConfig; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.connectors.athena.AthenaFeedbackSuggestionsService; +import de.tum.cit.aet.artemis.service.connectors.athena.AthenaModuleService; +import de.tum.cit.aet.artemis.service.connectors.athena.AthenaRepositoryExportService; +import de.tum.cit.aet.artemis.service.dto.athena.ModelingFeedbackDTO; +import de.tum.cit.aet.artemis.service.dto.athena.ProgrammingFeedbackDTO; +import de.tum.cit.aet.artemis.service.dto.athena.TextFeedbackDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.web.rest.util.ResponseUtil; /** * REST controller for Athena feedback suggestions. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/AttachmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AttachmentResource.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/web/rest/AttachmentResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/AttachmentResource.java index 0078b5385979..c924b9f2a247 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/AttachmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AttachmentResource.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.service.FilePathService.actualPathForPublicPath; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.service.FilePathService.actualPathForPublicPath; import java.net.URI; import java.net.URISyntaxException; @@ -26,21 +26,21 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import de.tum.in.www1.artemis.domain.Attachment; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AttachmentType; -import de.tum.in.www1.artemis.repository.AttachmentRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.FilePathService; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.notifications.GroupNotificationService; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.domain.Attachment; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; +import de.tum.cit.aet.artemis.repository.AttachmentRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; import tech.jhipster.web.util.ResponseUtil; /** diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/BonusResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/BonusResource.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/BonusResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/BonusResource.java index cb1b2ce196f0..fa3ea4f4531b 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/BonusResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/BonusResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -21,27 +21,27 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Bonus; -import de.tum.in.www1.artemis.domain.BonusStrategy; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.GradingScale; -import de.tum.in.www1.artemis.repository.BonusRepository; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.GradingScaleRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAdmin; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.ManualConfig; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.BonusService; -import de.tum.in.www1.artemis.service.CourseScoreCalculationService; -import de.tum.in.www1.artemis.service.exam.ExamAccessService; -import de.tum.in.www1.artemis.web.rest.dto.BonusExampleDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.domain.Bonus; +import de.tum.cit.aet.artemis.domain.BonusStrategy; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.repository.BonusRepository; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.ManualConfig; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.BonusService; +import de.tum.cit.aet.artemis.service.CourseScoreCalculationService; +import de.tum.cit.aet.artemis.service.exam.ExamAccessService; +import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** * REST controller for managing bonus diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ComplaintResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResource.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/web/rest/ComplaintResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResource.java index 8c419daa75dc..81ce7a110a9b 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ComplaintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -21,38 +21,38 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Complaint; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.FileUploadSubmission; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.ComplaintType; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.ComplaintRepository; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ComplaintService; -import de.tum.in.www1.artemis.service.dto.ComplaintRequestDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.domain.Complaint; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ComplaintService; +import de.tum.cit.aet.artemis.service.dto.ComplaintRequestDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** * REST controller for managing complaints. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ComplaintResponseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResponseResource.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/ComplaintResponseResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResponseResource.java index 444851caa304..3696381d23c2 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ComplaintResponseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResponseResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Optional; @@ -17,17 +17,17 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Complaint; -import de.tum.in.www1.artemis.domain.ComplaintResponse; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.ComplaintRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.ComplaintResponseService; -import de.tum.in.www1.artemis.service.dto.ComplaintAction; -import de.tum.in.www1.artemis.service.dto.ComplaintResponseUpdateDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.Complaint; +import de.tum.cit.aet.artemis.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.ComplaintResponseService; +import de.tum.cit.aet.artemis.service.dto.ComplaintAction; +import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; /** * REST controller for managing complaints. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ConsistencyCheckResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ConsistencyCheckResource.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/web/rest/ConsistencyCheckResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/ConsistencyCheckResource.java index 0d64c6487b02..319b34e4c757 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ConsistencyCheckResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ConsistencyCheckResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; @@ -13,13 +13,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ConsistencyCheckService; -import de.tum.in.www1.artemis.service.dto.ConsistencyErrorDTO; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ConsistencyCheckService; +import de.tum.cit.aet.artemis.service.dto.ConsistencyErrorDTO; /** * REST controller for consistency checks diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/CourseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/web/rest/CourseResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java index 0c2749ccb50d..bb68a0eecb4e 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/CourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static java.time.ZonedDateTime.now; import java.io.File; @@ -56,67 +56,67 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.GradingScale; -import de.tum.in.www1.artemis.domain.OnlineCourseConfiguration; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.participation.Participant; -import de.tum.in.www1.artemis.domain.participation.TutorParticipation; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.GradingScaleRepository; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.repository.TutorParticipationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AssessmentDashboardService; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ComplaintService; -import de.tum.in.www1.artemis.service.ConductAgreementService; -import de.tum.in.www1.artemis.service.CourseScoreCalculationService; -import de.tum.in.www1.artemis.service.CourseService; -import de.tum.in.www1.artemis.service.ExerciseService; -import de.tum.in.www1.artemis.service.FilePathService; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.GradingScaleService; -import de.tum.in.www1.artemis.service.OnlineCourseConfigurationService; -import de.tum.in.www1.artemis.service.SubmissionService; -import de.tum.in.www1.artemis.service.connectors.athena.AthenaModuleService; -import de.tum.in.www1.artemis.service.connectors.ci.CIUserManagementService; -import de.tum.in.www1.artemis.service.connectors.vcs.VcsUserManagementService; -import de.tum.in.www1.artemis.service.dto.StudentDTO; -import de.tum.in.www1.artemis.service.dto.UserDTO; -import de.tum.in.www1.artemis.service.dto.UserPublicInfoDTO; -import de.tum.in.www1.artemis.service.feature.Feature; -import de.tum.in.www1.artemis.service.feature.FeatureToggle; -import de.tum.in.www1.artemis.service.learningpath.LearningPathService; -import de.tum.in.www1.artemis.service.tutorialgroups.TutorialGroupsConfigurationService; -import de.tum.in.www1.artemis.service.util.TimeLogUtil; -import de.tum.in.www1.artemis.web.rest.dto.CourseForDashboardDTO; -import de.tum.in.www1.artemis.web.rest.dto.CourseForImportDTO; -import de.tum.in.www1.artemis.web.rest.dto.CourseManagementDetailViewDTO; -import de.tum.in.www1.artemis.web.rest.dto.CourseManagementOverviewStatisticsDTO; -import de.tum.in.www1.artemis.web.rest.dto.CoursesForDashboardDTO; -import de.tum.in.www1.artemis.web.rest.dto.OnlineCourseDTO; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.in.www1.artemis.web.rest.dto.StatsForDashboardDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.dto.user.UserNameAndLoginDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenAlertException; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.in.www1.artemis.web.rest.errors.ErrorConstants; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.participation.Participant; +import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.repository.TutorParticipationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AssessmentDashboardService; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ComplaintService; +import de.tum.cit.aet.artemis.service.ConductAgreementService; +import de.tum.cit.aet.artemis.service.CourseScoreCalculationService; +import de.tum.cit.aet.artemis.service.CourseService; +import de.tum.cit.aet.artemis.service.ExerciseService; +import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.GradingScaleService; +import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; +import de.tum.cit.aet.artemis.service.SubmissionService; +import de.tum.cit.aet.artemis.service.connectors.athena.AthenaModuleService; +import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; +import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; +import de.tum.cit.aet.artemis.service.dto.StudentDTO; +import de.tum.cit.aet.artemis.service.dto.UserDTO; +import de.tum.cit.aet.artemis.service.dto.UserPublicInfoDTO; +import de.tum.cit.aet.artemis.service.feature.Feature; +import de.tum.cit.aet.artemis.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.service.learningpath.LearningPathService; +import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupsConfigurationService; +import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.web.rest.dto.CourseForDashboardDTO; +import de.tum.cit.aet.artemis.web.rest.dto.CourseForImportDTO; +import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementDetailViewDTO; +import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementOverviewStatisticsDTO; +import de.tum.cit.aet.artemis.web.rest.dto.CoursesForDashboardDTO; +import de.tum.cit.aet.artemis.web.rest.dto.OnlineCourseDTO; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.dto.user.UserNameAndLoginDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; import tech.jhipster.web.util.PaginationUtil; /** diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/CustomMetricsExtension.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/CustomMetricsExtension.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/web/rest/CustomMetricsExtension.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/CustomMetricsExtension.java index 9aff5965ab73..4f09fd3c3531 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/CustomMetricsExtension.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/CustomMetricsExtension.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/DataExportResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/DataExportResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java index 3ee03da3c8a9..973bba9d430c 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/DataExportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.File; import java.nio.file.Path; @@ -23,16 +23,16 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.DataExport; -import de.tum.in.www1.artemis.domain.enumeration.DataExportState; -import de.tum.in.www1.artemis.repository.DataExportRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.export.DataExportService; -import de.tum.in.www1.artemis.web.rest.dto.DataExportDTO; -import de.tum.in.www1.artemis.web.rest.dto.RequestDataExportDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.DataExport; +import de.tum.cit.aet.artemis.domain.enumeration.DataExportState; +import de.tum.cit.aet.artemis.repository.DataExportRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.export.DataExportService; +import de.tum.cit.aet.artemis.web.rest.dto.DataExportDTO; +import de.tum.cit.aet.artemis.web.rest.dto.RequestDataExportDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * REST controller for data exports. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ExamLockResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamLockResource.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/web/rest/ExamLockResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/ExamLockResource.java index b09690fc861a..59eea8c4588b 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ExamLockResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamLockResource.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -9,9 +9,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.service.exam.ExamAccessService; -import de.tum.in.www1.artemis.service.exam.ExamService; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.service.exam.ExamAccessService; +import de.tum.cit.aet.artemis.service.exam.ExamService; // only available for external version control services @Profile("!localvc & core") diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ExamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/web/rest/ExamResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java index bc3cbf5f8dff..8d393a626776 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.service.util.TimeLogUtil.formatDurationFrom; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.service.util.TimeLogUtil.formatDurationFrom; import static java.time.ZonedDateTime.now; import java.io.File; @@ -50,68 +50,68 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.exam.SuspiciousSessionsAnalysisOptions; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.participation.TutorParticipation; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.CustomAuditEventRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.TutorParticipationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AssessmentDashboardService; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.SubmissionService; -import de.tum.in.www1.artemis.service.dto.StudentDTO; -import de.tum.in.www1.artemis.service.exam.ExamAccessService; -import de.tum.in.www1.artemis.service.exam.ExamDateService; -import de.tum.in.www1.artemis.service.exam.ExamDeletionService; -import de.tum.in.www1.artemis.service.exam.ExamImportService; -import de.tum.in.www1.artemis.service.exam.ExamLiveEventsService; -import de.tum.in.www1.artemis.service.exam.ExamRegistrationService; -import de.tum.in.www1.artemis.service.exam.ExamService; -import de.tum.in.www1.artemis.service.exam.ExamSessionService; -import de.tum.in.www1.artemis.service.exam.ExamUserService; -import de.tum.in.www1.artemis.service.exam.StudentExamService; -import de.tum.in.www1.artemis.service.feature.Feature; -import de.tum.in.www1.artemis.service.feature.FeatureToggle; -import de.tum.in.www1.artemis.service.messaging.InstanceMessageSendService; -import de.tum.in.www1.artemis.service.metis.conversation.ChannelService; -import de.tum.in.www1.artemis.service.util.TimeLogUtil; -import de.tum.in.www1.artemis.web.rest.dto.CourseWithIdDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExamChecklistDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExamInformationDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExamScoresDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExamUserDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExamWithIdAndCourseDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExerciseForPlagiarismCasesOverviewDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExerciseGroupWithIdAndExamDTO; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.in.www1.artemis.web.rest.dto.StatsForDashboardDTO; -import de.tum.in.www1.artemis.web.rest.dto.SuspiciousExamSessionsDTO; -import de.tum.in.www1.artemis.web.rest.dto.examevent.ExamWideAnnouncementEventDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenAlertException; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.exam.SuspiciousSessionsAnalysisOptions; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.CustomAuditEventRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.TutorParticipationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AssessmentDashboardService; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.SubmissionService; +import de.tum.cit.aet.artemis.service.dto.StudentDTO; +import de.tum.cit.aet.artemis.service.exam.ExamAccessService; +import de.tum.cit.aet.artemis.service.exam.ExamDateService; +import de.tum.cit.aet.artemis.service.exam.ExamDeletionService; +import de.tum.cit.aet.artemis.service.exam.ExamImportService; +import de.tum.cit.aet.artemis.service.exam.ExamLiveEventsService; +import de.tum.cit.aet.artemis.service.exam.ExamRegistrationService; +import de.tum.cit.aet.artemis.service.exam.ExamService; +import de.tum.cit.aet.artemis.service.exam.ExamSessionService; +import de.tum.cit.aet.artemis.service.exam.ExamUserService; +import de.tum.cit.aet.artemis.service.exam.StudentExamService; +import de.tum.cit.aet.artemis.service.feature.Feature; +import de.tum.cit.aet.artemis.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; +import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.web.rest.dto.CourseWithIdDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExamChecklistDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExamInformationDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExamScoresDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExamUserDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExamWithIdAndCourseDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExerciseForPlagiarismCasesOverviewDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExerciseGroupWithIdAndExamDTO; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; +import de.tum.cit.aet.artemis.web.rest.dto.SuspiciousExamSessionsDTO; +import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamWideAnnouncementEventDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.PaginationUtil; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ExamUserResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/web/rest/ExamUserResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java index 69ded3a55872..f55372963f3f 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ExamUserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.nio.file.Path; @@ -19,20 +19,20 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import de.tum.in.www1.artemis.domain.exam.ExamUser; -import de.tum.in.www1.artemis.repository.ExamUserRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.FilePathService; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.exam.ExamAccessService; -import de.tum.in.www1.artemis.service.exam.ExamUserService; -import de.tum.in.www1.artemis.web.rest.dto.ExamUserAttendanceCheckDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExamUserDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExamUsersNotFoundDTO; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.exam.ExamUser; +import de.tum.cit.aet.artemis.repository.ExamUserRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.exam.ExamAccessService; +import de.tum.cit.aet.artemis.service.exam.ExamUserService; +import de.tum.cit.aet.artemis.web.rest.dto.ExamUserAttendanceCheckDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExamUserDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExamUsersNotFoundDTO; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * REST controller for managing ExamUser. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ExampleSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/web/rest/ExampleSubmissionResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java index a143b2e5426d..5b1285f4595d 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ExampleSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Optional; @@ -21,24 +21,24 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.ExampleSubmission; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseType; -import de.tum.in.www1.artemis.repository.ExampleSubmissionRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.TextSubmissionRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ExampleSubmissionService; -import de.tum.in.www1.artemis.service.TextBlockService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ExampleSubmissionService; +import de.tum.cit.aet.artemis.service.TextBlockService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** * REST controller for managing ExampleSubmission. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ExerciseGroupResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/ExerciseGroupResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java index 944479615797..a77997d2cbe0 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ExerciseGroupResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.IOException; import java.net.URI; @@ -24,23 +24,23 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExerciseGroupRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.service.ExerciseDeletionService; -import de.tum.in.www1.artemis.service.exam.ExamAccessService; -import de.tum.in.www1.artemis.service.exam.ExamImportService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExerciseGroupRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.service.ExerciseDeletionService; +import de.tum.cit.aet.artemis.service.exam.ExamAccessService; +import de.tum.cit.aet.artemis.service.exam.ExamImportService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** * REST controller for managing ExerciseGroup. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/web/rest/ExerciseResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java index fdc424207a00..cb304a3f1ad3 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Collections; @@ -21,46 +21,46 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.ExampleSubmission; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.TutorParticipationStatus; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.hestia.ExerciseHint; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.participation.TutorParticipation; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.repository.ExampleSubmissionRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.GradingCriterionRepository; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ExerciseDeletionService; -import de.tum.in.www1.artemis.service.ExerciseService; -import de.tum.in.www1.artemis.service.ParticipationService; -import de.tum.in.www1.artemis.service.TutorParticipationService; -import de.tum.in.www1.artemis.service.exam.ExamAccessService; -import de.tum.in.www1.artemis.service.exam.ExamDateService; -import de.tum.in.www1.artemis.service.hestia.ExerciseHintService; -import de.tum.in.www1.artemis.service.iris.dto.IrisCombinedSettingsDTO; -import de.tum.in.www1.artemis.service.iris.settings.IrisSettingsService; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismCaseService; -import de.tum.in.www1.artemis.service.quiz.QuizBatchService; -import de.tum.in.www1.artemis.web.rest.dto.ExerciseDetailsDTO; -import de.tum.in.www1.artemis.web.rest.dto.StatsForDashboardDTO; -import de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.hestia.ExerciseHint; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ExerciseDeletionService; +import de.tum.cit.aet.artemis.service.ExerciseService; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.service.TutorParticipationService; +import de.tum.cit.aet.artemis.service.exam.ExamAccessService; +import de.tum.cit.aet.artemis.service.exam.ExamDateService; +import de.tum.cit.aet.artemis.service.hestia.ExerciseHintService; +import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedSettingsDTO; +import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; +import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismCaseService; +import de.tum.cit.aet.artemis.service.quiz.QuizBatchService; +import de.tum.cit.aet.artemis.web.rest.dto.ExerciseDetailsDTO; +import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; +import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; /** * REST controller for managing Exercise. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ExerciseScoresChartResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseScoresChartResource.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/web/rest/ExerciseScoresChartResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseScoresChartResource.java index d97283b883e3..490cedf1d9ba 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ExerciseScoresChartResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseScoresChartResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Set; @@ -15,17 +15,17 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ExerciseDateService; -import de.tum.in.www1.artemis.service.ExerciseScoresChartService; -import de.tum.in.www1.artemis.web.rest.dto.ExerciseScoresDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ExerciseDateService; +import de.tum.cit.aet.artemis.service.ExerciseScoresChartService; +import de.tum.cit.aet.artemis.web.rest.dto.ExerciseScoresDTO; /** * Controller to provides endpoints to query the necessary data for the exercise-scores-chart.component.ts in the client diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/FileResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/web/rest/FileResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java index b9d970faca8e..ff029d76c272 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/FileResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.IOException; import java.net.FileNameMap; @@ -39,44 +39,44 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import de.tum.in.www1.artemis.domain.Attachment; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.FileUploadSubmission; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AttachmentType; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.domain.exam.ExamUser; -import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; -import de.tum.in.www1.artemis.domain.lecture.Slide; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.in.www1.artemis.domain.quiz.DragItem; -import de.tum.in.www1.artemis.repository.AttachmentRepository; -import de.tum.in.www1.artemis.repository.AttachmentUnitRepository; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.DragItemRepository; -import de.tum.in.www1.artemis.repository.ExamUserRepository; -import de.tum.in.www1.artemis.repository.FileUploadSubmissionRepository; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.QuizQuestionRepository; -import de.tum.in.www1.artemis.repository.SlideRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.FilePathService; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.LectureUnitService; -import de.tum.in.www1.artemis.service.ResourceLoaderService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.Attachment; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.domain.exam.ExamUser; +import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.domain.lecture.Slide; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; +import de.tum.cit.aet.artemis.domain.quiz.DragItem; +import de.tum.cit.aet.artemis.repository.AttachmentRepository; +import de.tum.cit.aet.artemis.repository.AttachmentUnitRepository; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.DragItemRepository; +import de.tum.cit.aet.artemis.repository.ExamUserRepository; +import de.tum.cit.aet.artemis.repository.FileUploadSubmissionRepository; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.QuizQuestionRepository; +import de.tum.cit.aet.artemis.repository.SlideRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.LectureUnitService; +import de.tum.cit.aet.artemis.service.ResourceLoaderService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * REST controller for managing Files. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/FileUploadAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/web/rest/FileUploadAssessmentResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java index 2880b97e1353..53ff7ed29498 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/FileUploadAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -17,26 +17,26 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.FileUploadSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.ExampleSubmissionRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.FileUploadExerciseRepository; -import de.tum.in.www1.artemis.repository.FileUploadSubmissionRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AssessmentService; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.web.rest.dto.AssessmentUpdateDTO; -import de.tum.in.www1.artemis.web.rest.dto.FileUploadAssessmentDTO; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.FileUploadExerciseRepository; +import de.tum.cit.aet.artemis.repository.FileUploadSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AssessmentService; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; +import de.tum.cit.aet.artemis.web.rest.dto.FileUploadAssessmentDTO; /** * REST controller for managing FileUploadAssessment. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/FileUploadExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/web/rest/FileUploadExerciseResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java index 986f0ee9015d..608f23acbf94 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/FileUploadExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.FILE_ENDING_PATTERN; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.FILE_ENDING_PATTERN; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.File; import java.net.URI; @@ -26,41 +26,41 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.FileUploadExerciseRepository; -import de.tum.in.www1.artemis.repository.GradingCriterionRepository; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.CourseService; -import de.tum.in.www1.artemis.service.ExerciseDeletionService; -import de.tum.in.www1.artemis.service.ExerciseService; -import de.tum.in.www1.artemis.service.FileUploadExerciseImportService; -import de.tum.in.www1.artemis.service.FileUploadExerciseService; -import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; -import de.tum.in.www1.artemis.service.export.FileUploadSubmissionExportService; -import de.tum.in.www1.artemis.service.feature.Feature; -import de.tum.in.www1.artemis.service.feature.FeatureToggle; -import de.tum.in.www1.artemis.service.metis.conversation.ChannelService; -import de.tum.in.www1.artemis.service.notifications.GroupNotificationScheduleService; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.in.www1.artemis.web.rest.dto.SubmissionExportOptionsDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; -import de.tum.in.www1.artemis.web.rest.util.ResponseUtil; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.FileUploadExerciseRepository; +import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.CourseService; +import de.tum.cit.aet.artemis.service.ExerciseDeletionService; +import de.tum.cit.aet.artemis.service.ExerciseService; +import de.tum.cit.aet.artemis.service.FileUploadExerciseImportService; +import de.tum.cit.aet.artemis.service.FileUploadExerciseService; +import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.service.export.FileUploadSubmissionExportService; +import de.tum.cit.aet.artemis.service.feature.Feature; +import de.tum.cit.aet.artemis.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; +import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.web.rest.util.ResponseUtil; /** * REST controller for managing FileUploadExercise. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/FileUploadSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/web/rest/FileUploadSubmissionResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java index c9c36612635f..b8038d53c875 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/FileUploadSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.IOException; import java.util.Collections; @@ -26,35 +26,35 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.server.ResponseStatusException; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.FileUploadSubmission; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exception.EmptyFileException; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.FileUploadExerciseRepository; -import de.tum.in.www1.artemis.repository.FileUploadSubmissionRepository; -import de.tum.in.www1.artemis.repository.GradingCriterionRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ExerciseDateService; -import de.tum.in.www1.artemis.service.FileUploadSubmissionService; -import de.tum.in.www1.artemis.service.ResultService; -import de.tum.in.www1.artemis.service.exam.ExamSubmissionService; -import de.tum.in.www1.artemis.service.notifications.SingleUserNotificationService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exception.EmptyFileException; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.FileUploadExerciseRepository; +import de.tum.cit.aet.artemis.repository.FileUploadSubmissionRepository; +import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ExerciseDateService; +import de.tum.cit.aet.artemis.service.FileUploadSubmissionService; +import de.tum.cit.aet.artemis.service.ResultService; +import de.tum.cit.aet.artemis.service.exam.ExamSubmissionService; +import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** * REST controller for managing FileUploadSubmission. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/GitDiffReportParserService.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/GitDiffReportParserService.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/web/rest/GitDiffReportParserService.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/GitDiffReportParserService.java index 9636c2f0686c..1b8303946d04 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/GitDiffReportParserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/GitDiffReportParserService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.HashMap; @@ -13,7 +13,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/GradeStepResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/GradeStepResource.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/web/rest/GradeStepResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/GradeStepResource.java index 58ab808d3cfd..314a16d95614 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/GradeStepResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/GradeStepResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Optional; import java.util.Set; @@ -15,26 +15,26 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.GradeStep; -import de.tum.in.www1.artemis.domain.GradingScale; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.GradeStepRepository; -import de.tum.in.www1.artemis.repository.GradingScaleRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.web.rest.dto.GradeDTO; -import de.tum.in.www1.artemis.web.rest.dto.GradeStepsDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.GradeStep; +import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.GradeStepRepository; +import de.tum.cit.aet.artemis.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.web.rest.dto.GradeDTO; +import de.tum.cit.aet.artemis.web.rest.dto.GradeStepsDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; /** * REST controller for managing grade steps of a grading scale diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/GradingScaleResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/GradingScaleResource.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/web/rest/GradingScaleResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/GradingScaleResource.java index 508df95c015f..99cfaf50648e 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/GradingScaleResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/GradingScaleResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -23,21 +23,21 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.GradingScale; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.GradingScaleRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.GradingScaleService; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.GradingScaleService; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** * REST controller for managing grading scale diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/GuidedTourSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/GuidedTourSettingsResource.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/web/rest/GuidedTourSettingsResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/GuidedTourSettingsResource.java index d02f4ce58fcf..2bb17b1be00b 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/GuidedTourSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/GuidedTourSettingsResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Set; @@ -16,10 +16,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.GuidedTourSetting; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.user.UserService; +import de.tum.cit.aet.artemis.domain.GuidedTourSetting; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.user.UserService; /** * Rest controller for managing GuidedTourSetting diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/LearningPathResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/LearningPathResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java index 5bdb10c41c9e..fd1efe6573d4 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/LearningPathResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -24,37 +24,37 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.LearningPath; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.LearningPathRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.CourseService; -import de.tum.in.www1.artemis.service.LearningObjectService; -import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; -import de.tum.in.www1.artemis.service.feature.Feature; -import de.tum.in.www1.artemis.service.feature.FeatureToggle; -import de.tum.in.www1.artemis.service.learningpath.LearningPathNavigationService; -import de.tum.in.www1.artemis.service.learningpath.LearningPathRecommendationService; -import de.tum.in.www1.artemis.service.learningpath.LearningPathService; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyNameDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyProgressForLearningPathDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathCompetencyGraphDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathHealthDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathInformationDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathNavigationDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathNavigationObjectDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathNavigationObjectDTO.LearningObjectType; -import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathNavigationOverviewDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.NgxLearningPathDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.competency.LearningPath; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.LearningPathRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.CourseService; +import de.tum.cit.aet.artemis.service.LearningObjectService; +import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.service.feature.Feature; +import de.tum.cit.aet.artemis.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.service.learningpath.LearningPathNavigationService; +import de.tum.cit.aet.artemis.service.learningpath.LearningPathRecommendationService; +import de.tum.cit.aet.artemis.service.learningpath.LearningPathService; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyNameDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyProgressForLearningPathDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathCompetencyGraphDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathHealthDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathInformationDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationObjectDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationObjectDTO.LearningObjectType; +import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationOverviewDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.NgxLearningPathDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/LectureResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/LectureResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java index 9aa73d603557..d0b85ca60f66 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/LectureResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -26,31 +26,31 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; -import de.tum.in.www1.artemis.domain.lecture.ExerciseUnit; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ExerciseService; -import de.tum.in.www1.artemis.service.LectureImportService; -import de.tum.in.www1.artemis.service.LectureService; -import de.tum.in.www1.artemis.service.metis.conversation.ChannelService; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ExerciseService; +import de.tum.cit.aet.artemis.service.LectureImportService; +import de.tum.cit.aet.artemis.service.LectureService; +import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** * REST controller for managing Lecture. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/LongFeedbackTextResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/web/rest/LongFeedbackTextResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java index 88a6977dd29e..f2fa5da94814 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/LongFeedbackTextResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.LongFeedbackText; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.repository.LongFeedbackTextRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.ParticipationAuthorizationCheckService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.LongFeedbackText; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.repository.LongFeedbackTextRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/LtiResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/web/rest/LtiResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java index afaf0e9eee9b..4bd5606b581c 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/LtiResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; import java.text.ParseException; import java.util.List; @@ -25,15 +25,15 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.nimbusds.jwt.SignedJWT; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.LtiPlatformConfiguration; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.LtiPlatformConfigurationRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.connectors.lti.LtiDeepLinkingService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.connectors.lti.LtiDeepLinkingService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.PaginationUtil; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/MetricsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/MetricsResource.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/web/rest/MetricsResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/MetricsResource.java index 28d0ff374a9f..34c2d0c7cee1 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/MetricsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/MetricsResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -11,10 +11,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; -import de.tum.in.www1.artemis.service.metrics.LearningMetricsService; -import de.tum.in.www1.artemis.web.rest.dto.metrics.StudentMetricsDTO; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; +import de.tum.cit.aet.artemis.service.metrics.LearningMetricsService; +import de.tum.cit.aet.artemis.web.rest.dto.metrics.StudentMetricsDTO; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/web/rest/ModelingAssessmentResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java index 696b826b6dff..a4781821fa2b 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; @@ -20,28 +20,28 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.ExampleSubmissionRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.ModelingExerciseRepository; -import de.tum.in.www1.artemis.repository.ModelingSubmissionRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AssessmentService; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.web.rest.dto.AssessmentUpdateDTO; -import de.tum.in.www1.artemis.web.rest.dto.ModelingAssessmentDTO; -import de.tum.in.www1.artemis.web.rest.errors.ErrorConstants; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ModelingSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AssessmentService; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ModelingAssessmentDTO; +import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java index f8ee4659f3ff..8c79a169058b 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.web.rest.plagiarism.PlagiarismResultResponseBuilder.buildPlagiarismResultResponse; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.web.rest.plagiarism.PlagiarismResultResponseBuilder.buildPlagiarismResultResponse; import java.io.File; import java.net.URI; @@ -27,47 +27,47 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.GradingCriterionRepository; -import de.tum.in.www1.artemis.repository.ModelingExerciseRepository; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismResultRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.CourseService; -import de.tum.in.www1.artemis.service.ExerciseDeletionService; -import de.tum.in.www1.artemis.service.ExerciseService; -import de.tum.in.www1.artemis.service.ModelingExerciseImportService; -import de.tum.in.www1.artemis.service.ModelingExerciseService; -import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; -import de.tum.in.www1.artemis.service.export.SubmissionExportService; -import de.tum.in.www1.artemis.service.feature.Feature; -import de.tum.in.www1.artemis.service.feature.FeatureToggle; -import de.tum.in.www1.artemis.service.metis.conversation.ChannelService; -import de.tum.in.www1.artemis.service.notifications.GroupNotificationScheduleService; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionConfigHelper; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionService; -import de.tum.in.www1.artemis.service.util.TimeLogUtil; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.in.www1.artemis.web.rest.dto.SubmissionExportOptionsDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; -import de.tum.in.www1.artemis.web.rest.util.ResponseUtil; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.CourseService; +import de.tum.cit.aet.artemis.service.ExerciseDeletionService; +import de.tum.cit.aet.artemis.service.ExerciseService; +import de.tum.cit.aet.artemis.service.ModelingExerciseImportService; +import de.tum.cit.aet.artemis.service.ModelingExerciseService; +import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.service.export.SubmissionExportService; +import de.tum.cit.aet.artemis.service.feature.Feature; +import de.tum.cit.aet.artemis.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; +import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; +import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionConfigHelper; +import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionService; +import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.web.rest.util.ResponseUtil; /** * REST controller for managing ModelingExercise. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/ModelingSubmissionResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java index 5aef7f9eef8b..49f3dcdfe90e 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.List; @@ -26,32 +26,32 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.GradingCriterionRepository; -import de.tum.in.www1.artemis.repository.ModelingExerciseRepository; -import de.tum.in.www1.artemis.repository.ModelingSubmissionRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ModelingSubmissionService; -import de.tum.in.www1.artemis.service.ResultService; -import de.tum.in.www1.artemis.service.exam.ExamSubmissionService; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.ErrorConstants; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ModelingSubmissionRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ModelingSubmissionService; +import de.tum.cit.aet.artemis.service.ResultService; +import de.tum.cit.aet.artemis.service.exam.ExamSubmissionService; +import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/NotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationResource.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/web/rest/NotificationResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationResource.java index 039d3eb46316..0ab06b1e5c8b 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/NotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationResource.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.MESSAGE_REPLY_IN_CONVERSATION_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.NEW_MESSAGE_TITLE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.MESSAGE_REPLY_IN_CONVERSATION_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_MESSAGE_TITLE; import java.time.ZonedDateTime; import java.util.List; @@ -21,16 +21,16 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.notification.Notification; -import de.tum.in.www1.artemis.repository.NotificationRepository; -import de.tum.in.www1.artemis.repository.NotificationSettingRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.notifications.NotificationSettingsCommunicationChannel; -import de.tum.in.www1.artemis.service.notifications.NotificationSettingsService; -import de.tum.in.www1.artemis.service.tutorialgroups.TutorialGroupService; -import de.tum.in.www1.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.notification.Notification; +import de.tum.cit.aet.artemis.repository.NotificationRepository; +import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel; +import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService; +import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupService; +import de.tum.cit.aet.artemis.service.util.TimeLogUtil; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.PaginationUtil; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/NotificationSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/web/rest/NotificationSettingsResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java index f22823f6b0f7..aa4b238f6f80 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/NotificationSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Arrays; import java.util.List; @@ -20,15 +20,15 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.NotificationSetting; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.NotificationSettingRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.notifications.NotificationSettingsService; -import de.tum.in.www1.artemis.service.util.TimeLogUtil; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.domain.NotificationSetting; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService; +import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** * REST controller for managing NotificationSettings (NotificationSettings). diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/OrganizationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/OrganizationResource.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/web/rest/OrganizationResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/OrganizationResource.java index 7f369439cf67..9aeec987b4c4 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/OrganizationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/OrganizationResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Set; @@ -14,9 +14,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Organization; -import de.tum.in.www1.artemis.repository.OrganizationRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.domain.Organization; +import de.tum.cit.aet.artemis.repository.OrganizationRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; /** * REST controller for managing the Organization entities diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipantScoreResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/web/rest/ParticipantScoreResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java index 66e3f0ffb1b9..af5f3528dcb7 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipantScoreResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; @@ -13,15 +13,15 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ParticipantScoreService; -import de.tum.in.www1.artemis.web.rest.dto.score.ScoreDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ParticipantScoreService; +import de.tum.cit.aet.artemis.web.rest.dto.score.ScoreDTO; @Profile(PROFILE_CORE) @RestController @@ -54,7 +54,7 @@ public ParticipantScoreResource(AuthorizationCheckService authorizationCheckServ * Currently both this server based calculation method and the traditional client side calculation method is used * side-by-side in course-scores.component.ts. *

- * The goal is to switch completely to this much faster server based calculation if the {@link de.tum.in.www1.artemis.service.listeners.ResultListener} + * The goal is to switch completely to this much faster server based calculation if the {@link de.tum.cit.aet.artemis.service.listeners.ResultListener} * has been battle tested enough. * * @param courseId the id of the course for which to calculate the course scores @@ -80,7 +80,7 @@ public ResponseEntity> getScoresOfCourse(@PathVariable Long cours * Currently both this server based calculation method and the traditional client side calculation method is used * side-by-side in exam-scores.component.ts. *

- * The goal is to switch completely to this much faster server based calculation if the {@link de.tum.in.www1.artemis.service.listeners.ResultListener} + * The goal is to switch completely to this much faster server based calculation if the {@link de.tum.cit.aet.artemis.service.listeners.ResultListener} * has been battle tested enough. * * @param examId the id of the exam for which to calculate the exam scores diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java index 8e5654e315d7..10812bf4873e 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static java.time.ZonedDateTime.now; import java.net.URI; @@ -41,64 +41,64 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ResponseStatusException; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.config.GuidedTourConfiguration; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.GradingScale; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseType; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.participation.Participant; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.quiz.QuizBatch; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.QuizExerciseRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.SubmittedAnswerRepository; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ExerciseDateService; -import de.tum.in.www1.artemis.service.GradingScaleService; -import de.tum.in.www1.artemis.service.ParticipationAuthorizationCheckService; -import de.tum.in.www1.artemis.service.ParticipationService; -import de.tum.in.www1.artemis.service.TextExerciseFeedbackService; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.in.www1.artemis.service.feature.Feature; -import de.tum.in.www1.artemis.service.feature.FeatureToggle; -import de.tum.in.www1.artemis.service.feature.FeatureToggleService; -import de.tum.in.www1.artemis.service.messaging.InstanceMessageSendService; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseCodeReviewFeedbackService; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseParticipationService; -import de.tum.in.www1.artemis.service.quiz.QuizBatchService; -import de.tum.in.www1.artemis.service.quiz.QuizSubmissionService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.config.GuidedTourConfiguration; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.participation.Participant; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.SubmittedAnswerRepository; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ExerciseDateService; +import de.tum.cit.aet.artemis.service.GradingScaleService; +import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.service.TextExerciseFeedbackService; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.service.feature.Feature; +import de.tum.cit.aet.artemis.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.service.feature.FeatureToggleService; +import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseCodeReviewFeedbackService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseParticipationService; +import de.tum.cit.aet.artemis.service.quiz.QuizBatchService; +import de.tum.cit.aet.artemis.service.quiz.QuizSubmissionService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** * REST controller for managing Participation. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/PlantUmlResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/PlantUmlResource.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/web/rest/PlantUmlResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/PlantUmlResource.java index 0a83e2bbcbed..e586689a455f 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/PlantUmlResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/PlantUmlResource.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.service.util.TimeLogUtil.formatDurationFrom; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.service.util.TimeLogUtil.formatDurationFrom; import java.io.IOException; @@ -17,8 +17,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.PlantUmlService; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.PlantUmlService; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/QuizExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/web/rest/QuizExerciseResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java index eb1a4e6ed97c..c4c9f81033f9 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/QuizExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.beans.PropertyEditorSupport; import java.io.IOException; @@ -38,56 +38,56 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.QuizAction; -import de.tum.in.www1.artemis.domain.enumeration.QuizMode; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.in.www1.artemis.domain.quiz.DragItem; -import de.tum.in.www1.artemis.domain.quiz.QuizBatch; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.exception.FilePathParsingException; -import de.tum.in.www1.artemis.exception.QuizJoinException; -import de.tum.in.www1.artemis.repository.QuizBatchRepository; -import de.tum.in.www1.artemis.repository.QuizExerciseRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastTutorInCourse; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastInstructorInExercise; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.CourseService; -import de.tum.in.www1.artemis.service.ExerciseDeletionService; -import de.tum.in.www1.artemis.service.ExerciseService; -import de.tum.in.www1.artemis.service.FilePathService; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; -import de.tum.in.www1.artemis.service.exam.ExamDateService; -import de.tum.in.www1.artemis.service.messaging.InstanceMessageSendService; -import de.tum.in.www1.artemis.service.metis.conversation.ChannelService; -import de.tum.in.www1.artemis.service.notifications.GroupNotificationScheduleService; -import de.tum.in.www1.artemis.service.notifications.GroupNotificationService; -import de.tum.in.www1.artemis.service.quiz.QuizBatchService; -import de.tum.in.www1.artemis.service.quiz.QuizExerciseImportService; -import de.tum.in.www1.artemis.service.quiz.QuizExerciseService; -import de.tum.in.www1.artemis.service.quiz.QuizMessagingService; -import de.tum.in.www1.artemis.service.quiz.QuizResultService; -import de.tum.in.www1.artemis.service.quiz.QuizStatisticService; -import de.tum.in.www1.artemis.service.quiz.QuizSubmissionService; -import de.tum.in.www1.artemis.web.rest.dto.QuizBatchJoinDTO; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.QuizAction; +import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; +import de.tum.cit.aet.artemis.domain.quiz.DragItem; +import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.exception.FilePathParsingException; +import de.tum.cit.aet.artemis.exception.QuizJoinException; +import de.tum.cit.aet.artemis.repository.QuizBatchRepository; +import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastTutorInCourse; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastInstructorInExercise; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.CourseService; +import de.tum.cit.aet.artemis.service.ExerciseDeletionService; +import de.tum.cit.aet.artemis.service.ExerciseService; +import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.service.exam.ExamDateService; +import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; +import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; +import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; +import de.tum.cit.aet.artemis.service.quiz.QuizBatchService; +import de.tum.cit.aet.artemis.service.quiz.QuizExerciseImportService; +import de.tum.cit.aet.artemis.service.quiz.QuizExerciseService; +import de.tum.cit.aet.artemis.service.quiz.QuizMessagingService; +import de.tum.cit.aet.artemis.service.quiz.QuizResultService; +import de.tum.cit.aet.artemis.service.quiz.QuizStatisticService; +import de.tum.cit.aet.artemis.service.quiz.QuizSubmissionService; +import de.tum.cit.aet.artemis.web.rest.dto.QuizBatchJoinDTO; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** * REST controller for managing QuizExercise. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/QuizParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/web/rest/QuizParticipationResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java index dc8e7fd62013..c4ccd27433ac 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/QuizParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Optional; @@ -18,20 +18,20 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.repository.QuizExerciseRepository; -import de.tum.in.www1.artemis.repository.QuizSubmissionRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.SubmittedAnswerRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; -import de.tum.in.www1.artemis.service.ParticipationService; -import de.tum.in.www1.artemis.service.quiz.QuizBatchService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.SubmittedAnswerRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.service.quiz.QuizBatchService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; /** * REST controller for managing quiz participations. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/QuizPoolResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/web/rest/QuizPoolResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java index e5185ba2ea58..e4f7c1e53b63 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/QuizPoolResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -14,15 +14,15 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.quiz.QuizPool; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.exam.ExamAccessService; -import de.tum.in.www1.artemis.service.quiz.QuizPoolService; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.quiz.QuizPool; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.exam.ExamAccessService; +import de.tum.cit.aet.artemis.service.quiz.QuizPoolService; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** * REST controller for managing QuizPool. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/QuizSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/web/rest/QuizSubmissionResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java index ebd3b7bfc40c..ebe940af0cb8 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/QuizSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; @@ -20,28 +20,28 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.domain.quiz.SubmittedAnswer; -import de.tum.in.www1.artemis.exception.QuizSubmissionException; -import de.tum.in.www1.artemis.repository.QuizExerciseRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ParticipationService; -import de.tum.in.www1.artemis.service.exam.ExamSubmissionService; -import de.tum.in.www1.artemis.service.quiz.QuizSubmissionService; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; -import de.tum.in.www1.artemis.web.websocket.ResultWebsocketService; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.exception.QuizSubmissionException; +import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.service.exam.ExamSubmissionService; +import de.tum.cit.aet.artemis.service.quiz.QuizSubmissionService; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; /** * REST controller for managing QuizSubmission. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/RatingResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/web/rest/RatingResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java index 6358fd40ecf9..2eec8aa53e8f 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/RatingResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -19,21 +19,21 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Rating; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.RatingService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Rating; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.RatingService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; /** * REST controller for managing Rating. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ResultResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/web/rest/ResultResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java index bd901ccd824b..1ead2b7a2b69 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -25,36 +25,36 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ParticipationAuthorizationCheckService; -import de.tum.in.www1.artemis.service.ParticipationService; -import de.tum.in.www1.artemis.service.ResultService; -import de.tum.in.www1.artemis.service.exam.ExamDateService; -import de.tum.in.www1.artemis.web.rest.dto.ResultWithPointsPerGradingCriterionDTO; -import de.tum.in.www1.artemis.web.rest.dto.feedback.FeedbackDetailDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.service.ResultService; +import de.tum.cit.aet.artemis.service.exam.ExamDateService; +import de.tum.cit.aet.artemis.web.rest.dto.ResultWithPointsPerGradingCriterionDTO; +import de.tum.cit.aet.artemis.web.rest.dto.feedback.FeedbackDetailDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** * REST controller for managing Result. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/StaticCodeAnalysisResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/StaticCodeAnalysisResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java index caffc53578ab..119d544ca292 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/StaticCodeAnalysisResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Objects; import java.util.Set; @@ -17,17 +17,17 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.StaticCodeAnalysisCategory; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.StaticCodeAnalysisCategoryRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.StaticCodeAnalysisService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisCategory; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.StaticCodeAnalysisCategoryRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; /** * REST controller for managing static code analysis. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/StatisticsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/StatisticsResource.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/web/rest/StatisticsResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/StatisticsResource.java index fbfc1947cc0c..14e5b0057a70 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/StatisticsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/StatisticsResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; @@ -11,19 +11,19 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.enumeration.GraphType; -import de.tum.in.www1.artemis.domain.enumeration.SpanType; -import de.tum.in.www1.artemis.domain.enumeration.StatisticsView; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.StatisticsService; -import de.tum.in.www1.artemis.web.rest.dto.CourseManagementStatisticsDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExerciseManagementStatisticsDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.enumeration.GraphType; +import de.tum.cit.aet.artemis.domain.enumeration.SpanType; +import de.tum.cit.aet.artemis.domain.enumeration.StatisticsView; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.StatisticsService; +import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementStatisticsDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExerciseManagementStatisticsDTO; /** * REST controller for managing statistics. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/StudentExamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/web/rest/StudentExamResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java index 7efc8d5f6640..bf65da6b38b9 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/StudentExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.EXAM_START_WAIT_TIME_MINUTES; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.service.util.TimeLogUtil.formatDurationFrom; +import static de.tum.cit.aet.artemis.config.Constants.EXAM_START_WAIT_TIME_MINUTES; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.service.util.TimeLogUtil.formatDurationFrom; import static java.time.ZonedDateTime.now; import java.time.ZonedDateTime; @@ -35,46 +35,46 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExamSession; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.exam.event.ExamLiveEvent; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.ExamLiveEventRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionPolicyRepository; -import de.tum.in.www1.artemis.repository.SubmittedAnswerRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; -import de.tum.in.www1.artemis.service.exam.ExamAccessService; -import de.tum.in.www1.artemis.service.exam.ExamDateService; -import de.tum.in.www1.artemis.service.exam.ExamDeletionService; -import de.tum.in.www1.artemis.service.exam.ExamLiveEventsService; -import de.tum.in.www1.artemis.service.exam.ExamService; -import de.tum.in.www1.artemis.service.exam.ExamSessionService; -import de.tum.in.www1.artemis.service.exam.StudentExamAccessService; -import de.tum.in.www1.artemis.service.exam.StudentExamService; -import de.tum.in.www1.artemis.service.messaging.InstanceMessageSendService; -import de.tum.in.www1.artemis.service.util.ExamExerciseStartPreparationStatus; -import de.tum.in.www1.artemis.service.util.HttpRequestUtils; -import de.tum.in.www1.artemis.web.rest.dto.StudentExamWithGradeDTO; -import de.tum.in.www1.artemis.web.rest.dto.examevent.ExamAttendanceCheckEventDTO; -import de.tum.in.www1.artemis.web.rest.dto.examevent.ExamLiveEventBaseDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExamSession; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.exam.event.ExamLiveEvent; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.ExamLiveEventRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionPolicyRepository; +import de.tum.cit.aet.artemis.repository.SubmittedAnswerRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.service.exam.ExamAccessService; +import de.tum.cit.aet.artemis.service.exam.ExamDateService; +import de.tum.cit.aet.artemis.service.exam.ExamDeletionService; +import de.tum.cit.aet.artemis.service.exam.ExamLiveEventsService; +import de.tum.cit.aet.artemis.service.exam.ExamService; +import de.tum.cit.aet.artemis.service.exam.ExamSessionService; +import de.tum.cit.aet.artemis.service.exam.StudentExamAccessService; +import de.tum.cit.aet.artemis.service.exam.StudentExamService; +import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.service.util.ExamExerciseStartPreparationStatus; +import de.tum.cit.aet.artemis.service.util.HttpRequestUtils; +import de.tum.cit.aet.artemis.web.rest.dto.StudentExamWithGradeDTO; +import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamAttendanceCheckEventDTO; +import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamLiveEventBaseDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** * REST controller for managing ExerciseGroup. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/SubmissionPolicyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/web/rest/SubmissionPolicyResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java index 89b522c64588..eaa2e4ca1429 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/SubmissionPolicyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -22,18 +22,18 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.submissionpolicy.SubmissionPolicy; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ParticipationAuthorizationCheckService; -import de.tum.in.www1.artemis.service.SubmissionPolicyService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; +import de.tum.cit.aet.artemis.service.SubmissionPolicyService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/SubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/web/rest/SubmissionResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java index bd081a4afbe6..4f9462f9027b 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/SubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Collections; import java.util.List; @@ -17,34 +17,34 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.SubmissionVersion; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.repository.BuildLogStatisticsEntryRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.SubmissionVersionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.BuildLogEntryService; -import de.tum.in.www1.artemis.service.ResultService; -import de.tum.in.www1.artemis.service.SubmissionService; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.in.www1.artemis.web.rest.dto.SubmissionVersionDTO; -import de.tum.in.www1.artemis.web.rest.dto.SubmissionWithComplaintDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.SubmissionVersion; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.repository.BuildLogStatisticsEntryRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.SubmissionVersionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.BuildLogEntryService; +import de.tum.cit.aet.artemis.service.ResultService; +import de.tum.cit.aet.artemis.service.SubmissionService; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.SubmissionVersionDTO; +import de.tum.cit.aet.artemis.web.rest.dto.SubmissionWithComplaintDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** * REST controller for managing Submission. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/SystemNotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/SystemNotificationResource.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/web/rest/SystemNotificationResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/SystemNotificationResource.java index 00d7b2df603f..ae72b73c1fb1 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/SystemNotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/SystemNotificationResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Optional; @@ -19,10 +19,10 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; -import de.tum.in.www1.artemis.domain.notification.SystemNotification; -import de.tum.in.www1.artemis.repository.SystemNotificationRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.domain.notification.SystemNotification; +import de.tum.cit.aet.artemis.repository.SystemNotificationRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.PaginationUtil; import tech.jhipster.web.util.ResponseUtil; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/TeamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/web/rest/TeamResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java index e9c4433b35c9..22099aa1a85b 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/TeamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.config.Constants.SHORT_NAME_PATTERN; -import static de.tum.in.www1.artemis.web.rest.util.StringUtil.stripIllegalCharacters; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.SHORT_NAME_PATTERN; +import static de.tum.cit.aet.artemis.web.rest.util.StringUtil.stripIllegalCharacters; import java.net.URI; import java.net.URISyntaxException; @@ -34,34 +34,34 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ResponseStatusException; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.TeamImportStrategyType; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.repository.TeamScoreRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ParticipationService; -import de.tum.in.www1.artemis.service.SubmissionService; -import de.tum.in.www1.artemis.service.TeamService; -import de.tum.in.www1.artemis.service.dto.TeamSearchUserDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; -import de.tum.in.www1.artemis.web.websocket.team.TeamWebsocketService; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.TeamImportStrategyType; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.repository.TeamScoreRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.service.SubmissionService; +import de.tum.cit.aet.artemis.service.TeamService; +import de.tum.cit.aet.artemis.service.dto.TeamSearchUserDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.web.websocket.team.TeamWebsocketService; /** * REST controller for managing Teams. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/TextAssessmentEventResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentEventResource.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/web/rest/TextAssessmentEventResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentEventResource.java index a23f69b9e8f3..d536f92dffec 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/TextAssessmentEventResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentEventResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -18,19 +18,19 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.analytics.TextAssessmentEvent; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.TextAssessmentEventRepository; -import de.tum.in.www1.artemis.repository.TextSubmissionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.analytics.TextAssessmentEvent; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.TextAssessmentEventRepository; +import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; /** * REST controller for managing TextAssessmentEventResource. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/TextAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/TextAssessmentResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java index 0d3201fc6b36..4a2bdfc982ea 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/TextAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static java.util.stream.Collectors.toSet; import java.util.Collections; @@ -29,42 +29,42 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.ExampleSubmission; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextBlock; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.ExampleSubmissionRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.FeedbackRepository; -import de.tum.in.www1.artemis.repository.GradingCriterionRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.TextExerciseRepository; -import de.tum.in.www1.artemis.repository.TextSubmissionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ResultService; -import de.tum.in.www1.artemis.service.TextAssessmentService; -import de.tum.in.www1.artemis.service.TextBlockService; -import de.tum.in.www1.artemis.service.TextSubmissionService; -import de.tum.in.www1.artemis.service.connectors.athena.AthenaFeedbackSendingService; -import de.tum.in.www1.artemis.web.rest.dto.TextAssessmentDTO; -import de.tum.in.www1.artemis.web.rest.dto.TextAssessmentUpdateDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.ErrorConstants; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextBlock; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ResultService; +import de.tum.cit.aet.artemis.service.TextAssessmentService; +import de.tum.cit.aet.artemis.service.TextBlockService; +import de.tum.cit.aet.artemis.service.TextSubmissionService; +import de.tum.cit.aet.artemis.service.connectors.athena.AthenaFeedbackSendingService; +import de.tum.cit.aet.artemis.web.rest.dto.TextAssessmentDTO; +import de.tum.cit.aet.artemis.web.rest.dto.TextAssessmentUpdateDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java index cb528fc8e38d..b7dc70f9a322 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.web.rest.plagiarism.PlagiarismResultResponseBuilder.buildPlagiarismResultResponse; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.web.rest.plagiarism.PlagiarismResultResponseBuilder.buildPlagiarismResultResponse; import java.io.File; import java.net.URI; @@ -29,65 +29,65 @@ import org.springframework.web.bind.annotation.RestController; import de.jplag.exceptions.ExitException; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ExampleSubmission; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExampleSubmissionRepository; -import de.tum.in.www1.artemis.repository.FeedbackRepository; -import de.tum.in.www1.artemis.repository.GradingCriterionRepository; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.TextBlockRepository; -import de.tum.in.www1.artemis.repository.TextExerciseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismResultRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.CourseService; -import de.tum.in.www1.artemis.service.ExerciseDateService; -import de.tum.in.www1.artemis.service.ExerciseDeletionService; -import de.tum.in.www1.artemis.service.ExerciseService; -import de.tum.in.www1.artemis.service.TextExerciseImportService; -import de.tum.in.www1.artemis.service.TextExerciseService; -import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; -import de.tum.in.www1.artemis.service.connectors.athena.AthenaModuleService; -import de.tum.in.www1.artemis.service.export.TextSubmissionExportService; -import de.tum.in.www1.artemis.service.feature.Feature; -import de.tum.in.www1.artemis.service.feature.FeatureToggle; -import de.tum.in.www1.artemis.service.messaging.InstanceMessageSendService; -import de.tum.in.www1.artemis.service.metis.conversation.ChannelService; -import de.tum.in.www1.artemis.service.notifications.GroupNotificationScheduleService; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionConfigHelper; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionService; -import de.tum.in.www1.artemis.service.util.TimeLogUtil; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.in.www1.artemis.web.rest.dto.SubmissionExportOptionsDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; -import de.tum.in.www1.artemis.web.rest.util.ResponseUtil; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.TextBlockRepository; +import de.tum.cit.aet.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.CourseService; +import de.tum.cit.aet.artemis.service.ExerciseDateService; +import de.tum.cit.aet.artemis.service.ExerciseDeletionService; +import de.tum.cit.aet.artemis.service.ExerciseService; +import de.tum.cit.aet.artemis.service.TextExerciseImportService; +import de.tum.cit.aet.artemis.service.TextExerciseService; +import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.service.connectors.athena.AthenaModuleService; +import de.tum.cit.aet.artemis.service.export.TextSubmissionExportService; +import de.tum.cit.aet.artemis.service.feature.Feature; +import de.tum.cit.aet.artemis.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; +import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; +import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionConfigHelper; +import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionService; +import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.web.rest.util.ResponseUtil; /** * REST controller for managing TextExercise. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/TextSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/web/rest/TextSubmissionResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java index 6c0317c88e13..ed30b460b8c0 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/TextSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Optional; @@ -22,30 +22,30 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.GradingCriterionRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.TextExerciseRepository; -import de.tum.in.www1.artemis.repository.TextSubmissionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ResultService; -import de.tum.in.www1.artemis.service.TextAssessmentService; -import de.tum.in.www1.artemis.service.TextSubmissionService; -import de.tum.in.www1.artemis.service.exam.ExamSubmissionService; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ResultService; +import de.tum.cit.aet.artemis.service.TextAssessmentService; +import de.tum.cit.aet.artemis.service.TextSubmissionService; +import de.tum.cit.aet.artemis.service.exam.ExamSubmissionService; +import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * REST controller for managing TextSubmission. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/TutorEffortResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorEffortResource.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/web/rest/TutorEffortResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/TutorEffortResource.java index d1143231fc95..1e2fb8342958 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/TutorEffortResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorEffortResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; @@ -13,17 +13,17 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.statistics.tutor.effort.TutorEffort; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.TutorEffortService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.statistics.tutor.effort.TutorEffort; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.TutorEffortService; /** * REST controller for managing TutorEffortResource. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/TutorParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/web/rest/TutorParticipationResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java index a4c5d3ccd05c..b1c82c62f801 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/TutorParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -17,19 +17,19 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.config.GuidedTourConfiguration; -import de.tum.in.www1.artemis.domain.ExampleSubmission; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.participation.TutorParticipation; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.TutorParticipationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.TutorParticipationService; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.config.GuidedTourConfiguration; +import de.tum.cit.aet.artemis.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.TutorParticipationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.TutorParticipationService; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** * REST controller for managing TutorParticipation. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/UserResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/UserResource.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/UserResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/UserResource.java index 8415cbc6f104..5a1475cb9cbe 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/UserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/UserResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.List; @@ -23,15 +23,15 @@ import org.springframework.web.server.ResponseStatusException; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.connectors.lti.LtiService; -import de.tum.in.www1.artemis.service.dto.UserDTO; -import de.tum.in.www1.artemis.service.dto.UserInitializationDTO; -import de.tum.in.www1.artemis.service.user.UserCreationService; -import de.tum.in.www1.artemis.service.user.UserService; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.connectors.lti.LtiService; +import de.tum.cit.aet.artemis.service.dto.UserDTO; +import de.tum.cit.aet.artemis.service.dto.UserInitializationDTO; +import de.tum.cit.aet.artemis.service.user.UserCreationService; +import de.tum.cit.aet.artemis.service.user.UserService; import tech.jhipster.web.util.PaginationUtil; /** diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminBuildJobQueueResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminBuildJobQueueResource.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminBuildJobQueueResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminBuildJobQueueResource.java index 2de424bb76e0..b97b2017c50f 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminBuildJobQueueResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminBuildJobQueueResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_LOCALCI; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALCI; import java.time.ZonedDateTime; import java.util.List; @@ -20,16 +20,16 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; -import de.tum.in.www1.artemis.domain.BuildJob; -import de.tum.in.www1.artemis.repository.BuildJobRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAdmin; -import de.tum.in.www1.artemis.service.connectors.localci.SharedQueueManagementService; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildAgentInformation; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.in.www1.artemis.service.dto.BuildJobResultCountDTO; -import de.tum.in.www1.artemis.service.dto.BuildJobsStatisticsDTO; -import de.tum.in.www1.artemis.service.dto.FinishedBuildJobDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.FinishedBuildJobPageableSearchDTO; +import de.tum.cit.aet.artemis.domain.BuildJob; +import de.tum.cit.aet.artemis.repository.BuildJobRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.service.connectors.localci.SharedQueueManagementService; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.service.dto.BuildJobResultCountDTO; +import de.tum.cit.aet.artemis.service.dto.BuildJobsStatisticsDTO; +import de.tum.cit.aet.artemis.service.dto.FinishedBuildJobDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.FinishedBuildJobPageableSearchDTO; import tech.jhipster.web.util.PaginationUtil; @Profile(PROFILE_LOCALCI) diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminCourseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminCourseResource.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminCourseResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminCourseResource.java index 8fcd97fdec90..ca38ba85b1e2 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminCourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminCourseResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -28,21 +28,21 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.DefaultChannelType; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAdmin; -import de.tum.in.www1.artemis.service.CourseService; -import de.tum.in.www1.artemis.service.FilePathService; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.OnlineCourseConfigurationService; -import de.tum.in.www1.artemis.service.metis.conversation.ChannelService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.DefaultChannelType; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.service.CourseService; +import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; +import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** * REST controller for managing Course. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminDataExportResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminDataExportResource.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminDataExportResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminDataExportResource.java index b1d12b2ea50d..f5f3f52ced30 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminDataExportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminDataExportResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.http.ResponseEntity; @@ -9,9 +9,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.security.annotations.EnforceAdmin; -import de.tum.in.www1.artemis.service.export.DataExportService; -import de.tum.in.www1.artemis.web.rest.dto.RequestDataExportDTO; +import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.service.export.DataExportService; +import de.tum.cit.aet.artemis.web.rest.dto.RequestDataExportDTO; /** * REST controller for requesting data exports for another user as admin. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminExamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminExamResource.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminExamResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminExamResource.java index 91e41a8537e7..e3bae4962bee 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminExamResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; @@ -12,9 +12,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; /** * REST controller for administrating Exam. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminExerciseResource.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminExerciseResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminExerciseResource.java index 77c81fa51566..c86b465dd031 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminExerciseResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Set; @@ -12,9 +12,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; /** * REST controller for administrating Exercise. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminImprintResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminImprintResource.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminImprintResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminImprintResource.java index bc1a4c3bcdf3..d38f3e0e8410 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminImprintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminImprintResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import jakarta.ws.rs.BadRequestException; @@ -13,10 +13,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.security.annotations.EnforceAdmin; -import de.tum.in.www1.artemis.service.LegalDocumentService; -import de.tum.in.www1.artemis.web.rest.dto.ImprintDTO; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.service.LegalDocumentService; +import de.tum.cit.aet.artemis.web.rest.dto.ImprintDTO; /** * REST controller for editing the imprint as an admin. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminLtiConfigurationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminLtiConfigurationResource.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminLtiConfigurationResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminLtiConfigurationResource.java index 0d7d7a54b1f1..7d51179190fc 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminLtiConfigurationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminLtiConfigurationResource.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.web.rest.admin; import java.util.UUID; @@ -18,13 +18,13 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.LtiPlatformConfiguration; -import de.tum.in.www1.artemis.repository.LtiPlatformConfigurationRepository; -import de.tum.in.www1.artemis.security.OAuth2JWKSService; -import de.tum.in.www1.artemis.security.annotations.EnforceAdmin; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.connectors.lti.LtiDynamicRegistrationService; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; +import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; +import de.tum.cit.aet.artemis.security.OAuth2JWKSService; +import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.connectors.lti.LtiDynamicRegistrationService; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** * REST controller for managing LTI platform configurations. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminModelingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminModelingExerciseResource.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminModelingExerciseResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminModelingExerciseResource.java index 2a13c6e7ab8c..d68d7c679c80 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminModelingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminModelingExerciseResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -14,12 +14,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.repository.ModelClusterRepository; -import de.tum.in.www1.artemis.repository.ModelingExerciseRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAdmin; -import de.tum.in.www1.artemis.service.ModelingExerciseService; -import de.tum.in.www1.artemis.service.messaging.InstanceMessageSendService; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.repository.ModelClusterRepository; +import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.service.ModelingExerciseService; +import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** * REST controller for administrating ModelingExercise. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminOrganizationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminOrganizationResource.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminOrganizationResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminOrganizationResource.java index 3890123efb29..1bc9030c3c04 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminOrganizationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminOrganizationResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.List; @@ -21,16 +21,16 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Organization; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.OrganizationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAdmin; -import de.tum.in.www1.artemis.service.OrganizationService; -import de.tum.in.www1.artemis.web.rest.dto.OrganizationCountDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.domain.Organization; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.OrganizationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.service.OrganizationService; +import de.tum.cit.aet.artemis.web.rest.dto.OrganizationCountDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** * REST controller for administrating the Organization entities diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminPrivacyStatementResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminPrivacyStatementResource.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminPrivacyStatementResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminPrivacyStatementResource.java index 67e1d582fade..1b037c59f3e9 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminPrivacyStatementResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminPrivacyStatementResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import jakarta.ws.rs.BadRequestException; @@ -13,10 +13,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.security.annotations.EnforceAdmin; -import de.tum.in.www1.artemis.service.LegalDocumentService; -import de.tum.in.www1.artemis.web.rest.dto.PrivacyStatementDTO; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.service.LegalDocumentService; +import de.tum.cit.aet.artemis.web.rest.dto.PrivacyStatementDTO; /** * REST controller for editing the Privacy Statement as an admin. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminStandardizedCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminStandardizedCompetencyResource.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminStandardizedCompetencyResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminStandardizedCompetencyResource.java index b39c5a97b484..1a1d7d89c858 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminStandardizedCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminStandardizedCompetencyResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -22,17 +22,17 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.competency.StandardizedCompetency; -import de.tum.in.www1.artemis.security.annotations.EnforceAdmin; -import de.tum.in.www1.artemis.service.competency.KnowledgeAreaService; -import de.tum.in.www1.artemis.service.competency.StandardizedCompetencyService; -import de.tum.in.www1.artemis.service.feature.Feature; -import de.tum.in.www1.artemis.service.feature.FeatureToggle; -import de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaRequestDTO; -import de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaResultDTO; -import de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO; -import de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyRequestDTO; -import de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyResultDTO; +import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; +import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.service.competency.KnowledgeAreaService; +import de.tum.cit.aet.artemis.service.competency.StandardizedCompetencyService; +import de.tum.cit.aet.artemis.service.feature.Feature; +import de.tum.cit.aet.artemis.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaRequestDTO; +import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaResultDTO; +import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO; +import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyRequestDTO; +import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyResultDTO; /** * Admin REST controller for managing {@link StandardizedCompetency} entities. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminStatisticsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminStatisticsResource.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminStatisticsResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminStatisticsResource.java index c3d364859273..99899111d5b6 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminStatisticsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminStatisticsResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; @@ -13,11 +13,11 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.enumeration.GraphType; -import de.tum.in.www1.artemis.domain.enumeration.SpanType; -import de.tum.in.www1.artemis.domain.enumeration.StatisticsView; -import de.tum.in.www1.artemis.security.annotations.EnforceAdmin; -import de.tum.in.www1.artemis.service.StatisticsService; +import de.tum.cit.aet.artemis.domain.enumeration.GraphType; +import de.tum.cit.aet.artemis.domain.enumeration.SpanType; +import de.tum.cit.aet.artemis.domain.enumeration.StatisticsView; +import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.service.StatisticsService; /** * REST controller for administrating statistics. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminSystemNotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminSystemNotificationResource.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminSystemNotificationResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminSystemNotificationResource.java index e3d14603971e..dcef5961aac1 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminSystemNotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminSystemNotificationResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -18,13 +18,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.notification.Notification; -import de.tum.in.www1.artemis.domain.notification.SystemNotification; -import de.tum.in.www1.artemis.repository.SystemNotificationRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAdmin; -import de.tum.in.www1.artemis.service.SystemNotificationService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.domain.notification.Notification; +import de.tum.cit.aet.artemis.domain.notification.SystemNotification; +import de.tum.cit.aet.artemis.repository.SystemNotificationRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.service.SystemNotificationService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** * REST controller for administrating system notifications. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminTextAssessmentEventResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminTextAssessmentEventResource.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminTextAssessmentEventResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminTextAssessmentEventResource.java index 7ccd2795db3f..76f76afbb73a 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminTextAssessmentEventResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminTextAssessmentEventResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; @@ -11,9 +11,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.analytics.TextAssessmentEvent; -import de.tum.in.www1.artemis.repository.TextAssessmentEventRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.domain.analytics.TextAssessmentEvent; +import de.tum.cit.aet.artemis.repository.TextAssessmentEventRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; /** * REST controller for administrating TextAssessmentEventResource. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminUserResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminUserResource.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminUserResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminUserResource.java index 90c813cf9bb0..cd490d0516f8 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminUserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminUserResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -29,22 +29,22 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.AuthorityRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAdmin; -import de.tum.in.www1.artemis.service.dto.StudentDTO; -import de.tum.in.www1.artemis.service.dto.UserDTO; -import de.tum.in.www1.artemis.service.ldap.LdapUserService; -import de.tum.in.www1.artemis.service.user.UserCreationService; -import de.tum.in.www1.artemis.service.user.UserService; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.UserPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EmailAlreadyUsedException; -import de.tum.in.www1.artemis.web.rest.errors.LoginAlreadyUsedException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; -import de.tum.in.www1.artemis.web.rest.vm.ManagedUserVM; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.AuthorityRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.service.dto.StudentDTO; +import de.tum.cit.aet.artemis.service.dto.UserDTO; +import de.tum.cit.aet.artemis.service.ldap.LdapUserService; +import de.tum.cit.aet.artemis.service.user.UserCreationService; +import de.tum.cit.aet.artemis.service.user.UserService; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.UserPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EmailAlreadyUsedException; +import de.tum.cit.aet.artemis.web.rest.errors.LoginAlreadyUsedException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.PaginationUtil; import tech.jhipster.web.util.ResponseUtil; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AuditResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AuditResource.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/web/rest/admin/AuditResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AuditResource.java index a98cc05df7b3..385a1b1244f0 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AuditResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AuditResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static tech.jhipster.web.util.PaginationUtil.generatePaginationHttpHeaders; import java.time.Instant; @@ -22,8 +22,8 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; -import de.tum.in.www1.artemis.security.annotations.EnforceAdmin; -import de.tum.in.www1.artemis.service.AuditEventService; +import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.service.AuditEventService; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.ResponseUtil; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/FeatureToggleResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/FeatureToggleResource.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/web/rest/admin/FeatureToggleResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/admin/FeatureToggleResource.java index 14bde3ff8034..e79c591ec400 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/FeatureToggleResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/FeatureToggleResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Map; @@ -13,9 +13,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.security.annotations.EnforceAdmin; -import de.tum.in.www1.artemis.service.feature.Feature; -import de.tum.in.www1.artemis.service.feature.FeatureToggleService; +import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.service.feature.Feature; +import de.tum.cit.aet.artemis.service.feature.FeatureToggleService; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/LogResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/LogResource.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/web/rest/admin/LogResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/admin/LogResource.java index 3894257f6194..b48407683fbb 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/LogResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/LogResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; @@ -16,8 +16,8 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; -import de.tum.in.www1.artemis.security.annotations.EnforceAdmin; -import de.tum.in.www1.artemis.web.rest.vm.LoggerVM; +import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.web.rest.vm.LoggerVM; /** * Controller for view and managing Log Level at runtime. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/iris/AdminIrisSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/iris/AdminIrisSettingsResource.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/web/rest/admin/iris/AdminIrisSettingsResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/admin/iris/AdminIrisSettingsResource.java index dacf5c65b3fb..35f3f9e6ba16 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/iris/AdminIrisSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/iris/AdminIrisSettingsResource.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.admin.iris; +package de.tum.cit.aet.artemis.web.rest.admin.iris; import org.springframework.context.annotation.Profile; import org.springframework.http.ResponseEntity; @@ -7,9 +7,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.iris.settings.IrisSettings; -import de.tum.in.www1.artemis.security.annotations.EnforceAdmin; -import de.tum.in.www1.artemis.service.iris.settings.IrisSettingsService; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisSettings; +import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; /** * REST controller for managing {@link IrisSettings}. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/competency/CompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/web/rest/competency/CompetencyResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java index 44a5a3194151..22ee45836ba9 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/competency/CompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.competency; +package de.tum.cit.aet.artemis.web.rest.competency; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -25,26 +25,26 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.Competency; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; -import de.tum.in.www1.artemis.repository.CompetencyRepository; -import de.tum.in.www1.artemis.repository.CourseCompetencyRepository; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.LectureUnitService; -import de.tum.in.www1.artemis.service.competency.CompetencyService; -import de.tum.in.www1.artemis.service.competency.CourseCompetencyService; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.competency.Competency; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.repository.CompetencyRepository; +import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.LectureUnitService; +import de.tum.cit.aet.artemis.service.competency.CompetencyService; +import de.tum.cit.aet.artemis.service.competency.CourseCompetencyService; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/competency/CourseCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/web/rest/competency/CourseCompetencyResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java index 036b673d1674..69994ddc2732 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/competency/CourseCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.competency; +package de.tum.cit.aet.artemis.web.rest.competency; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -26,37 +26,37 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.CompetencyProgress; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; -import de.tum.in.www1.artemis.repository.CompetencyProgressRepository; -import de.tum.in.www1.artemis.repository.CompetencyRelationRepository; -import de.tum.in.www1.artemis.repository.CourseCompetencyRepository; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.competency.CompetencyJolService; -import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; -import de.tum.in.www1.artemis.service.competency.CompetencyRelationService; -import de.tum.in.www1.artemis.service.competency.CourseCompetencyService; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionInputDTO; -import de.tum.in.www1.artemis.service.feature.Feature; -import de.tum.in.www1.artemis.service.feature.FeatureToggle; -import de.tum.in.www1.artemis.service.iris.IrisCompetencyGenerationService; -import de.tum.in.www1.artemis.web.rest.dto.CourseCompetencyProgressDTO; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyJolPairDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyRelationDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.CompetencyPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.repository.CompetencyProgressRepository; +import de.tum.cit.aet.artemis.repository.CompetencyRelationRepository; +import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.competency.CompetencyJolService; +import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.service.competency.CompetencyRelationService; +import de.tum.cit.aet.artemis.service.competency.CourseCompetencyService; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionInputDTO; +import de.tum.cit.aet.artemis.service.feature.Feature; +import de.tum.cit.aet.artemis.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.service.iris.IrisCompetencyGenerationService; +import de.tum.cit.aet.artemis.web.rest.dto.CourseCompetencyProgressDTO; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolPairDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyRelationDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.CompetencyPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/competency/PrerequisiteResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/web/rest/competency/PrerequisiteResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java index 3954fbf0c826..9b7729ddb2c2 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/competency/PrerequisiteResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.competency; +package de.tum.cit.aet.artemis.web.rest.competency; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -25,29 +25,29 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; -import de.tum.in.www1.artemis.domain.competency.Prerequisite; -import de.tum.in.www1.artemis.repository.CourseCompetencyRepository; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.PrerequisiteRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.LectureUnitService; -import de.tum.in.www1.artemis.service.competency.CourseCompetencyService; -import de.tum.in.www1.artemis.service.competency.PrerequisiteService; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.domain.competency.Prerequisite; +import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.PrerequisiteRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.LectureUnitService; +import de.tum.cit.aet.artemis.service.competency.CourseCompetencyService; +import de.tum.cit.aet.artemis.service.competency.PrerequisiteService; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** - * REST controller for managing {@link de.tum.in.www1.artemis.domain.competency.Prerequisite Prerequisite} entities. + * REST controller for managing {@link de.tum.cit.aet.artemis.domain.competency.Prerequisite Prerequisite} entities. */ @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/competency/StandardizedCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/StandardizedCompetencyResource.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/web/rest/competency/StandardizedCompetencyResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/competency/StandardizedCompetencyResource.java index bf03a183c5f5..d223c17222b3 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/competency/StandardizedCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/StandardizedCompetencyResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.competency; +package de.tum.cit.aet.artemis.web.rest.competency; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; @@ -13,17 +13,17 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.competency.KnowledgeArea; -import de.tum.in.www1.artemis.domain.competency.StandardizedCompetency; -import de.tum.in.www1.artemis.repository.SourceRepository; -import de.tum.in.www1.artemis.repository.competency.KnowledgeAreaRepository; -import de.tum.in.www1.artemis.repository.competency.StandardizedCompetencyRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.service.competency.StandardizedCompetencyService; -import de.tum.in.www1.artemis.service.feature.Feature; -import de.tum.in.www1.artemis.service.feature.FeatureToggle; -import de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaResultDTO; -import de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.SourceDTO; +import de.tum.cit.aet.artemis.domain.competency.KnowledgeArea; +import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; +import de.tum.cit.aet.artemis.repository.SourceRepository; +import de.tum.cit.aet.artemis.repository.competency.KnowledgeAreaRepository; +import de.tum.cit.aet.artemis.repository.competency.StandardizedCompetencyRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.service.competency.StandardizedCompetencyService; +import de.tum.cit.aet.artemis.service.feature.Feature; +import de.tum.cit.aet.artemis.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaResultDTO; +import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.SourceDTO; /** * REST controller for managing {@link StandardizedCompetency} entities. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/AssessmentUpdateBaseDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/AssessmentUpdateBaseDTO.java similarity index 68% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/AssessmentUpdateBaseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/AssessmentUpdateBaseDTO.java index b4e7af15a15e..fc58d5870e97 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/AssessmentUpdateBaseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/AssessmentUpdateBaseDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.util.List; @@ -6,8 +6,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.ComplaintResponse; -import de.tum.in.www1.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.domain.Feedback; @JsonInclude(JsonInclude.Include.NON_EMPTY) public interface AssessmentUpdateBaseDTO { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/AssessmentUpdateDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/AssessmentUpdateDTO.java similarity index 77% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/AssessmentUpdateDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/AssessmentUpdateDTO.java index 64b470b4f616..1eadcc8daf1a 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/AssessmentUpdateDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/AssessmentUpdateDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.util.List; @@ -6,8 +6,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.ComplaintResponse; -import de.tum.in.www1.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.domain.Feedback; /** * @param feedbacks the updated feedback list diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/BonusExampleDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusExampleDTO.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/BonusExampleDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusExampleDTO.java index 06eb4b7af689..300d3ea1a861 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/BonusExampleDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusExampleDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/BonusResultDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusResultDTO.java similarity index 76% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/BonusResultDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusResultDTO.java index a8cb3791d9fb..3e68e7c0982a 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/BonusResultDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusResultDTO.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.BonusStrategy; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict; +import de.tum.cit.aet.artemis.domain.BonusStrategy; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; /** * Represents a bonus grade result with the relevant parameters from bonusFrom and bonusTo grading scales. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/BonusSourceResultDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusSourceResultDTO.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/BonusSourceResultDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusSourceResultDTO.java index 9307e4c7ffe1..53bdf781222e 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/BonusSourceResultDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusSourceResultDTO.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; /** * Represents a grade result from a bonus source course or exam with plagiarism verdict. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/BuildLogStatisticsDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BuildLogStatisticsDTO.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/BuildLogStatisticsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BuildLogStatisticsDTO.java index ddc426ff85f8..2d686c94a879 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/BuildLogStatisticsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BuildLogStatisticsDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/BuildPlanCheckoutDirectoriesDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BuildPlanCheckoutDirectoriesDTO.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/BuildPlanCheckoutDirectoriesDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BuildPlanCheckoutDirectoriesDTO.java index f83aaae3ed2f..796a00168f31 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/BuildPlanCheckoutDirectoriesDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BuildPlanCheckoutDirectoriesDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/CheckoutDirectoriesDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CheckoutDirectoriesDTO.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/CheckoutDirectoriesDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CheckoutDirectoriesDTO.java index 8cd4f34f434e..45f26941f505 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/CheckoutDirectoriesDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CheckoutDirectoriesDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/CommitInfoDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CommitInfoDTO.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/CommitInfoDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CommitInfoDTO.java index 49f7a1255adb..3ac91447b27d 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/CommitInfoDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CommitInfoDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseCompetencyProgressDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseCompetencyProgressDTO.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseCompetencyProgressDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseCompetencyProgressDTO.java index ac71ebd3454b..aa23362aa74c 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseCompetencyProgressDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseCompetencyProgressDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseContentCount.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseContentCount.java similarity index 78% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseContentCount.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseContentCount.java index 7076a6a1a081..3d3d913801c0 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseContentCount.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseContentCount.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseForDashboardDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseForDashboardDTO.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseForDashboardDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseForDashboardDTO.java index ad59eb92c9e6..87cdedbf0a08 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseForDashboardDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseForDashboardDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.util.Set; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Course; /** * Returned by the for-dashboard resources. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseForImportDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseForImportDTO.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseForImportDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseForImportDTO.java index a3e4b8dd574d..dedb691298b6 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseForImportDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseForImportDTO.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Course; /** * DTO containing {@link Course} information. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseManagementDetailViewDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementDetailViewDTO.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseManagementDetailViewDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementDetailViewDTO.java index 89c31756e922..e9e40f05ef6f 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseManagementDetailViewDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementDetailViewDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseManagementOverviewExerciseStatisticsDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementOverviewExerciseStatisticsDTO.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseManagementOverviewExerciseStatisticsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementOverviewExerciseStatisticsDTO.java index 965ba26a0881..08c8a8aa962b 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseManagementOverviewExerciseStatisticsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementOverviewExerciseStatisticsDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseManagementOverviewStatisticsDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementOverviewStatisticsDTO.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseManagementOverviewStatisticsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementOverviewStatisticsDTO.java index f7e89fdd8a5d..8755e7a5f67e 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseManagementOverviewStatisticsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementOverviewStatisticsDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseManagementStatisticsDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementStatisticsDTO.java similarity index 71% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseManagementStatisticsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementStatisticsDTO.java index 7162acf6c16b..1e8f9a371473 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseManagementStatisticsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementStatisticsDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.statistics.CourseStatisticsAverageScore; +import de.tum.cit.aet.artemis.domain.statistics.CourseStatisticsAverageScore; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record CourseManagementStatisticsDTO(Double averageScoreOfCourse, List averageScoresOfExercises) { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseScoresDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseScoresDTO.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseScoresDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseScoresDTO.java index d61a4d9ce273..41f7eeef23cc 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseScoresDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseScoresDTO.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.web.rest.dto.score.StudentScoresDTO; +import de.tum.cit.aet.artemis.web.rest.dto.score.StudentScoresDTO; /** * Contains the scores that enable the client to show statistics for a calling student. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseWithIdDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseWithIdDTO.java similarity index 75% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseWithIdDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseWithIdDTO.java index 51747af6f6b4..ea3f0cbd4c0a 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/CourseWithIdDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseWithIdDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/CoursesForDashboardDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CoursesForDashboardDTO.java similarity index 70% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/CoursesForDashboardDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CoursesForDashboardDTO.java index 28c7ed826adf..54d5c8898f08 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/CoursesForDashboardDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CoursesForDashboardDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.util.Set; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.Exam; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record CoursesForDashboardDTO(Set courses, Set activeExams) { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/DataExportDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/DataExportDTO.java similarity index 71% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/DataExportDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/DataExportDTO.java index 46b65fce5048..4625ec73b37e 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/DataExportDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/DataExportDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.time.ZonedDateTime; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.DataExportState; +import de.tum.cit.aet.artemis.domain.enumeration.DataExportState; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record DataExportDTO(Long id, DataExportState dataExportState, ZonedDateTime createdDate, ZonedDateTime nextRequestDate) { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/DueDateStat.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/DueDateStat.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/DueDateStat.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/DueDateStat.java index 441ed6f62afd..fe7e95d2d186 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/DueDateStat.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/DueDateStat.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamChecklistDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamChecklistDTO.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamChecklistDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamChecklistDTO.java index 0160a78fa2bd..51dfe2fb3973 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamChecklistDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamChecklistDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import jakarta.annotation.Nullable; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamInformationDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamInformationDTO.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamInformationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamInformationDTO.java index c3667c2318d0..2d04c49d480c 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamInformationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamInformationDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamScoresDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamScoresDTO.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamScoresDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamScoresDTO.java index 5d37f8302b4a..5169e5bc9673 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamScoresDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamScoresDTO.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.util.List; import java.util.Map; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ExamScoresDTO(Long examId, String title, Integer maxPoints, Double averagePointsAchieved, Boolean hasSecondCorrectionAndStarted, List exerciseGroups, diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamSessionDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamSessionDTO.java similarity index 77% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamSessionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamSessionDTO.java index befe8a8af08f..7131f8f19b4a 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamSessionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamSessionDTO.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.time.Instant; import java.util.Set; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.exam.SuspiciousSessionReason; +import de.tum.cit.aet.artemis.domain.exam.SuspiciousSessionReason; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ExamSessionDTO(long id, String browserFingerprintHash, String ipAddress, Set suspiciousReasons, Instant createdDate, diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamUserAttendanceCheckDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamUserAttendanceCheckDTO.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamUserAttendanceCheckDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamUserAttendanceCheckDTO.java index 7e898db4bb0f..48474c9ef65d 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamUserAttendanceCheckDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamUserAttendanceCheckDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamUserDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamUserDTO.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamUserDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamUserDTO.java index d30ba7f3a8b7..9387ff0e32de 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamUserDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamUserDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.Size; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamUsersNotFoundDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamUsersNotFoundDTO.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamUsersNotFoundDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamUsersNotFoundDTO.java index 9fb353727877..02e20b4ca5f5 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamUsersNotFoundDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamUsersNotFoundDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamWithIdAndCourseDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamWithIdAndCourseDTO.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamWithIdAndCourseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamWithIdAndCourseDTO.java index bda611e75852..a1c3ad1ecbd6 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExamWithIdAndCourseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamWithIdAndCourseDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExerciseDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDTO.java similarity index 80% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExerciseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDTO.java index 2596c0dd3a4c..e6ff5135dd23 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExerciseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDTO.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; /** * A DTO representing an exercise. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExerciseDetailsDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDetailsDTO.java similarity index 57% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExerciseDetailsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDetailsDTO.java index e2b6b5a5c0e2..ac85c113358d 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExerciseDetailsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDetailsDTO.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.util.Set; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.hestia.ExerciseHint; -import de.tum.in.www1.artemis.service.iris.dto.IrisCombinedSettingsDTO; -import de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.hestia.ExerciseHint; +import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedSettingsDTO; +import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ExerciseDetailsDTO(Exercise exercise, IrisCombinedSettingsDTO irisSettings, PlagiarismCaseInfoDTO plagiarismCaseInfo, Set availableExerciseHints, diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExerciseForPlagiarismCasesOverviewDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseForPlagiarismCasesOverviewDTO.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExerciseForPlagiarismCasesOverviewDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseForPlagiarismCasesOverviewDTO.java index ec77f1dd0b4e..e9e9504041f0 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExerciseForPlagiarismCasesOverviewDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseForPlagiarismCasesOverviewDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExerciseGroupWithIdAndExamDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseGroupWithIdAndExamDTO.java similarity index 80% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExerciseGroupWithIdAndExamDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseGroupWithIdAndExamDTO.java index 8ba0a38fdf0d..789d1f758945 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExerciseGroupWithIdAndExamDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseGroupWithIdAndExamDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExerciseManagementStatisticsDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseManagementStatisticsDTO.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExerciseManagementStatisticsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseManagementStatisticsDTO.java index ef8a3a3969e2..4e71b806979f 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExerciseManagementStatisticsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseManagementStatisticsDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExerciseScoresAggregatedInformation.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseScoresAggregatedInformation.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExerciseScoresAggregatedInformation.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseScoresAggregatedInformation.java index 00c27a4d7038..fe603ed9b056 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExerciseScoresAggregatedInformation.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseScoresAggregatedInformation.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExerciseScoresDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseScoresDTO.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExerciseScoresDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseScoresDTO.java index e3374b99f617..bdf5a9b7288e 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ExerciseScoresDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseScoresDTO.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.time.ZonedDateTime; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; /** * This DTO contains the information used for the exercise-scores-chart.component.ts diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/FileMove.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/FileMove.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/FileMove.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/FileMove.java index c074e9f36e1d..706111ee7690 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/FileMove.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/FileMove.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/FileUploadAssessmentDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/FileUploadAssessmentDTO.java similarity index 70% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/FileUploadAssessmentDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/FileUploadAssessmentDTO.java index 9a36547633ce..71aacfe63b25 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/FileUploadAssessmentDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/FileUploadAssessmentDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.Feedback; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record FileUploadAssessmentDTO(List feedbacks, String assessmentNote) { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/GradeDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/GradeDTO.java similarity index 67% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/GradeDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/GradeDTO.java index 46d418cd23b3..4b015d538c40 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/GradeDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/GradeDTO.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.GradeType; +import de.tum.cit.aet.artemis.domain.GradeType; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record GradeDTO(String gradeName, Boolean isPassingGrade, GradeType gradeType) { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/GradeStepsDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/GradeStepsDTO.java similarity index 71% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/GradeStepsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/GradeStepsDTO.java index 5234c7d0c974..986be200144d 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/GradeStepsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/GradeStepsDTO.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.util.Set; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.GradeStep; -import de.tum.in.www1.artemis.domain.GradeType; +import de.tum.cit.aet.artemis.domain.GradeStep; +import de.tum.cit.aet.artemis.domain.GradeType; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record GradeStepsDTO(String title, GradeType gradeType, Set gradeSteps, Integer maxPoints, String plagiarismGrade, String noParticipationGrade, diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ImageDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ImageDTO.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ImageDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ImageDTO.java index 523b0f87952c..ea82f66a2665 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ImageDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ImageDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ImprintDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ImprintDTO.java similarity index 66% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ImprintDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ImprintDTO.java index 5ce6639a2f5d..fadd8b7e859c 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ImprintDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ImprintDTO.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.enumeration.LegalDocumentType; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.enumeration.LegalDocumentType; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ImprintDTO(LegalDocumentType type, String text, Language language) implements LegalDocument { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/LectureUnitInformationDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LectureUnitInformationDTO.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/LectureUnitInformationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LectureUnitInformationDTO.java index 6d9293f7666e..db5cb0a54253 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/LectureUnitInformationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LectureUnitInformationDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/LectureUnitSplitDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LectureUnitSplitDTO.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/LectureUnitSplitDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LectureUnitSplitDTO.java index eafcf9b8ed54..0622d57295a2 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/LectureUnitSplitDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LectureUnitSplitDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/LegalDocument.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LegalDocument.java similarity index 56% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/LegalDocument.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LegalDocument.java index 9fc42a921a26..daaf19a7aa51 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/LegalDocument.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LegalDocument.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.enumeration.LegalDocumentType; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.enumeration.LegalDocumentType; @JsonInclude(JsonInclude.Include.NON_EMPTY) public interface LegalDocument { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/LinkPreviewDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LinkPreviewDTO.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/LinkPreviewDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LinkPreviewDTO.java index 6245bd2b4a8a..5cd711b66949 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/LinkPreviewDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LinkPreviewDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ModelingAssessmentDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ModelingAssessmentDTO.java similarity index 69% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ModelingAssessmentDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ModelingAssessmentDTO.java index 66e0981754c1..beb1e624f4de 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ModelingAssessmentDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ModelingAssessmentDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.Feedback; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ModelingAssessmentDTO(List feedbacks, String assessmentNote) { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/OnlineCourseDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/OnlineCourseDTO.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/OnlineCourseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/OnlineCourseDTO.java index c11bcc364d89..fa086617e315 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/OnlineCourseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/OnlineCourseDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/OnlineResourceDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/OnlineResourceDTO.java similarity index 80% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/OnlineResourceDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/OnlineResourceDTO.java index f79bf96c7b8a..330abea0f76b 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/OnlineResourceDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/OnlineResourceDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/OrganizationCountDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/OrganizationCountDTO.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/OrganizationCountDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/OrganizationCountDTO.java index 5a0379da6d74..46856aa6642f 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/OrganizationCountDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/OrganizationCountDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ParticipationDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationDTO.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ParticipationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationDTO.java index c74909e7ed72..f8d0426a271b 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ParticipationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.io.Serializable; import java.time.ZonedDateTime; @@ -8,11 +8,11 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseType; -import de.tum.in.www1.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.domain.participation.Participation; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ParticipationDTO(Long id, boolean testRun, String type, Integer submissionCount, ParticipationExerciseDTO exercise) implements Serializable { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ParticipationResultDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationResultDTO.java similarity index 80% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ParticipationResultDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationResultDTO.java index 7549af09689b..eb9c066a1bd9 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ParticipationResultDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationResultDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ParticipationWithExerciseDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationWithExerciseDTO.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ParticipationWithExerciseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationWithExerciseDTO.java index 4bc841aa6fd9..c2c4a7d591dc 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ParticipationWithExerciseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationWithExerciseDTO.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.Participation; /** * A DTO representing a participation. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/PostContextFilterDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/PostContextFilterDTO.java similarity index 73% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/PostContextFilterDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/PostContextFilterDTO.java index 9089aac9d71f..3fa3cf8242b5 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/PostContextFilterDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/PostContextFilterDTO.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import jakarta.validation.constraints.NotBlank; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.SortingOrder; -import de.tum.in.www1.artemis.domain.metis.PostSortCriterion; +import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; +import de.tum.cit.aet.artemis.domain.metis.PostSortCriterion; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PostContextFilterDTO(@NotBlank Long courseId, long[] courseWideChannelIds, Long plagiarismCaseId, Long conversationId, String searchText, Boolean filterToUnresolved, diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/PrivacyStatementDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/PrivacyStatementDTO.java similarity index 68% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/PrivacyStatementDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/PrivacyStatementDTO.java index f7068706872e..28d96486447d 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/PrivacyStatementDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/PrivacyStatementDTO.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.enumeration.LegalDocumentType; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.enumeration.LegalDocumentType; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PrivacyStatementDTO(LegalDocumentType type, String text, Language language) implements LegalDocument { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ProgrammingExerciseGitDiffEntryDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseGitDiffEntryDTO.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ProgrammingExerciseGitDiffEntryDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseGitDiffEntryDTO.java index f9eb90546be9..768d136c9503 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ProgrammingExerciseGitDiffEntryDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseGitDiffEntryDTO.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; /** * DTO for a git diff report entry. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ProgrammingExerciseGitDiffReportDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseGitDiffReportDTO.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ProgrammingExerciseGitDiffReportDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseGitDiffReportDTO.java index 430d2b79d86b..318cfde7f8af 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ProgrammingExerciseGitDiffReportDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseGitDiffReportDTO.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.util.Set; import java.util.stream.Collectors; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; /** * DTO for a git diff report. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ProgrammingExerciseGradingStatisticsDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseGradingStatisticsDTO.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ProgrammingExerciseGradingStatisticsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseGradingStatisticsDTO.java index 4f1fec62e002..f3ed2123fab4 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ProgrammingExerciseGradingStatisticsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseGradingStatisticsDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.util.HashMap; import java.util.Map; @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.Feedback; /** * This is a dto for providing statistics for the programming exercise test cases & sca categories. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ProgrammingExerciseResetOptionsDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseResetOptionsDTO.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ProgrammingExerciseResetOptionsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseResetOptionsDTO.java index 2ab402aa93d5..d9961f7354f7 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ProgrammingExerciseResetOptionsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseResetOptionsDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ProgrammingExerciseTestCaseDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseTestCaseDTO.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ProgrammingExerciseTestCaseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseTestCaseDTO.java index be80c49bb361..9dd9defe9719 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ProgrammingExerciseTestCaseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseTestCaseDTO.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.domain.enumeration.Visibility; /** * This is a dto for updating a programming exercise test case. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/QuizBatchJoinDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/QuizBatchJoinDTO.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/QuizBatchJoinDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/QuizBatchJoinDTO.java index 938e0e44141e..aa04c90c6f0f 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/QuizBatchJoinDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/QuizBatchJoinDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import jakarta.annotation.Nullable; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/RepositoryExportOptionsDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/RepositoryExportOptionsDTO.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/RepositoryExportOptionsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/RepositoryExportOptionsDTO.java index d36e9da04be7..283e3620f62d 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/RepositoryExportOptionsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/RepositoryExportOptionsDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/RepositoryStatusDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/RepositoryStatusDTO.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/RepositoryStatusDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/RepositoryStatusDTO.java index 2e59d66e2df7..c7e15ae655c6 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/RepositoryStatusDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/RepositoryStatusDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/RepositoryStatusDTOType.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/RepositoryStatusDTOType.java similarity index 64% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/RepositoryStatusDTOType.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/RepositoryStatusDTOType.java index df8c816952aa..044e8a9fe00f 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/RepositoryStatusDTOType.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/RepositoryStatusDTOType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; public enum RepositoryStatusDTOType { CLEAN, CONFLICT, UNCOMMITTED_CHANGES diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/RequestDataExportDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/RequestDataExportDTO.java similarity index 69% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/RequestDataExportDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/RequestDataExportDTO.java index e6a0217dcd49..ace915cf76d6 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/RequestDataExportDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/RequestDataExportDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.time.ZonedDateTime; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.DataExportState; +import de.tum.cit.aet.artemis.domain.enumeration.DataExportState; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record RequestDataExportDTO(long id, DataExportState dataExportState, ZonedDateTime createdDate) { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ResultDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ResultDTO.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ResultDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ResultDTO.java index 5a58b628090f..3c23ae51196b 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ResultDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ResultDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.io.Serializable; import java.time.ZonedDateTime; @@ -8,12 +8,12 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.Visibility; /** * DTO containing {@link Result} information. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ResultWithPointsPerGradingCriterionDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ResultWithPointsPerGradingCriterionDTO.java similarity index 71% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/ResultWithPointsPerGradingCriterionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ResultWithPointsPerGradingCriterionDTO.java index 23d3c8c72cb3..3d387587820c 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/ResultWithPointsPerGradingCriterionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ResultWithPointsPerGradingCriterionDTO.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.util.Map; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.Result; /** * @param pointsPerCriterion Map of {@link GradingCriterion#getId()} to the result points in that category. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/SearchResultPageDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SearchResultPageDTO.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/SearchResultPageDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SearchResultPageDTO.java index 682a9022b233..52b248aa36dc 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/SearchResultPageDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SearchResultPageDTO.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.util.ArrayList; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; /** * Wrapper for a search result which is paged
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/StatsForDashboardDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StatsForDashboardDTO.java similarity index 99% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/StatsForDashboardDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StatsForDashboardDTO.java index 638541bd870a..ba22410fbab2 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/StatsForDashboardDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StatsForDashboardDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/StudentExamWithGradeDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StudentExamWithGradeDTO.java similarity index 78% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/StudentExamWithGradeDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StudentExamWithGradeDTO.java index 63cb87274916..cf2088236fb8 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/StudentExamWithGradeDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StudentExamWithGradeDTO.java @@ -1,20 +1,20 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.util.Map; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.GradeType; -import de.tum.in.www1.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.GradeType; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; /** * DTO that wraps the {@link StudentExam} and contains related assessment result and grading information if available. * Includes max points and max bonus points. *

* It is possible to calculate data included in this DTO by using the {@link StudentExam}, {@link ExamScoresDTO.StudentResult} - * and {@link de.tum.in.www1.artemis.domain.GradingScale} for the exam. The calculations are done in the server and returned with this DTO so that the client + * and {@link de.tum.cit.aet.artemis.domain.GradingScale} for the exam. The calculations are done in the server and returned with this DTO so that the client * does not need to repeat the same filtering and calculation logic. Also this removes the need for client to send an extra request to - * {@link de.tum.in.www1.artemis.web.rest.GradeStepResource#getGradeStepByPercentageForExam(Long, Long, Double)} + * {@link de.tum.cit.aet.artemis.web.rest.GradeStepResource#getGradeStepByPercentageForExam(Long, Long, Double)} * by including the grade in {@link ExamScoresDTO.StudentResult#overallGrade()}. */ @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/StudentExamWithIdAndExamAndUserDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StudentExamWithIdAndExamAndUserDTO.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/StudentExamWithIdAndExamAndUserDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StudentExamWithIdAndExamAndUserDTO.java index 84c78719dd80..a58023d8b131 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/StudentExamWithIdAndExamAndUserDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StudentExamWithIdAndExamAndUserDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/SubmissionDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionDTO.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/SubmissionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionDTO.java index 12465cb3f051..6766b06e733b 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/SubmissionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionDTO.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.io.Serializable; import java.time.ZonedDateTime; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; /** * DTO containing {@link Submission} information. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/SubmissionExportOptionsDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionExportOptionsDTO.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/SubmissionExportOptionsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionExportOptionsDTO.java index f73dbb542a5d..388f7d999f43 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/SubmissionExportOptionsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionExportOptionsDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/SubmissionVersionDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionVersionDTO.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/SubmissionVersionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionVersionDTO.java index f1a229513d1f..3fe1270f8583 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/SubmissionVersionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionVersionDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.time.Instant; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.SubmissionVersion; +import de.tum.cit.aet.artemis.domain.SubmissionVersion; /** * A DTO representing a submission version. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/SubmissionWithComplaintDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionWithComplaintDTO.java similarity index 68% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/SubmissionWithComplaintDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionWithComplaintDTO.java index c02be1e54cdd..02cf814c556d 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/SubmissionWithComplaintDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionWithComplaintDTO.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Complaint; -import de.tum.in.www1.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.Complaint; +import de.tum.cit.aet.artemis.domain.Submission; /** * Wrapper Class to send achieved points and achieved scores of a student to the client for courses / exam diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/SubmissionWithParticipationDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionWithParticipationDTO.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/SubmissionWithParticipationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionWithParticipationDTO.java index c3f83cb9181a..b8545b0119df 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/SubmissionWithParticipationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionWithParticipationDTO.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.Submission; /** * A DTO representing a submission. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/SuspiciousExamSessionsDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SuspiciousExamSessionsDTO.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/SuspiciousExamSessionsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SuspiciousExamSessionsDTO.java index 659654a2bf4e..7ea072f70120 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/SuspiciousExamSessionsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SuspiciousExamSessionsDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.util.Set; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/TextAssessmentDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentDTO.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/TextAssessmentDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentDTO.java index eedffed549ec..a099875fab38 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/TextAssessmentDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.util.ArrayList; import java.util.HashSet; @@ -7,8 +7,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.TextBlock; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.TextBlock; @JsonInclude(JsonInclude.Include.NON_EMPTY) public class TextAssessmentDTO { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/TextAssessmentUpdateDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentUpdateDTO.java similarity index 63% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/TextAssessmentUpdateDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentUpdateDTO.java index 80e589c2091e..adcd0a1167f2 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/TextAssessmentUpdateDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentUpdateDTO.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.util.List; import java.util.Set; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.ComplaintResponse; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.TextBlock; +import de.tum.cit.aet.artemis.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.TextBlock; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record TextAssessmentUpdateDTO(List feedbacks, ComplaintResponse complaintResponse, String assessmentNote, Set textBlocks) diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/TutorLeaderboardDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TutorLeaderboardDTO.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/TutorLeaderboardDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TutorLeaderboardDTO.java index 37182af4800a..f3f944150cae 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/TutorLeaderboardDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TutorLeaderboardDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/TutorialGroupFreePeriodDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TutorialGroupFreePeriodDTO.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/TutorialGroupFreePeriodDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TutorialGroupFreePeriodDTO.java index f9603008ac40..21b65769def5 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/TutorialGroupFreePeriodDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TutorialGroupFreePeriodDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import java.time.LocalDateTime; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/UserWithIdAndLoginDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/UserWithIdAndLoginDTO.java similarity index 78% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/UserWithIdAndLoginDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/UserWithIdAndLoginDTO.java index 0c45c3e918a3..f326efeac272 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/UserWithIdAndLoginDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/UserWithIdAndLoginDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.web.rest.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/CompetencyGraphEdgeDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyGraphEdgeDTO.java similarity index 75% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/CompetencyGraphEdgeDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyGraphEdgeDTO.java index cd4755bb7d68..dfcff58de92e 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/CompetencyGraphEdgeDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyGraphEdgeDTO.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.web.rest.dto.competency; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.competency.CompetencyRelation; -import de.tum.in.www1.artemis.domain.competency.RelationType; +import de.tum.cit.aet.artemis.domain.competency.CompetencyRelation; +import de.tum.cit.aet.artemis.domain.competency.RelationType; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record CompetencyGraphEdgeDTO(String id, String source, String target, RelationType relationType) { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/CompetencyGraphNodeDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyGraphNodeDTO.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/CompetencyGraphNodeDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyGraphNodeDTO.java index 5cb4fe54d003..48138704d133 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/CompetencyGraphNodeDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyGraphNodeDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.web.rest.dto.competency; import java.time.ZonedDateTime; @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record CompetencyGraphNodeDTO(String id, String label, ZonedDateTime softDueDate, Double value, CompetencyNodeValueType valueType) { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/CompetencyImportResponseDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyImportResponseDTO.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/CompetencyImportResponseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyImportResponseDTO.java index 38dcf3e83f64..07a39eb0ab06 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/CompetencyImportResponseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyImportResponseDTO.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.web.rest.dto.competency; import java.time.ZonedDateTime; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record CompetencyImportResponseDTO(long id, String title, String description, CompetencyTaxonomy taxonomy, ZonedDateTime softDueDate, Integer masteryThreshold, diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/CompetencyJolDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyJolDTO.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/CompetencyJolDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyJolDTO.java index 65de792abb32..fcafcd428624 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/CompetencyJolDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyJolDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.web.rest.dto.competency; import java.time.ZonedDateTime; @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.competency.CompetencyJol; +import de.tum.cit.aet.artemis.domain.competency.CompetencyJol; /** * A DTO for the CompetencyJol entity. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/CompetencyJolPairDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyJolPairDTO.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/CompetencyJolPairDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyJolPairDTO.java index 14527f2c8e1b..5b2c503d3f41 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/CompetencyJolPairDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyJolPairDTO.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.web.rest.dto.competency; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.competency.CompetencyJol; +import de.tum.cit.aet.artemis.domain.competency.CompetencyJol; /** * This DTO is used to represent a pair of CompetencyJolDTOs, where the first one is the current judgement of learning value and the second one is the judgement of learning value diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/CompetencyNameDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyNameDTO.java similarity index 69% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/CompetencyNameDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyNameDTO.java index 40f93f4d0c07..ea7ac99c6434 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/CompetencyNameDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyNameDTO.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.web.rest.dto.competency; import java.util.Optional; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.competency.CompetencyProgress; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; -import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record CompetencyNameDTO(long id, String title, double masteryProgress) { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/CompetencyProgressForLearningPathDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyProgressForLearningPathDTO.java similarity index 80% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/CompetencyProgressForLearningPathDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyProgressForLearningPathDTO.java index 98b58e08e8fa..e3b5c96e2b7d 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/CompetencyProgressForLearningPathDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyProgressForLearningPathDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.web.rest.dto.competency; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/CompetencyRelationDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyRelationDTO.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/CompetencyRelationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyRelationDTO.java index 8da3815236b1..7637f61f0d78 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/CompetencyRelationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyRelationDTO.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.web.rest.dto.competency; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.competency.CompetencyRelation; -import de.tum.in.www1.artemis.domain.competency.RelationType; +import de.tum.cit.aet.artemis.domain.competency.CompetencyRelation; +import de.tum.cit.aet.artemis.domain.competency.RelationType; /** * DTO containing {@link CompetencyRelation} data. It only contains ids of the linked competencies to reduce data sent. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/CompetencyWithTailRelationDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyWithTailRelationDTO.java similarity index 73% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/CompetencyWithTailRelationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyWithTailRelationDTO.java index 58f28542ca87..cb51f954b0ab 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/CompetencyWithTailRelationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyWithTailRelationDTO.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.web.rest.dto.competency; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.competency.Competency; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.domain.competency.Competency; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; /** * DTO containing a {@link Competency} and list of {@link CompetencyRelationDTO CompetencyRelation(DTO)s} for which it is the tail competency. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/LearningPathCompetencyGraphDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathCompetencyGraphDTO.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/LearningPathCompetencyGraphDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathCompetencyGraphDTO.java index b8f48aaec5da..d364ef1e58ab 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/LearningPathCompetencyGraphDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathCompetencyGraphDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.web.rest.dto.competency; import java.util.Set; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/LearningPathHealthDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathHealthDTO.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/LearningPathHealthDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathHealthDTO.java index 94b25276a28d..179375f3a0df 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/LearningPathHealthDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathHealthDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.web.rest.dto.competency; import java.util.Set; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/LearningPathInformationDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathInformationDTO.java similarity index 70% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/LearningPathInformationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathInformationDTO.java index 88d08c955d12..11d8cc9b6276 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/LearningPathInformationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathInformationDTO.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.web.rest.dto.competency; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.competency.LearningPath; -import de.tum.in.www1.artemis.web.rest.dto.user.UserNameAndLoginDTO; +import de.tum.cit.aet.artemis.domain.competency.LearningPath; +import de.tum.cit.aet.artemis.web.rest.dto.user.UserNameAndLoginDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record LearningPathInformationDTO(long id, UserNameAndLoginDTO user, int progress) { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/LearningPathNavigationDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathNavigationDTO.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/LearningPathNavigationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathNavigationDTO.java index b6d682f19b9a..1cd98b319c13 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/LearningPathNavigationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathNavigationDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.web.rest.dto.competency; import jakarta.annotation.Nullable; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/LearningPathNavigationObjectDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathNavigationObjectDTO.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/LearningPathNavigationObjectDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathNavigationObjectDTO.java index 6a7b7a84d7f2..afe9fd24fa7a 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/LearningPathNavigationObjectDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathNavigationObjectDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.web.rest.dto.competency; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.LearningObject; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.LearningObject; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; /** * DTO for a learning navigation object. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/LearningPathNavigationOverviewDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathNavigationOverviewDTO.java similarity index 80% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/LearningPathNavigationOverviewDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathNavigationOverviewDTO.java index 1ac6f6807d44..8eb81f20b65e 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/LearningPathNavigationOverviewDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathNavigationOverviewDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.web.rest.dto.competency; import java.util.List; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/LinkedCourseCompetencyDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LinkedCourseCompetencyDTO.java similarity index 71% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/LinkedCourseCompetencyDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LinkedCourseCompetencyDTO.java index 6f2c7fcb5dcf..11971e365314 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/LinkedCourseCompetencyDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LinkedCourseCompetencyDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.web.rest.dto.competency; import com.fasterxml.jackson.annotation.JsonInclude; /** * A DTO containing the information of the linkedCourseCompetency field of a - * {@link de.tum.in.www1.artemis.domain.competency.CourseCompetency CourseCompetency} + * {@link de.tum.cit.aet.artemis.domain.competency.CourseCompetency CourseCompetency} */ @JsonInclude(JsonInclude.Include.NON_EMPTY) record LinkedCourseCompetencyDTO(long id, long courseId, String courseTitle, String semester) { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/NgxLearningPathDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/NgxLearningPathDTO.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/NgxLearningPathDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/NgxLearningPathDTO.java index ef1d1bebba69..6d1ed0bc35af 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/NgxLearningPathDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/NgxLearningPathDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.web.rest.dto.competency; import java.util.Set; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/examevent/ExamAttendanceCheckEventDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamAttendanceCheckEventDTO.java similarity index 78% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/examevent/ExamAttendanceCheckEventDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamAttendanceCheckEventDTO.java index 7e84bc516c07..fea8dbbb6b63 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/examevent/ExamAttendanceCheckEventDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamAttendanceCheckEventDTO.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.web.rest.dto.examevent; +package de.tum.cit.aet.artemis.web.rest.dto.examevent; import java.time.Instant; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.exam.event.ExamAttendanceCheckEvent; +import de.tum.cit.aet.artemis.domain.exam.event.ExamAttendanceCheckEvent; /** - * A DTO for the {@link de.tum.in.www1.artemis.domain.exam.event.ExamAttendanceCheckEvent} entity. + * A DTO for the {@link de.tum.cit.aet.artemis.domain.exam.event.ExamAttendanceCheckEvent} entity. */ @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ExamAttendanceCheckEventDTO(Long id, String createdBy, Instant createdDate, String text) implements ExamLiveEventBaseDTO { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/examevent/ExamLiveEventBaseDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamLiveEventBaseDTO.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/examevent/ExamLiveEventBaseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamLiveEventBaseDTO.java index d6e61fb8d44d..39829e42d3d8 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/examevent/ExamLiveEventBaseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamLiveEventBaseDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto.examevent; +package de.tum.cit.aet.artemis.web.rest.dto.examevent; import java.time.Instant; @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; /** - * A DTO for the {@link de.tum.in.www1.artemis.domain.exam.event.ExamLiveEvent} entity. + * A DTO for the {@link de.tum.cit.aet.artemis.domain.exam.event.ExamLiveEvent} entity. */ @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "eventType") diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/examevent/ExamWideAnnouncementEventDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamWideAnnouncementEventDTO.java similarity index 72% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/examevent/ExamWideAnnouncementEventDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamWideAnnouncementEventDTO.java index e906bf476fca..8a57bceba1ae 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/examevent/ExamWideAnnouncementEventDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamWideAnnouncementEventDTO.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.web.rest.dto.examevent; +package de.tum.cit.aet.artemis.web.rest.dto.examevent; import java.time.Instant; import com.fasterxml.jackson.annotation.JsonInclude; /** - * A DTO for the {@link de.tum.in.www1.artemis.domain.exam.event.ExamWideAnnouncementEvent} entity. + * A DTO for the {@link de.tum.cit.aet.artemis.domain.exam.event.ExamWideAnnouncementEvent} entity. */ @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ExamWideAnnouncementEventDTO(Long id, String createdBy, Instant createdDate, String text) implements ExamLiveEventBaseDTO { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/examevent/ProblemStatementUpdateEventDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ProblemStatementUpdateEventDTO.java similarity index 76% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/examevent/ProblemStatementUpdateEventDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ProblemStatementUpdateEventDTO.java index 5e0d8262b9ea..d6a1b530928f 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/examevent/ProblemStatementUpdateEventDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ProblemStatementUpdateEventDTO.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.web.rest.dto.examevent; +package de.tum.cit.aet.artemis.web.rest.dto.examevent; import java.time.Instant; import com.fasterxml.jackson.annotation.JsonInclude; /** - * A DTO for the {@link de.tum.in.www1.artemis.domain.exam.event.ProblemStatementUpdateEvent} entity. + * A DTO for the {@link de.tum.cit.aet.artemis.domain.exam.event.ProblemStatementUpdateEvent} entity. */ @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ProblemStatementUpdateEventDTO(Long id, String createdBy, Instant createdDate, String text, String problemStatement, long exerciseId, String exerciseName) diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/examevent/WorkingTimeUpdateEventDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/WorkingTimeUpdateEventDTO.java similarity index 75% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/examevent/WorkingTimeUpdateEventDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/WorkingTimeUpdateEventDTO.java index 2882d36b087e..71208775321e 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/examevent/WorkingTimeUpdateEventDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/WorkingTimeUpdateEventDTO.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.web.rest.dto.examevent; +package de.tum.cit.aet.artemis.web.rest.dto.examevent; import java.time.Instant; import com.fasterxml.jackson.annotation.JsonInclude; /** - * A DTO for the {@link de.tum.in.www1.artemis.domain.exam.event.WorkingTimeUpdateEvent} entity. + * A DTO for the {@link de.tum.cit.aet.artemis.domain.exam.event.WorkingTimeUpdateEvent} entity. */ @JsonInclude(JsonInclude.Include.NON_EMPTY) public record WorkingTimeUpdateEventDTO(Long id, String createdBy, Instant createdDate, int newWorkingTime, int oldWorkingTime, boolean courseWide) diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/feedback/FeedbackDetailDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/feedback/FeedbackDetailDTO.java similarity index 80% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/feedback/FeedbackDetailDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/feedback/FeedbackDetailDTO.java index d9e1f86d231d..8e9e88afad82 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/feedback/FeedbackDetailDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/feedback/FeedbackDetailDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto.feedback; +package de.tum.cit.aet.artemis.web.rest.dto.feedback; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/lectureunit/LectureUnitForLearningPathNodeDetailsDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/lectureunit/LectureUnitForLearningPathNodeDetailsDTO.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/lectureunit/LectureUnitForLearningPathNodeDetailsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/lectureunit/LectureUnitForLearningPathNodeDetailsDTO.java index 14b9223fdb9a..cf852e92ed2a 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/lectureunit/LectureUnitForLearningPathNodeDetailsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/lectureunit/LectureUnitForLearningPathNodeDetailsDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.web.rest.dto.lectureunit; +package de.tum.cit.aet.artemis.web.rest.dto.lectureunit; import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record LectureUnitForLearningPathNodeDetailsDTO(long id, @NotNull String name, @NotNull String type) { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/CompetencyExerciseMasteryCalculationDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyExerciseMasteryCalculationDTO.java similarity index 75% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/CompetencyExerciseMasteryCalculationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyExerciseMasteryCalculationDTO.java index 0c8778d480b0..4c64afb5f2aa 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/CompetencyExerciseMasteryCalculationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyExerciseMasteryCalculationDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.web.rest.dto.metrics; +package de.tum.cit.aet.artemis.web.rest.dto.metrics; import java.time.Instant; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.DifficultyLevel; +import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record CompetencyExerciseMasteryCalculationDTO(double maxPoints, DifficultyLevel difficulty, boolean isProgrammingExercise, Double lastScore, Double lastPoints, diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/CompetencyInformationDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyInformationDTO.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/CompetencyInformationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyInformationDTO.java index 20bd5960f618..addec264241b 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/CompetencyInformationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyInformationDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.web.rest.dto.metrics; +package de.tum.cit.aet.artemis.web.rest.dto.metrics; import java.time.ZonedDateTime; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; /** * A DTO for the CompetencyInformation entity. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/CompetencyProgressDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyProgressDTO.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/CompetencyProgressDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyProgressDTO.java index cdf3dcd66977..ae2feb5661e4 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/CompetencyProgressDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyProgressDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto.metrics; +package de.tum.cit.aet.artemis.web.rest.dto.metrics; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/CompetencyStudentMetricsDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyStudentMetricsDTO.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/CompetencyStudentMetricsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyStudentMetricsDTO.java index 190fd7df8869..b4da3f64fb89 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/CompetencyStudentMetricsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyStudentMetricsDTO.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.web.rest.dto.metrics; +package de.tum.cit.aet.artemis.web.rest.dto.metrics; import java.util.Map; import java.util.Set; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyJolDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO; /** * A DTO representing the metrics for a student regarding competencies. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/ExerciseInformationDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ExerciseInformationDTO.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/ExerciseInformationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ExerciseInformationDTO.java index 911b2dd60f76..43ce83306c5a 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/ExerciseInformationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ExerciseInformationDTO.java @@ -1,14 +1,14 @@ -package de.tum.in.www1.artemis.web.rest.dto.metrics; +package de.tum.cit.aet.artemis.web.rest.dto.metrics; import java.time.ZonedDateTime; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.enumeration.DifficultyLevel; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; /** * DTO for exercise information. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/ExerciseStudentMetricsDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ExerciseStudentMetricsDTO.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/ExerciseStudentMetricsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ExerciseStudentMetricsDTO.java index 91a7819a4523..5137ecead82c 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/ExerciseStudentMetricsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ExerciseStudentMetricsDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto.metrics; +package de.tum.cit.aet.artemis.web.rest.dto.metrics; import java.util.Map; import java.util.Set; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/LectureUnitInformationDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/LectureUnitInformationDTO.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/LectureUnitInformationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/LectureUnitInformationDTO.java index d448b5bbe07e..a04db9083a03 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/LectureUnitInformationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/LectureUnitInformationDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.web.rest.dto.metrics; +package de.tum.cit.aet.artemis.web.rest.dto.metrics; import java.time.ZonedDateTime; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; /** * DTO for lecture unit information. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/LectureUnitStudentMetricsDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/LectureUnitStudentMetricsDTO.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/LectureUnitStudentMetricsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/LectureUnitStudentMetricsDTO.java index 9d53a6b0299c..e1fa761e513a 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/LectureUnitStudentMetricsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/LectureUnitStudentMetricsDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto.metrics; +package de.tum.cit.aet.artemis.web.rest.dto.metrics; import java.util.Map; import java.util.Set; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/MapEntryLongLong.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/MapEntryLongLong.java similarity index 78% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/MapEntryLongLong.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/MapEntryLongLong.java index 7b67fe81b310..2d97b9b9ae30 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/MapEntryLongLong.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/MapEntryLongLong.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto.metrics; +package de.tum.cit.aet.artemis.web.rest.dto.metrics; /** * DTO for a map entry (key : long -> value : long). diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/ResourceTimestampDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ResourceTimestampDTO.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/ResourceTimestampDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ResourceTimestampDTO.java index 9770932e8dfb..d9f7988012fc 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/ResourceTimestampDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ResourceTimestampDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto.metrics; +package de.tum.cit.aet.artemis.web.rest.dto.metrics; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/ScoreDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ScoreDTO.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/ScoreDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ScoreDTO.java index db540e45fe10..c8cac515dfba 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/ScoreDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ScoreDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto.metrics; +package de.tum.cit.aet.artemis.web.rest.dto.metrics; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/StudentMetricsDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/StudentMetricsDTO.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/StudentMetricsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/StudentMetricsDTO.java index 9d36e181db22..007b4b932562 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/metrics/StudentMetricsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/StudentMetricsDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto.metrics; +package de.tum.cit.aet.artemis.web.rest.dto.metrics; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/pageablesearch/CompetencyPageableSearchDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/CompetencyPageableSearchDTO.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/pageablesearch/CompetencyPageableSearchDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/CompetencyPageableSearchDTO.java index 7fb00e7e02ec..905d5dd67161 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/pageablesearch/CompetencyPageableSearchDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/CompetencyPageableSearchDTO.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.web.rest.dto.pageablesearch; +package de.tum.cit.aet.artemis.web.rest.dto.pageablesearch; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; /** * Search DTO for a list of competencies matching the given search terms. The result should be paged, diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/pageablesearch/FinishedBuildJobPageableSearchDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/FinishedBuildJobPageableSearchDTO.java similarity index 76% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/pageablesearch/FinishedBuildJobPageableSearchDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/FinishedBuildJobPageableSearchDTO.java index 284130b99f3e..40a33ced5655 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/pageablesearch/FinishedBuildJobPageableSearchDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/FinishedBuildJobPageableSearchDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.web.rest.dto.pageablesearch; +package de.tum.cit.aet.artemis.web.rest.dto.pageablesearch; import java.time.ZonedDateTime; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.BuildStatus; +import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record FinishedBuildJobPageableSearchDTO(BuildStatus buildStatus, String buildAgentAddress, ZonedDateTime startDate, ZonedDateTime endDate, Integer buildDurationLower, diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/pageablesearch/PageableSearchDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/PageableSearchDTO.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/pageablesearch/PageableSearchDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/PageableSearchDTO.java index e992c441ca38..4ac7613ad5b0 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/pageablesearch/PageableSearchDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/PageableSearchDTO.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.web.rest.dto.pageablesearch; +package de.tum.cit.aet.artemis.web.rest.dto.pageablesearch; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.SortingOrder; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; /** * Wrapper for a generic search for any list of entities. The result should be paged, diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/pageablesearch/SearchTermPageableSearchDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/SearchTermPageableSearchDTO.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/pageablesearch/SearchTermPageableSearchDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/SearchTermPageableSearchDTO.java index 96c71d84d0c5..f1383d543656 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/pageablesearch/SearchTermPageableSearchDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/SearchTermPageableSearchDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.web.rest.dto.pageablesearch; +package de.tum.cit.aet.artemis.web.rest.dto.pageablesearch; import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; /** * Wrapper for a generic search for any list of entities matching a given search term. The result should be paged, diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/pageablesearch/UserPageableSearchDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/UserPageableSearchDTO.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/pageablesearch/UserPageableSearchDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/UserPageableSearchDTO.java index bf39024cba29..750bd8c5e5a9 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/pageablesearch/UserPageableSearchDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/UserPageableSearchDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto.pageablesearch; +package de.tum.cit.aet.artemis.web.rest.dto.pageablesearch; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/plagiarism/PlagiarismCaseInfoDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismCaseInfoDTO.java similarity index 73% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/plagiarism/PlagiarismCaseInfoDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismCaseInfoDTO.java index 420d32bcd724..bcb123bf0d03 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/plagiarism/PlagiarismCaseInfoDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismCaseInfoDTO.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.web.rest.dto.plagiarism; +package de.tum.cit.aet.artemis.web.rest.dto.plagiarism; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; /** * A DTO with a subset of Plagiarism Case fields for displaying relevant info to a student. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/plagiarism/PlagiarismComparisonStatusDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismComparisonStatusDTO.java similarity index 59% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/plagiarism/PlagiarismComparisonStatusDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismComparisonStatusDTO.java index aefd1ac10fca..5bd9e7703842 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/plagiarism/PlagiarismComparisonStatusDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismComparisonStatusDTO.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.web.rest.dto.plagiarism; +package de.tum.cit.aet.artemis.web.rest.dto.plagiarism; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismStatus; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PlagiarismComparisonStatusDTO(PlagiarismStatus status) { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/plagiarism/PlagiarismResultDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismResultDTO.java similarity index 70% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/plagiarism/PlagiarismResultDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismResultDTO.java index 663150ef8843..ab2eb31a7fde 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/plagiarism/PlagiarismResultDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismResultDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.web.rest.dto.plagiarism; +package de.tum.cit.aet.artemis.web.rest.dto.plagiarism; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismResult; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmissionElement; -import de.tum.in.www1.artemis.web.rest.plagiarism.PlagiarismResultStats; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismResult; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmissionElement; +import de.tum.cit.aet.artemis.web.rest.plagiarism.PlagiarismResultStats; /** * Transfers information about plagiarism checks result and its statistics diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/plagiarism/PlagiarismVerdictDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismVerdictDTO.java similarity index 69% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/plagiarism/PlagiarismVerdictDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismVerdictDTO.java index acd94f1b580a..8f5ed9d5aa69 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/plagiarism/PlagiarismVerdictDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismVerdictDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.web.rest.dto.plagiarism; +package de.tum.cit.aet.artemis.web.rest.dto.plagiarism; import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PlagiarismVerdictDTO(@NotNull PlagiarismVerdict verdict, String verdictMessage, int verdictPointDeduction) { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/science/ScienceEventDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/science/ScienceEventDTO.java similarity index 60% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/science/ScienceEventDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/science/ScienceEventDTO.java index b76cb5bedda5..9eed4de5569c 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/science/ScienceEventDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/science/ScienceEventDTO.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.web.rest.dto.science; +package de.tum.cit.aet.artemis.web.rest.dto.science; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.science.ScienceEventType; +import de.tum.cit.aet.artemis.domain.science.ScienceEventType; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ScienceEventDTO(ScienceEventType type, Long resourceId) { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/score/ScoreDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/ScoreDTO.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/score/ScoreDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/ScoreDTO.java index 9718549b591e..b6ccc896de9a 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/score/ScoreDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/ScoreDTO.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.web.rest.dto.score; +package de.tum.cit.aet.artemis.web.rest.dto.score; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.User; /** * DTO to send achieved points and achieved scores of a student to the client for courses / exam diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/score/StudentScoreSum.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/StudentScoreSum.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/score/StudentScoreSum.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/StudentScoreSum.java index 9b3ea5a64a9c..07dbaa291809 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/score/StudentScoreSum.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/StudentScoreSum.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto.score; +package de.tum.cit.aet.artemis.web.rest.dto.score; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/score/StudentScoresDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/StudentScoresDTO.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/score/StudentScoresDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/StudentScoresDTO.java index 22511762d4cb..8c2cca0d8e48 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/score/StudentScoresDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/StudentScoresDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto.score; +package de.tum.cit.aet.artemis.web.rest.dto.score; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/score/TeamScoreSum.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/TeamScoreSum.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/score/TeamScoreSum.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/TeamScoreSum.java index 382b8e29c9d1..cb7983a414f7 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/score/TeamScoreSum.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/TeamScoreSum.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto.score; +package de.tum.cit.aet.artemis.web.rest.dto.score; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/settings/ide/IdeDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/settings/ide/IdeDTO.java similarity index 67% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/settings/ide/IdeDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/settings/ide/IdeDTO.java index 858c205e9b0e..2c17e2cf1c49 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/settings/ide/IdeDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/settings/ide/IdeDTO.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.web.rest.dto.settings.ide; +package de.tum.cit.aet.artemis.web.rest.dto.settings.ide; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.settings.ide.Ide; +import de.tum.cit.aet.artemis.domain.settings.ide.Ide; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record IdeDTO(String name, String deepLink) { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/settings/ide/IdeMappingDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/settings/ide/IdeMappingDTO.java similarity index 64% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/settings/ide/IdeMappingDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/settings/ide/IdeMappingDTO.java index f6d2aab364e4..67b277a7b1b7 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/settings/ide/IdeMappingDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/settings/ide/IdeMappingDTO.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.web.rest.dto.settings.ide; +package de.tum.cit.aet.artemis.web.rest.dto.settings.ide; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.settings.ide.Ide; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.settings.ide.Ide; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record IdeMappingDTO(ProgrammingLanguage programmingLanguage, IdeDTO ide) { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaRequestDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaRequestDTO.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaRequestDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaRequestDTO.java index 651df5db311b..c5d2c6eadc54 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaRequestDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaRequestDTO.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency; +package de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.competency.KnowledgeArea; +import de.tum.cit.aet.artemis.domain.competency.KnowledgeArea; /** * DTO used to send requests regarding {@link KnowledgeArea} objects. It has no id and only contains the id (not object) of its parent diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaResultDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaResultDTO.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaResultDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaResultDTO.java index 3ce9333815fb..e0d274acd2e1 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaResultDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaResultDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency; +package de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency; import java.util.List; @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.competency.KnowledgeArea; +import de.tum.cit.aet.artemis.domain.competency.KnowledgeArea; /** * DTO containing {@link KnowledgeArea} data. It only contains the id of the knowledge area and source. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/standardizedCompetency/SourceDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/SourceDTO.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/standardizedCompetency/SourceDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/SourceDTO.java index 9a9071d75cd6..3085440d018f 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/standardizedCompetency/SourceDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/SourceDTO.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency; +package de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.competency.Source; +import de.tum.cit.aet.artemis.domain.competency.Source; /** * DTO containing source information diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyCatalogDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyCatalogDTO.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyCatalogDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyCatalogDTO.java index 71b0eaa18085..6b9d6fb61336 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyCatalogDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyCatalogDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency; +package de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency; import java.util.List; @@ -10,10 +10,10 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy; -import de.tum.in.www1.artemis.domain.competency.KnowledgeArea; -import de.tum.in.www1.artemis.domain.competency.Source; -import de.tum.in.www1.artemis.domain.competency.StandardizedCompetency; +import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.domain.competency.KnowledgeArea; +import de.tum.cit.aet.artemis.domain.competency.Source; +import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; /** * DTO including a nested structure of knowledge areas (including their descendants and competencies), as well as a list of sources diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyRequestDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyRequestDTO.java similarity index 75% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyRequestDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyRequestDTO.java index 5cda0f0b99d9..5046fd969172 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyRequestDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyRequestDTO.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency; +package de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy; -import de.tum.in.www1.artemis.domain.competency.StandardizedCompetency; +import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; /** * DTO used to send requests regarding {@link StandardizedCompetency} objects. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyResultDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyResultDTO.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyResultDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyResultDTO.java index 9ac341da7de9..d1132092d9b1 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyResultDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyResultDTO.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency; +package de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy; -import de.tum.in.www1.artemis.domain.competency.StandardizedCompetency; +import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; /** * DTO containing {@link StandardizedCompetency} data. It only contains the id of the knowledge area and source. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/user/UserNameAndLoginDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/user/UserNameAndLoginDTO.java similarity index 76% rename from src/main/java/de/tum/in/www1/artemis/web/rest/dto/user/UserNameAndLoginDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/dto/user/UserNameAndLoginDTO.java index 9f3000f1b321..bb13b3c7adb5 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/user/UserNameAndLoginDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/user/UserNameAndLoginDTO.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.web.rest.dto.user; +package de.tum.cit.aet.artemis.web.rest.dto.user; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.User; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record UserNameAndLoginDTO(String name, String login) { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/AccessForbiddenAlertException.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/AccessForbiddenAlertException.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/errors/AccessForbiddenAlertException.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/errors/AccessForbiddenAlertException.java index 5168b7e6bd00..d73185b34aa8 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/AccessForbiddenAlertException.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/AccessForbiddenAlertException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.web.rest.errors; import java.net.URI; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/AccessForbiddenException.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/AccessForbiddenException.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/web/rest/errors/AccessForbiddenException.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/errors/AccessForbiddenException.java index c5d4ded5c3e1..31714d31a1e8 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/AccessForbiddenException.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/AccessForbiddenException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.web.rest.errors; import java.io.Serial; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/BadRequestAlertException.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/BadRequestAlertException.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/web/rest/errors/BadRequestAlertException.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/errors/BadRequestAlertException.java index bbd0a49b701f..d75acee1e1c8 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/BadRequestAlertException.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/BadRequestAlertException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.web.rest.errors; import java.net.URI; import java.util.Map; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/CaptchaRequiredException.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/CaptchaRequiredException.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/web/rest/errors/CaptchaRequiredException.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/errors/CaptchaRequiredException.java index 4fe58c09fa38..33e342894260 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/CaptchaRequiredException.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/CaptchaRequiredException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.web.rest.errors; import java.io.Serial; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/ComplaintResponseLockedException.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ComplaintResponseLockedException.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/web/rest/errors/ComplaintResponseLockedException.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ComplaintResponseLockedException.java index 0d20eb7ee9cf..234a73689011 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/ComplaintResponseLockedException.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ComplaintResponseLockedException.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.web.rest.errors; import java.io.Serial; import java.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.Map; -import de.tum.in.www1.artemis.domain.ComplaintResponse; -import de.tum.in.www1.artemis.web.rest.ComplaintResponseResource; +import de.tum.cit.aet.artemis.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.web.rest.ComplaintResponseResource; public class ComplaintResponseLockedException extends BadRequestAlertException { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/ConflictException.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ConflictException.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/errors/ConflictException.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ConflictException.java index f658f4db6098..58c8fca26fae 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/ConflictException.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ConflictException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.web.rest.errors; import java.net.URI; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/EmailAlreadyUsedException.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/EmailAlreadyUsedException.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/web/rest/errors/EmailAlreadyUsedException.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/errors/EmailAlreadyUsedException.java index f33581eccbd3..4b1bae770635 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/EmailAlreadyUsedException.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/EmailAlreadyUsedException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.web.rest.errors; import java.io.Serial; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/EntityNotFoundException.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/EntityNotFoundException.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/web/rest/errors/EntityNotFoundException.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/errors/EntityNotFoundException.java index a6d5a565266b..5313bd5158c8 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/EntityNotFoundException.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/EntityNotFoundException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.web.rest.errors; import java.io.Serial; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/ErrorConstants.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ErrorConstants.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/web/rest/errors/ErrorConstants.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ErrorConstants.java index 2712b42d798e..1ddaf6f6523b 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/ErrorConstants.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ErrorConstants.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.web.rest.errors; import java.net.URI; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/ExamConfigurationException.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ExamConfigurationException.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/web/rest/errors/ExamConfigurationException.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ExamConfigurationException.java index 60ebc708e90d..e9689e090732 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/ExamConfigurationException.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ExamConfigurationException.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.web.rest.errors; import java.io.Serial; import java.util.HashMap; import java.util.List; import java.util.Map; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; /** * Exception that will be thrown if the user tries to import an exam that contains programming exercises with an invalid shortName. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/ExceptionTranslator.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ExceptionTranslator.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/web/rest/errors/ExceptionTranslator.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ExceptionTranslator.java index 2e3c95060336..826188b04917 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/ExceptionTranslator.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ExceptionTranslator.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.web.rest.errors; import java.io.IOException; import java.util.List; @@ -33,7 +33,7 @@ import org.zalando.problem.spring.web.advice.security.SecurityAdviceTrait; import org.zalando.problem.violations.ConstraintViolationProblem; -import de.tum.in.www1.artemis.service.connectors.gitlab.GitLabException; +import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabException; import tech.jhipster.web.util.HeaderUtil; /** @@ -102,7 +102,7 @@ public ResponseEntity handleEmailAlreadyUsedException(EmailAlreadyUsedE } @ExceptionHandler - public ResponseEntity handleUsernameAlreadyUsedException(de.tum.in.www1.artemis.exception.UsernameAlreadyUsedException ex, NativeWebRequest request) { + public ResponseEntity handleUsernameAlreadyUsedException(de.tum.cit.aet.artemis.exception.UsernameAlreadyUsedException ex, NativeWebRequest request) { LoginAlreadyUsedException problem = new LoginAlreadyUsedException(); return create(problem, request, HeaderUtil.createFailureAlert(applicationName, true, problem.getEntityName(), problem.getErrorKey(), problem.getMessage())); } diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/FieldErrorVM.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/FieldErrorVM.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/web/rest/errors/FieldErrorVM.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/errors/FieldErrorVM.java index 91dae0b0f04a..0f022e16d13d 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/FieldErrorVM.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/FieldErrorVM.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.web.rest.errors; import java.io.Serial; import java.io.Serializable; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/HttpStatusException.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/HttpStatusException.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/web/rest/errors/HttpStatusException.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/errors/HttpStatusException.java index 4c541456a4a2..4990b16f1c16 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/HttpStatusException.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/HttpStatusException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.web.rest.errors; import java.io.Serial; import java.net.URI; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/InternalServerErrorAlertException.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/InternalServerErrorAlertException.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/errors/InternalServerErrorAlertException.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/errors/InternalServerErrorAlertException.java index 9762aa9b7350..91074f3a6c97 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/InternalServerErrorAlertException.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/InternalServerErrorAlertException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.web.rest.errors; import java.net.URI; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/InternalServerErrorException.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/InternalServerErrorException.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/web/rest/errors/InternalServerErrorException.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/errors/InternalServerErrorException.java index 34f7265bf9a2..4a74f7a24182 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/InternalServerErrorException.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/InternalServerErrorException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.web.rest.errors; import java.io.Serial; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/LoginAlreadyUsedException.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/LoginAlreadyUsedException.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/web/rest/errors/LoginAlreadyUsedException.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/errors/LoginAlreadyUsedException.java index d5674e45583d..bb2731554020 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/LoginAlreadyUsedException.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/LoginAlreadyUsedException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.web.rest.errors; import java.io.Serial; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/PasswordViolatesRequirementsException.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/PasswordViolatesRequirementsException.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/web/rest/errors/PasswordViolatesRequirementsException.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/errors/PasswordViolatesRequirementsException.java index bc3accb0f9e3..76e3f4a9d1a0 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/PasswordViolatesRequirementsException.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/PasswordViolatesRequirementsException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.web.rest.errors; import java.io.Serial; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/ServiceUnavailableException.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ServiceUnavailableException.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/web/rest/errors/ServiceUnavailableException.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ServiceUnavailableException.java index 9a10ed026d24..54c34b84eada 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/ServiceUnavailableException.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ServiceUnavailableException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.web.rest.errors; import java.io.Serial; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/StudentsAlreadyAssignedException.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/StudentsAlreadyAssignedException.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/web/rest/errors/StudentsAlreadyAssignedException.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/errors/StudentsAlreadyAssignedException.java index 77f86df48017..9337e10b9018 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/StudentsAlreadyAssignedException.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/StudentsAlreadyAssignedException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.web.rest.errors; import java.io.Serial; import java.util.HashMap; @@ -7,9 +7,9 @@ import org.springframework.data.util.Pair; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.web.rest.TeamResource; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.web.rest.TeamResource; /** * Exception that will be thrown if the user tries to create a team that contains students who are already assigned to a different team for the exercise. The error response will diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/StudentsAppearMultipleTimesException.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/StudentsAppearMultipleTimesException.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/web/rest/errors/StudentsAppearMultipleTimesException.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/errors/StudentsAppearMultipleTimesException.java index 0417979c27d4..2c8b8ef48920 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/StudentsAppearMultipleTimesException.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/StudentsAppearMultipleTimesException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.web.rest.errors; import java.io.Serial; import java.util.HashMap; @@ -7,8 +7,8 @@ import org.springframework.data.util.Pair; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.web.rest.TeamResource; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.web.rest.TeamResource; /** * Exception that will be thrown if the user tries to import teams that contain students who appear in another imported team. The error response will diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/StudentsNotFoundException.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/StudentsNotFoundException.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/web/rest/errors/StudentsNotFoundException.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/errors/StudentsNotFoundException.java index d1f82b4f7a96..fcb5758635ec 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/StudentsNotFoundException.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/StudentsNotFoundException.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.web.rest.errors; import java.io.Serial; import java.util.HashMap; import java.util.List; import java.util.Map; -import de.tum.in.www1.artemis.web.rest.TeamResource; +import de.tum.cit.aet.artemis.web.rest.TeamResource; /** * Exception that will be thrown if the user tries to import teams that contain students whose login or registration number cannot be found. The error response will diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/package-info.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/package-info.java similarity index 74% rename from src/main/java/de/tum/in/www1/artemis/web/rest/errors/package-info.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/errors/package-info.java index ea308b84325a..f0f87034cf81 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/errors/package-info.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/package-info.java @@ -1,4 +1,4 @@ /** * Specific errors used with Zalando's "problem-spring-web" library. More information on https://github.com/zalando/problem-spring-web */ -package de.tum.in.www1.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.web.rest.errors; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/CodeHintResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CodeHintResource.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/web/rest/hestia/CodeHintResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CodeHintResource.java index 6c4231e06df0..c9eb2442d7bf 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/CodeHintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CodeHintResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.hestia; +package de.tum.cit.aet.artemis.web.rest.hestia; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Objects; @@ -19,17 +19,17 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.hestia.CodeHint; -import de.tum.in.www1.artemis.domain.iris.settings.IrisSubSettingsType; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.hestia.CodeHintRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; -import de.tum.in.www1.artemis.service.hestia.CodeHintService; -import de.tum.in.www1.artemis.service.iris.settings.IrisSettingsService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettingsType; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.hestia.CodeHintRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; +import de.tum.cit.aet.artemis.service.hestia.CodeHintService; +import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; /** * REST controller for managing {@link CodeHint}. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/CoverageReportResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CoverageReportResource.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/web/rest/hestia/CoverageReportResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CoverageReportResource.java index ae6ccdd1b746..ef6efa32dade 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/CoverageReportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CoverageReportResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.hestia; +package de.tum.cit.aet.artemis.web.rest.hestia; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -11,10 +11,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.hestia.CoverageReport; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; -import de.tum.in.www1.artemis.service.hestia.TestwiseCoverageService; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.hestia.CoverageReport; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; +import de.tum.cit.aet.artemis.service.hestia.TestwiseCoverageService; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * REST controller for managing ProgrammingExerciseTestwiseCoverageReports and its entries. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ExerciseHintResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ExerciseHintResource.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ExerciseHintResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ExerciseHintResource.java index c5c62d75099f..a4ff566f39fd 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ExerciseHintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ExerciseHintResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.hestia; +package de.tum.cit.aet.artemis.web.rest.hestia; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -20,26 +20,26 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.hestia.CodeHint; -import de.tum.in.www1.artemis.domain.hestia.ExerciseHint; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.hestia.ExerciseHintRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; -import de.tum.in.www1.artemis.service.hestia.CodeHintService; -import de.tum.in.www1.artemis.service.hestia.ExerciseHintService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.domain.hestia.ExerciseHint; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.hestia.ExerciseHintRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; +import de.tum.cit.aet.artemis.service.hestia.CodeHintService; +import de.tum.cit.aet.artemis.service.hestia.ExerciseHintService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; import tech.jhipster.web.util.HeaderUtil; /** - * REST controller for managing {@link de.tum.in.www1.artemis.domain.hestia.ExerciseHint}. + * REST controller for managing {@link de.tum.cit.aet.artemis.domain.hestia.ExerciseHint}. */ @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java index c1bd02d83e61..75d20e0b0c61 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.hestia; +package de.tum.cit.aet.artemis.web.rest.hestia; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.IOException; @@ -15,25 +15,25 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ParticipationAuthorizationCheckService; -import de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseGitDiffReportService; -import de.tum.in.www1.artemis.service.programming.CommitHistoryService; -import de.tum.in.www1.artemis.service.programming.RepositoryService; -import de.tum.in.www1.artemis.web.rest.dto.ProgrammingExerciseGitDiffReportDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; +import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseGitDiffReportService; +import de.tum.cit.aet.artemis.service.programming.CommitHistoryService; +import de.tum.cit.aet.artemis.service.programming.RepositoryService; +import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseGitDiffReportDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; /** * REST controller for managing ProgrammingExerciseGitDiffReports and its entries. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java index 2464ceb593a5..de92d3b00732 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.hestia; +package de.tum.cit.aet.artemis.web.rest.hestia; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -21,29 +21,29 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.hestia.CodeHint; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.hestia.CodeHintRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralSolutionEntryGenerationException; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralTestCaseService; -import de.tum.in.www1.artemis.service.hestia.structural.StructuralSolutionEntryGenerationException; -import de.tum.in.www1.artemis.service.hestia.structural.StructuralTestCaseService; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; -import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.hestia.CodeHintRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralSolutionEntryGenerationException; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralTestCaseService; +import de.tum.cit.aet.artemis.service.hestia.structural.StructuralSolutionEntryGenerationException; +import de.tum.cit.aet.artemis.service.hestia.structural.StructuralTestCaseService; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; import tech.jhipster.web.util.HeaderUtil; /** - * REST controller for managing {@link de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseSolutionEntry}. + * REST controller for managing {@link de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry}. */ @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java index 3614c7ead894..32fb96aece8b 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.hestia; +package de.tum.cit.aet.artemis.web.rest.hestia; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Set; @@ -13,16 +13,16 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseTaskService; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; /** - * REST controller for managing {@link de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask}. + * REST controller for managing {@link de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask}. */ @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/iris/IrisCourseChatSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisCourseChatSessionResource.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/web/rest/iris/IrisCourseChatSessionResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisCourseChatSessionResource.java index d611eb61bb39..10911ab67409 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/iris/IrisCourseChatSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisCourseChatSessionResource.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.iris; +package de.tum.cit.aet.artemis.web.rest.iris; import java.net.URI; import java.net.URISyntaxException; @@ -12,17 +12,17 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.iris.session.IrisCourseChatSession; -import de.tum.in.www1.artemis.domain.iris.settings.IrisSubSettingsType; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.iris.IrisCourseChatSessionRepository; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; -import de.tum.in.www1.artemis.service.connectors.pyris.PyrisHealthIndicator; -import de.tum.in.www1.artemis.service.iris.IrisRateLimitService; -import de.tum.in.www1.artemis.service.iris.IrisSessionService; -import de.tum.in.www1.artemis.service.iris.session.IrisCourseChatSessionService; -import de.tum.in.www1.artemis.service.iris.settings.IrisSettingsService; +import de.tum.cit.aet.artemis.domain.iris.session.IrisCourseChatSession; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettingsType; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.iris.IrisCourseChatSessionRepository; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; +import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisHealthIndicator; +import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; +import de.tum.cit.aet.artemis.service.iris.IrisSessionService; +import de.tum.cit.aet.artemis.service.iris.session.IrisCourseChatSessionService; +import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; /** * REST controller for managing {@link IrisCourseChatSession}. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/iris/IrisExerciseChatSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisExerciseChatSessionResource.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/web/rest/iris/IrisExerciseChatSessionResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisExerciseChatSessionResource.java index f3bf07426305..c2879d1bb963 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/iris/IrisExerciseChatSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisExerciseChatSessionResource.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.iris; +package de.tum.cit.aet.artemis.web.rest.iris; import java.net.URI; import java.net.URISyntaxException; @@ -13,19 +13,19 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.iris.session.IrisExerciseChatSession; -import de.tum.in.www1.artemis.domain.iris.settings.IrisSubSettingsType; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.iris.IrisExerciseChatSessionRepository; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; -import de.tum.in.www1.artemis.service.connectors.pyris.PyrisHealthIndicator; -import de.tum.in.www1.artemis.service.iris.IrisRateLimitService; -import de.tum.in.www1.artemis.service.iris.IrisSessionService; -import de.tum.in.www1.artemis.service.iris.settings.IrisSettingsService; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.iris.session.IrisExerciseChatSession; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettingsType; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.iris.IrisExerciseChatSessionRepository; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; +import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisHealthIndicator; +import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; +import de.tum.cit.aet.artemis.service.iris.IrisSessionService; +import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; /** * REST controller for managing {@link IrisExerciseChatSession}. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/iris/IrisMessageResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisMessageResource.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/web/rest/iris/IrisMessageResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisMessageResource.java index dcc80685c35f..0038959d0127 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/iris/IrisMessageResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisMessageResource.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.iris; +package de.tum.cit.aet.artemis.web.rest.iris; import java.net.URI; import java.net.URISyntaxException; @@ -17,16 +17,16 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.iris.message.IrisMessage; -import de.tum.in.www1.artemis.domain.iris.message.IrisMessageSender; -import de.tum.in.www1.artemis.domain.iris.session.IrisSession; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.iris.IrisMessageRepository; -import de.tum.in.www1.artemis.repository.iris.IrisSessionRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.iris.IrisMessageService; -import de.tum.in.www1.artemis.service.iris.IrisSessionService; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; +import de.tum.cit.aet.artemis.domain.iris.message.IrisMessageSender; +import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.iris.IrisMessageRepository; +import de.tum.cit.aet.artemis.repository.iris.IrisSessionRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.iris.IrisMessageService; +import de.tum.cit.aet.artemis.service.iris.IrisSessionService; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; /** * REST controller for managing {@link IrisMessage}. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/iris/IrisModelsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisModelsResource.java similarity index 78% rename from src/main/java/de/tum/in/www1/artemis/web/rest/iris/IrisModelsResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisModelsResource.java index 781975c1aa9b..4795e2f31857 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/iris/IrisModelsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisModelsResource.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.iris; +package de.tum.cit.aet.artemis.web.rest.iris; import java.util.List; @@ -8,11 +8,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.service.connectors.pyris.PyrisConnectorException; -import de.tum.in.www1.artemis.service.connectors.pyris.PyrisConnectorService; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisModelDTO; -import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisConnectorException; +import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisConnectorService; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisModelDTO; +import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; /** * REST controller for managing the models Pyris provides. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/iris/IrisResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisResource.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/web/rest/iris/IrisResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisResource.java index a566917b2a34..795f74b28c11 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/iris/IrisResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisResource.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.iris; +package de.tum.cit.aet.artemis.web.rest.iris; import org.springframework.boot.actuate.health.Status; import org.springframework.context.annotation.Profile; @@ -7,10 +7,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.connectors.pyris.PyrisHealthIndicator; -import de.tum.in.www1.artemis.service.iris.IrisRateLimitService; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisHealthIndicator; +import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; @Profile("iris") @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/iris/IrisSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisSettingsResource.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/web/rest/iris/IrisSettingsResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisSettingsResource.java index 2eb992fde508..24d27ed1e909 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/iris/IrisSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisSettingsResource.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.iris; +package de.tum.cit.aet.artemis.web.rest.iris; import org.springframework.context.annotation.Profile; import org.springframework.http.ResponseEntity; @@ -9,19 +9,19 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.iris.settings.IrisCourseSettings; -import de.tum.in.www1.artemis.domain.iris.settings.IrisExerciseSettings; -import de.tum.in.www1.artemis.domain.iris.settings.IrisSettings; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.iris.dto.IrisCombinedSettingsDTO; -import de.tum.in.www1.artemis.service.iris.settings.IrisSettingsService; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisCourseSettings; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisExerciseSettings; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisSettings; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedSettingsDTO; +import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; /** * REST controller for managing {@link IrisSettings}. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/iris/IrisStatusDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisStatusDTO.java similarity index 65% rename from src/main/java/de/tum/in/www1/artemis/web/rest/iris/IrisStatusDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisStatusDTO.java index 6e7badf165ba..3459e93aa319 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/iris/IrisStatusDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisStatusDTO.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.web.rest.iris; +package de.tum.cit.aet.artemis.web.rest.iris; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.service.iris.IrisRateLimitService; +import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record IrisStatusDTO(boolean active, IrisRateLimitService.IrisRateLimitInformation rateLimitInfo) { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/AttachmentUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/web/rest/lecture/AttachmentUnitResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java index 9f0bd52376e9..89d5962ac7ca 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/AttachmentUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.lecture; +package de.tum.cit.aet.artemis.web.rest.lecture; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.IOException; import java.net.URI; @@ -29,24 +29,24 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.Attachment; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; -import de.tum.in.www1.artemis.repository.AttachmentUnitRepository; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.service.AttachmentUnitService; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.LectureUnitProcessingService; -import de.tum.in.www1.artemis.service.SlideSplitterService; -import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; -import de.tum.in.www1.artemis.service.notifications.GroupNotificationService; -import de.tum.in.www1.artemis.web.rest.dto.LectureUnitInformationDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.domain.Attachment; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.repository.AttachmentUnitRepository; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.service.AttachmentUnitService; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.LectureUnitProcessingService; +import de.tum.cit.aet.artemis.service.SlideSplitterService; +import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; +import de.tum.cit.aet.artemis.web.rest.dto.LectureUnitInformationDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/ExerciseUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/ExerciseUnitResource.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/web/rest/lecture/ExerciseUnitResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/ExerciseUnitResource.java index 6abfaabe5b39..6e95ab809a7e 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/ExerciseUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/ExerciseUnitResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.lecture; +package de.tum.cit.aet.artemis.web.rest.lecture; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -19,14 +19,14 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.lecture.ExerciseUnit; -import de.tum.in.www1.artemis.repository.ExerciseUnitRepository; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; +import de.tum.cit.aet.artemis.repository.ExerciseUnitRepository; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/LectureUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/web/rest/lecture/LectureUnitResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java index 3e3e589c4203..5e8025ffb348 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/LectureUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.lecture; +package de.tum.cit.aet.artemis.web.rest.lecture; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Comparator; import java.util.List; @@ -22,24 +22,24 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.LectureUnitRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.LectureUnitService; -import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; -import de.tum.in.www1.artemis.service.user.UserService; -import de.tum.in.www1.artemis.web.rest.dto.lectureunit.LectureUnitForLearningPathNodeDetailsDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.LectureUnitRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.LectureUnitService; +import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.service.user.UserService; +import de.tum.cit.aet.artemis.web.rest.dto.lectureunit.LectureUnitForLearningPathNodeDetailsDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/OnlineUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/lecture/OnlineUnitResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java index 1db202306ae0..7c09bc4a7ea8 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/OnlineUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.lecture; +package de.tum.cit.aet.artemis.web.rest.lecture; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.IOException; import java.net.URI; @@ -28,18 +28,18 @@ import com.google.common.net.InternetDomainName; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.lecture.OnlineUnit; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.OnlineUnitRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.LectureUnitService; -import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; -import de.tum.in.www1.artemis.web.rest.dto.OnlineResourceDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.lecture.OnlineUnit; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.OnlineUnitRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.LectureUnitService; +import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.web.rest.dto.OnlineResourceDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/TextUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/web/rest/lecture/TextUnitResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java index 9dae07a3feab..c7a3f6469136 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/TextUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.lecture; +package de.tum.cit.aet.artemis.web.rest.lecture; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -18,16 +18,16 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.lecture.TextUnit; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.TextUnitRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.lecture.TextUnit; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.TextUnitRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/VideoUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/web/rest/lecture/VideoUnitResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java index 026611ad945c..21a75084a29b 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/VideoUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.lecture; +package de.tum.cit.aet.artemis.web.rest.lecture; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -20,16 +20,16 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.lecture.VideoUnit; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.VideoUnitRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.LectureUnitService; -import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.lecture.VideoUnit; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.VideoUnitRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.LectureUnitService; +import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/localci/BuildJobQueueResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildJobQueueResource.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/web/rest/localci/BuildJobQueueResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildJobQueueResource.java index 595d2a465b0f..8e96112c9bf5 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/localci/BuildJobQueueResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildJobQueueResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.localci; +package de.tum.cit.aet.artemis.web.rest.localci; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_LOCALCI; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALCI; import java.time.ZonedDateTime; import java.util.List; @@ -20,20 +20,20 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; -import de.tum.in.www1.artemis.domain.BuildJob; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.repository.BuildJobRepository; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.connectors.localci.SharedQueueManagementService; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.in.www1.artemis.service.dto.BuildJobResultCountDTO; -import de.tum.in.www1.artemis.service.dto.BuildJobsStatisticsDTO; -import de.tum.in.www1.artemis.service.dto.FinishedBuildJobDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.FinishedBuildJobPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.domain.BuildJob; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.repository.BuildJobRepository; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.connectors.localci.SharedQueueManagementService; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.service.dto.BuildJobResultCountDTO; +import de.tum.cit.aet.artemis.service.dto.BuildJobsStatisticsDTO; +import de.tum.cit.aet.artemis.service.dto.FinishedBuildJobDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.FinishedBuildJobPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import tech.jhipster.web.util.PaginationUtil; @Profile(PROFILE_LOCALCI) diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/localci/BuildLogResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildLogResource.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/web/rest/localci/BuildLogResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildLogResource.java index 77813c969dbf..3dbb33883d44 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/localci/BuildLogResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildLogResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.localci; +package de.tum.cit.aet.artemis.web.rest.localci; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_LOCALCI; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALCI; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -16,8 +16,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.service.BuildLogEntryService; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.service.BuildLogEntryService; @Profile(PROFILE_LOCALCI) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/localci/BuildPlanResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildPlanResource.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/web/rest/localci/BuildPlanResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildPlanResource.java index 391434abd8f4..aa2306b48a92 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/localci/BuildPlanResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildPlanResource.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.localci; +package de.tum.cit.aet.artemis.web.rest.localci; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -11,15 +11,15 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.BuildPlan; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.repository.BuildPlanRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.programming.ProgrammingTriggerService; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.BuildPlan; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingTriggerService; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile("gitlabci | jenkins") @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/AnswerMessageResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/AnswerMessageResource.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/web/rest/metis/AnswerMessageResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/metis/AnswerMessageResource.java index 8d72d787dbc6..4952bbf59b74 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/AnswerMessageResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/AnswerMessageResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.metis; +package de.tum.cit.aet.artemis.web.rest.metis; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -18,10 +18,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.metis.AnswerPost; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.metis.AnswerMessageService; -import de.tum.in.www1.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.domain.metis.AnswerPost; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.metis.AnswerMessageService; +import de.tum.cit.aet.artemis.service.util.TimeLogUtil; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/ConversationMessageResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/web/rest/metis/ConversationMessageResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java index 4bc3728c14b0..3972dfdb1cb9 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/ConversationMessageResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.metis; +package de.tum.cit.aet.artemis.web.rest.metis; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -28,18 +28,18 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; -import de.tum.in.www1.artemis.domain.enumeration.DisplayPriority; -import de.tum.in.www1.artemis.domain.metis.CreatedConversationMessage; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.metis.ConversationMessagingService; -import de.tum.in.www1.artemis.service.util.TimeLogUtil; -import de.tum.in.www1.artemis.web.rest.dto.PostContextFilterDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; +import de.tum.cit.aet.artemis.domain.metis.CreatedConversationMessage; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.metis.ConversationMessagingService; +import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.PaginationUtil; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/ReactionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ReactionResource.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/web/rest/metis/ReactionResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ReactionResource.java index c094daa08b18..d5f5034b6700 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/ReactionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ReactionResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.metis; +package de.tum.cit.aet.artemis.web.rest.metis; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -19,9 +19,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.metis.Reaction; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.metis.ReactionService; +import de.tum.cit.aet.artemis.domain.metis.Reaction; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.metis.ReactionService; /** * REST controller for Reaction on Postings. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/ChannelResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/ChannelResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java index 121039b4977b..61739df37771 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/ChannelResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.web.rest.metis.conversation; +package de.tum.cit.aet.artemis.web.rest.metis.conversation; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.service.metis.conversation.ChannelService.CHANNEL_ENTITY_NAME; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.service.metis.conversation.ChannelService.CHANNEL_ENTITY_NAME; import java.net.URI; import java.net.URISyntaxException; @@ -30,28 +30,28 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.NotificationType; -import de.tum.in.www1.artemis.domain.metis.ConversationParticipant; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.metis.conversation.ChannelService; -import de.tum.in.www1.artemis.service.metis.conversation.ConversationDTOService; -import de.tum.in.www1.artemis.service.metis.conversation.ConversationService; -import de.tum.in.www1.artemis.service.metis.conversation.auth.ChannelAuthorizationService; -import de.tum.in.www1.artemis.service.notifications.SingleUserNotificationService; -import de.tum.in.www1.artemis.service.tutorialgroups.TutorialGroupChannelManagementService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenAlertException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.ErrorConstants; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.ChannelDTO; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.ChannelIdAndNameDTO; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; +import de.tum.cit.aet.artemis.service.metis.conversation.ConversationDTOService; +import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; +import de.tum.cit.aet.artemis.service.metis.conversation.auth.ChannelAuthorizationService; +import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; +import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupChannelManagementService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelIdAndNameDTO; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/ConversationManagementResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationManagementResource.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/ConversationManagementResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationManagementResource.java index 890b17fb2b9f..1bbf3cc29e7c 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/ConversationManagementResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationManagementResource.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.web.rest.metis.conversation; +package de.tum.cit.aet.artemis.web.rest.metis.conversation; import org.springframework.http.HttpStatus; import org.springframework.web.server.ResponseStatusException; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.in.www1.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.repository.CourseRepository; public class ConversationManagementResource { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/ConversationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/ConversationResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java index 710b77697490..63a39f117801 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/ConversationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.metis.conversation; +package de.tum.cit.aet.artemis.web.rest.metis.conversation; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.List; @@ -25,24 +25,24 @@ import org.springframework.web.server.ResponseStatusException; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.metis.conversation.Conversation; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ConductAgreementService; -import de.tum.in.www1.artemis.service.dto.ResponsibleUserDTO; -import de.tum.in.www1.artemis.service.dto.UserPublicInfoDTO; -import de.tum.in.www1.artemis.service.metis.conversation.ConversationService; -import de.tum.in.www1.artemis.service.metis.conversation.ConversationService.ConversationMemberSearchFilters; -import de.tum.in.www1.artemis.service.metis.conversation.auth.ChannelAuthorizationService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.ConversationDTO; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.ConversationUserDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ConductAgreementService; +import de.tum.cit.aet.artemis.service.dto.ResponsibleUserDTO; +import de.tum.cit.aet.artemis.service.dto.UserPublicInfoDTO; +import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; +import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService.ConversationMemberSearchFilters; +import de.tum.cit.aet.artemis.service.metis.conversation.auth.ChannelAuthorizationService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ConversationDTO; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ConversationUserDTO; import tech.jhipster.web.util.PaginationUtil; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/GroupChatResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/GroupChatResource.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/GroupChatResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/GroupChatResource.java index a26d3ceb4546..71dda7c0faa6 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/GroupChatResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/GroupChatResource.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.web.rest.metis.conversation; +package de.tum.cit.aet.artemis.web.rest.metis.conversation; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.domain.metis.conversation.ConversationSettings.MAX_GROUP_CHAT_PARTICIPANTS; -import static de.tum.in.www1.artemis.service.metis.conversation.GroupChatService.GROUP_CHAT_ENTITY_NAME; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.domain.metis.conversation.ConversationSettings.MAX_GROUP_CHAT_PARTICIPANTS; +import static de.tum.cit.aet.artemis.service.metis.conversation.GroupChatService.GROUP_CHAT_ENTITY_NAME; import java.net.URI; import java.net.URISyntaxException; @@ -21,20 +21,20 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.enumeration.NotificationType; -import de.tum.in.www1.artemis.domain.metis.conversation.GroupChat; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.GroupChatRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.metis.conversation.ConversationDTOService; -import de.tum.in.www1.artemis.service.metis.conversation.ConversationService; -import de.tum.in.www1.artemis.service.metis.conversation.GroupChatService; -import de.tum.in.www1.artemis.service.metis.conversation.auth.GroupChatAuthorizationService; -import de.tum.in.www1.artemis.service.notifications.SingleUserNotificationService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.GroupChatDTO; -import de.tum.in.www1.artemis.web.websocket.dto.metis.MetisCrudAction; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.GroupChatRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.metis.conversation.ConversationDTOService; +import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; +import de.tum.cit.aet.artemis.service.metis.conversation.GroupChatService; +import de.tum.cit.aet.artemis.service.metis.conversation.auth.GroupChatAuthorizationService; +import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.GroupChatDTO; +import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/OneToOneChatResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/OneToOneChatResource.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/OneToOneChatResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/OneToOneChatResource.java index 46e5fff79bd0..6e385dbfdf44 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/OneToOneChatResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/OneToOneChatResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.metis.conversation; +package de.tum.cit.aet.artemis.web.rest.metis.conversation; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -18,17 +18,17 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.enumeration.NotificationType; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.metis.conversation.ConversationDTOService; -import de.tum.in.www1.artemis.service.metis.conversation.ConversationService; -import de.tum.in.www1.artemis.service.metis.conversation.OneToOneChatService; -import de.tum.in.www1.artemis.service.metis.conversation.auth.OneToOneChatAuthorizationService; -import de.tum.in.www1.artemis.service.notifications.SingleUserNotificationService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.OneToOneChatDTO; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.metis.conversation.ConversationDTOService; +import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; +import de.tum.cit.aet.artemis.service.metis.conversation.OneToOneChatService; +import de.tum.cit.aet.artemis.service.metis.conversation.auth.OneToOneChatAuthorizationService; +import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.OneToOneChatDTO; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/dtos/ChannelDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ChannelDTO.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/dtos/ChannelDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ChannelDTO.java index b99c661844cf..be151a3cbd5b 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/dtos/ChannelDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ChannelDTO.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.web.rest.metis.conversation.dtos; +package de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.metis.conversation.ChannelSubType; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.metis.conversation.ChannelSubType; @JsonInclude(JsonInclude.Include.NON_EMPTY) public class ChannelDTO extends ConversationDTO { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/dtos/ChannelIdAndNameDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ChannelIdAndNameDTO.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/dtos/ChannelIdAndNameDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ChannelIdAndNameDTO.java index 1a24d1f09c31..037441c008cd 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/dtos/ChannelIdAndNameDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ChannelIdAndNameDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.metis.conversation.dtos; +package de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/dtos/ConversationDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ConversationDTO.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/dtos/ConversationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ConversationDTO.java index a0d726f44bdb..ea8fd7b0d4ec 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/dtos/ConversationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ConversationDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.metis.conversation.dtos; +package de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos; import java.time.ZonedDateTime; @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import de.tum.in.www1.artemis.domain.metis.conversation.Conversation; +import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type") diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/dtos/ConversationUserDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ConversationUserDTO.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/dtos/ConversationUserDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ConversationUserDTO.java index efcd2a15b202..d8c10e762aef 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/dtos/ConversationUserDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ConversationUserDTO.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.web.rest.metis.conversation.dtos; +package de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.service.dto.UserPublicInfoDTO; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.service.dto.UserPublicInfoDTO; /** * Extension of the UserPublicInfoDTO with special flags for the conversation context diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/dtos/GroupChatDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/GroupChatDTO.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/dtos/GroupChatDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/GroupChatDTO.java index 1b638dc3df39..bceb9bad02d3 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/dtos/GroupChatDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/GroupChatDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.web.rest.metis.conversation.dtos; +package de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos; import java.util.Set; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.metis.conversation.GroupChat; +import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; @JsonInclude(JsonInclude.Include.NON_EMPTY) public class GroupChatDTO extends ConversationDTO { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/dtos/OneToOneChatDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/OneToOneChatDTO.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/dtos/OneToOneChatDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/OneToOneChatDTO.java index e8b8e915e1f4..54185b5e3c71 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/metis/conversation/dtos/OneToOneChatDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/OneToOneChatDTO.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.web.rest.metis.conversation.dtos; +package de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos; import java.util.Set; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.metis.conversation.Conversation; +import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; @JsonInclude(JsonInclude.Include.NON_EMPTY) public class OneToOneChatDTO extends ConversationDTO { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ogparser/LinkPreviewResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ogparser/LinkPreviewResource.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/web/rest/ogparser/LinkPreviewResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/ogparser/LinkPreviewResource.java index 7edf6ccccf06..6c9a9dcd79af 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ogparser/LinkPreviewResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ogparser/LinkPreviewResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.ogparser; +package de.tum.cit.aet.artemis.web.rest.ogparser; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -11,9 +11,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.linkpreview.LinkPreviewService; -import de.tum.in.www1.artemis.web.rest.dto.LinkPreviewDTO; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.linkpreview.LinkPreviewService; +import de.tum.cit.aet.artemis.web.rest.dto.LinkPreviewDTO; /** * REST controller for Link Preview. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicAccountResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicAccountResource.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicAccountResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicAccountResource.java index 7950c09cb773..c07e37c3721d 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicAccountResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicAccountResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.open; +package de.tum.cit.aet.artemis.web.rest.open; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -25,23 +25,23 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.security.annotations.EnforceNothing; -import de.tum.in.www1.artemis.service.AccountService; -import de.tum.in.www1.artemis.service.dto.UserDTO; -import de.tum.in.www1.artemis.service.notifications.MailService; -import de.tum.in.www1.artemis.service.user.UserService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EmailAlreadyUsedException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException; -import de.tum.in.www1.artemis.web.rest.errors.LoginAlreadyUsedException; -import de.tum.in.www1.artemis.web.rest.errors.PasswordViolatesRequirementsException; -import de.tum.in.www1.artemis.web.rest.vm.KeyAndPasswordVM; -import de.tum.in.www1.artemis.web.rest.vm.ManagedUserVM; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.service.AccountService; +import de.tum.cit.aet.artemis.service.dto.UserDTO; +import de.tum.cit.aet.artemis.service.notifications.MailService; +import de.tum.cit.aet.artemis.service.user.UserService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EmailAlreadyUsedException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.web.rest.errors.LoginAlreadyUsedException; +import de.tum.cit.aet.artemis.web.rest.errors.PasswordViolatesRequirementsException; +import de.tum.cit.aet.artemis.web.rest.vm.KeyAndPasswordVM; +import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; /** * REST controller for public endpoints regarding the current user's account. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicBuildPlanResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicBuildPlanResource.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicBuildPlanResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicBuildPlanResource.java index 134d51dc8a68..d84400654ae8 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicBuildPlanResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicBuildPlanResource.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.open; +package de.tum.cit.aet.artemis.web.rest.open; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -10,12 +10,12 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.BuildPlan; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.repository.BuildPlanRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceNothing; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.BuildPlan; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile("gitlabci | jenkins") @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicImprintResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicImprintResource.java similarity index 80% rename from src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicImprintResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicImprintResource.java index c0c5ba722e7d..605d29bcfca6 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicImprintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicImprintResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.open; +package de.tum.cit.aet.artemis.web.rest.open; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import jakarta.ws.rs.BadRequestException; @@ -11,10 +11,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.security.annotations.EnforceNothing; -import de.tum.in.www1.artemis.service.LegalDocumentService; -import de.tum.in.www1.artemis.web.rest.dto.ImprintDTO; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.service.LegalDocumentService; +import de.tum.cit.aet.artemis.web.rest.dto.ImprintDTO; /** * REST controller for retrieving the imprint. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicLtiResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicLtiResource.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicLtiResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicLtiResource.java index 89ae1578b692..35410e783660 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicLtiResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicLtiResource.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.web.rest.open; +package de.tum.cit.aet.artemis.web.rest.open; -import static de.tum.in.www1.artemis.config.lti.CustomLti13Configurer.LTI13_DEEPLINK_REDIRECT_PATH; -import static de.tum.in.www1.artemis.config.lti.CustomLti13Configurer.LTI13_LOGIN_REDIRECT_PROXY_PATH; +import static de.tum.cit.aet.artemis.config.lti.CustomLti13Configurer.LTI13_DEEPLINK_REDIRECT_PATH; +import static de.tum.cit.aet.artemis.config.lti.CustomLti13Configurer.LTI13_LOGIN_REDIRECT_PROXY_PATH; import java.io.IOException; import java.text.ParseException; @@ -23,7 +23,7 @@ import com.nimbusds.jwt.SignedJWT; -import de.tum.in.www1.artemis.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; /** * REST controller for receiving LTI requests. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicOAuth2JWKSResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicOAuth2JWKSResource.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicOAuth2JWKSResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicOAuth2JWKSResource.java index 50e8ac086307..721df2e75457 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicOAuth2JWKSResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicOAuth2JWKSResource.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.open; +package de.tum.cit.aet.artemis.web.rest.open; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -12,9 +12,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import de.tum.in.www1.artemis.security.OAuth2JWKSService; -import de.tum.in.www1.artemis.security.annotations.EnforceNothing; -import de.tum.in.www1.artemis.security.annotations.ManualConfig; +import de.tum.cit.aet.artemis.security.OAuth2JWKSService; +import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.security.annotations.ManualConfig; /** * REST controller to serve the public JWKSet related to all OAuth2 clients. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicPrivacyStatementResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPrivacyStatementResource.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicPrivacyStatementResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPrivacyStatementResource.java index a3da13b8618e..4e673d3c8c47 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicPrivacyStatementResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPrivacyStatementResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.open; +package de.tum.cit.aet.artemis.web.rest.open; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import jakarta.ws.rs.BadRequestException; @@ -11,10 +11,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.security.annotations.EnforceNothing; -import de.tum.in.www1.artemis.service.LegalDocumentService; -import de.tum.in.www1.artemis.web.rest.dto.PrivacyStatementDTO; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.service.LegalDocumentService; +import de.tum.cit.aet.artemis.web.rest.dto.PrivacyStatementDTO; /** * REST controller for retrieving the Privacy Statement. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicProgrammingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicProgrammingSubmissionResource.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicProgrammingSubmissionResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicProgrammingSubmissionResource.java index 39477bd4718b..e6eb9a32cddc 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicProgrammingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicProgrammingSubmissionResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.open; +package de.tum.cit.aet.artemis.web.rest.open; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Optional; @@ -15,23 +15,23 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Commit; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.exception.ContinuousIntegrationException; -import de.tum.in.www1.artemis.exception.VersionControlException; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.security.annotations.EnforceNothing; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlService; -import de.tum.in.www1.artemis.service.programming.ProgrammingMessagingService; -import de.tum.in.www1.artemis.service.programming.ProgrammingSubmissionService; -import de.tum.in.www1.artemis.service.programming.ProgrammingTriggerService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.Commit; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.exception.VersionControlException; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingMessagingService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingSubmissionService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingTriggerService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * REST controller for receiving updates for a ProgrammingSubmission. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicPyrisStatusUpdateResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPyrisStatusUpdateResource.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicPyrisStatusUpdateResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPyrisStatusUpdateResource.java index f843fb729484..f5f4d2547473 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicPyrisStatusUpdateResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPyrisStatusUpdateResource.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.open; +package de.tum.cit.aet.artemis.web.rest.open; import java.util.Objects; @@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.security.annotations.EnforceNothing; -import de.tum.in.www1.artemis.service.connectors.pyris.PyrisJobService; -import de.tum.in.www1.artemis.service.connectors.pyris.PyrisStatusUpdateService; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.job.CompetencyExtractionJob; -import de.tum.in.www1.artemis.service.connectors.pyris.job.CourseChatJob; -import de.tum.in.www1.artemis.service.connectors.pyris.job.ExerciseChatJob; -import de.tum.in.www1.artemis.service.connectors.pyris.job.IngestionWebhookJob; -import de.tum.in.www1.artemis.service.connectors.pyris.job.PyrisJob; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisJobService; +import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisStatusUpdateService; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.job.CompetencyExtractionJob; +import de.tum.cit.aet.artemis.service.connectors.pyris.job.CourseChatJob; +import de.tum.cit.aet.artemis.service.connectors.pyris.job.ExerciseChatJob; +import de.tum.cit.aet.artemis.service.connectors.pyris.job.IngestionWebhookJob; +import de.tum.cit.aet.artemis.service.connectors.pyris.job.PyrisJob; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; /** * REST controller for providing Pyris access to Artemis internal data and status updates. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicResultResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicResultResource.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicResultResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicResultResource.java index bca3e3378b29..82302e9d44bc 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicResultResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.open; +package de.tum.cit.aet.artemis.web.rest.open; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Optional; @@ -15,22 +15,22 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.exception.ContinuousIntegrationException; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.security.annotations.EnforceNothing; -import de.tum.in.www1.artemis.service.ResultService; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.in.www1.artemis.service.hestia.TestwiseCoverageService; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseGradingService; -import de.tum.in.www1.artemis.service.programming.ProgrammingMessagingService; -import de.tum.in.www1.artemis.service.programming.ProgrammingTriggerService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.service.ResultService; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.service.hestia.TestwiseCoverageService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseGradingService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingMessagingService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingTriggerService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * REST controller for receiving build results. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicSystemNotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicSystemNotificationResource.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicSystemNotificationResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicSystemNotificationResource.java index e0eb2d170eb3..3a37c4614316 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicSystemNotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicSystemNotificationResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.open; +package de.tum.cit.aet.artemis.web.rest.open; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; @@ -12,9 +12,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.notification.SystemNotification; -import de.tum.in.www1.artemis.security.annotations.EnforceNothing; -import de.tum.in.www1.artemis.service.SystemNotificationService; +import de.tum.cit.aet.artemis.domain.notification.SystemNotification; +import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.service.SystemNotificationService; /** * REST controller for public system notifications. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicTimeResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicTimeResource.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicTimeResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicTimeResource.java index 6a418f6a6f2b..1bd9b8ee8587 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicTimeResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicTimeResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.open; +package de.tum.cit.aet.artemis.web.rest.open; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.Instant; @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicUserJwtResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicUserJwtResource.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicUserJwtResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicUserJwtResource.java index b463699416cb..1908e3a56087 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicUserJwtResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicUserJwtResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.open; +package de.tum.cit.aet.artemis.web.rest.open; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Optional; @@ -29,13 +29,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.security.UserNotActivatedException; -import de.tum.in.www1.artemis.security.annotations.EnforceNothing; -import de.tum.in.www1.artemis.security.jwt.JWTCookieService; -import de.tum.in.www1.artemis.service.connectors.SAML2Service; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.vm.LoginVM; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.security.UserNotActivatedException; +import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.security.jwt.JWTCookieService; +import de.tum.cit.aet.artemis.service.connectors.SAML2Service; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.vm.LoginVM; /** * REST controller to authenticate users. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/package-info.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/package-info.java new file mode 100644 index 000000000000..61d227dffc4b --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/package-info.java @@ -0,0 +1,4 @@ +/** + * Spring MVC REST controllers. + */ +package de.tum.cit.aet.artemis.web.rest; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/plagiarism/PlagiarismAnswerPostResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismAnswerPostResource.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/plagiarism/PlagiarismAnswerPostResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismAnswerPostResource.java index 9333b4c57aa8..402bb01daeb6 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/plagiarism/PlagiarismAnswerPostResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismAnswerPostResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.plagiarism; +package de.tum.cit.aet.artemis.web.rest.plagiarism; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -18,10 +18,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.metis.AnswerPost; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismAnswerPostService; -import de.tum.in.www1.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.domain.metis.AnswerPost; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismAnswerPostService; +import de.tum.cit.aet.artemis.service.util.TimeLogUtil; /** * REST controller for managing AnswerPost. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/plagiarism/PlagiarismCaseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/web/rest/plagiarism/PlagiarismCaseResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java index bf3270b9b92d..33de91425fad 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/plagiarism/PlagiarismCaseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.plagiarism; +package de.tum.cit.aet.artemis.web.rest.plagiarism; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Map; @@ -20,22 +20,22 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismCaseService; -import de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; -import de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismVerdictDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismDetectionConfig; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismCaseService; +import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; +import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismVerdictDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; /** * REST controller for managing Plagiarism Cases. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/plagiarism/PlagiarismPostResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismPostResource.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/web/rest/plagiarism/PlagiarismPostResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismPostResource.java index 9e415de85d99..7f06f87943f9 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/plagiarism/PlagiarismPostResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismPostResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.plagiarism; +package de.tum.cit.aet.artemis.web.rest.plagiarism; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -27,14 +27,14 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismPostService; -import de.tum.in.www1.artemis.service.util.TimeLogUtil; -import de.tum.in.www1.artemis.web.rest.dto.PostContextFilterDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismPostService; +import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; import tech.jhipster.web.util.PaginationUtil; /** diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/plagiarism/PlagiarismResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/web/rest/plagiarism/PlagiarismResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java index 9976e0d20e31..78b6dd6aba22 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/plagiarism/PlagiarismResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.plagiarism; +package de.tum.cit.aet.artemis.web.rest.plagiarism; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Objects; @@ -17,25 +17,25 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismStatus; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismComparisonRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismResultRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismService; -import de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismComparisonStatusDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismService; +import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismComparisonStatusDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; /** * REST controller for managing Plagiarism Cases. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilder.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilder.java similarity index 86% rename from src/main/java/de/tum/in/www1/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilder.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilder.java index 27d4e845dcc3..1af2eaad608b 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilder.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilder.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.plagiarism; +package de.tum.cit.aet.artemis.web.rest.plagiarism; -import static de.tum.in.www1.artemis.config.Constants.SYSTEM_ACCOUNT; +import static de.tum.cit.aet.artemis.config.Constants.SYSTEM_ACCOUNT; import java.util.Objects; import java.util.stream.DoubleStream; @@ -8,10 +8,10 @@ import org.springframework.http.ResponseEntity; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismResult; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmissionElement; -import de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismResult; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmissionElement; +import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; /** * A class containing a shared logic for creating an HTTP response about plagiarism checks results diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/plagiarism/PlagiarismResultStats.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultStats.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/web/rest/plagiarism/PlagiarismResultStats.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultStats.java index e2b045b1da1e..1fdbe7db7451 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/plagiarism/PlagiarismResultStats.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultStats.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.plagiarism; +package de.tum.cit.aet.artemis.web.rest.plagiarism; /** * Stores statistics about particular plagiarism checks result. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingAssessmentResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java index 4b63c010590b..e54304601629 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.programming; +package de.tum.cit.aet.artemis.web.rest.programming; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Comparator; @@ -19,29 +19,29 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.ExampleSubmissionRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.exam.ExamService; -import de.tum.in.www1.artemis.service.programming.ProgrammingAssessmentService; -import de.tum.in.www1.artemis.web.rest.AssessmentResource; -import de.tum.in.www1.artemis.web.rest.dto.AssessmentUpdateDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.exam.ExamService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingAssessmentService; +import de.tum.cit.aet.artemis.web.rest.AssessmentResource; +import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * REST controller for managing ProgrammingAssessment. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java index 692ad07f381c..e047696cb0a2 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.web.rest.programming; +package de.tum.cit.aet.artemis.web.rest.programming; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.service.util.TimeLogUtil.formatDurationFrom; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.service.util.TimeLogUtil.formatDurationFrom; import java.io.File; import java.io.FileInputStream; @@ -40,47 +40,47 @@ import com.fasterxml.jackson.core.JsonProcessingException; -import de.tum.in.www1.artemis.domain.AuxiliaryRepository; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.enumeration.Visibility; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.AuxiliaryRepositoryRepository; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseTaskRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ConsistencyCheckService; -import de.tum.in.www1.artemis.service.CourseService; -import de.tum.in.www1.artemis.service.SubmissionPolicyService; -import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; -import de.tum.in.www1.artemis.service.connectors.athena.AthenaModuleService; -import de.tum.in.www1.artemis.service.exam.ExamAccessService; -import de.tum.in.www1.artemis.service.export.ProgrammingExerciseExportService; -import de.tum.in.www1.artemis.service.feature.Feature; -import de.tum.in.www1.artemis.service.feature.FeatureToggle; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseImportFromFileService; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseImportService; -import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeature; -import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeatureService; -import de.tum.in.www1.artemis.web.rest.dto.RepositoryExportOptionsDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.in.www1.artemis.web.rest.errors.HttpStatusException; -import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorAlertException; -import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.AuxiliaryRepositoryRepository; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ConsistencyCheckService; +import de.tum.cit.aet.artemis.service.CourseService; +import de.tum.cit.aet.artemis.service.SubmissionPolicyService; +import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.service.connectors.athena.AthenaModuleService; +import de.tum.cit.aet.artemis.service.exam.ExamAccessService; +import de.tum.cit.aet.artemis.service.export.ProgrammingExerciseExportService; +import de.tum.cit.aet.artemis.service.feature.Feature; +import de.tum.cit.aet.artemis.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseImportFromFileService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseImportService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeature; +import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeatureService; +import de.tum.cit.aet.artemis.web.rest.dto.RepositoryExportOptionsDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.rest.errors.HttpStatusException; +import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** * REST controller for managing ProgrammingExercise. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java index 3af9ce36d0c2..64e5ba9f1bd7 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.programming; +package de.tum.cit.aet.artemis.web.rest.programming; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; @@ -14,19 +14,19 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseGradingService; -import de.tum.in.www1.artemis.web.rest.dto.ProgrammingExerciseGradingStatisticsDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseGradingService; +import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseGradingStatisticsDTO; /** * REST controller for managing ProgrammingExerciseTestCase. Test cases are created automatically from build run results which is why there are no endpoints available for POST, diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExerciseLockResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseLockResource.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExerciseLockResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseLockResource.java index ade4c9e33c96..7bf777079444 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExerciseLockResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseLockResource.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.programming; +package de.tum.cit.aet.artemis.web.rest.programming; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -9,8 +9,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastInstructorInExercise; -import de.tum.in.www1.artemis.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastInstructorInExercise; +import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; // only available for external version control services @Profile("!localvc & core") diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java index ff820ab4e484..0cde504eaa8a 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.programming; +package de.tum.cit.aet.artemis.web.rest.programming; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.io.IOException; import java.time.ZonedDateTime; @@ -20,35 +20,35 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ParticipationAuthorizationCheckService; -import de.tum.in.www1.artemis.service.ResultService; -import de.tum.in.www1.artemis.service.exam.ExamService; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseParticipationService; -import de.tum.in.www1.artemis.service.programming.ProgrammingSubmissionService; -import de.tum.in.www1.artemis.service.programming.RepositoryService; -import de.tum.in.www1.artemis.web.rest.dto.CommitInfoDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ResultService; +import de.tum.cit.aet.artemis.service.exam.ExamService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseParticipationService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingSubmissionService; +import de.tum.cit.aet.artemis.service.programming.RepositoryService; +import de.tum.cit.aet.artemis.web.rest.dto.CommitInfoDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java index b1e3041f854e..4ec351c0b2b4 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.web.rest.programming; +package de.tum.cit.aet.artemis.web.rest.programming; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.web.rest.plagiarism.PlagiarismResultResponseBuilder.buildPlagiarismResultResponse; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.web.rest.plagiarism.PlagiarismResultResponseBuilder.buildPlagiarismResultResponse; import java.io.FileInputStream; import java.io.IOException; @@ -20,21 +20,21 @@ import org.springframework.web.bind.annotation.RestController; import de.jplag.exceptions.ExitException; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismResultRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.feature.Feature; -import de.tum.in.www1.artemis.service.feature.FeatureToggle; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionConfigHelper; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionService; -import de.tum.in.www1.artemis.service.plagiarism.ProgrammingLanguageNotSupportedForPlagiarismDetectionException; -import de.tum.in.www1.artemis.service.util.TimeLogUtil; -import de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.feature.Feature; +import de.tum.cit.aet.artemis.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionConfigHelper; +import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionService; +import de.tum.cit.aet.artemis.service.plagiarism.ProgrammingLanguageNotSupportedForPlagiarismDetectionException; +import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; /** * REST controller for managing ProgrammingExercise. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExerciseResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java index 2620f59f6a5d..af76d8a63924 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.web.rest.programming; +package de.tum.cit.aet.artemis.web.rest.programming; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_THEIA; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_THEIA; import java.io.IOException; import java.net.URI; @@ -38,59 +38,59 @@ import com.fasterxml.jackson.core.JsonProcessingException; -import de.tum.in.www1.artemis.domain.AuxiliaryRepository; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exception.ContinuousIntegrationException; -import de.tum.in.www1.artemis.repository.BuildLogStatisticsEntryRepository; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.GradingCriterionRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.TemplateProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.CourseService; -import de.tum.in.www1.artemis.service.ExerciseDeletionService; -import de.tum.in.www1.artemis.service.ExerciseService; -import de.tum.in.www1.artemis.service.StaticCodeAnalysisService; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.connectors.athena.AthenaModuleService; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlService; -import de.tum.in.www1.artemis.service.feature.Feature; -import de.tum.in.www1.artemis.service.feature.FeatureToggle; -import de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseTaskService; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionConfigHelper; -import de.tum.in.www1.artemis.service.programming.AuxiliaryRepositoryService; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseRepositoryService; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseService; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseTestCaseService; -import de.tum.in.www1.artemis.web.rest.dto.BuildLogStatisticsDTO; -import de.tum.in.www1.artemis.web.rest.dto.CheckoutDirectoriesDTO; -import de.tum.in.www1.artemis.web.rest.dto.ProgrammingExerciseResetOptionsDTO; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; -import de.tum.in.www1.artemis.web.websocket.dto.ProgrammingExerciseTestCaseStateDTO; +import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.repository.BuildLogStatisticsEntryRepository; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.CourseService; +import de.tum.cit.aet.artemis.service.ExerciseDeletionService; +import de.tum.cit.aet.artemis.service.ExerciseService; +import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.connectors.athena.AthenaModuleService; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.service.feature.Feature; +import de.tum.cit.aet.artemis.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; +import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionConfigHelper; +import de.tum.cit.aet.artemis.service.programming.AuxiliaryRepositoryService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseRepositoryService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseTestCaseService; +import de.tum.cit.aet.artemis.web.rest.dto.BuildLogStatisticsDTO; +import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseResetOptionsDTO; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.web.websocket.dto.ProgrammingExerciseTestCaseStateDTO; import io.jsonwebtoken.lang.Arrays; /** diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExerciseResourceErrorKeys.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResourceErrorKeys.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExerciseResourceErrorKeys.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResourceErrorKeys.java index d6ff3b941657..e3c8523d900f 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExerciseResourceErrorKeys.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResourceErrorKeys.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.programming; +package de.tum.cit.aet.artemis.web.rest.programming; public final class ProgrammingExerciseResourceErrorKeys { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java index b3194bb0e142..a2d0bbf4eb57 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.programming; +package de.tum.cit.aet.artemis.web.rest.programming; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Set; @@ -16,19 +16,19 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseService; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseTestCaseService; -import de.tum.in.www1.artemis.web.rest.dto.ProgrammingExerciseTestCaseDTO; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseTestCaseService; +import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseTestCaseDTO; /** * REST controller for managing ProgrammingExerciseTestCase. Test cases are created automatically from build run results which is why there are no endpoints available for POST, diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingSubmissionResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java index cf2d6a96553c..68888a203241 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.programming; +package de.tum.cit.aet.artemis.web.rest.programming; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Collections; @@ -21,41 +21,41 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.GradingCriterionRepository; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ExerciseDateService; -import de.tum.in.www1.artemis.service.ParticipationAuthorizationCheckService; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.in.www1.artemis.service.feature.Feature; -import de.tum.in.www1.artemis.service.feature.FeatureToggle; -import de.tum.in.www1.artemis.service.programming.ProgrammingMessagingService; -import de.tum.in.www1.artemis.service.programming.ProgrammingSubmissionService; -import de.tum.in.www1.artemis.service.programming.ProgrammingTriggerService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ExerciseDateService; +import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.service.feature.Feature; +import de.tum.cit.aet.artemis.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.service.programming.ProgrammingMessagingService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingSubmissionService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingTriggerService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * REST controller for managing ProgrammingSubmission. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationRegisterBody.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationRegisterBody.java new file mode 100644 index 000000000000..0fdbe523d30b --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationRegisterBody.java @@ -0,0 +1,6 @@ +package de.tum.cit.aet.artemis.web.rest.push_notification; + +import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceType; + +public record PushNotificationRegisterBody(String token, PushNotificationDeviceType deviceType) { +} diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/push_notification/PushNotificationRegisterDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationRegisterDTO.java similarity index 75% rename from src/main/java/de/tum/in/www1/artemis/web/rest/push_notification/PushNotificationRegisterDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationRegisterDTO.java index 97c12e1069a3..18fc1c4924bb 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/push_notification/PushNotificationRegisterDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationRegisterDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.push_notification; +package de.tum.cit.aet.artemis.web.rest.push_notification; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/push_notification/PushNotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationResource.java similarity index 89% rename from src/main/java/de/tum/in/www1/artemis/web/rest/push_notification/PushNotificationResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationResource.java index d3e6a655d884..1be1e0acf13a 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/push_notification/PushNotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.push_notification; +package de.tum.cit.aet.artemis.web.rest.push_notification; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; @@ -24,14 +24,14 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.push_notification.PushNotificationDeviceConfiguration; -import de.tum.in.www1.artemis.domain.push_notification.PushNotificationDeviceConfigurationId; -import de.tum.in.www1.artemis.repository.PushNotificationDeviceConfigurationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.jwt.TokenProvider; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfiguration; +import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfigurationId; +import de.tum.cit.aet.artemis.repository.PushNotificationDeviceConfigurationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.jwt.TokenProvider; import io.jsonwebtoken.ExpiredJwtException; /** diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/push_notification/PushNotificationUnregisterRequest.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationUnregisterRequest.java similarity index 50% rename from src/main/java/de/tum/in/www1/artemis/web/rest/push_notification/PushNotificationUnregisterRequest.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationUnregisterRequest.java index 02a2481aa44f..4146a3db7c90 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/push_notification/PushNotificationUnregisterRequest.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationUnregisterRequest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.push_notification; +package de.tum.cit.aet.artemis.web.rest.push_notification; -import de.tum.in.www1.artemis.domain.push_notification.PushNotificationDeviceType; +import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceType; public record PushNotificationUnregisterRequest(String token, PushNotificationDeviceType deviceType) { } diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/repository/FileSubmission.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/FileSubmission.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/web/rest/repository/FileSubmission.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/repository/FileSubmission.java index 07e9ec831f52..138ed3ec18e4 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/repository/FileSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/FileSubmission.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.repository; +package de.tum.cit.aet.artemis.web.rest.repository; import java.io.Serializable; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/repository/FileSubmissionError.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/FileSubmissionError.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/web/rest/repository/FileSubmissionError.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/repository/FileSubmissionError.java index 1bae187ce84c..a8116d32bf5e 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/repository/FileSubmissionError.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/FileSubmissionError.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.repository; +package de.tum.cit.aet.artemis.web.rest.repository; import java.io.Serializable; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/repository/RepositoryActionType.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryActionType.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/web/rest/repository/RepositoryActionType.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryActionType.java index c10d3f4c803e..83e6f8b6df22 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/repository/RepositoryActionType.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryActionType.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.repository; +package de.tum.cit.aet.artemis.web.rest.repository; /** * Determines if a repository action only reads (e.g. get a file from the repo) or updates (e.g. create a new file in the repo). diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java index 32a639bbbd14..31ae2f16eca5 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.repository; +package de.tum.cit.aet.artemis.web.rest.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.List; @@ -30,40 +30,40 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ResponseStatusException; -import de.tum.in.www1.artemis.domain.BuildLogEntry; -import de.tum.in.www1.artemis.domain.FileType; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionRepository; -import de.tum.in.www1.artemis.repository.SubmissionPolicyRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.BuildLogEntryService; -import de.tum.in.www1.artemis.service.ParticipationAuthorizationCheckService; -import de.tum.in.www1.artemis.service.ProfileService; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCServletService; -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlService; -import de.tum.in.www1.artemis.service.feature.Feature; -import de.tum.in.www1.artemis.service.feature.FeatureToggle; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseParticipationService; -import de.tum.in.www1.artemis.service.programming.RepositoryAccessService; -import de.tum.in.www1.artemis.service.programming.RepositoryParticipationService; -import de.tum.in.www1.artemis.service.programming.RepositoryService; -import de.tum.in.www1.artemis.web.rest.dto.FileMove; -import de.tum.in.www1.artemis.web.rest.dto.RepositoryStatusDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.domain.FileType; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.repository.SubmissionPolicyRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.BuildLogEntryService; +import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ProfileService; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCServletService; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.service.feature.Feature; +import de.tum.cit.aet.artemis.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseParticipationService; +import de.tum.cit.aet.artemis.service.programming.RepositoryAccessService; +import de.tum.cit.aet.artemis.service.programming.RepositoryParticipationService; +import de.tum.cit.aet.artemis.service.programming.RepositoryService; +import de.tum.cit.aet.artemis.web.rest.dto.FileMove; +import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Executes repository actions on repositories related to the participation id transmitted. Available to the owner of the participation, TAs/Instructors of the exercise and Admins. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/repository/RepositoryResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryResource.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/repository/RepositoryResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryResource.java index e7cab2a54b20..e817d01a9e4e 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/repository/RepositoryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryResource.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.web.rest.repository; +package de.tum.cit.aet.artemis.web.rest.repository; -import static de.tum.in.www1.artemis.web.rest.dto.RepositoryStatusDTOType.CLEAN; -import static de.tum.in.www1.artemis.web.rest.dto.RepositoryStatusDTOType.CONFLICT; -import static de.tum.in.www1.artemis.web.rest.dto.RepositoryStatusDTOType.UNCOMMITTED_CHANGES; +import static de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTOType.CLEAN; +import static de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTOType.CONFLICT; +import static de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTOType.UNCOMMITTED_CHANGES; import java.io.ByteArrayInputStream; import java.io.FileNotFoundException; @@ -27,28 +27,28 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.server.ResponseStatusException; -import de.tum.in.www1.artemis.domain.File; -import de.tum.in.www1.artemis.domain.FileType; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.exception.ContinuousIntegrationException; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ProfileService; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCServletService; -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlService; -import de.tum.in.www1.artemis.service.programming.RepositoryAccessService; -import de.tum.in.www1.artemis.service.programming.RepositoryService; -import de.tum.in.www1.artemis.web.rest.dto.FileMove; -import de.tum.in.www1.artemis.web.rest.dto.RepositoryStatusDTO; -import de.tum.in.www1.artemis.web.rest.dto.RepositoryStatusDTOType; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.in.www1.artemis.web.rest.repository.util.RepositoryExecutor; +import de.tum.cit.aet.artemis.domain.File; +import de.tum.cit.aet.artemis.domain.FileType; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ProfileService; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCServletService; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.service.programming.RepositoryAccessService; +import de.tum.cit.aet.artemis.service.programming.RepositoryService; +import de.tum.cit.aet.artemis.web.rest.dto.FileMove; +import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTO; +import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTOType; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.rest.repository.util.RepositoryExecutor; /** * Abstract class that can be extended to make repository endpoints available that retrieve the repository based on the implemented method getRepository. This way the retrieval of diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/repository/TestRepositoryResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/TestRepositoryResource.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/web/rest/repository/TestRepositoryResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/repository/TestRepositoryResource.java index 9d5c8c2a8b45..4c23ee712333 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/repository/TestRepositoryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/TestRepositoryResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.repository; +package de.tum.cit.aet.artemis.web.rest.repository; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.security.Principal; import java.util.List; @@ -27,26 +27,26 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ResponseStatusException; -import de.tum.in.www1.artemis.domain.FileType; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ProfileService; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCServletService; -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlService; -import de.tum.in.www1.artemis.service.feature.Feature; -import de.tum.in.www1.artemis.service.feature.FeatureToggle; -import de.tum.in.www1.artemis.service.programming.RepositoryAccessService; -import de.tum.in.www1.artemis.service.programming.RepositoryService; -import de.tum.in.www1.artemis.web.rest.dto.FileMove; -import de.tum.in.www1.artemis.web.rest.dto.RepositoryStatusDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.domain.FileType; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ProfileService; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCServletService; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.service.feature.Feature; +import de.tum.cit.aet.artemis.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.service.programming.RepositoryAccessService; +import de.tum.cit.aet.artemis.service.programming.RepositoryService; +import de.tum.cit.aet.artemis.web.rest.dto.FileMove; +import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; /** * Executes requested actions on the test repository of a programming exercise. Only available to TAs, Instructors and Admins. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/repository/util/RepositoryExecutor.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/util/RepositoryExecutor.java similarity index 82% rename from src/main/java/de/tum/in/www1/artemis/web/rest/repository/util/RepositoryExecutor.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/repository/util/RepositoryExecutor.java index c14c19580d6b..c9b188c773ae 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/repository/util/RepositoryExecutor.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/util/RepositoryExecutor.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.repository.util; +package de.tum.cit.aet.artemis.web.rest.repository.util; import java.io.IOException; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/science/ScienceResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceResource.java similarity index 77% rename from src/main/java/de/tum/in/www1/artemis/web/rest/science/ScienceResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceResource.java index 84582d6e824a..c762eab43c3e 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/science/ScienceResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.science; +package de.tum.cit.aet.artemis.web.rest.science; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -11,11 +11,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.feature.Feature; -import de.tum.in.www1.artemis.service.feature.FeatureToggle; -import de.tum.in.www1.artemis.service.science.ScienceEventService; -import de.tum.in.www1.artemis.web.rest.dto.science.ScienceEventDTO; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.feature.Feature; +import de.tum.cit.aet.artemis.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.service.science.ScienceEventService; +import de.tum.cit.aet.artemis.web.rest.dto.science.ScienceEventDTO; /** * REST controller providing the science related endpoints. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/science/ScienceSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceSettingsResource.java similarity index 88% rename from src/main/java/de/tum/in/www1/artemis/web/rest/science/ScienceSettingsResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceSettingsResource.java index b07832c07a9a..e6a2298f9f97 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/science/ScienceSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceSettingsResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.science; +package de.tum.cit.aet.artemis.web.rest.science; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Arrays; import java.util.List; @@ -20,13 +20,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.science.ScienceSetting; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.science.ScienceSettingRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.science.ScienceSetting; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.science.ScienceSettingRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** * REST controller for managing ScienceSettings. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/settings/ide/IdeSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/settings/ide/IdeSettingsResource.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/web/rest/settings/ide/IdeSettingsResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/settings/ide/IdeSettingsResource.java index 5d46bb1f335e..b758081e8d15 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/settings/ide/IdeSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/settings/ide/IdeSettingsResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.settings.ide; +package de.tum.cit.aet.artemis.web.rest.settings.ide; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.Arrays; import java.util.List; @@ -17,16 +17,16 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.settings.ide.Ide; -import de.tum.in.www1.artemis.domain.settings.ide.UserIdeMapping; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.settings.IdeRepository; -import de.tum.in.www1.artemis.repository.settings.UserIdeMappingRepository; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.web.rest.dto.settings.ide.IdeDTO; -import de.tum.in.www1.artemis.web.rest.dto.settings.ide.IdeMappingDTO; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.settings.ide.Ide; +import de.tum.cit.aet.artemis.domain.settings.ide.UserIdeMapping; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.settings.IdeRepository; +import de.tum.cit.aet.artemis.repository.settings.UserIdeMappingRepository; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.web.rest.dto.settings.ide.IdeDTO; +import de.tum.cit.aet.artemis.web.rest.dto.settings.ide.IdeMappingDTO; /** * REST controller for managing Ide Settings (IdeSettings). diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/theia/TheiaConfigurationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/theia/TheiaConfigurationResource.java similarity index 80% rename from src/main/java/de/tum/in/www1/artemis/web/rest/theia/TheiaConfigurationResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/theia/TheiaConfigurationResource.java index 24a6977afa5b..d8847920d42b 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/theia/TheiaConfigurationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/theia/TheiaConfigurationResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.rest.theia; +package de.tum.cit.aet.artemis.web.rest.theia; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_THEIA; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_THEIA; import java.util.Map; @@ -11,9 +11,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.config.TheiaConfiguration; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.config.TheiaConfiguration; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; @Profile(PROFILE_THEIA) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java index 9423bc1b031d..ff8cf30626aa 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.web.rest.tutorialgroups; +package de.tum.cit.aet.artemis.web.rest.tutorialgroups; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.web.rest.util.DateUtil.interpretInTimeZone; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.web.rest.util.DateUtil.interpretInTimeZone; import java.net.URI; import java.net.URISyntaxException; @@ -23,18 +23,18 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupFreePeriodRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupsConfigurationRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.feature.Feature; -import de.tum.in.www1.artemis.service.feature.FeatureToggle; -import de.tum.in.www1.artemis.service.tutorialgroups.TutorialGroupFreePeriodService; -import de.tum.in.www1.artemis.web.rest.dto.TutorialGroupFreePeriodDTO; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupFreePeriodRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupsConfigurationRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.feature.Feature; +import de.tum.cit.aet.artemis.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupFreePeriodService; +import de.tum.cit.aet.artemis.web.rest.dto.TutorialGroupFreePeriodDTO; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/tutorialgroups/TutorialGroupResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/web/rest/tutorialgroups/TutorialGroupResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java index 82d3a21358a9..324a4b6dfa49 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/tutorialgroups/TutorialGroupResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.web.rest.tutorialgroups; +package de.tum.cit.aet.artemis.web.rest.tutorialgroups; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.web.rest.util.DateUtil.isIso8601DateString; -import static de.tum.in.www1.artemis.web.rest.util.DateUtil.isIso8601TimeString; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.web.rest.util.DateUtil.isIso8601DateString; +import static de.tum.cit.aet.artemis.web.rest.util.DateUtil.isIso8601TimeString; import java.io.IOException; import java.net.URI; @@ -42,33 +42,33 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupSchedule; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupNotificationRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupsConfigurationRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.dto.StudentDTO; -import de.tum.in.www1.artemis.service.feature.Feature; -import de.tum.in.www1.artemis.service.feature.FeatureToggle; -import de.tum.in.www1.artemis.service.notifications.SingleUserNotificationService; -import de.tum.in.www1.artemis.service.notifications.TutorialGroupNotificationService; -import de.tum.in.www1.artemis.service.tutorialgroups.TutorialGroupChannelManagementService; -import de.tum.in.www1.artemis.service.tutorialgroups.TutorialGroupScheduleService; -import de.tum.in.www1.artemis.service.tutorialgroups.TutorialGroupService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSchedule; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupNotificationRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupsConfigurationRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.dto.StudentDTO; +import de.tum.cit.aet.artemis.service.feature.Feature; +import de.tum.cit.aet.artemis.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; +import de.tum.cit.aet.artemis.service.notifications.TutorialGroupNotificationService; +import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupChannelManagementService; +import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupScheduleService; +import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java index 20ece5d5f577..9766cdcad6e3 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.web.rest.tutorialgroups; +package de.tum.cit.aet.artemis.web.rest.tutorialgroups; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.service.tutorialgroups.TutorialGroupScheduleService.updateTutorialGroupSession; -import static de.tum.in.www1.artemis.web.rest.util.DateUtil.interpretInTimeZone; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupScheduleService.updateTutorialGroupSession; +import static de.tum.cit.aet.artemis.web.rest.util.DateUtil.interpretInTimeZone; import java.net.URI; import java.net.URISyntaxException; @@ -36,24 +36,24 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.enumeration.TutorialGroupSessionStatus; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupSession; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupFreePeriodRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupScheduleRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupSessionRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupsConfigurationRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.feature.Feature; -import de.tum.in.www1.artemis.service.feature.FeatureToggle; -import de.tum.in.www1.artemis.service.tutorialgroups.TutorialGroupService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.tutorialgroups.errors.SessionOverlapsWithSessionException; +import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupFreePeriodRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupScheduleRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupSessionRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupsConfigurationRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.feature.Feature; +import de.tum.cit.aet.artemis.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.tutorialgroups.errors.SessionOverlapsWithSessionException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java index bbe3c2e67d6c..60acad1c1294 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.web.rest.tutorialgroups; +package de.tum.cit.aet.artemis.web.rest.tutorialgroups; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.web.rest.util.DateUtil.isIso8601DateString; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.web.rest.util.DateUtil.isIso8601DateString; import java.net.URI; import java.net.URISyntaxException; @@ -23,17 +23,17 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupsConfigurationRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.feature.Feature; -import de.tum.in.www1.artemis.service.feature.FeatureToggle; -import de.tum.in.www1.artemis.service.tutorialgroups.TutorialGroupChannelManagementService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupsConfigurationRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.feature.Feature; +import de.tum.cit.aet.artemis.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupChannelManagementService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/tutorialgroups/errors/ScheduleOverlapsWithSessionException.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/errors/ScheduleOverlapsWithSessionException.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/web/rest/tutorialgroups/errors/ScheduleOverlapsWithSessionException.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/errors/ScheduleOverlapsWithSessionException.java index a576dda788a2..5894fc439b20 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/tutorialgroups/errors/ScheduleOverlapsWithSessionException.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/errors/ScheduleOverlapsWithSessionException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.tutorialgroups.errors; +package de.tum.cit.aet.artemis.web.rest.tutorialgroups.errors; import java.io.Serial; import java.time.ZoneId; @@ -8,10 +8,10 @@ import java.util.Map; import java.util.Set; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupSession; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.ErrorConstants; -import de.tum.in.www1.artemis.web.rest.tutorialgroups.TutorialGroupResource; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; +import de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupResource; /** * Exception that will be thrown if the user tries to create a tutorial group with a schedule that overlaps with a session of the same tutorial group. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/tutorialgroups/errors/SessionOverlapsWithSessionException.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/errors/SessionOverlapsWithSessionException.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/web/rest/tutorialgroups/errors/SessionOverlapsWithSessionException.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/errors/SessionOverlapsWithSessionException.java index 707d2078758d..4dad3f1c5628 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/tutorialgroups/errors/SessionOverlapsWithSessionException.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/errors/SessionOverlapsWithSessionException.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.tutorialgroups.errors; +package de.tum.cit.aet.artemis.web.rest.tutorialgroups.errors; import java.io.Serial; import java.time.ZoneId; @@ -8,10 +8,10 @@ import java.util.Map; import java.util.Set; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupSession; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.ErrorConstants; -import de.tum.in.www1.artemis.web.rest.tutorialgroups.TutorialGroupResource; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; +import de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupResource; /** * Exception that will be thrown if the user tries to create a session that overlaps with a session of the same tutorial group. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/util/DateUtil.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/util/DateUtil.java similarity index 98% rename from src/main/java/de/tum/in/www1/artemis/web/rest/util/DateUtil.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/util/DateUtil.java index 50aed93fcd95..dccb5056090e 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/util/DateUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/util/DateUtil.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.util; +package de.tum.cit.aet.artemis.web.rest.util; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/util/HeaderUtil.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/util/HeaderUtil.java similarity index 97% rename from src/main/java/de/tum/in/www1/artemis/web/rest/util/HeaderUtil.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/util/HeaderUtil.java index 6310ae552be3..dcbe8336ff25 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/util/HeaderUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/util/HeaderUtil.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.util; +package de.tum.cit.aet.artemis.web.rest.util; import org.springframework.http.HttpHeaders; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/util/PageUtil.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/util/PageUtil.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/web/rest/util/PageUtil.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/util/PageUtil.java index 8cfc4b562919..d156934e6596 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/util/PageUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/util/PageUtil.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.util; +package de.tum.cit.aet.artemis.web.rest.util; import java.util.Map; @@ -7,8 +7,8 @@ import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; -import de.tum.in.www1.artemis.domain.enumeration.SortingOrder; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.PageableSearchDTO; +import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.PageableSearchDTO; public class PageUtil { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/util/ResponseUtil.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/util/ResponseUtil.java similarity index 91% rename from src/main/java/de/tum/in/www1/artemis/web/rest/util/ResponseUtil.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/util/ResponseUtil.java index 865e41d265ba..c91bed729f89 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/util/ResponseUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/util/ResponseUtil.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.util; +package de.tum.cit.aet.artemis.web.rest.util; import java.io.File; import java.io.FileInputStream; @@ -9,7 +9,7 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** * Deprecation: please throw exceptions instead of using the below methods, diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/util/StringUtil.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/util/StringUtil.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/web/rest/util/StringUtil.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/util/StringUtil.java index 829669f16657..2898f45737b2 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/util/StringUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/util/StringUtil.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.util; +package de.tum.cit.aet.artemis.web.rest.util; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/vm/KeyAndPasswordVM.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/KeyAndPasswordVM.java similarity index 92% rename from src/main/java/de/tum/in/www1/artemis/web/rest/vm/KeyAndPasswordVM.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/vm/KeyAndPasswordVM.java index 2ecb5c992fe8..301bcffff223 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/vm/KeyAndPasswordVM.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/KeyAndPasswordVM.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.vm; +package de.tum.cit.aet.artemis.web.rest.vm; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/vm/LoggerVM.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/LoggerVM.java similarity index 96% rename from src/main/java/de/tum/in/www1/artemis/web/rest/vm/LoggerVM.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/vm/LoggerVM.java index 50a667db73be..f0978f62d559 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/vm/LoggerVM.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/LoggerVM.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.vm; +package de.tum.cit.aet.artemis.web.rest.vm; import java.util.Objects; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/vm/LoginVM.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/LoginVM.java similarity index 79% rename from src/main/java/de/tum/in/www1/artemis/web/rest/vm/LoginVM.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/vm/LoginVM.java index 1f38753101ab..3e2c17d5db62 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/vm/LoginVM.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/LoginVM.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.web.rest.vm; +package de.tum.cit.aet.artemis.web.rest.vm; -import static de.tum.in.www1.artemis.config.Constants.PASSWORD_MAX_LENGTH; -import static de.tum.in.www1.artemis.config.Constants.PASSWORD_MIN_LENGTH; -import static de.tum.in.www1.artemis.config.Constants.USERNAME_MAX_LENGTH; -import static de.tum.in.www1.artemis.config.Constants.USERNAME_MIN_LENGTH; +import static de.tum.cit.aet.artemis.config.Constants.PASSWORD_MAX_LENGTH; +import static de.tum.cit.aet.artemis.config.Constants.PASSWORD_MIN_LENGTH; +import static de.tum.cit.aet.artemis.config.Constants.USERNAME_MAX_LENGTH; +import static de.tum.cit.aet.artemis.config.Constants.USERNAME_MIN_LENGTH; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/vm/ManagedUserVM.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/ManagedUserVM.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/web/rest/vm/ManagedUserVM.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/vm/ManagedUserVM.java index 95c664c17533..9a2cf755d961 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/vm/ManagedUserVM.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/ManagedUserVM.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.web.rest.vm; +package de.tum.cit.aet.artemis.web.rest.vm; import jakarta.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.service.dto.UserDTO; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.service.dto.UserDTO; /** * View Model extending the UserDTO, which is meant to be used in the user management UI. diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/vm/package-info.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/package-info.java similarity index 57% rename from src/main/java/de/tum/in/www1/artemis/web/rest/vm/package-info.java rename to src/main/java/de/tum/cit/aet/artemis/web/rest/vm/package-info.java index 8418938ea2ce..4442f7f26ef8 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/vm/package-info.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/package-info.java @@ -1,4 +1,4 @@ /** * View Models used by Spring MVC REST controllers. */ -package de.tum.in.www1.artemis.web.rest.vm; +package de.tum.cit.aet.artemis.web.rest.vm; diff --git a/src/main/java/de/tum/in/www1/artemis/web/websocket/ResultWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/web/websocket/ResultWebsocketService.java rename to src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java index ab27fb9e76b9..f976764dc574 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/websocket/ResultWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.web.websocket; +package de.tum.cit.aet.artemis.web.websocket; -import static de.tum.in.www1.artemis.config.Constants.EXERCISE_TOPIC_ROOT; -import static de.tum.in.www1.artemis.config.Constants.NEW_RESULT_TOPIC; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.EXERCISE_TOPIC_ROOT; +import static de.tum.cit.aet.artemis.config.Constants.NEW_RESULT_TOPIC; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Optional; @@ -13,18 +13,18 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.ExerciseDateService; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; -import de.tum.in.www1.artemis.service.exam.ExamDateService; -import de.tum.in.www1.artemis.web.rest.dto.ResultDTO; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.ExerciseDateService; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.service.exam.ExamDateService; +import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; /** * This service is responsible for sending websocket notifications when a new result got created. diff --git a/src/main/java/de/tum/in/www1/artemis/web/websocket/WebsocketError.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/WebsocketError.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/web/websocket/WebsocketError.java rename to src/main/java/de/tum/cit/aet/artemis/web/websocket/WebsocketError.java index 53c6f6956f41..e3b32ce12664 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/websocket/WebsocketError.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/WebsocketError.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.websocket; +package de.tum.cit.aet.artemis.web.websocket; import java.io.Serializable; diff --git a/src/main/java/de/tum/in/www1/artemis/web/websocket/dto/OnlineTeamStudentDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/OnlineTeamStudentDTO.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/web/websocket/dto/OnlineTeamStudentDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/OnlineTeamStudentDTO.java index 4d52662fdcf5..6222374edaa2 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/websocket/dto/OnlineTeamStudentDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/OnlineTeamStudentDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.websocket.dto; +package de.tum.cit.aet.artemis.web.websocket.dto; import java.time.Instant; diff --git a/src/main/java/de/tum/in/www1/artemis/web/websocket/dto/ProgrammingExerciseTestCaseStateDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/ProgrammingExerciseTestCaseStateDTO.java similarity index 94% rename from src/main/java/de/tum/in/www1/artemis/web/websocket/dto/ProgrammingExerciseTestCaseStateDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/ProgrammingExerciseTestCaseStateDTO.java index 6af2725d52bb..d8f256cc0c84 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/websocket/dto/ProgrammingExerciseTestCaseStateDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/ProgrammingExerciseTestCaseStateDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.websocket.dto; +package de.tum.cit.aet.artemis.web.websocket.dto; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/in/www1/artemis/web/websocket/dto/SubmissionPatch.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/SubmissionPatch.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/web/websocket/dto/SubmissionPatch.java rename to src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/SubmissionPatch.java index 8c4ce58f7042..9d10156e3191 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/websocket/dto/SubmissionPatch.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/SubmissionPatch.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.web.websocket.dto; +package de.tum.cit.aet.artemis.web.websocket.dto; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.JsonNode; -import de.tum.in.www1.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.Participation; /** * DTO for a submission patch. Represents changes conducted by a peer while collaborating diff --git a/src/main/java/de/tum/in/www1/artemis/web/websocket/dto/SubmissionPatchPayload.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/SubmissionPatchPayload.java similarity index 90% rename from src/main/java/de/tum/in/www1/artemis/web/websocket/dto/SubmissionPatchPayload.java rename to src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/SubmissionPatchPayload.java index 24ea153de9ec..054dc0ad2dea 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/websocket/dto/SubmissionPatchPayload.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/SubmissionPatchPayload.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.websocket.dto; +package de.tum.cit.aet.artemis.web.websocket.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/web/websocket/dto/SubmissionSyncPayload.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/SubmissionSyncPayload.java similarity index 55% rename from src/main/java/de/tum/in/www1/artemis/web/websocket/dto/SubmissionSyncPayload.java rename to src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/SubmissionSyncPayload.java index a40df77ccf5a..1e5c5890d561 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/websocket/dto/SubmissionSyncPayload.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/SubmissionSyncPayload.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.web.websocket.dto; +package de.tum.cit.aet.artemis.web.websocket.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.User; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record SubmissionSyncPayload(Submission submission, User sender) { diff --git a/src/main/java/de/tum/in/www1/artemis/web/websocket/dto/TeamAssignmentPayload.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/TeamAssignmentPayload.java similarity index 72% rename from src/main/java/de/tum/in/www1/artemis/web/websocket/dto/TeamAssignmentPayload.java rename to src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/TeamAssignmentPayload.java index 64c2791f88fb..9f46a8446ffd 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/websocket/dto/TeamAssignmentPayload.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/TeamAssignmentPayload.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.websocket.dto; +package de.tum.cit.aet.artemis.web.websocket.dto; import java.util.List; @@ -7,9 +7,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record TeamAssignmentPayload(@NotNull Exercise exercise, @Nullable Team team, @NotNull List studentParticipations) { diff --git a/src/main/java/de/tum/in/www1/artemis/web/websocket/dto/metis/ConversationWebsocketDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/metis/ConversationWebsocketDTO.java similarity index 71% rename from src/main/java/de/tum/in/www1/artemis/web/websocket/dto/metis/ConversationWebsocketDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/metis/ConversationWebsocketDTO.java index 37c74d55b911..ecafba5378ca 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/websocket/dto/metis/ConversationWebsocketDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/metis/ConversationWebsocketDTO.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.web.websocket.dto.metis; +package de.tum.cit.aet.artemis.web.websocket.dto.metis; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.ConversationDTO; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ConversationDTO; /** * DTO that is included as payload for conversation related websocket messages diff --git a/src/main/java/de/tum/in/www1/artemis/web/websocket/dto/metis/MetisCrudAction.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/metis/MetisCrudAction.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/web/websocket/dto/metis/MetisCrudAction.java rename to src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/metis/MetisCrudAction.java index b802b6109479..794868747b3b 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/websocket/dto/metis/MetisCrudAction.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/metis/MetisCrudAction.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.websocket.dto.metis; +package de.tum.cit.aet.artemis.web.websocket.dto.metis; /** * Enum that is used in DTOs sent as payload in websocket messages, diff --git a/src/main/java/de/tum/in/www1/artemis/web/websocket/dto/metis/PostDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/metis/PostDTO.java similarity index 68% rename from src/main/java/de/tum/in/www1/artemis/web/websocket/dto/metis/PostDTO.java rename to src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/metis/PostDTO.java index b5c8d1f25624..48d64f4f2cd8 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/websocket/dto/metis/PostDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/metis/PostDTO.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.web.websocket.dto.metis; +package de.tum.cit.aet.artemis.web.websocket.dto.metis; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.notification.Notification; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.notification.Notification; /** * DTO that is included as payload for post related websocket messages diff --git a/src/main/java/de/tum/in/www1/artemis/web/websocket/dto/package-info.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/package-info.java similarity index 54% rename from src/main/java/de/tum/in/www1/artemis/web/websocket/dto/package-info.java rename to src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/package-info.java index 48a12160fbea..7c71c6173d61 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/websocket/dto/package-info.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/package-info.java @@ -1,4 +1,4 @@ /** * Data Access Objects used by WebSocket services. */ -package de.tum.in.www1.artemis.web.websocket.dto; +package de.tum.cit.aet.artemis.web.websocket.dto; diff --git a/src/main/java/de/tum/in/www1/artemis/web/websocket/localci/LocalCIWebsocketMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/localci/LocalCIWebsocketMessagingService.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/web/websocket/localci/LocalCIWebsocketMessagingService.java rename to src/main/java/de/tum/cit/aet/artemis/web/websocket/localci/LocalCIWebsocketMessagingService.java index bd6de362c617..f7e08b27c090 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/websocket/localci/LocalCIWebsocketMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/localci/LocalCIWebsocketMessagingService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.websocket.localci; +package de.tum.cit.aet.artemis.web.websocket.localci; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_LOCALCI; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALCI; import java.util.List; import java.util.Optional; @@ -12,9 +12,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildAgentInformation; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; /** * This service sends out websocket messages for the local continuous integration system. diff --git a/src/main/java/de/tum/in/www1/artemis/web/websocket/package-info.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/package-info.java similarity index 54% rename from src/main/java/de/tum/in/www1/artemis/web/websocket/package-info.java rename to src/main/java/de/tum/cit/aet/artemis/web/websocket/package-info.java index 71d4b8aa85ac..6a655923cde0 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/websocket/package-info.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/package-info.java @@ -1,4 +1,4 @@ /** * WebSocket services, using Spring Websocket. */ -package de.tum.in.www1.artemis.web.websocket; +package de.tum.cit.aet.artemis.web.websocket; diff --git a/src/main/java/de/tum/in/www1/artemis/web/websocket/programmingSubmission/BuildTriggerWebsocketError.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/programmingSubmission/BuildTriggerWebsocketError.java similarity index 83% rename from src/main/java/de/tum/in/www1/artemis/web/websocket/programmingSubmission/BuildTriggerWebsocketError.java rename to src/main/java/de/tum/cit/aet/artemis/web/websocket/programmingSubmission/BuildTriggerWebsocketError.java index 6ef9385fa592..b696483c872e 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/websocket/programmingSubmission/BuildTriggerWebsocketError.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/programmingSubmission/BuildTriggerWebsocketError.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.websocket.programmingSubmission; +package de.tum.cit.aet.artemis.web.websocket.programmingSubmission; -import de.tum.in.www1.artemis.web.websocket.WebsocketError; +import de.tum.cit.aet.artemis.web.websocket.WebsocketError; /** * A websocket dto for informing the client about a failed submission due to a communication error with the CI system. diff --git a/src/main/java/de/tum/in/www1/artemis/web/websocket/team/ParticipationTeamWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/ParticipationTeamWebsocketService.java similarity index 93% rename from src/main/java/de/tum/in/www1/artemis/web/websocket/team/ParticipationTeamWebsocketService.java rename to src/main/java/de/tum/cit/aet/artemis/web/websocket/team/ParticipationTeamWebsocketService.java index 119109a30bb1..30185a632114 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/websocket/team/ParticipationTeamWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/ParticipationTeamWebsocketService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.websocket.team; +package de.tum.cit.aet.artemis.web.websocket.team; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.security.Principal; import java.time.Instant; @@ -32,25 +32,25 @@ import com.hazelcast.core.HazelcastInstance; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.ModelingSubmissionService; -import de.tum.in.www1.artemis.service.TextSubmissionService; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; -import de.tum.in.www1.artemis.web.websocket.dto.OnlineTeamStudentDTO; -import de.tum.in.www1.artemis.web.websocket.dto.SubmissionPatch; -import de.tum.in.www1.artemis.web.websocket.dto.SubmissionPatchPayload; -import de.tum.in.www1.artemis.web.websocket.dto.SubmissionSyncPayload; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.ModelingSubmissionService; +import de.tum.cit.aet.artemis.service.TextSubmissionService; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.web.websocket.dto.OnlineTeamStudentDTO; +import de.tum.cit.aet.artemis.web.websocket.dto.SubmissionPatch; +import de.tum.cit.aet.artemis.web.websocket.dto.SubmissionPatchPayload; +import de.tum.cit.aet.artemis.web.websocket.dto.SubmissionSyncPayload; @Controller @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/in/www1/artemis/web/websocket/team/TeamWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/TeamWebsocketService.java similarity index 87% rename from src/main/java/de/tum/in/www1/artemis/web/websocket/team/TeamWebsocketService.java rename to src/main/java/de/tum/cit/aet/artemis/web/websocket/team/TeamWebsocketService.java index 5a306317a1c5..6756af3f548a 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/websocket/team/TeamWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/TeamWebsocketService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.web.websocket.team; +package de.tum.cit.aet.artemis.web.websocket.team; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import java.util.HashSet; import java.util.List; @@ -12,12 +12,12 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Controller; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; -import de.tum.in.www1.artemis.web.websocket.dto.TeamAssignmentPayload; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.web.websocket.dto.TeamAssignmentPayload; @Profile(PROFILE_CORE) @Controller diff --git a/src/main/java/de/tum/in/www1/artemis/config/audit/package-info.java b/src/main/java/de/tum/in/www1/artemis/config/audit/package-info.java deleted file mode 100644 index 91bedf89a2b9..000000000000 --- a/src/main/java/de/tum/in/www1/artemis/config/audit/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Audit specific code. - */ -package de.tum.in.www1.artemis.config.audit; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/package-info.java b/src/main/java/de/tum/in/www1/artemis/domain/package-info.java deleted file mode 100644 index c694627ea53e..000000000000 --- a/src/main/java/de/tum/in/www1/artemis/domain/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * JPA domain objects. - */ -package de.tum.in.www1.artemis.domain; diff --git a/src/main/java/de/tum/in/www1/artemis/repository/MigrationChangeRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/MigrationChangeRepository.java deleted file mode 100644 index 84125b806ebb..000000000000 --- a/src/main/java/de/tum/in/www1/artemis/repository/MigrationChangeRepository.java +++ /dev/null @@ -1,7 +0,0 @@ -package de.tum.in.www1.artemis.repository; - -import de.tum.in.www1.artemis.domain.MigrationChangelog; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; - -public interface MigrationChangeRepository extends ArtemisJpaRepository { -} diff --git a/src/main/java/de/tum/in/www1/artemis/repository/iris/IrisTemplateRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/iris/IrisTemplateRepository.java deleted file mode 100644 index 9cf3a0c9e943..000000000000 --- a/src/main/java/de/tum/in/www1/artemis/repository/iris/IrisTemplateRepository.java +++ /dev/null @@ -1,11 +0,0 @@ -package de.tum.in.www1.artemis.repository.iris; - -import de.tum.in.www1.artemis.domain.iris.IrisTemplate; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; - -/** - * Spring Data repository for the IrisTemplate entity. - */ -public interface IrisTemplateRepository extends ArtemisJpaRepository { - -} diff --git a/src/main/java/de/tum/in/www1/artemis/repository/package-info.java b/src/main/java/de/tum/in/www1/artemis/repository/package-info.java deleted file mode 100644 index 9ae04cbd68de..000000000000 --- a/src/main/java/de/tum/in/www1/artemis/repository/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Spring Data JPA repositories. - */ -package de.tum.in.www1.artemis.repository; diff --git a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/communication/Direction.java b/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/communication/Direction.java deleted file mode 100644 index 1dba7c6be59c..000000000000 --- a/src/main/java/de/tum/in/www1/artemis/service/compass/umlmodel/communication/Direction.java +++ /dev/null @@ -1,5 +0,0 @@ -package de.tum.in.www1.artemis.service.compass.umlmodel.communication; - -public enum Direction { - SOURCE, TARGET -} diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/package-info.java b/src/main/java/de/tum/in/www1/artemis/service/dto/package-info.java deleted file mode 100644 index 2b0997e804c3..000000000000 --- a/src/main/java/de/tum/in/www1/artemis/service/dto/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Data Transfer Objects. - */ -package de.tum.in.www1.artemis.service.dto; diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisRateLimitedFeatureInterface.java b/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisRateLimitedFeatureInterface.java deleted file mode 100644 index e75fc5bca4be..000000000000 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisRateLimitedFeatureInterface.java +++ /dev/null @@ -1,8 +0,0 @@ -package de.tum.in.www1.artemis.service.iris.session; - -import de.tum.in.www1.artemis.domain.User; - -public interface IrisRateLimitedFeatureInterface { - - void checkRateLimit(User user); -} diff --git a/src/main/java/de/tum/in/www1/artemis/service/package-info.java b/src/main/java/de/tum/in/www1/artemis/service/package-info.java deleted file mode 100644 index a51f44ca33d4..000000000000 --- a/src/main/java/de/tum/in/www1/artemis/service/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Service layer beans. - */ -package de.tum.in.www1.artemis.service; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/package-info.java b/src/main/java/de/tum/in/www1/artemis/web/rest/package-info.java deleted file mode 100644 index 515953fdb931..000000000000 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Spring MVC REST controllers. - */ -package de.tum.in.www1.artemis.web.rest; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/push_notification/PushNotificationRegisterBody.java b/src/main/java/de/tum/in/www1/artemis/web/rest/push_notification/PushNotificationRegisterBody.java deleted file mode 100644 index 6837731c844d..000000000000 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/push_notification/PushNotificationRegisterBody.java +++ /dev/null @@ -1,6 +0,0 @@ -package de.tum.in.www1.artemis.web.rest.push_notification; - -import de.tum.in.www1.artemis.domain.push_notification.PushNotificationDeviceType; - -public record PushNotificationRegisterBody(String token, PushNotificationDeviceType deviceType) { -} diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml index 56e3edc14e78..23abff9c330b 100644 --- a/src/main/resources/config/application-dev.yml +++ b/src/main/resources/config/application-dev.yml @@ -16,7 +16,7 @@ logging: level: ROOT: DEBUG - de.tum.in.www1.artemis: DEBUG + de.tum.cit.aet.artemis: DEBUG tech.jhipster: DEBUG liquibase: ERROR diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index 8c66b009451c..6b3f18dfaeeb 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -17,7 +17,7 @@ logging: level: ROOT: INFO - de.tum.in.www1.artemis: INFO + de.tum.cit.aet.artemis: INFO tech.jhipster: INFO org.springframework.web.socket.config: INFO liquibase: INFO diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index f8e054727323..f171deb555b5 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -39,7 +39,7 @@ - + diff --git a/src/main/resources/org/eclipse/jgit/http/server/HttpServerText.properties b/src/main/resources/org/eclipse/jgit/http/server/HttpServerText.properties deleted file mode 100644 index 28432b0d7520..000000000000 --- a/src/main/resources/org/eclipse/jgit/http/server/HttpServerText.properties +++ /dev/null @@ -1,30 +0,0 @@ -alreadyInitializedByContainer=Already initialized by container -cannotGetLengthOf=Cannot get length of {0} -clientHas175ChunkedEncodingBug=Git client software upgrade is required.\n\ -\n\ -Git 1.7.5 contains a bug that breaks HTTP support in the client.\n\ -Please upgrade to Git 1.7.5.1 or newer (or alternatively, downgrade\n\ -to any version between 1.6.6 and 1.7.4.5).\n\ -\n\ - http://git-scm.com/download\n -encodingNotSupportedByThisLibrary={0} "{1}": not supported by this library. -expectedRepositoryAttribute=Expected Repository attribute -filterMustNotBeNull=filter must not be null -internalServerError=Internal server error -internalErrorDuringReceivePack=Internal error during receive-pack to {0} -internalErrorDuringUploadPack=Internal error during upload-pack from {0} -internalServerErrorRequestAttributeWasAlreadySet=Internal server error, request attribute {0} was already set when {1} was invoked. -invalidBoolean=Invalid boolean {0} = {1} -invalidIndex=Invalid index: {0} -invalidRegexGroup=Invalid regex group {0} -noResolverAvailable=No resolver available -parameterNotSet=Parameter {0} not set -pathForParamNotFound={0} (for {1}) not found -pathNotSupported={0} not supported -receivedCorruptObject=Cannot receive {0} into {1} -repositoryAccessForbidden=Git access forbidden -repositoryNotFound=Git repository not found -servletAlreadyInitialized=Servlet already initialized -servletMustNotBeNull=servlet must not be null -servletWasAlreadyBound=servlet was already bound -unexpectedeOFOn=Unexpected EOF on {0} diff --git a/src/main/webapp/app/overview/course-dashboard/course-dashboard.service.ts b/src/main/webapp/app/overview/course-dashboard/course-dashboard.service.ts index 1aa46499cfb3..b048d24126f4 100644 --- a/src/main/webapp/app/overview/course-dashboard/course-dashboard.service.ts +++ b/src/main/webapp/app/overview/course-dashboard/course-dashboard.service.ts @@ -104,15 +104,15 @@ export class CourseDashboardService { private mapToExerciseType(type: string): ExerciseType { switch (type) { - case 'de.tum.in.www1.artemis.domain.ProgrammingExercise': + case 'de.tum.cit.aet.artemis.domain.ProgrammingExercise': return ExerciseType.PROGRAMMING; - case 'de.tum.in.www1.artemis.domain.modeling.ModelingExercise': + case 'de.tum.cit.aet.artemis.domain.modeling.ModelingExercise': return ExerciseType.MODELING; - case 'de.tum.in.www1.artemis.domain.quiz.QuizExercise': + case 'de.tum.cit.aet.artemis.domain.quiz.QuizExercise': return ExerciseType.QUIZ; - case 'de.tum.in.www1.artemis.domain.TextExercise': + case 'de.tum.cit.aet.artemis.domain.TextExercise': return ExerciseType.TEXT; - case 'de.tum.in.www1.artemis.domain.FileUploadExercise': + case 'de.tum.cit.aet.artemis.domain.FileUploadExercise': return ExerciseType.FILE_UPLOAD; default: throw new Error(`Unknown exercise type: ${type}`); @@ -121,15 +121,15 @@ export class CourseDashboardService { private mapToLectureUnitType(type: string): LectureUnitType { switch (type) { - case 'de.tum.in.www1.artemis.domain.lecture.AttachmentUnit': + case 'de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit': return LectureUnitType.ATTACHMENT; - case 'de.tum.in.www1.artemis.domain.lecture.ExerciseUnit': + case 'de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit': return LectureUnitType.EXERCISE; - case 'de.tum.in.www1.artemis.domain.lecture.TextUnit': + case 'de.tum.cit.aet.artemis.domain.lecture.TextUnit': return LectureUnitType.TEXT; - case 'de.tum.in.www1.artemis.domain.lecture.VideoUnit': + case 'de.tum.cit.aet.artemis.domain.lecture.VideoUnit': return LectureUnitType.VIDEO; - case 'de.tum.in.www1.artemis.domain.lecture.OnlineUnit': + case 'de.tum.cit.aet.artemis.domain.lecture.OnlineUnit': return LectureUnitType.ONLINE; default: throw new Error(`Unknown lecture unit type: ${type}`); diff --git a/src/test/java/de/tum/in/www1/artemis/AbstractArtemisIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractArtemisIntegrationTest.java similarity index 78% rename from src/test/java/de/tum/in/www1/artemis/AbstractArtemisIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/AbstractArtemisIntegrationTest.java index 70a73254ca01..57c802e022dd 100644 --- a/src/test/java/de/tum/in/www1/artemis/AbstractArtemisIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractArtemisIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; @@ -23,47 +23,47 @@ import org.springframework.mail.javamail.JavaMailSender; import org.springframework.test.context.junit.jupiter.SpringExtension; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.exercise.programming.MockDelegate; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.ModelingSubmissionService; -import de.tum.in.www1.artemis.service.TextBlockService; -import de.tum.in.www1.artemis.service.TextSubmissionService; -import de.tum.in.www1.artemis.service.UriService; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; -import de.tum.in.www1.artemis.service.ZipFileService; -import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.connectors.lti.Lti13Service; -import de.tum.in.www1.artemis.service.exam.ExamAccessService; -import de.tum.in.www1.artemis.service.messaging.InstanceMessageSendService; -import de.tum.in.www1.artemis.service.notifications.ConversationNotificationService; -import de.tum.in.www1.artemis.service.notifications.GeneralInstantNotificationService; -import de.tum.in.www1.artemis.service.notifications.GroupNotificationService; -import de.tum.in.www1.artemis.service.notifications.MailService; -import de.tum.in.www1.artemis.service.notifications.SingleUserNotificationService; -import de.tum.in.www1.artemis.service.notifications.TutorialGroupNotificationService; -import de.tum.in.www1.artemis.service.notifications.push_notifications.ApplePushNotificationService; -import de.tum.in.www1.artemis.service.notifications.push_notifications.FirebasePushNotificationService; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseGradingService; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseParticipationService; -import de.tum.in.www1.artemis.service.programming.ProgrammingTriggerService; -import de.tum.in.www1.artemis.service.scheduled.ParticipantScoreScheduleService; -import de.tum.in.www1.artemis.service.scheduled.ProgrammingExerciseScheduleService; -import de.tum.in.www1.artemis.service.scheduled.ScheduleService; -import de.tum.in.www1.artemis.user.UserFactory; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.util.HibernateQueryInterceptor; -import de.tum.in.www1.artemis.util.QueryCountAssert; -import de.tum.in.www1.artemis.util.RequestUtilService; -import de.tum.in.www1.artemis.util.ThrowingProducer; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.programming.MockDelegate; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.ModelingSubmissionService; +import de.tum.cit.aet.artemis.service.TextBlockService; +import de.tum.cit.aet.artemis.service.TextSubmissionService; +import de.tum.cit.aet.artemis.service.UriService; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.service.ZipFileService; +import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.connectors.lti.Lti13Service; +import de.tum.cit.aet.artemis.service.exam.ExamAccessService; +import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.service.notifications.ConversationNotificationService; +import de.tum.cit.aet.artemis.service.notifications.GeneralInstantNotificationService; +import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; +import de.tum.cit.aet.artemis.service.notifications.MailService; +import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; +import de.tum.cit.aet.artemis.service.notifications.TutorialGroupNotificationService; +import de.tum.cit.aet.artemis.service.notifications.push_notifications.ApplePushNotificationService; +import de.tum.cit.aet.artemis.service.notifications.push_notifications.FirebasePushNotificationService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseGradingService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseParticipationService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingTriggerService; +import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; +import de.tum.cit.aet.artemis.service.scheduled.ProgrammingExerciseScheduleService; +import de.tum.cit.aet.artemis.service.scheduled.ScheduleService; +import de.tum.cit.aet.artemis.user.UserFactory; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.util.HibernateQueryInterceptor; +import de.tum.cit.aet.artemis.util.QueryCountAssert; +import de.tum.cit.aet.artemis.util.RequestUtilService; +import de.tum.cit.aet.artemis.util.ThrowingProducer; import io.zonky.test.db.AutoConfigureEmbeddedDatabase; /** diff --git a/src/test/java/de/tum/in/www1/artemis/AbstractAthenaTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractAthenaTest.java similarity index 86% rename from src/test/java/de/tum/in/www1/artemis/AbstractAthenaTest.java rename to src/test/java/de/tum/cit/aet/artemis/AbstractAthenaTest.java index 80a8a71e339c..07d6ded8d191 100644 --- a/src/test/java/de/tum/in/www1/artemis/AbstractAthenaTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractAthenaTest.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.connector.AthenaRequestMockProvider; +import de.tum.cit.aet.artemis.connector.AthenaRequestMockProvider; /** * Base class for Athena tests providing common functionality diff --git a/src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java rename to src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java index 2994e818e2d4..61b37887d30d 100644 --- a/src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.doNothing; @@ -28,21 +28,21 @@ import com.fasterxml.jackson.core.JsonProcessingException; -import de.tum.in.www1.artemis.connector.GitlabRequestMockProvider; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.participation.AbstractBaseProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.exception.ContinuousIntegrationException; -import de.tum.in.www1.artemis.service.connectors.gitlab.GitLabService; -import de.tum.in.www1.artemis.service.connectors.gitlabci.GitLabCIService; -import de.tum.in.www1.artemis.service.connectors.gitlabci.GitLabCITriggerService; -import de.tum.in.www1.artemis.service.user.PasswordService; +import de.tum.cit.aet.artemis.connector.GitlabRequestMockProvider; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.participation.AbstractBaseProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabService; +import de.tum.cit.aet.artemis.service.connectors.gitlabci.GitLabCIService; +import de.tum.cit.aet.artemis.service.connectors.gitlabci.GitLabCITriggerService; +import de.tum.cit.aet.artemis.service.user.PasswordService; @ResourceLock("AbstractSpringIntegrationGitlabCIGitlabSamlTest") // NOTE: we use a common set of active profiles to reduce the number of application launches during testing. This significantly saves time and memory! diff --git a/src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationIndependentTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationIndependentTest.java rename to src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java index d2b41249721c..b2547cac989c 100644 --- a/src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationIndependentTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_SCHEDULING; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_THEIA; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_THEIA; import static tech.jhipster.config.JHipsterConstants.SPRING_PROFILE_TEST; import java.util.Set; @@ -17,18 +17,18 @@ import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.TestPropertySource; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.participation.AbstractBaseProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.repository.LtiPlatformConfigurationRepository; -import de.tum.in.www1.artemis.security.OAuth2JWKSService; -import de.tum.in.www1.artemis.service.exam.ExamLiveEventsService; -import de.tum.in.www1.artemis.service.notifications.GroupNotificationScheduleService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.participation.AbstractBaseProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; +import de.tum.cit.aet.artemis.security.OAuth2JWKSService; +import de.tum.cit.aet.artemis.service.exam.ExamLiveEventsService; +import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; /** * This SpringBootTest is used for tests that only require a minimal set of Active Spring Profiles. diff --git a/src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java rename to src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java index b8ea7a96bc04..0f172e460742 100644 --- a/src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis; - -import static de.tum.in.www1.artemis.config.Constants.ASSIGNMENT_REPO_NAME; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_SCHEDULING; -import static de.tum.in.www1.artemis.config.Constants.TEST_REPO_NAME; -import static de.tum.in.www1.artemis.domain.enumeration.BuildPlanType.SOLUTION; -import static de.tum.in.www1.artemis.domain.enumeration.BuildPlanType.TEMPLATE; -import static de.tum.in.www1.artemis.util.TestConstants.COMMIT_HASH_OBJECT_ID; +package de.tum.cit.aet.artemis; + +import static de.tum.cit.aet.artemis.config.Constants.ASSIGNMENT_REPO_NAME; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.config.Constants.TEST_REPO_NAME; +import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.SOLUTION; +import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.TEMPLATE; +import static de.tum.cit.aet.artemis.util.TestConstants.COMMIT_HASH_OBJECT_ID; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doReturn; import static tech.jhipster.config.JHipsterConstants.SPRING_PROFILE_TEST; @@ -29,25 +29,25 @@ import com.offbytwo.jenkins.JenkinsServer; -import de.tum.in.www1.artemis.connector.AeolusRequestMockProvider; -import de.tum.in.www1.artemis.connector.GitlabRequestMockProvider; -import de.tum.in.www1.artemis.connector.JenkinsRequestMockProvider; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.AeolusTarget; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.participation.AbstractBaseProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.service.connectors.gitlab.GitLabService; -import de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsService; -import de.tum.in.www1.artemis.service.exam.ExamLiveEventsService; -import de.tum.in.www1.artemis.service.notifications.GroupNotificationScheduleService; -import de.tum.in.www1.artemis.service.programming.ProgrammingMessagingService; -import de.tum.in.www1.artemis.web.websocket.ResultWebsocketService; +import de.tum.cit.aet.artemis.connector.AeolusRequestMockProvider; +import de.tum.cit.aet.artemis.connector.GitlabRequestMockProvider; +import de.tum.cit.aet.artemis.connector.JenkinsRequestMockProvider; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.AeolusTarget; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.participation.AbstractBaseProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabService; +import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsService; +import de.tum.cit.aet.artemis.service.exam.ExamLiveEventsService; +import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingMessagingService; +import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; @ResourceLock("AbstractSpringIntegrationJenkinsGitlabTest") // NOTE: we use a common set of active profiles to reduce the number of application launches during testing. This significantly saves time and memory! diff --git a/src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java rename to src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java index d1dcf21dc778..80d660ef18c1 100644 --- a/src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_BUILDAGENT; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; import static tech.jhipster.config.JHipsterConstants.SPRING_PROFILE_TEST; import java.io.IOException; @@ -26,30 +26,30 @@ import com.github.dockerjava.api.DockerClient; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.participation.AbstractBaseProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.localvcci.LocalVCLocalCITestService; -import de.tum.in.www1.artemis.localvcci.TestBuildAgentConfiguration; -import de.tum.in.www1.artemis.repository.BuildJobRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.repository.TemplateProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.service.ResourceLoaderService; -import de.tum.in.www1.artemis.service.connectors.localci.LocalCIService; -import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCService; -import de.tum.in.www1.artemis.service.exam.ExamLiveEventsService; -import de.tum.in.www1.artemis.service.ldap.LdapUserService; -import de.tum.in.www1.artemis.service.notifications.GroupNotificationScheduleService; -import de.tum.in.www1.artemis.service.programming.ProgrammingMessagingService; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.participation.AbstractBaseProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.localvcci.LocalVCLocalCITestService; +import de.tum.cit.aet.artemis.localvcci.TestBuildAgentConfiguration; +import de.tum.cit.aet.artemis.repository.BuildJobRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.service.ResourceLoaderService; +import de.tum.cit.aet.artemis.service.connectors.localci.LocalCIService; +import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCService; +import de.tum.cit.aet.artemis.service.exam.ExamLiveEventsService; +import de.tum.cit.aet.artemis.service.ldap.LdapUserService; +import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingMessagingService; +import de.tum.cit.aet.artemis.user.UserUtilService; // Must start up an actual web server such that the tests can communicate with the ArtemisGitServlet using JGit. // Otherwise, only MockMvc requests could be used. The port this runs on is defined at server.port (see @TestPropertySource). diff --git a/src/test/java/de/tum/in/www1/artemis/BuildPlanIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/BuildPlanIntegrationTest.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/BuildPlanIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/BuildPlanIntegrationTest.java index 2d08ed143685..5518bc61ede3 100644 --- a/src/test/java/de/tum/in/www1/artemis/BuildPlanIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/BuildPlanIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; @@ -9,15 +9,15 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.domain.BuildPlan; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.repository.BuildPlanRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.domain.BuildPlan; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; class BuildPlanIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/ClientForwardTest.java b/src/test/java/de/tum/cit/aet/artemis/ClientForwardTest.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/ClientForwardTest.java rename to src/test/java/de/tum/cit/aet/artemis/ClientForwardTest.java index 21108b99ac41..a1ea849bf6ed 100644 --- a/src/test/java/de/tum/in/www1/artemis/ClientForwardTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/ClientForwardTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; @@ -13,10 +13,10 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.test.web.servlet.ResultActions; -import de.tum.in.www1.artemis.config.SecurityConfiguration; -import de.tum.in.www1.artemis.security.jwt.JWTCookieService; -import de.tum.in.www1.artemis.security.jwt.JWTFilter; -import de.tum.in.www1.artemis.web.filter.SpaWebFilter; +import de.tum.cit.aet.artemis.config.SecurityConfiguration; +import de.tum.cit.aet.artemis.security.jwt.JWTCookieService; +import de.tum.cit.aet.artemis.security.jwt.JWTFilter; +import de.tum.cit.aet.artemis.web.filter.SpaWebFilter; /** * Test class for the ClientForwardController REST controller. diff --git a/src/test/java/de/tum/in/www1/artemis/ContentVersionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/ContentVersionIntegrationTest.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/ContentVersionIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/ContentVersionIntegrationTest.java index ca56be520972..9ad7bee430cd 100644 --- a/src/test/java/de/tum/in/www1/artemis/ContentVersionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/ContentVersionIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; import static org.assertj.core.api.Assertions.assertThat; @@ -11,7 +11,7 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import de.tum.in.www1.artemis.web.filter.ApiVersionFilter; +import de.tum.cit.aet.artemis.web.filter.ApiVersionFilter; class ContentVersionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/DatabaseQueryCountTest.java b/src/test/java/de/tum/cit/aet/artemis/DatabaseQueryCountTest.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/DatabaseQueryCountTest.java rename to src/test/java/de/tum/cit/aet/artemis/DatabaseQueryCountTest.java index 1479dc94bd9b..41cc3691ff00 100644 --- a/src/test/java/de/tum/in/www1/artemis/DatabaseQueryCountTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/DatabaseQueryCountTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; import java.util.Set; @@ -10,13 +10,13 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.lecture.LectureUtilService; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.web.rest.dto.CoursesForDashboardDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.web.rest.dto.CoursesForDashboardDTO; class DatabaseQueryCountTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/FileIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/FileIntegrationTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/FileIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/FileIntegrationTest.java index fb2ad2dec51d..4459ebd8fbce 100644 --- a/src/test/java/de/tum/in/www1/artemis/FileIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/FileIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.within; @@ -25,21 +25,21 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.Attachment; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AttachmentType; -import de.tum.in.www1.artemis.domain.exam.ExamUser; -import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.lecture.LectureFactory; -import de.tum.in.www1.artemis.lecture.LectureUtilService; -import de.tum.in.www1.artemis.repository.AttachmentRepository; -import de.tum.in.www1.artemis.repository.AttachmentUnitRepository; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.LectureUnitCompletionRepository; -import de.tum.in.www1.artemis.web.rest.dto.ExamUserDTO; +import de.tum.cit.aet.artemis.domain.Attachment; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; +import de.tum.cit.aet.artemis.domain.exam.ExamUser; +import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.lecture.LectureFactory; +import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.repository.AttachmentRepository; +import de.tum.cit.aet.artemis.repository.AttachmentUnitRepository; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.LectureUnitCompletionRepository; +import de.tum.cit.aet.artemis.web.rest.dto.ExamUserDTO; class FileIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/GuidedTourSettingResourceTest.java b/src/test/java/de/tum/cit/aet/artemis/GuidedTourSettingResourceTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/GuidedTourSettingResourceTest.java rename to src/test/java/de/tum/cit/aet/artemis/GuidedTourSettingResourceTest.java index 38c70b38b40a..81e6f1a27e50 100644 --- a/src/test/java/de/tum/in/www1/artemis/GuidedTourSettingResourceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/GuidedTourSettingResourceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; import static org.assertj.core.api.Assertions.assertThat; @@ -11,9 +11,9 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.domain.GuidedTourSetting; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.domain.GuidedTourSetting; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.user.UserUtilService; class GuidedTourSettingResourceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/ImprintResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/ImprintResourceIntegrationTest.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/ImprintResourceIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/ImprintResourceIntegrationTest.java index 7126cb9b2bd0..4b6757bfbe16 100644 --- a/src/test/java/de/tum/in/www1/artemis/ImprintResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/ImprintResourceIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -24,8 +24,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.web.rest.dto.ImprintDTO; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.web.rest.dto.ImprintDTO; class ImprintResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/InetSocketAddressValidatorTest.java b/src/test/java/de/tum/cit/aet/artemis/InetSocketAddressValidatorTest.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/InetSocketAddressValidatorTest.java rename to src/test/java/de/tum/cit/aet/artemis/InetSocketAddressValidatorTest.java index a6b160caf2b0..c08f81e9c2aa 100644 --- a/src/test/java/de/tum/in/www1/artemis/InetSocketAddressValidatorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/InetSocketAddressValidatorTest.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.validation.InetSocketAddressValidator; +import de.tum.cit.aet.artemis.validation.InetSocketAddressValidator; class InetSocketAddressValidatorTest { diff --git a/src/test/java/de/tum/in/www1/artemis/LogResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/LogResourceIntegrationTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/LogResourceIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/LogResourceIntegrationTest.java index 0a324351bdd3..ec390884b99c 100644 --- a/src/test/java/de/tum/in/www1/artemis/LogResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/LogResourceIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; import static org.assertj.core.api.Assertions.assertThat; @@ -8,7 +8,7 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.web.rest.vm.LoggerVM; +import de.tum.cit.aet.artemis.web.rest.vm.LoggerVM; class LogResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/LongFeedbackResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/LongFeedbackResourceIntegrationTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/LongFeedbackResourceIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/LongFeedbackResourceIntegrationTest.java index ad4c864a8fa7..a8009fad85d8 100644 --- a/src/test/java/de/tum/in/www1/artemis/LongFeedbackResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/LongFeedbackResourceIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; import static org.assertj.core.api.Assertions.assertThat; @@ -8,13 +8,13 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; class LongFeedbackResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/Lti13LaunchIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/Lti13LaunchIntegrationTest.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/Lti13LaunchIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/Lti13LaunchIntegrationTest.java index e99c4e9d64d8..5e0a64c362de 100644 --- a/src/test/java/de/tum/in/www1/artemis/Lti13LaunchIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/Lti13LaunchIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; -import static de.tum.in.www1.artemis.util.TestUriParamsUtil.assertUriParamsContain; +import static de.tum.cit.aet.artemis.util.TestUriParamsUtil.assertUriParamsContain; import static org.assertj.core.api.Assertions.assertThat; import java.net.URI; diff --git a/src/test/java/de/tum/in/www1/artemis/LtiDeepLinkingIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/LtiDeepLinkingIntegrationTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/LtiDeepLinkingIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/LtiDeepLinkingIntegrationTest.java index a6ad46588d1e..2ef779f6fdcf 100644 --- a/src/test/java/de/tum/in/www1/artemis/LtiDeepLinkingIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/LtiDeepLinkingIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; import static org.mockito.Mockito.any; import static org.mockito.Mockito.when; @@ -28,10 +28,10 @@ import com.nimbusds.jose.jwk.JWK; import com.nimbusds.jose.jwk.RSAKey; -import de.tum.in.www1.artemis.config.lti.CustomLti13Configurer; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.lti.Claims; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.config.lti.CustomLti13Configurer; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.lti.Claims; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import io.jsonwebtoken.Jwts; class LtiDeepLinkingIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/LtiIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/LtiIntegrationTest.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/LtiIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/LtiIntegrationTest.java index e90a3bebf6c0..14b4195a5870 100644 --- a/src/test/java/de/tum/in/www1/artemis/LtiIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/LtiIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -30,8 +30,8 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.LtiPlatformConfiguration; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; class LtiIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/LtiQuizIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/LtiQuizIntegrationTest.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/LtiQuizIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/LtiQuizIntegrationTest.java index d62312dfdc30..d3d158f3c97d 100644 --- a/src/test/java/de/tum/in/www1/artemis/LtiQuizIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/LtiQuizIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -28,20 +28,20 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.QuizMode; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.QuizExerciseRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.service.quiz.QuizExerciseService; -import de.tum.in.www1.artemis.service.quiz.QuizSubmissionService; -import de.tum.in.www1.artemis.util.RequestUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.service.quiz.QuizExerciseService; +import de.tum.cit.aet.artemis.service.quiz.QuizSubmissionService; +import de.tum.cit.aet.artemis.util.RequestUtilService; @Isolated class LtiQuizIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/ManagementResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/ManagementResourceIntegrationTest.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/ManagementResourceIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/ManagementResourceIntegrationTest.java index ed5708e12228..115aabdb48af 100644 --- a/src/test/java/de/tum/in/www1/artemis/ManagementResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/ManagementResourceIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; -import static de.tum.in.www1.artemis.util.RequestUtilService.deleteProgrammingExerciseParamsFalse; +import static de.tum.cit.aet.artemis.util.RequestUtilService.deleteProgrammingExerciseParamsFalse; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doNothing; @@ -21,17 +21,17 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.domain.PersistentAuditEvent; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.PersistenceAuditEventRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.in.www1.artemis.service.feature.Feature; -import de.tum.in.www1.artemis.service.feature.FeatureToggleService; +import de.tum.cit.aet.artemis.domain.PersistentAuditEvent; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.PersistenceAuditEventRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.service.feature.Feature; +import de.tum.cit.aet.artemis.service.feature.FeatureToggleService; class ManagementResourceIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/MetricsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/MetricsIntegrationTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/MetricsIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/MetricsIntegrationTest.java index d1a73ac87a1c..308ccc30488b 100644 --- a/src/test/java/de/tum/in/www1/artemis/MetricsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/MetricsIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; -import static de.tum.in.www1.artemis.service.util.TimeUtil.toRelativeTime; +import static de.tum.cit.aet.artemis.service.util.TimeUtil.toRelativeTime; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -22,15 +22,15 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.test.util.ReflectionTestUtils; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.repository.metrics.ExerciseMetricsRepository; -import de.tum.in.www1.artemis.service.scheduled.ParticipantScoreScheduleService; -import de.tum.in.www1.artemis.web.rest.dto.metrics.ExerciseInformationDTO; -import de.tum.in.www1.artemis.web.rest.dto.metrics.ResourceTimestampDTO; -import de.tum.in.www1.artemis.web.rest.dto.metrics.StudentMetricsDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.repository.metrics.ExerciseMetricsRepository; +import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; +import de.tum.cit.aet.artemis.web.rest.dto.metrics.ExerciseInformationDTO; +import de.tum.cit.aet.artemis.web.rest.dto.metrics.ResourceTimestampDTO; +import de.tum.cit.aet.artemis.web.rest.dto.metrics.StudentMetricsDTO; class MetricsIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/OAuth2JWKSIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/OAuth2JWKSIntegrationTest.java similarity index 87% rename from src/test/java/de/tum/in/www1/artemis/OAuth2JWKSIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/OAuth2JWKSIntegrationTest.java index dbd22f3f7371..b4e12c6edbfe 100644 --- a/src/test/java/de/tum/in/www1/artemis/OAuth2JWKSIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/OAuth2JWKSIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; import static org.assertj.core.api.Assertions.assertThat; @@ -10,11 +10,11 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.course.CourseFactory; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.LtiPlatformConfiguration; -import de.tum.in.www1.artemis.domain.OnlineCourseConfiguration; -import de.tum.in.www1.artemis.repository.OnlineCourseConfigurationRepository; +import de.tum.cit.aet.artemis.course.CourseFactory; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; +import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; +import de.tum.cit.aet.artemis.repository.OnlineCourseConfigurationRepository; class OAuth2JWKSIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/PrivacyStatementResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/PrivacyStatementResourceIntegrationTest.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/PrivacyStatementResourceIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/PrivacyStatementResourceIntegrationTest.java index 2581ad81746b..375eef7eba24 100644 --- a/src/test/java/de/tum/in/www1/artemis/PrivacyStatementResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/PrivacyStatementResourceIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -24,8 +24,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.web.rest.dto.PrivacyStatementDTO; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.web.rest.dto.PrivacyStatementDTO; class PrivacyStatementResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/StatisticsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/StatisticsIntegrationTest.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/StatisticsIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/StatisticsIntegrationTest.java index fb693a015a2a..a56a113e0ac3 100644 --- a/src/test/java/de/tum/in/www1/artemis/StatisticsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/StatisticsIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -19,30 +19,30 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import de.tum.in.www1.artemis.assessment.GradingScaleFactory; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.GradingScale; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.GraphType; -import de.tum.in.www1.artemis.domain.enumeration.SpanType; -import de.tum.in.www1.artemis.domain.enumeration.StatisticsView; -import de.tum.in.www1.artemis.domain.metis.AnswerPost; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.GradingScaleRepository; -import de.tum.in.www1.artemis.repository.ParticipantScoreRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.TextExerciseRepository; -import de.tum.in.www1.artemis.repository.metis.AnswerPostRepository; -import de.tum.in.www1.artemis.repository.metis.PostRepository; -import de.tum.in.www1.artemis.web.rest.dto.CourseManagementStatisticsDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExerciseManagementStatisticsDTO; +import de.tum.cit.aet.artemis.assessment.GradingScaleFactory; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.GraphType; +import de.tum.cit.aet.artemis.domain.enumeration.SpanType; +import de.tum.cit.aet.artemis.domain.enumeration.StatisticsView; +import de.tum.cit.aet.artemis.domain.metis.AnswerPost; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.repository.metis.AnswerPostRepository; +import de.tum.cit.aet.artemis.repository.metis.PostRepository; +import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementStatisticsDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExerciseManagementStatisticsDTO; class StatisticsIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/StringUtilTest.java b/src/test/java/de/tum/cit/aet/artemis/StringUtilTest.java similarity index 82% rename from src/test/java/de/tum/in/www1/artemis/StringUtilTest.java rename to src/test/java/de/tum/cit/aet/artemis/StringUtilTest.java index 7c3604a371ad..f0406b79c29c 100644 --- a/src/test/java/de/tum/in/www1/artemis/StringUtilTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/StringUtilTest.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; -import static de.tum.in.www1.artemis.web.rest.util.StringUtil.ILLEGAL_CHARACTERS; -import static de.tum.in.www1.artemis.web.rest.util.StringUtil.stripIllegalCharacters; +import static de.tum.cit.aet.artemis.web.rest.util.StringUtil.ILLEGAL_CHARACTERS; +import static de.tum.cit.aet.artemis.web.rest.util.StringUtil.stripIllegalCharacters; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; diff --git a/src/test/java/de/tum/in/www1/artemis/StudentScoreUtilService.java b/src/test/java/de/tum/cit/aet/artemis/StudentScoreUtilService.java similarity index 87% rename from src/test/java/de/tum/in/www1/artemis/StudentScoreUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/StudentScoreUtilService.java index 6c43b83c10d6..4382638401c8 100644 --- a/src/test/java/de/tum/in/www1/artemis/StudentScoreUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/StudentScoreUtilService.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis; +package de.tum.cit.aet.artemis; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.scores.StudentScore; -import de.tum.in.www1.artemis.repository.StudentScoreRepository; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.scores.StudentScore; +import de.tum.cit.aet.artemis.repository.StudentScoreRepository; /** * Service responsible for initializing the database with specific testdata related to student scores for use in integration tests. diff --git a/src/test/java/de/tum/in/www1/artemis/architecture/AbstractArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/architecture/AbstractArchitectureTest.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/architecture/AbstractArchitectureTest.java rename to src/test/java/de/tum/cit/aet/artemis/architecture/AbstractArchitectureTest.java index a34a166aaa05..206384351d9c 100644 --- a/src/test/java/de/tum/in/www1/artemis/architecture/AbstractArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/architecture/AbstractArchitectureTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.architecture; +package de.tum.cit.aet.artemis.architecture; import static com.tngtech.archunit.base.DescribedPredicate.equalTo; import static com.tngtech.archunit.base.DescribedPredicate.not; @@ -33,7 +33,7 @@ @Tag("ArchitectureTest") public abstract class AbstractArchitectureTest { - protected static final String ARTEMIS_PACKAGE = "de.tum.in.www1.artemis"; + protected static final String ARTEMIS_PACKAGE = "de.tum.cit.aet.artemis"; protected static JavaClasses testClasses; diff --git a/src/test/java/de/tum/in/www1/artemis/architecture/ArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/architecture/ArchitectureTest.java rename to src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java index a847f7be0ddf..2df5eb9b2252 100644 --- a/src/test/java/de/tum/in/www1/artemis/architecture/ArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.architecture; +package de.tum.cit.aet.artemis.architecture; import static com.tngtech.archunit.base.DescribedPredicate.and; import static com.tngtech.archunit.base.DescribedPredicate.not; @@ -70,13 +70,13 @@ import com.tngtech.archunit.lang.SimpleConditionEvent; import com.tngtech.archunit.library.GeneralCodingRules; -import de.tum.in.www1.artemis.AbstractArtemisIntegrationTest; -import de.tum.in.www1.artemis.authorization.AuthorizationTestService; -import de.tum.in.www1.artemis.config.ApplicationConfiguration; -import de.tum.in.www1.artemis.config.ConditionalMetricsExclusionConfiguration; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.web.rest.repository.RepositoryResource; +import de.tum.cit.aet.artemis.AbstractArtemisIntegrationTest; +import de.tum.cit.aet.artemis.authorization.AuthorizationTestService; +import de.tum.cit.aet.artemis.config.ApplicationConfiguration; +import de.tum.cit.aet.artemis.config.ConditionalMetricsExclusionConfiguration; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.web.rest.repository.RepositoryResource; /** * This class contains architecture tests that apply for the whole project. diff --git a/src/test/java/de/tum/in/www1/artemis/architecture/EnforceRoleInResourceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/architecture/EnforceRoleInResourceArchitectureTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/architecture/EnforceRoleInResourceArchitectureTest.java rename to src/test/java/de/tum/cit/aet/artemis/architecture/EnforceRoleInResourceArchitectureTest.java index 1107d3932a65..312b525d7c22 100644 --- a/src/test/java/de/tum/in/www1/artemis/architecture/EnforceRoleInResourceArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/architecture/EnforceRoleInResourceArchitectureTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.architecture; +package de.tum.cit.aet.artemis.architecture; import static com.tngtech.archunit.lang.SimpleConditionEvent.violated; import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.methods; @@ -9,8 +9,8 @@ import com.tngtech.archunit.lang.ArchCondition; import com.tngtech.archunit.lang.ConditionEvents; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceRoleInCourse; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceRoleInExercise; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceRoleInCourse; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceRoleInExercise; /** * This class contains architecture tests for endpoints with EnforceRoleInResource annotations. diff --git a/src/test/java/de/tum/in/www1/artemis/architecture/FeedbackArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/architecture/FeedbackArchitectureTest.java similarity index 87% rename from src/test/java/de/tum/in/www1/artemis/architecture/FeedbackArchitectureTest.java rename to src/test/java/de/tum/cit/aet/artemis/architecture/FeedbackArchitectureTest.java index 4646340100bd..9fa659dcd228 100644 --- a/src/test/java/de/tum/in/www1/artemis/architecture/FeedbackArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/architecture/FeedbackArchitectureTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.architecture; +package de.tum.cit.aet.artemis.architecture; import static com.tngtech.archunit.base.DescribedPredicate.not; import static com.tngtech.archunit.core.domain.JavaClass.Predicates.assignableFrom; @@ -10,8 +10,8 @@ import com.tngtech.archunit.core.domain.JavaClasses; import com.tngtech.archunit.lang.ArchRule; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.service.FeedbackService; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.service.FeedbackService; class FeedbackArchitectureTest extends AbstractArchitectureTest { @@ -29,7 +29,7 @@ void testGetLongFeedbackTextNotUsed() { // internal usage for the Feedback and its tests okay, the service needs it for Hibernate lazy initialisation checks final JavaClasses classesToCheck = allClasses - .that(are(not(assignableFrom(Feedback.class).or(assignableFrom("de.tum.in.www1.artemis.domain.FeedbackTest")).or(assignableFrom(FeedbackService.class))))); + .that(are(not(assignableFrom(Feedback.class).or(assignableFrom("de.tum.cit.aet.artemis.domain.FeedbackTest")).or(assignableFrom(FeedbackService.class))))); getLongFeedbackTextUsage.check(classesToCheck); } diff --git a/src/test/java/de/tum/in/www1/artemis/architecture/RepositoryArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/architecture/RepositoryArchitectureTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/architecture/RepositoryArchitectureTest.java rename to src/test/java/de/tum/cit/aet/artemis/architecture/RepositoryArchitectureTest.java index 0c32e6507d45..e35271c32631 100644 --- a/src/test/java/de/tum/in/www1/artemis/architecture/RepositoryArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/architecture/RepositoryArchitectureTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.architecture; +package de.tum.cit.aet.artemis.architecture; import static com.tngtech.archunit.base.DescribedPredicate.and; import static com.tngtech.archunit.core.domain.JavaClass.Predicates.INTERFACES; @@ -33,8 +33,8 @@ import com.tngtech.archunit.lang.ConditionEvents; import com.tngtech.archunit.lang.SimpleConditionEvent; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; -import de.tum.in.www1.artemis.repository.base.RepositoryImpl; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.repository.base.RepositoryImpl; /** * This class contains architecture tests for the persistence layer. @@ -132,11 +132,11 @@ void testTransactional() { // TODO: In the future we should reduce this number and eventually replace it by transactionalRule.check(allClasses) // The following methods currently violate this rule: - // Method - // Method - // Method - // Method - // Method + // Method + // Method + // Method + // Method + // Method var result = transactionalRule.evaluate(allClasses); assertThat(result.getFailureReport().getDetails()).hasSize(5); } diff --git a/src/test/java/de/tum/in/www1/artemis/architecture/ResourceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/architecture/ResourceArchitectureTest.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/architecture/ResourceArchitectureTest.java rename to src/test/java/de/tum/cit/aet/artemis/architecture/ResourceArchitectureTest.java index 96d46306b9df..6edad9fd842b 100644 --- a/src/test/java/de/tum/in/www1/artemis/architecture/ResourceArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/architecture/ResourceArchitectureTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.architecture; +package de.tum.cit.aet.artemis.architecture; import static com.tngtech.archunit.lang.ConditionEvent.createMessage; import static com.tngtech.archunit.lang.SimpleConditionEvent.violated; @@ -30,7 +30,7 @@ import com.tngtech.archunit.lang.ArchRule; import com.tngtech.archunit.lang.ConditionEvents; -import de.tum.in.www1.artemis.web.rest.ogparser.LinkPreviewResource; +import de.tum.cit.aet.artemis.web.rest.ogparser.LinkPreviewResource; class ResourceArchitectureTest extends AbstractArchitectureTest { diff --git a/src/test/java/de/tum/in/www1/artemis/architecture/ServiceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/architecture/ServiceArchitectureTest.java similarity index 89% rename from src/test/java/de/tum/in/www1/artemis/architecture/ServiceArchitectureTest.java rename to src/test/java/de/tum/cit/aet/artemis/architecture/ServiceArchitectureTest.java index 819168fcc74d..c9d9e421bfa2 100644 --- a/src/test/java/de/tum/in/www1/artemis/architecture/ServiceArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/architecture/ServiceArchitectureTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.architecture; +package de.tum.cit.aet.artemis.architecture; import static com.tngtech.archunit.core.domain.JavaModifier.ABSTRACT; import static com.tngtech.archunit.core.domain.JavaModifier.FINAL; @@ -18,14 +18,14 @@ import com.tngtech.archunit.lang.ArchRule; import com.tngtech.archunit.lang.ConditionEvents; -import de.tum.in.www1.artemis.config.migration.MigrationService; -import de.tum.in.www1.artemis.management.SecurityMetersService; -import de.tum.in.www1.artemis.security.DomainUserDetailsService; -import de.tum.in.www1.artemis.security.OAuth2JWKSService; -import de.tum.in.www1.artemis.security.jwt.JWTCookieService; -import de.tum.in.www1.artemis.web.rest.GitDiffReportParserService; -import de.tum.in.www1.artemis.web.websocket.ResultWebsocketService; -import de.tum.in.www1.artemis.web.websocket.localci.LocalCIWebsocketMessagingService; +import de.tum.cit.aet.artemis.config.migration.MigrationService; +import de.tum.cit.aet.artemis.management.SecurityMetersService; +import de.tum.cit.aet.artemis.security.DomainUserDetailsService; +import de.tum.cit.aet.artemis.security.OAuth2JWKSService; +import de.tum.cit.aet.artemis.security.jwt.JWTCookieService; +import de.tum.cit.aet.artemis.web.rest.GitDiffReportParserService; +import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; +import de.tum.cit.aet.artemis.web.websocket.localci.LocalCIWebsocketMessagingService; class ServiceArchitectureTest extends AbstractArchitectureTest { @@ -53,7 +53,7 @@ void testNoWrongServiceImports() { @Test void testCorrectServiceAnnotation() { - classes().that().resideInAPackage("de.tum.in.www1.artemis.service..").and().haveSimpleNameEndingWith("Service").and().areNotInterfaces().and().doNotHaveModifier(ABSTRACT) + classes().that().resideInAPackage("de.tum.cit.aet.artemis.service..").and().haveSimpleNameEndingWith("Service").and().areNotInterfaces().and().doNotHaveModifier(ABSTRACT) .should().beAnnotatedWith(org.springframework.stereotype.Service.class) .because("services should be consistently managed by Spring's dependency injection container.").check(allClasses); diff --git a/src/test/java/de/tum/in/www1/artemis/aspects/AbstractEnforceRoleInResourceTest.java b/src/test/java/de/tum/cit/aet/artemis/aspects/AbstractEnforceRoleInResourceTest.java similarity index 86% rename from src/test/java/de/tum/in/www1/artemis/aspects/AbstractEnforceRoleInResourceTest.java rename to src/test/java/de/tum/cit/aet/artemis/aspects/AbstractEnforceRoleInResourceTest.java index 985e8bf5b3af..d27d6730eb05 100644 --- a/src/test/java/de/tum/in/www1/artemis/aspects/AbstractEnforceRoleInResourceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/aspects/AbstractEnforceRoleInResourceTest.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.aspects; +package de.tum.cit.aet.artemis.aspects; import org.junit.jupiter.api.BeforeEach; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.user.UserUtilService; /** * This abstract class is used to test the aspect that enforces the role of the user for a specific resource. diff --git a/src/test/java/de/tum/in/www1/artemis/aspects/EnforceRoleInCourseTest.java b/src/test/java/de/tum/cit/aet/artemis/aspects/EnforceRoleInCourseTest.java similarity index 99% rename from src/test/java/de/tum/in/www1/artemis/aspects/EnforceRoleInCourseTest.java rename to src/test/java/de/tum/cit/aet/artemis/aspects/EnforceRoleInCourseTest.java index 6630b9e1ed95..57cc8349defa 100644 --- a/src/test/java/de/tum/in/www1/artemis/aspects/EnforceRoleInCourseTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/aspects/EnforceRoleInCourseTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.aspects; +package de.tum.cit.aet.artemis.aspects; import java.util.stream.Stream; diff --git a/src/test/java/de/tum/in/www1/artemis/aspects/EnforceRoleInExerciseTest.java b/src/test/java/de/tum/cit/aet/artemis/aspects/EnforceRoleInExerciseTest.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/aspects/EnforceRoleInExerciseTest.java rename to src/test/java/de/tum/cit/aet/artemis/aspects/EnforceRoleInExerciseTest.java index b7a7f71cdeb7..20ce48f12c31 100644 --- a/src/test/java/de/tum/in/www1/artemis/aspects/EnforceRoleInExerciseTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/aspects/EnforceRoleInExerciseTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.aspects; +package de.tum.cit.aet.artemis.aspects; import java.util.stream.Stream; @@ -9,8 +9,8 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; class EnforceRoleInExerciseTest extends AbstractEnforceRoleInResourceTest { diff --git a/src/test/java/de/tum/in/www1/artemis/aspects/resources/EnforceRoleInCourseResource.java b/src/test/java/de/tum/cit/aet/artemis/aspects/resources/EnforceRoleInCourseResource.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/aspects/resources/EnforceRoleInCourseResource.java rename to src/test/java/de/tum/cit/aet/artemis/aspects/resources/EnforceRoleInCourseResource.java index 2a6a09a012d2..b00df4ff619e 100644 --- a/src/test/java/de/tum/in/www1/artemis/aspects/resources/EnforceRoleInCourseResource.java +++ b/src/test/java/de/tum/cit/aet/artemis/aspects/resources/EnforceRoleInCourseResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.aspects.resources; +package de.tum.cit.aet.artemis.aspects.resources; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.http.ResponseEntity; @@ -9,12 +9,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastTutorInCourse; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceRoleInCourse; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastTutorInCourse; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceRoleInCourse; @Profile(PROFILE_CORE) @RestController diff --git a/src/test/java/de/tum/in/www1/artemis/aspects/resources/EnforceRoleInExerciseResource.java b/src/test/java/de/tum/cit/aet/artemis/aspects/resources/EnforceRoleInExerciseResource.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/aspects/resources/EnforceRoleInExerciseResource.java rename to src/test/java/de/tum/cit/aet/artemis/aspects/resources/EnforceRoleInExerciseResource.java index 4c918ea43be4..3c81e8c22bbe 100644 --- a/src/test/java/de/tum/in/www1/artemis/aspects/resources/EnforceRoleInExerciseResource.java +++ b/src/test/java/de/tum/cit/aet/artemis/aspects/resources/EnforceRoleInExerciseResource.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.aspects.resources; +package de.tum.cit.aet.artemis.aspects.resources; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.http.ResponseEntity; @@ -9,12 +9,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastInstructorInExercise; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; -import de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceRoleInExercise; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastInstructorInExercise; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; +import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceRoleInExercise; @Profile(PROFILE_CORE) @RestController diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/AssessmentComplaintIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentComplaintIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/assessment/AssessmentComplaintIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentComplaintIntegrationTest.java index d30186355a9c..65869e4c8466 100644 --- a/src/test/java/de/tum/in/www1/artemis/assessment/AssessmentComplaintIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentComplaintIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.assessment; +package de.tum.cit.aet.artemis.assessment; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -16,43 +16,43 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Complaint; -import de.tum.in.www1.artemis.domain.ComplaintResponse; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.ComplaintType; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exam.ExamFactory; -import de.tum.in.www1.artemis.exercise.fileupload.FileUploadExerciseUtilService; -import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ComplaintRepository; -import de.tum.in.www1.artemis.repository.ComplaintResponseRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.service.dto.ComplaintAction; -import de.tum.in.www1.artemis.service.dto.ComplaintRequestDTO; -import de.tum.in.www1.artemis.service.dto.ComplaintResponseUpdateDTO; -import de.tum.in.www1.artemis.util.TestResourceUtils; -import de.tum.in.www1.artemis.web.rest.dto.AssessmentUpdateDTO; -import de.tum.in.www1.artemis.web.rest.dto.SubmissionWithComplaintDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Complaint; +import de.tum.cit.aet.artemis.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exam.ExamFactory; +import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.repository.ComplaintResponseRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.service.dto.ComplaintAction; +import de.tum.cit.aet.artemis.service.dto.ComplaintRequestDTO; +import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; +import de.tum.cit.aet.artemis.util.TestResourceUtils; +import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; +import de.tum.cit.aet.artemis.web.rest.dto.SubmissionWithComplaintDTO; class AssessmentComplaintIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java index 97c827890736..a35a3f9950f6 100644 --- a/src/test/java/de/tum/in/www1/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.assessment; +package de.tum.cit.aet.artemis.assessment; import static org.assertj.core.api.Assertions.assertThat; @@ -14,31 +14,31 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Complaint; -import de.tum.in.www1.artemis.domain.ComplaintResponse; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.enumeration.ComplaintType; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ComplaintRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.service.dto.ComplaintAction; -import de.tum.in.www1.artemis.service.dto.ComplaintRequestDTO; -import de.tum.in.www1.artemis.service.dto.ComplaintResponseUpdateDTO; -import de.tum.in.www1.artemis.team.TeamUtilService; -import de.tum.in.www1.artemis.util.TestResourceUtils; -import de.tum.in.www1.artemis.web.rest.dto.AssessmentUpdateDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Complaint; +import de.tum.cit.aet.artemis.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.service.dto.ComplaintAction; +import de.tum.cit.aet.artemis.service.dto.ComplaintRequestDTO; +import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; +import de.tum.cit.aet.artemis.team.TeamUtilService; +import de.tum.cit.aet.artemis.util.TestResourceUtils; +import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; class AssessmentTeamComplaintIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/ComplaintResponseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintResponseIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/assessment/ComplaintResponseIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintResponseIntegrationTest.java index dbb94ceebb6a..cad08d00e226 100644 --- a/src/test/java/de/tum/in/www1/artemis/assessment/ComplaintResponseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintResponseIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.assessment; +package de.tum.cit.aet.artemis.assessment; import static org.assertj.core.api.Assertions.assertThat; @@ -14,26 +14,26 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Complaint; -import de.tum.in.www1.artemis.domain.ComplaintResponse; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.ComplaintType; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.repository.ComplaintRepository; -import de.tum.in.www1.artemis.repository.ComplaintResponseRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.service.ParticipationService; -import de.tum.in.www1.artemis.service.dto.ComplaintAction; -import de.tum.in.www1.artemis.service.dto.ComplaintResponseUpdateDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Complaint; +import de.tum.cit.aet.artemis.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.repository.ComplaintResponseRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.service.dto.ComplaintAction; +import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; class ComplaintResponseIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/ComplaintUtilService.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintUtilService.java similarity index 89% rename from src/test/java/de/tum/in/www1/artemis/assessment/ComplaintUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintUtilService.java index fcb64ce7bfa9..8ccf8c531490 100644 --- a/src/test/java/de/tum/in/www1/artemis/assessment/ComplaintUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintUtilService.java @@ -1,22 +1,22 @@ -package de.tum.in.www1.artemis.assessment; +package de.tum.cit.aet.artemis.assessment; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Complaint; -import de.tum.in.www1.artemis.domain.ComplaintResponse; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.ComplaintType; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.repository.ComplaintRepository; -import de.tum.in.www1.artemis.repository.ComplaintResponseRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.web.rest.dto.AssessmentUpdateDTO; +import de.tum.cit.aet.artemis.domain.Complaint; +import de.tum.cit.aet.artemis.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.repository.ComplaintResponseRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; /** * Service responsible for initializing the database with specific testdata related to complaints for use in integration tests. diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/ExampleSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ExampleSubmissionIntegrationTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/assessment/ExampleSubmissionIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/assessment/ExampleSubmissionIntegrationTest.java index c275810ffb54..0cbedf31d97a 100644 --- a/src/test/java/de/tum/in/www1/artemis/assessment/ExampleSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ExampleSubmissionIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.assessment; +package de.tum.cit.aet.artemis.assessment; import static org.assertj.core.api.Assertions.assertThat; @@ -19,31 +19,31 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ExampleSubmission; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextBlock; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.TutorParticipation; -import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ExampleSubmissionRepository; -import de.tum.in.www1.artemis.repository.GradingCriterionRepository; -import de.tum.in.www1.artemis.util.TestResourceUtils; -import de.tum.in.www1.artemis.web.rest.dto.TextAssessmentDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextBlock; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; +import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.util.TestResourceUtils; +import de.tum.cit.aet.artemis.web.rest.dto.TextAssessmentDTO; class ExampleSubmissionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/ExerciseScoresChartIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java similarity index 89% rename from src/test/java/de/tum/in/www1/artemis/assessment/ExerciseScoresChartIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java index a0d7abd42939..f903909a8bb1 100644 --- a/src/test/java/de/tum/in/www1/artemis/assessment/ExerciseScoresChartIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.assessment; +package de.tum.cit.aet.artemis.assessment; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -17,19 +17,19 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.test.util.ReflectionTestUtils; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ParticipantScoreRepository; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.service.scheduled.ParticipantScoreScheduleService; -import de.tum.in.www1.artemis.team.TeamUtilService; -import de.tum.in.www1.artemis.web.rest.dto.ExerciseScoresDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; +import de.tum.cit.aet.artemis.team.TeamUtilService; +import de.tum.cit.aet.artemis.web.rest.dto.ExerciseScoresDTO; class ExerciseScoresChartIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/GradeStepIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/GradeStepIntegrationTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/assessment/GradeStepIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/assessment/GradeStepIntegrationTest.java index 17c675fa7d05..fc074d02b6f2 100644 --- a/src/test/java/de/tum/in/www1/artemis/assessment/GradeStepIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/GradeStepIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.assessment; +package de.tum.cit.aet.artemis.assessment; import static org.assertj.core.api.Assertions.assertThat; @@ -12,24 +12,24 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.GradeStep; -import de.tum.in.www1.artemis.domain.GradeType; -import de.tum.in.www1.artemis.domain.GradingScale; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.GradingScaleRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.in.www1.artemis.web.rest.dto.GradeDTO; -import de.tum.in.www1.artemis.web.rest.dto.GradeStepsDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.GradeStep; +import de.tum.cit.aet.artemis.domain.GradeType; +import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.web.rest.dto.GradeDTO; +import de.tum.cit.aet.artemis.web.rest.dto.GradeStepsDTO; class GradeStepIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/GradingScaleFactory.java b/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleFactory.java similarity index 88% rename from src/test/java/de/tum/in/www1/artemis/assessment/GradingScaleFactory.java rename to src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleFactory.java index 708949d772a7..1f484be2b20c 100644 --- a/src/test/java/de/tum/in/www1/artemis/assessment/GradingScaleFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleFactory.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.assessment; +package de.tum.cit.aet.artemis.assessment; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.GradeType; -import de.tum.in.www1.artemis.domain.GradingScale; -import de.tum.in.www1.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.GradeType; +import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.domain.exam.Exam; /** * Factory for creating GradingScales and related objects. diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/GradingScaleIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleIntegrationTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/assessment/GradingScaleIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleIntegrationTest.java index 1b0925ec16f8..39cac8f1c897 100644 --- a/src/test/java/de/tum/in/www1/artemis/assessment/GradingScaleIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.assessment; +package de.tum.cit.aet.artemis.assessment; import static org.assertj.core.api.Assertions.assertThat; @@ -12,17 +12,17 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.GradeStep; -import de.tum.in.www1.artemis.domain.GradeType; -import de.tum.in.www1.artemis.domain.GradingScale; -import de.tum.in.www1.artemis.domain.enumeration.SortingOrder; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.GradingScaleRepository; -import de.tum.in.www1.artemis.util.PageableSearchUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.GradeStep; +import de.tum.cit.aet.artemis.domain.GradeType; +import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.util.PageableSearchUtilService; class GradingScaleIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/GradingScaleUtilService.java b/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleUtilService.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/assessment/GradingScaleUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleUtilService.java index d746a1d79060..19cb86364065 100644 --- a/src/test/java/de/tum/in/www1/artemis/assessment/GradingScaleUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleUtilService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.assessment; +package de.tum.cit.aet.artemis.assessment; import static org.assertj.core.api.Assertions.fail; @@ -18,12 +18,12 @@ import com.opencsv.CSVReader; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.GradeStep; -import de.tum.in.www1.artemis.domain.GradeType; -import de.tum.in.www1.artemis.domain.GradingScale; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.GradeStep; +import de.tum.cit.aet.artemis.domain.GradeType; +import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.repository.GradingScaleRepository; /** * Service responsible for initializing the database with specific testdata related to grading for use in integration tests. diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/ParticipantScoreIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java similarity index 88% rename from src/test/java/de/tum/in/www1/artemis/assessment/ParticipantScoreIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java index 45b228aeb9a1..3dc97d50b2bb 100644 --- a/src/test/java/de/tum/in/www1/artemis/assessment/ParticipantScoreIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.assessment; +package de.tum.cit.aet.artemis.assessment; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -17,30 +17,30 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.test.util.ReflectionTestUtils; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.competency.CompetencyUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.GradingScale; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.lecture.ExerciseUnit; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.lecture.LectureUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.GradingScaleRepository; -import de.tum.in.www1.artemis.repository.LectureUnitRepository; -import de.tum.in.www1.artemis.repository.ParticipantScoreRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.service.scheduled.ParticipantScoreScheduleService; -import de.tum.in.www1.artemis.team.TeamUtilService; -import de.tum.in.www1.artemis.web.rest.dto.score.ScoreDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.competency.CompetencyUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.repository.LectureUnitRepository; +import de.tum.cit.aet.artemis.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; +import de.tum.cit.aet.artemis.team.TeamUtilService; +import de.tum.cit.aet.artemis.web.rest.dto.score.ScoreDTO; class ParticipantScoreIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/RatingResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/RatingResourceIntegrationTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/assessment/RatingResourceIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/assessment/RatingResourceIntegrationTest.java index 3f671699f6a2..dc06bbad06db 100644 --- a/src/test/java/de/tum/in/www1/artemis/assessment/RatingResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/RatingResourceIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.assessment; +package de.tum.cit.aet.artemis.assessment; import static org.assertj.core.api.Assertions.assertThat; @@ -12,18 +12,18 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Rating; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.service.RatingService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Rating; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.service.RatingService; class RatingResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/ResultServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/assessment/ResultServiceIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java index 2c8e7c82b389..57e756c1916f 100644 --- a/src/test/java/de/tum/in/www1/artemis/assessment/ResultServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.assessment; +package de.tum.cit.aet.artemis.assessment; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -25,56 +25,56 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.FileUploadSubmission; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.GradingInstruction; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.DiagramType; -import de.tum.in.www1.artemis.domain.enumeration.QuizMode; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.GradingCriterionUtil; -import de.tum.in.www1.artemis.exercise.fileupload.FileUploadExerciseFactory; -import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseFactory; -import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseFactory; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.FeedbackRepository; -import de.tum.in.www1.artemis.repository.FileUploadExerciseRepository; -import de.tum.in.www1.artemis.repository.GradingCriterionRepository; -import de.tum.in.www1.artemis.repository.ModelingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.QuizExerciseRepository; -import de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.TextExerciseRepository; -import de.tum.in.www1.artemis.web.rest.dto.ResultWithPointsPerGradingCriterionDTO; -import de.tum.in.www1.artemis.web.rest.dto.feedback.FeedbackDetailDTO; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.GradingInstruction; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; +import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseFactory; +import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; +import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.repository.FileUploadExerciseRepository; +import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.web.rest.dto.ResultWithPointsPerGradingCriterionDTO; +import de.tum.cit.aet.artemis.web.rest.dto.feedback.FeedbackDetailDTO; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; class ResultServiceIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/TutorEffortIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorEffortIntegrationTest.java similarity index 89% rename from src/test/java/de/tum/in/www1/artemis/assessment/TutorEffortIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/assessment/TutorEffortIntegrationTest.java index d4f896f2a0d9..d1849e1fc3bf 100644 --- a/src/test/java/de/tum/in/www1/artemis/assessment/TutorEffortIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorEffortIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.assessment; +package de.tum.cit.aet.artemis.assessment; import static org.assertj.core.api.Assertions.assertThat; @@ -13,17 +13,17 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.analytics.TextAssessmentEvent; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.statistics.tutor.effort.TutorEffort; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.TextAssessmentEventRepository; -import de.tum.in.www1.artemis.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.analytics.TextAssessmentEvent; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.statistics.tutor.effort.TutorEffort; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.TextAssessmentEventRepository; +import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; class TutorEffortIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java similarity index 88% rename from src/test/java/de/tum/in/www1/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java index e181359ad038..709491c25606 100644 --- a/src/test/java/de/tum/in/www1/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.assessment; +package de.tum.cit.aet.artemis.assessment; import static org.assertj.core.api.Assertions.assertThat; @@ -12,15 +12,15 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.service.TutorLeaderboardService; -import de.tum.in.www1.artemis.web.rest.dto.TutorLeaderboardDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.service.TutorLeaderboardService; +import de.tum.cit.aet.artemis.web.rest.dto.TutorLeaderboardDTO; class TutorLeaderboardServiceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/TutorParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationIntegrationTest.java similarity index 89% rename from src/test/java/de/tum/in/www1/artemis/assessment/TutorParticipationIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationIntegrationTest.java index fa5577867394..f4443947c632 100644 --- a/src/test/java/de/tum/in/www1/artemis/assessment/TutorParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.assessment; +package de.tum.cit.aet.artemis.assessment; import static org.assertj.core.api.Assertions.assertThat; @@ -16,29 +16,29 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ExampleSubmission; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextBlock; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.TutorParticipationStatus; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.participation.TutorParticipation; -import de.tum.in.www1.artemis.exercise.ExerciseFactory; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.GradingCriterionRepository; -import de.tum.in.www1.artemis.repository.GradingInstructionRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.service.ExampleSubmissionService; -import de.tum.in.www1.artemis.service.ResultService; -import de.tum.in.www1.artemis.service.SubmissionService; -import de.tum.in.www1.artemis.service.TutorParticipationService; -import de.tum.in.www1.artemis.util.TestResourceUtils; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextBlock; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; +import de.tum.cit.aet.artemis.exercise.ExerciseFactory; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.repository.GradingInstructionRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.service.ExampleSubmissionService; +import de.tum.cit.aet.artemis.service.ResultService; +import de.tum.cit.aet.artemis.service.SubmissionService; +import de.tum.cit.aet.artemis.service.TutorParticipationService; +import de.tum.cit.aet.artemis.util.TestResourceUtils; class TutorParticipationIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/TutorParticipationResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationResourceIntegrationTest.java similarity index 87% rename from src/test/java/de/tum/in/www1/artemis/assessment/TutorParticipationResourceIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationResourceIntegrationTest.java index 642b6eebddda..f43e4c8e5405 100644 --- a/src/test/java/de/tum/in/www1/artemis/assessment/TutorParticipationResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationResourceIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.assessment; +package de.tum.cit.aet.artemis.assessment; import static org.assertj.core.api.Assertions.assertThat; @@ -10,15 +10,15 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ExampleSubmission; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.participation.TutorParticipation; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ExampleSubmissionRepository; -import de.tum.in.www1.artemis.repository.TutorParticipationRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.repository.TutorParticipationRepository; class TutorParticipationResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/authentication/AuthenticationIntegrationTestHelper.java b/src/test/java/de/tum/cit/aet/artemis/authentication/AuthenticationIntegrationTestHelper.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/authentication/AuthenticationIntegrationTestHelper.java rename to src/test/java/de/tum/cit/aet/artemis/authentication/AuthenticationIntegrationTestHelper.java index 02b6dbf02559..3e5494420047 100644 --- a/src/test/java/de/tum/in/www1/artemis/authentication/AuthenticationIntegrationTestHelper.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/AuthenticationIntegrationTestHelper.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.authentication; +package de.tum.cit.aet.artemis.authentication; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/de/tum/in/www1/artemis/authentication/InternalAuthenticationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/InternalAuthenticationIntegrationTest.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/authentication/InternalAuthenticationIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/authentication/InternalAuthenticationIntegrationTest.java index 2b4e904104a4..95cf5f15fd0e 100644 --- a/src/test/java/de/tum/in/www1/artemis/authentication/InternalAuthenticationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/InternalAuthenticationIntegrationTest.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.authentication; +package de.tum.cit.aet.artemis.authentication; -import static de.tum.in.www1.artemis.domain.Authority.EDITOR_AUTHORITY; -import static de.tum.in.www1.artemis.domain.Authority.INSTRUCTOR_AUTHORITY; -import static de.tum.in.www1.artemis.domain.Authority.TA_AUTHORITY; -import static de.tum.in.www1.artemis.domain.Authority.USER_AUTHORITY; -import static de.tum.in.www1.artemis.user.UserFactory.USER_PASSWORD; +import static de.tum.cit.aet.artemis.domain.Authority.EDITOR_AUTHORITY; +import static de.tum.cit.aet.artemis.domain.Authority.INSTRUCTOR_AUTHORITY; +import static de.tum.cit.aet.artemis.domain.Authority.TA_AUTHORITY; +import static de.tum.cit.aet.artemis.domain.Authority.USER_AUTHORITY; +import static de.tum.cit.aet.artemis.user.UserFactory.USER_PASSWORD; import static org.assertj.core.api.Assertions.assertThat; import java.time.ZonedDateTime; @@ -26,22 +26,22 @@ import org.springframework.security.test.context.support.WithAnonymousUser; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.connector.GitlabRequestMockProvider; -import de.tum.in.www1.artemis.course.CourseFactory; -import de.tum.in.www1.artemis.domain.Authority; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.repository.AuthorityRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.user.PasswordService; -import de.tum.in.www1.artemis.tutorialgroups.TutorialGroupUtilService; -import de.tum.in.www1.artemis.web.rest.vm.LoginVM; -import de.tum.in.www1.artemis.web.rest.vm.ManagedUserVM; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.connector.GitlabRequestMockProvider; +import de.tum.cit.aet.artemis.course.CourseFactory; +import de.tum.cit.aet.artemis.domain.Authority; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.repository.AuthorityRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.user.PasswordService; +import de.tum.cit.aet.artemis.tutorialgroups.TutorialGroupUtilService; +import de.tum.cit.aet.artemis.web.rest.vm.LoginVM; +import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; class InternalAuthenticationIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/authentication/LdapAuthenticationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java similarity index 88% rename from src/test/java/de/tum/in/www1/artemis/authentication/LdapAuthenticationIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java index 67013c511f53..8d1e4bdd987e 100644 --- a/src/test/java/de/tum/in/www1/artemis/authentication/LdapAuthenticationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.authentication; +package de.tum.cit.aet.artemis.authentication; -import static de.tum.in.www1.artemis.user.UserFactory.USER_PASSWORD; +import static de.tum.cit.aet.artemis.user.UserFactory.USER_PASSWORD; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doReturn; @@ -20,20 +20,20 @@ import org.springframework.security.test.context.support.WithAnonymousUser; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Authority; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.repository.AuthorityRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.service.dto.StudentDTO; -import de.tum.in.www1.artemis.service.ldap.LdapUserDto; -import de.tum.in.www1.artemis.web.rest.vm.LoginVM; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Authority; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.repository.AuthorityRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.service.dto.StudentDTO; +import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; +import de.tum.cit.aet.artemis.web.rest.vm.LoginVM; class LdapAuthenticationIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/authentication/UserAccountLocalVcsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/UserAccountLocalVcsIntegrationTest.java similarity index 89% rename from src/test/java/de/tum/in/www1/artemis/authentication/UserAccountLocalVcsIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/authentication/UserAccountLocalVcsIntegrationTest.java index 29630b917676..9260ca546072 100644 --- a/src/test/java/de/tum/in/www1/artemis/authentication/UserAccountLocalVcsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/UserAccountLocalVcsIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.authentication; +package de.tum.cit.aet.artemis.authentication; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -6,8 +6,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.user.UserTestService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.user.UserTestService; class UserAccountLocalVcsIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/authentication/UserJenkinsGitlabIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/UserJenkinsGitlabIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/authentication/UserJenkinsGitlabIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/authentication/UserJenkinsGitlabIntegrationTest.java index 2115f713b389..955c43f7d013 100644 --- a/src/test/java/de/tum/in/www1/artemis/authentication/UserJenkinsGitlabIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/UserJenkinsGitlabIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.authentication; +package de.tum.cit.aet.artemis.authentication; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.anyLong; @@ -17,19 +17,19 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.test.util.ReflectionTestUtils; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.connectors.gitlab.GitLabPersonalAccessTokenManagementService; -import de.tum.in.www1.artemis.service.connectors.gitlab.GitLabUserManagementService; -import de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsUserManagementService; -import de.tum.in.www1.artemis.service.user.PasswordService; -import de.tum.in.www1.artemis.user.UserFactory; -import de.tum.in.www1.artemis.user.UserTestService; -import de.tum.in.www1.artemis.web.rest.vm.ManagedUserVM; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabPersonalAccessTokenManagementService; +import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabUserManagementService; +import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsUserManagementService; +import de.tum.cit.aet.artemis.service.user.PasswordService; +import de.tum.cit.aet.artemis.user.UserFactory; +import de.tum.cit.aet.artemis.user.UserTestService; +import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; class UserJenkinsGitlabIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/authentication/UserSaml2IntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/UserSaml2IntegrationTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/authentication/UserSaml2IntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/authentication/UserSaml2IntegrationTest.java index 6da84d2ff160..2a0cfe939a22 100644 --- a/src/test/java/de/tum/in/www1/artemis/authentication/UserSaml2IntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/UserSaml2IntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.authentication; +package de.tum.cit.aet.artemis.authentication; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; @@ -19,12 +19,12 @@ import org.springframework.security.saml2.provider.service.authentication.Saml2Authentication; import org.springframework.security.test.context.TestSecurityContextHolder; -import de.tum.in.www1.artemis.AbstractSpringIntegrationGitlabCIGitlabSamlTest; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.service.connectors.SAML2Service; -import de.tum.in.www1.artemis.service.user.PasswordService; -import de.tum.in.www1.artemis.web.rest.open.PublicUserJwtResource; -import de.tum.in.www1.artemis.web.rest.vm.LoginVM; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationGitlabCIGitlabSamlTest; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.service.connectors.SAML2Service; +import de.tum.cit.aet.artemis.service.user.PasswordService; +import de.tum.cit.aet.artemis.web.rest.open.PublicUserJwtResource; +import de.tum.cit.aet.artemis.web.rest.vm.LoginVM; /** * Tests for {@link PublicUserJwtResource} and {@link SAML2Service}. diff --git a/src/test/java/de/tum/in/www1/artemis/authorization/AuthorizationArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationArchitectureTest.java similarity index 86% rename from src/test/java/de/tum/in/www1/artemis/authorization/AuthorizationArchitectureTest.java rename to src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationArchitectureTest.java index 2de0d76455a4..f09d65c6ca5f 100644 --- a/src/test/java/de/tum/in/www1/artemis/authorization/AuthorizationArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationArchitectureTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.authorization; +package de.tum.cit.aet.artemis.authorization; import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.methods; import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses; @@ -10,18 +10,18 @@ import com.tngtech.archunit.lang.ArchRule; -import de.tum.in.www1.artemis.architecture.AbstractArchitectureTest; -import de.tum.in.www1.artemis.security.annotations.EnforceAdmin; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.security.annotations.EnforceNothing; -import de.tum.in.www1.artemis.security.annotations.ManualConfig; +import de.tum.cit.aet.artemis.architecture.AbstractArchitectureTest; +import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.security.annotations.ManualConfig; class AuthorizationArchitectureTest extends AbstractArchitectureTest { - private static final String ARTEMIS_PACKAGE = "de.tum.in.www1.artemis"; + private static final String ARTEMIS_PACKAGE = "de.tum.cit.aet.artemis"; private static final String REST_BASE_PACKAGE = ARTEMIS_PACKAGE + ".web.rest"; diff --git a/src/test/java/de/tum/in/www1/artemis/authorization/AuthorizationGeneralAndIndependentEndpointTest.java b/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationGeneralAndIndependentEndpointTest.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/authorization/AuthorizationGeneralAndIndependentEndpointTest.java rename to src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationGeneralAndIndependentEndpointTest.java index b80905c4d2ae..d71f695bc6e0 100644 --- a/src/test/java/de/tum/in/www1/artemis/authorization/AuthorizationGeneralAndIndependentEndpointTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationGeneralAndIndependentEndpointTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.authorization; +package de.tum.cit.aet.artemis.authorization; import java.util.Map; import java.util.stream.Collectors; @@ -10,7 +10,7 @@ import org.springframework.web.servlet.mvc.method.RequestMappingInfo; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; /** * Contains the one automatic test covering all rest endpoints for authorization tests. diff --git a/src/test/java/de/tum/in/www1/artemis/authorization/AuthorizationGitlabCISamlEndpointTest.java b/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationGitlabCISamlEndpointTest.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/authorization/AuthorizationGitlabCISamlEndpointTest.java rename to src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationGitlabCISamlEndpointTest.java index 6fe6e39d33fa..5571f39b6438 100644 --- a/src/test/java/de/tum/in/www1/artemis/authorization/AuthorizationGitlabCISamlEndpointTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationGitlabCISamlEndpointTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.authorization; +package de.tum.cit.aet.artemis.authorization; import java.lang.reflect.InvocationTargetException; @@ -7,7 +7,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; -import de.tum.in.www1.artemis.AbstractSpringIntegrationGitlabCIGitlabSamlTest; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationGitlabCIGitlabSamlTest; /** * Contains the one automatic test covering all rest endpoints for authorization tests. diff --git a/src/test/java/de/tum/in/www1/artemis/authorization/AuthorizationJenkinsGitlabEndpointTest.java b/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationJenkinsGitlabEndpointTest.java similarity index 89% rename from src/test/java/de/tum/in/www1/artemis/authorization/AuthorizationJenkinsGitlabEndpointTest.java rename to src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationJenkinsGitlabEndpointTest.java index e46106910264..167d24d1832f 100644 --- a/src/test/java/de/tum/in/www1/artemis/authorization/AuthorizationJenkinsGitlabEndpointTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationJenkinsGitlabEndpointTest.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.authorization; +package de.tum.cit.aet.artemis.authorization; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; /** * Contains the one automatic test covering all rest endpoints for authorization tests. diff --git a/src/test/java/de/tum/in/www1/artemis/authorization/AuthorizationLocalCILocalVCEndpointTest.java b/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationLocalCILocalVCEndpointTest.java similarity index 89% rename from src/test/java/de/tum/in/www1/artemis/authorization/AuthorizationLocalCILocalVCEndpointTest.java rename to src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationLocalCILocalVCEndpointTest.java index af769674c1ff..4493e44b2e62 100644 --- a/src/test/java/de/tum/in/www1/artemis/authorization/AuthorizationLocalCILocalVCEndpointTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationLocalCILocalVCEndpointTest.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.authorization; +package de.tum.cit.aet.artemis.authorization; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; /** * Contains the one automatic test covering all rest endpoints for authorization tests. diff --git a/src/test/java/de/tum/in/www1/artemis/authorization/AuthorizationTestService.java b/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationTestService.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/authorization/AuthorizationTestService.java rename to src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationTestService.java index 31bdd5d13c27..d3decec5e3b7 100644 --- a/src/test/java/de/tum/in/www1/artemis/authorization/AuthorizationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationTestService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.authorization; +package de.tum.cit.aet.artemis.authorization; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; import static org.assertj.core.api.Fail.fail; import java.lang.annotation.Annotation; @@ -20,13 +20,13 @@ import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.mvc.method.RequestMappingInfo; -import de.tum.in.www1.artemis.security.annotations.EnforceAdmin; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.in.www1.artemis.security.annotations.EnforceNothing; -import de.tum.in.www1.artemis.security.annotations.ManualConfig; +import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.security.annotations.ManualConfig; /** * This service is used to check if the authorization annotations are used correctly. @@ -94,7 +94,7 @@ private void testEndpoints(Map endpointMap) { * @return true if the endpoint should be tested, false otherwise */ public boolean validEndpointToTest(HandlerMethod method, boolean onlyConditional) { - return method.getBeanType().getPackage().getName().startsWith("de.tum.in.www1.artemis") && method.getMethod().getAnnotation(ManualConfig.class) == null + return method.getBeanType().getPackage().getName().startsWith("de.tum.cit.aet.artemis") && method.getMethod().getAnnotation(ManualConfig.class) == null && (!onlyConditional || isConditionalEndpoint(method)); } diff --git a/src/test/java/de/tum/in/www1/artemis/bonus/BonusFactory.java b/src/test/java/de/tum/cit/aet/artemis/bonus/BonusFactory.java similarity index 87% rename from src/test/java/de/tum/in/www1/artemis/bonus/BonusFactory.java rename to src/test/java/de/tum/cit/aet/artemis/bonus/BonusFactory.java index aca647fe560e..2262523c7b90 100644 --- a/src/test/java/de/tum/in/www1/artemis/bonus/BonusFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/bonus/BonusFactory.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.bonus; +package de.tum.cit.aet.artemis.bonus; -import de.tum.in.www1.artemis.domain.Bonus; -import de.tum.in.www1.artemis.domain.BonusStrategy; -import de.tum.in.www1.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.domain.Bonus; +import de.tum.cit.aet.artemis.domain.BonusStrategy; +import de.tum.cit.aet.artemis.domain.GradingScale; /** * Factory for creating Bonuses and related objects. diff --git a/src/test/java/de/tum/in/www1/artemis/bonus/BonusIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/bonus/BonusIntegrationTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/bonus/BonusIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/bonus/BonusIntegrationTest.java index 1cb2af6811c1..e2ce03a9985a 100644 --- a/src/test/java/de/tum/in/www1/artemis/bonus/BonusIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/bonus/BonusIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.bonus; +package de.tum.cit.aet.artemis.bonus; import static org.assertj.core.api.Assertions.assertThat; @@ -16,24 +16,24 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.assessment.GradingScaleFactory; -import de.tum.in.www1.artemis.assessment.GradingScaleUtilService; -import de.tum.in.www1.artemis.domain.Bonus; -import de.tum.in.www1.artemis.domain.BonusStrategy; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.GradeStep; -import de.tum.in.www1.artemis.domain.GradeType; -import de.tum.in.www1.artemis.domain.GradingScale; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.repository.BonusRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.GradingScaleRepository; -import de.tum.in.www1.artemis.web.rest.dto.BonusExampleDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.GradingScaleFactory; +import de.tum.cit.aet.artemis.assessment.GradingScaleUtilService; +import de.tum.cit.aet.artemis.domain.Bonus; +import de.tum.cit.aet.artemis.domain.BonusStrategy; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.GradeStep; +import de.tum.cit.aet.artemis.domain.GradeType; +import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.repository.BonusRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; class BonusIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/competency/AbstractCompetencyPrerequisiteIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/AbstractCompetencyPrerequisiteIntegrationTest.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/competency/AbstractCompetencyPrerequisiteIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/competency/AbstractCompetencyPrerequisiteIntegrationTest.java index b281126a34cd..a49a309dcf0e 100644 --- a/src/test/java/de/tum/in/www1/artemis/competency/AbstractCompetencyPrerequisiteIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/AbstractCompetencyPrerequisiteIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.competency; +package de.tum.cit.aet.artemis.competency; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.eq; @@ -16,35 +16,35 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.CompetencyRelation; -import de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; -import de.tum.in.www1.artemis.domain.competency.Prerequisite; -import de.tum.in.www1.artemis.domain.competency.RelationType; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; -import de.tum.in.www1.artemis.domain.lecture.ExerciseUnit; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.domain.lecture.TextUnit; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.lecture.LectureUtilService; -import de.tum.in.www1.artemis.repository.AttachmentUnitRepository; -import de.tum.in.www1.artemis.repository.CompetencyRelationRepository; -import de.tum.in.www1.artemis.repository.CourseCompetencyRepository; -import de.tum.in.www1.artemis.repository.ExerciseUnitRepository; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.LectureUnitRepository; -import de.tum.in.www1.artemis.repository.PrerequisiteRepository; -import de.tum.in.www1.artemis.repository.TextUnitRepository; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.competency.CompetencyRelation; +import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.domain.competency.Prerequisite; +import de.tum.cit.aet.artemis.domain.competency.RelationType; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.domain.lecture.TextUnit; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.repository.AttachmentUnitRepository; +import de.tum.cit.aet.artemis.repository.CompetencyRelationRepository; +import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.repository.ExerciseUnitRepository; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.LectureUnitRepository; +import de.tum.cit.aet.artemis.repository.PrerequisiteRepository; +import de.tum.cit.aet.artemis.repository.TextUnitRepository; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; abstract class AbstractCompetencyPrerequisiteIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/competency/CompetencyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyIntegrationTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/competency/CompetencyIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/competency/CompetencyIntegrationTest.java index c3dbd62af775..a2d904b32566 100644 --- a/src/test/java/de/tum/in/www1/artemis/competency/CompetencyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.competency; +package de.tum.cit.aet.artemis.competency; import java.util.Collections; import java.util.List; @@ -13,11 +13,11 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.domain.competency.Competency; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; +import de.tum.cit.aet.artemis.domain.competency.Competency; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; class CompetencyIntegrationTest extends AbstractCompetencyPrerequisiteIntegrationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/competency/CompetencyJolIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyJolIntegrationTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/competency/CompetencyJolIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/competency/CompetencyJolIntegrationTest.java index 87379e4dfc31..a80b749b3748 100644 --- a/src/test/java/de/tum/in/www1/artemis/competency/CompetencyJolIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyJolIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.competency; +package de.tum.cit.aet.artemis.competency; import static org.assertj.core.api.Assertions.assertThat; @@ -13,12 +13,12 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.Competency; -import de.tum.in.www1.artemis.domain.competency.CompetencyProgress; -import de.tum.in.www1.artemis.repository.competency.CompetencyJolRepository; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyJolPairDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.competency.Competency; +import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; +import de.tum.cit.aet.artemis.repository.competency.CompetencyJolRepository; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolPairDTO; class CompetencyJolIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/competency/CompetencyProgressUtilService.java b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyProgressUtilService.java similarity index 82% rename from src/test/java/de/tum/in/www1/artemis/competency/CompetencyProgressUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/competency/CompetencyProgressUtilService.java index db7dbfc1122c..db9d461400c1 100644 --- a/src/test/java/de/tum/in/www1/artemis/competency/CompetencyProgressUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyProgressUtilService.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.competency; +package de.tum.cit.aet.artemis.competency; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.CompetencyProgress; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; -import de.tum.in.www1.artemis.repository.CompetencyProgressRepository; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.repository.CompetencyProgressRepository; /** * Service responsible for initializing the database with specific testdata related to competency progress for use in integration tests. diff --git a/src/test/java/de/tum/in/www1/artemis/competency/CompetencyUtilService.java b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyUtilService.java similarity index 89% rename from src/test/java/de/tum/in/www1/artemis/competency/CompetencyUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/competency/CompetencyUtilService.java index 8957aad934e3..6157c3478be9 100644 --- a/src/test/java/de/tum/in/www1/artemis/competency/CompetencyUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyUtilService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.competency; +package de.tum.cit.aet.artemis.competency; import java.time.ZonedDateTime; @@ -7,20 +7,20 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.Competency; -import de.tum.in.www1.artemis.domain.competency.CompetencyJol; -import de.tum.in.www1.artemis.domain.competency.CompetencyRelation; -import de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy; -import de.tum.in.www1.artemis.domain.competency.RelationType; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.repository.CompetencyRelationRepository; -import de.tum.in.www1.artemis.repository.CompetencyRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.LectureUnitRepository; -import de.tum.in.www1.artemis.repository.competency.CompetencyJolRepository; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.competency.Competency; +import de.tum.cit.aet.artemis.domain.competency.CompetencyJol; +import de.tum.cit.aet.artemis.domain.competency.CompetencyRelation; +import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.domain.competency.RelationType; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.repository.CompetencyRelationRepository; +import de.tum.cit.aet.artemis.repository.CompetencyRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.LectureUnitRepository; +import de.tum.cit.aet.artemis.repository.competency.CompetencyJolRepository; /** * Service responsible for initializing the database with specific test data related to competencies for use in integration tests. diff --git a/src/test/java/de/tum/in/www1/artemis/competency/CourseCompetencyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/CourseCompetencyIntegrationTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/competency/CourseCompetencyIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/competency/CourseCompetencyIntegrationTest.java index c27554e2f096..8c4cdbbbdce1 100644 --- a/src/test/java/de/tum/in/www1/artemis/competency/CourseCompetencyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/CourseCompetencyIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.competency; +package de.tum.cit.aet.artemis.competency; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.within; @@ -19,59 +19,59 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.StudentScoreUtilService; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.Competency; -import de.tum.in.www1.artemis.domain.competency.CompetencyProgress; -import de.tum.in.www1.artemis.domain.competency.CompetencyRelation; -import de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; -import de.tum.in.www1.artemis.domain.competency.Prerequisite; -import de.tum.in.www1.artemis.domain.competency.RelationType; -import de.tum.in.www1.artemis.domain.enumeration.DifficultyLevel; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; -import de.tum.in.www1.artemis.domain.lecture.ExerciseUnit; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.domain.lecture.TextUnit; -import de.tum.in.www1.artemis.domain.participation.Participant; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.lecture.LectureUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.AttachmentUnitRepository; -import de.tum.in.www1.artemis.repository.CompetencyRelationRepository; -import de.tum.in.www1.artemis.repository.CompetencyRepository; -import de.tum.in.www1.artemis.repository.CourseCompetencyRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.ExerciseUnitRepository; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.PrerequisiteRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.TextUnitRepository; -import de.tum.in.www1.artemis.service.LectureUnitService; -import de.tum.in.www1.artemis.service.ParticipationService; -import de.tum.in.www1.artemis.team.TeamUtilService; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.util.PageableSearchUtilService; -import de.tum.in.www1.artemis.web.rest.dto.CourseCompetencyProgressDTO; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyRelationDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.StudentScoreUtilService; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.competency.Competency; +import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; +import de.tum.cit.aet.artemis.domain.competency.CompetencyRelation; +import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.domain.competency.Prerequisite; +import de.tum.cit.aet.artemis.domain.competency.RelationType; +import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.domain.lecture.TextUnit; +import de.tum.cit.aet.artemis.domain.participation.Participant; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.AttachmentUnitRepository; +import de.tum.cit.aet.artemis.repository.CompetencyRelationRepository; +import de.tum.cit.aet.artemis.repository.CompetencyRepository; +import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.ExerciseUnitRepository; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.PrerequisiteRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.TextUnitRepository; +import de.tum.cit.aet.artemis.service.LectureUnitService; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.team.TeamUtilService; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.util.PageableSearchUtilService; +import de.tum.cit.aet.artemis.web.rest.dto.CourseCompetencyProgressDTO; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyRelationDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; class CourseCompetencyIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/competency/LearningPathIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/competency/LearningPathIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java index a047380acc0e..941953aed1e5 100644 --- a/src/test/java/de/tum/in/www1/artemis/competency/LearningPathIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.competency; +package de.tum.cit.aet.artemis.competency; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.eq; @@ -23,43 +23,43 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.StudentScoreUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.LearningObject; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.Competency; -import de.tum.in.www1.artemis.domain.competency.CompetencyRelation; -import de.tum.in.www1.artemis.domain.competency.LearningPath; -import de.tum.in.www1.artemis.domain.competency.RelationType; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.domain.lecture.TextUnit; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.lecture.LectureUtilService; -import de.tum.in.www1.artemis.repository.CompetencyProgressRepository; -import de.tum.in.www1.artemis.repository.CompetencyRelationRepository; -import de.tum.in.www1.artemis.repository.GradingCriterionRepository; -import de.tum.in.www1.artemis.repository.LearningPathRepository; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.LectureUnitRepository; -import de.tum.in.www1.artemis.service.LectureUnitService; -import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; -import de.tum.in.www1.artemis.util.PageableSearchUtilService; -import de.tum.in.www1.artemis.web.rest.LearningPathResource; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyGraphNodeDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyNameDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathCompetencyGraphDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathHealthDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathInformationDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathNavigationDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathNavigationObjectDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathNavigationOverviewDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.NgxLearningPathDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.StudentScoreUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.LearningObject; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.competency.Competency; +import de.tum.cit.aet.artemis.domain.competency.CompetencyRelation; +import de.tum.cit.aet.artemis.domain.competency.LearningPath; +import de.tum.cit.aet.artemis.domain.competency.RelationType; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.domain.lecture.TextUnit; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.repository.CompetencyProgressRepository; +import de.tum.cit.aet.artemis.repository.CompetencyRelationRepository; +import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.repository.LearningPathRepository; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.LectureUnitRepository; +import de.tum.cit.aet.artemis.service.LectureUnitService; +import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.util.PageableSearchUtilService; +import de.tum.cit.aet.artemis.web.rest.LearningPathResource; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyGraphNodeDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyNameDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathCompetencyGraphDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathHealthDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathInformationDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationObjectDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationOverviewDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.NgxLearningPathDTO; class LearningPathIntegrationTest extends AbstractSpringIntegrationIndependentTest { @@ -421,7 +421,7 @@ void testUpdateLearningPathProgress() throws Exception { * This only tests if the end point successfully retrieves the health status. The correctness of the health status is tested in LearningPathServiceTest. * * @throws Exception the request failed - * @see de.tum.in.www1.artemis.service.LearningPathServiceTest + * @see de.tum.cit.aet.artemis.service.LearningPathServiceTest */ @Test @WithMockUser(username = INSTRUCTOR_OF_COURSE, roles = "INSTRUCTOR") @@ -510,7 +510,7 @@ void testGetLearningPathNgxForOtherStudent(LearningPathResource.NgxRequestType t * This only tests if the end point successfully retrieves the graph representation. The correctness of the response is tested in LearningPathServiceTest. * * @throws Exception the request failed - * @see de.tum.in.www1.artemis.service.LearningPathServiceTest + * @see de.tum.cit.aet.artemis.service.LearningPathServiceTest */ @ParameterizedTest(name = "{displayName} [{index}] {argumentsWithNames}") @EnumSource(LearningPathResource.NgxRequestType.class) @@ -526,7 +526,7 @@ void testGetLearningPathNgxAsStudent(LearningPathResource.NgxRequestType type) t * This only tests if the end point successfully retrieves the graph representation. The correctness of the response is tested in LearningPathServiceTest. * * @throws Exception the request failed - * @see de.tum.in.www1.artemis.service.LearningPathServiceTest + * @see de.tum.cit.aet.artemis.service.LearningPathServiceTest */ @ParameterizedTest(name = "{displayName} [{index}] {argumentsWithNames}") @EnumSource(LearningPathResource.NgxRequestType.class) @@ -542,7 +542,7 @@ void testGetLearningPathNgxAsTutor(LearningPathResource.NgxRequestType type) thr * This only tests if the end point successfully retrieves the graph representation. The correctness of the response is tested in LearningPathServiceTest. * * @throws Exception the request failed - * @see de.tum.in.www1.artemis.service.LearningPathServiceTest + * @see de.tum.cit.aet.artemis.service.LearningPathServiceTest */ @ParameterizedTest(name = "{displayName} [{index}] {argumentsWithNames}") @EnumSource(LearningPathResource.NgxRequestType.class) @@ -558,7 +558,7 @@ void testGetLearningPathNgxAsEditor(LearningPathResource.NgxRequestType type) th * This only tests if the end point successfully retrieves the graph representation. The correctness of the response is tested in LearningPathServiceTest. * * @throws Exception the request failed - * @see de.tum.in.www1.artemis.service.LearningPathServiceTest + * @see de.tum.cit.aet.artemis.service.LearningPathServiceTest */ @ParameterizedTest(name = "{displayName} [{index}] {argumentsWithNames}") @EnumSource(LearningPathResource.NgxRequestType.class) diff --git a/src/test/java/de/tum/in/www1/artemis/competency/LearningPathUtilService.java b/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathUtilService.java similarity index 85% rename from src/test/java/de/tum/in/www1/artemis/competency/LearningPathUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/competency/LearningPathUtilService.java index b719bf326bee..2ecb5c58fb6a 100644 --- a/src/test/java/de/tum/in/www1/artemis/competency/LearningPathUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathUtilService.java @@ -1,19 +1,19 @@ -package de.tum.in.www1.artemis.competency; +package de.tum.cit.aet.artemis.competency; import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; -import de.tum.in.www1.artemis.domain.competency.LearningPath; -import de.tum.in.www1.artemis.repository.CompetencyRepository; -import de.tum.in.www1.artemis.repository.CourseCompetencyRepository; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.LearningPathRepository; -import de.tum.in.www1.artemis.service.learningpath.LearningPathService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.domain.competency.LearningPath; +import de.tum.cit.aet.artemis.repository.CompetencyRepository; +import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.LearningPathRepository; +import de.tum.cit.aet.artemis.service.learningpath.LearningPathService; /** * Service responsible for initializing the database with specific testdata related to learning paths for use in integration tests. diff --git a/src/test/java/de/tum/in/www1/artemis/competency/PrerequisiteIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteIntegrationTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/competency/PrerequisiteIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteIntegrationTest.java index 6d840cac8d54..e71131f14795 100644 --- a/src/test/java/de/tum/in/www1/artemis/competency/PrerequisiteIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.competency; +package de.tum.cit.aet.artemis.competency; import java.util.Collections; import java.util.List; @@ -13,11 +13,11 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; -import de.tum.in.www1.artemis.domain.competency.Prerequisite; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.domain.competency.Prerequisite; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; class PrerequisiteIntegrationTest extends AbstractCompetencyPrerequisiteIntegrationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/competency/PrerequisiteUtilService.java b/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteUtilService.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/competency/PrerequisiteUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteUtilService.java index 6deb83311d4b..6c0692280afe 100644 --- a/src/test/java/de/tum/in/www1/artemis/competency/PrerequisiteUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteUtilService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.competency; +package de.tum.cit.aet.artemis.competency; import java.util.ArrayList; import java.util.List; @@ -6,9 +6,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.competency.Prerequisite; -import de.tum.in.www1.artemis.repository.PrerequisiteRepository; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.competency.Prerequisite; +import de.tum.cit.aet.artemis.repository.PrerequisiteRepository; /** * Service responsible for initializing the database with specific test data related to prerequisites for use in integration tests. diff --git a/src/test/java/de/tum/in/www1/artemis/competency/StandardizedCompetencyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/competency/StandardizedCompetencyIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyIntegrationTest.java index 2ebf7d93c157..abc73f4d0a1b 100644 --- a/src/test/java/de/tum/in/www1/artemis/competency/StandardizedCompetencyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.competency; +package de.tum.cit.aet.artemis.competency; -import static de.tum.in.www1.artemis.domain.competency.StandardizedCompetency.FIRST_VERSION; +import static de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency.FIRST_VERSION; import static org.assertj.core.api.Assertions.assertThat; import java.util.List; @@ -17,22 +17,22 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.competency.Competency; -import de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy; -import de.tum.in.www1.artemis.domain.competency.KnowledgeArea; -import de.tum.in.www1.artemis.domain.competency.Source; -import de.tum.in.www1.artemis.domain.competency.StandardizedCompetency; -import de.tum.in.www1.artemis.repository.CompetencyRepository; -import de.tum.in.www1.artemis.repository.SourceRepository; -import de.tum.in.www1.artemis.repository.competency.KnowledgeAreaRepository; -import de.tum.in.www1.artemis.repository.competency.StandardizedCompetencyRepository; -import de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaRequestDTO; -import de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaResultDTO; -import de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.SourceDTO; -import de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO; -import de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyRequestDTO; -import de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyResultDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.competency.Competency; +import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.domain.competency.KnowledgeArea; +import de.tum.cit.aet.artemis.domain.competency.Source; +import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; +import de.tum.cit.aet.artemis.repository.CompetencyRepository; +import de.tum.cit.aet.artemis.repository.SourceRepository; +import de.tum.cit.aet.artemis.repository.competency.KnowledgeAreaRepository; +import de.tum.cit.aet.artemis.repository.competency.StandardizedCompetencyRepository; +import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaRequestDTO; +import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaResultDTO; +import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.SourceDTO; +import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO; +import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyRequestDTO; +import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyResultDTO; class StandardizedCompetencyIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/competency/StandardizedCompetencyUtilService.java b/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyUtilService.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/competency/StandardizedCompetencyUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyUtilService.java index d8d3b55955a5..cabd529aa78f 100644 --- a/src/test/java/de/tum/in/www1/artemis/competency/StandardizedCompetencyUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyUtilService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.competency; +package de.tum.cit.aet.artemis.competency; import java.util.ArrayList; import java.util.stream.Stream; @@ -9,14 +9,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy; -import de.tum.in.www1.artemis.domain.competency.KnowledgeArea; -import de.tum.in.www1.artemis.domain.competency.Source; -import de.tum.in.www1.artemis.domain.competency.StandardizedCompetency; -import de.tum.in.www1.artemis.repository.competency.KnowledgeAreaRepository; -import de.tum.in.www1.artemis.repository.competency.StandardizedCompetencyRepository; -import de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaRequestDTO; -import de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyRequestDTO; +import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.domain.competency.KnowledgeArea; +import de.tum.cit.aet.artemis.domain.competency.Source; +import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; +import de.tum.cit.aet.artemis.repository.competency.KnowledgeAreaRepository; +import de.tum.cit.aet.artemis.repository.competency.StandardizedCompetencyRepository; +import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaRequestDTO; +import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyRequestDTO; @Service public class StandardizedCompetencyUtilService { diff --git a/src/test/java/de/tum/in/www1/artemis/config/HibernatePropertiesConfig.java b/src/test/java/de/tum/cit/aet/artemis/config/HibernatePropertiesConfig.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/config/HibernatePropertiesConfig.java rename to src/test/java/de/tum/cit/aet/artemis/config/HibernatePropertiesConfig.java index 74eda8afd6c2..b05ebfd4a013 100644 --- a/src/test/java/de/tum/in/www1/artemis/config/HibernatePropertiesConfig.java +++ b/src/test/java/de/tum/cit/aet/artemis/config/HibernatePropertiesConfig.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; import org.hibernate.cfg.AvailableSettings; import org.hibernate.resource.jdbc.spi.StatementInspector; diff --git a/src/test/java/de/tum/in/www1/artemis/config/MetricsBeanTest.java b/src/test/java/de/tum/cit/aet/artemis/config/MetricsBeanTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/config/MetricsBeanTest.java rename to src/test/java/de/tum/cit/aet/artemis/config/MetricsBeanTest.java index 3610c6fdc57a..8a5e2398ed5d 100644 --- a/src/test/java/de/tum/in/www1/artemis/config/MetricsBeanTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/config/MetricsBeanTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; import static org.assertj.core.api.Assertions.assertThat; @@ -12,28 +12,28 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseType; -import de.tum.in.www1.artemis.domain.enumeration.QuizMode; -import de.tum.in.www1.artemis.domain.exam.ExamUser; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseFactory; -import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExamUserRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; +import de.tum.cit.aet.artemis.domain.exam.ExamUser; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; +import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExamUserRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.user.UserUtilService; import io.micrometer.core.instrument.MeterRegistry; class MetricsBeanTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/config/ProgrammingLanguageConfigurationTest.java b/src/test/java/de/tum/cit/aet/artemis/config/ProgrammingLanguageConfigurationTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/config/ProgrammingLanguageConfigurationTest.java rename to src/test/java/de/tum/cit/aet/artemis/config/ProgrammingLanguageConfigurationTest.java index fad0f96c8b74..610cfe5d1c5d 100644 --- a/src/test/java/de/tum/in/www1/artemis/config/ProgrammingLanguageConfigurationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/config/ProgrammingLanguageConfigurationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; @@ -13,8 +13,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; class ProgrammingLanguageConfigurationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/config/TheiaConfigurationTest.java b/src/test/java/de/tum/cit/aet/artemis/config/TheiaConfigurationTest.java similarity index 87% rename from src/test/java/de/tum/in/www1/artemis/config/TheiaConfigurationTest.java rename to src/test/java/de/tum/cit/aet/artemis/config/TheiaConfigurationTest.java index 41852515b971..2dfced061a4a 100644 --- a/src/test/java/de/tum/in/www1/artemis/config/TheiaConfigurationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/config/TheiaConfigurationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; import static org.assertj.core.api.Assertions.assertThat; @@ -7,8 +7,8 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; class TheiaConfigurationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/config/TopicSubscriptionInterceptorTest.java b/src/test/java/de/tum/cit/aet/artemis/config/TopicSubscriptionInterceptorTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/config/TopicSubscriptionInterceptorTest.java rename to src/test/java/de/tum/cit/aet/artemis/config/TopicSubscriptionInterceptorTest.java index d359d3d242d8..f0f438349a26 100644 --- a/src/test/java/de/tum/in/www1/artemis/config/TopicSubscriptionInterceptorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/config/TopicSubscriptionInterceptorTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.config; +package de.tum.cit.aet.artemis.config; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -14,11 +14,11 @@ import org.springframework.messaging.simp.stomp.StompCommand; import org.springframework.messaging.simp.stomp.StompHeaderAccessor; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.config.websocket.WebsocketConfiguration; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.config.websocket.WebsocketConfiguration; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.user.UserUtilService; @SuppressWarnings("unchecked") class TopicSubscriptionInterceptorTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/connector/AeolusRequestMockProvider.java b/src/test/java/de/tum/cit/aet/artemis/connector/AeolusRequestMockProvider.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/connector/AeolusRequestMockProvider.java rename to src/test/java/de/tum/cit/aet/artemis/connector/AeolusRequestMockProvider.java index f4ac1ffb3aa0..9c5fcb8b8fc8 100644 --- a/src/test/java/de/tum/in/www1/artemis/connector/AeolusRequestMockProvider.java +++ b/src/test/java/de/tum/cit/aet/artemis/connector/AeolusRequestMockProvider.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.connector; +package de.tum.cit.aet.artemis.connector; import static org.springframework.test.web.client.match.MockRestRequestMatchers.header; import static org.springframework.test.web.client.match.MockRestRequestMatchers.method; @@ -23,7 +23,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.enumeration.AeolusTarget; +import de.tum.cit.aet.artemis.domain.enumeration.AeolusTarget; /** * Mocks requests to Aeolus diff --git a/src/test/java/de/tum/in/www1/artemis/connector/AthenaRequestMockProvider.java b/src/test/java/de/tum/cit/aet/artemis/connector/AthenaRequestMockProvider.java similarity index 99% rename from src/test/java/de/tum/in/www1/artemis/connector/AthenaRequestMockProvider.java rename to src/test/java/de/tum/cit/aet/artemis/connector/AthenaRequestMockProvider.java index 089da4b67b31..5e17e3636ddb 100644 --- a/src/test/java/de/tum/in/www1/artemis/connector/AthenaRequestMockProvider.java +++ b/src/test/java/de/tum/cit/aet/artemis/connector/AthenaRequestMockProvider.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.connector; +package de.tum.cit.aet.artemis.connector; import static org.springframework.test.web.client.match.MockRestRequestMatchers.content; import static org.springframework.test.web.client.match.MockRestRequestMatchers.method; diff --git a/src/test/java/de/tum/in/www1/artemis/connector/GitlabRequestMockProvider.java b/src/test/java/de/tum/cit/aet/artemis/connector/GitlabRequestMockProvider.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/connector/GitlabRequestMockProvider.java rename to src/test/java/de/tum/cit/aet/artemis/connector/GitlabRequestMockProvider.java index 06965362eaed..881dd4e2b803 100644 --- a/src/test/java/de/tum/in/www1/artemis/connector/GitlabRequestMockProvider.java +++ b/src/test/java/de/tum/cit/aet/artemis/connector/GitlabRequestMockProvider.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.connector; +package de.tum.cit.aet.artemis.connector; import static org.gitlab4j.api.models.AccessLevel.DEVELOPER; import static org.gitlab4j.api.models.AccessLevel.GUEST; @@ -90,19 +90,19 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.UriService; -import de.tum.in.www1.artemis.service.connectors.gitlab.GitLabException; -import de.tum.in.www1.artemis.service.connectors.gitlab.GitLabUserDoesNotExistException; -import de.tum.in.www1.artemis.service.connectors.gitlab.GitLabUserManagementService; -import de.tum.in.www1.artemis.service.connectors.gitlab.dto.GitLabPersonalAccessTokenListResponseDTO; -import de.tum.in.www1.artemis.service.connectors.gitlab.dto.GitLabPersonalAccessTokenResponseDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.UriService; +import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabException; +import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabUserDoesNotExistException; +import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabUserManagementService; +import de.tum.cit.aet.artemis.service.connectors.gitlab.dto.GitLabPersonalAccessTokenListResponseDTO; +import de.tum.cit.aet.artemis.service.connectors.gitlab.dto.GitLabPersonalAccessTokenResponseDTO; @Component @Profile("gitlab") @@ -454,7 +454,7 @@ public void mockCopyRepositoryForParticipation(ProgrammingExercise exercise, Str mockCreateRepository(exercise, clonedRepoName); } - public void mockConfigureRepository(ProgrammingExercise exercise, Set users, boolean userExists) throws GitLabApiException { + public void mockConfigureRepository(ProgrammingExercise exercise, Set users, boolean userExists) throws GitLabApiException { programmingExerciseUtilService.addTemplateParticipationForProgrammingExercise(exercise); var repositoryUri = exercise.getVcsTemplateRepositoryUri(); for (var user : users) { @@ -472,7 +472,7 @@ public void mockUserExists(String username, boolean exists) throws GitLabApiExce doReturn(exists ? new User().withUsername(username) : null).when(userApi).getUser(username); } - private void mockImportUser(de.tum.in.www1.artemis.domain.User user, boolean shouldFail) throws GitLabApiException { + private void mockImportUser(de.tum.cit.aet.artemis.domain.User user, boolean shouldFail) throws GitLabApiException { final var gitlabUser = new org.gitlab4j.api.models.User().withEmail(user.getEmail()).withUsername(user.getLogin()).withName(user.getName()).withCanCreateGroup(false) .withCanCreateProject(false).withSkipConfirmation(true); if (!shouldFail) { @@ -538,7 +538,7 @@ public void mockRemoveMemberFromRepository(String repositoryPath, String login) doNothing().when(projectApi).removeMember(repositoryPath, mockedUserId); } - public void mockUpdateVcsUser(String login, de.tum.in.www1.artemis.domain.User user, Set removedGroups, Set addedGroups, boolean shouldSynchronizePassword) + public void mockUpdateVcsUser(String login, de.tum.cit.aet.artemis.domain.User user, Set removedGroups, Set addedGroups, boolean shouldSynchronizePassword) throws GitLabApiException { mockUpdateBasicUserInformation(login, shouldSynchronizePassword); mockUpdateUserActivationState(user, false); @@ -573,7 +573,7 @@ else if (user.getGroups().contains(course.getTeachingAssistantGroupName())) { } } - public void mockUpdateVcsUserFailToActivate(String login, de.tum.in.www1.artemis.domain.User user) throws GitLabApiException { + public void mockUpdateVcsUserFailToActivate(String login, de.tum.cit.aet.artemis.domain.User user) throws GitLabApiException { mockUpdateBasicUserInformation(login, true); mockUpdateUserActivationState(user, true); } @@ -630,7 +630,7 @@ else if (userExists) { } } - public void mockCreateVcsUser(de.tum.in.www1.artemis.domain.User user, boolean shouldFail) throws GitLabApiException { + public void mockCreateVcsUser(de.tum.cit.aet.artemis.domain.User user, boolean shouldFail) throws GitLabApiException { var userId = mockGetUserIdCreateIfNotExist(user, false, shouldFail); // Add user to existing exercises @@ -646,17 +646,17 @@ public void mockCreateVcsUser(de.tum.in.www1.artemis.domain.User user, boolean s } } - public void mockAddUserToGroupsUserExists(de.tum.in.www1.artemis.domain.User user, String projectKey) throws GitLabApiException { + public void mockAddUserToGroupsUserExists(de.tum.cit.aet.artemis.domain.User user, String projectKey) throws GitLabApiException { Long userId = mockGetUserIdCreateIfNotExist(user, false, false); doThrow(new GitLabApiException("Member already exists")).when(groupApi).addMember(eq(projectKey), eq(userId), any(AccessLevel.class)); } - public void mockAddUserToGroupsFails(de.tum.in.www1.artemis.domain.User user, String projectKey) throws GitLabApiException { + public void mockAddUserToGroupsFails(de.tum.cit.aet.artemis.domain.User user, String projectKey) throws GitLabApiException { Long userId = mockGetUserIdCreateIfNotExist(user, false, false); doThrow(new GitLabApiException("Oh no")).when(groupApi).addMember(eq(projectKey), eq(userId), any(AccessLevel.class)); } - private Long mockGetUserIdCreateIfNotExist(de.tum.in.www1.artemis.domain.User user, boolean userExists, boolean shouldFail) throws GitLabApiException { + private Long mockGetUserIdCreateIfNotExist(de.tum.cit.aet.artemis.domain.User user, boolean userExists, boolean shouldFail) throws GitLabApiException { var userToReturn = new User().withId(1L).withUsername(user.getLogin()); doReturn(userExists ? userToReturn : null).when(userApi).getUser(user.getLogin()); if (!userExists) { @@ -687,8 +687,8 @@ public void mockUpdateCoursePermissions(Course updatedCourse, String oldInstruct allUsers.addAll(userRepository.findAllUserInGroupAndNotIn(updatedCourse.getEditorGroupName(), allUsers)); allUsers.addAll(userRepository.findAllUserInGroupAndNotIn(updatedCourse.getTeachingAssistantGroupName(), allUsers)); - final Set oldUsers = new HashSet<>(); - final Set newUsers = new HashSet<>(); + final Set oldUsers = new HashSet<>(); + final Set newUsers = new HashSet<>(); for (var user : allUsers) { Set userGroups = user.getGroups(); @@ -704,7 +704,7 @@ public void mockUpdateCoursePermissions(Course updatedCourse, String oldInstruct mockSetPermissionsForNewGroupMembers(programmingExercises, newUsers, updatedCourse); } - private void mockUpdateOldGroupMembers(List programmingExercises, Set oldUsers, Course updatedCourse) + private void mockUpdateOldGroupMembers(List programmingExercises, Set oldUsers, Course updatedCourse) throws GitLabApiException { for (var user : oldUsers) { mockGetUserId(user.getLogin(), true, false); @@ -725,8 +725,8 @@ private void mockUpdateOldGroupMembers(List programmingExer } } - private void mockSetPermissionsForNewGroupMembers(List programmingExercises, Set newUsers, Course updatedCourse) { - for (de.tum.in.www1.artemis.domain.User user : newUsers) { + private void mockSetPermissionsForNewGroupMembers(List programmingExercises, Set newUsers, Course updatedCourse) { + for (de.tum.cit.aet.artemis.domain.User user : newUsers) { try { mockGetUserId(user.getLogin(), true, false); @@ -775,16 +775,16 @@ private void mockRemoveMemberFromExercises(List programming } } - public void mockFailToGetUserWhenUpdatingOldMembers(de.tum.in.www1.artemis.domain.User user) throws GitLabApiException { + public void mockFailToGetUserWhenUpdatingOldMembers(de.tum.cit.aet.artemis.domain.User user) throws GitLabApiException { mockGetUserId(user.getLogin(), false, true); } - public void mockFailToUpdateOldGroupMembers(ProgrammingExercise exercise, de.tum.in.www1.artemis.domain.User user) throws GitLabApiException { + public void mockFailToUpdateOldGroupMembers(ProgrammingExercise exercise, de.tum.cit.aet.artemis.domain.User user) throws GitLabApiException { mockGetUserId(user.getLogin(), true, false); doThrow(GitLabApiException.class).when(groupApi).updateMember(eq(exercise.getProjectKey()), eq(1L), any(AccessLevel.class)); } - public void mockFailToRemoveOldMember(ProgrammingExercise programmingExercise, de.tum.in.www1.artemis.domain.User user) throws GitLabApiException { + public void mockFailToRemoveOldMember(ProgrammingExercise programmingExercise, de.tum.cit.aet.artemis.domain.User user) throws GitLabApiException { mockGetUserId(user.getLogin(), true, false); doThrow(GitLabApiException.class).when(groupApi).removeMember(programmingExercise.getProjectKey(), 1L); } @@ -823,7 +823,7 @@ public void mockRepositoryUriIsValid(VcsRepositoryUri repositoryUri, boolean isU } } - public void setRepositoryPermissionsToReadOnly(VcsRepositoryUri repositoryUri, Set users) throws GitLabApiException { + public void setRepositoryPermissionsToReadOnly(VcsRepositoryUri repositoryUri, Set users) throws GitLabApiException { for (var user : users) { mockGetUserId(user.getLogin(), true, false); final var repositoryPath = uriService.getRepositoryPathFromRepositoryUri(repositoryUri); @@ -841,7 +841,7 @@ public void mockActivateUser(String userLogin, boolean shouldFail) throws GitLab mockUnblockUser(shouldFail); } - public void mockUpdateUserActivationState(de.tum.in.www1.artemis.domain.User user, boolean shouldFail) throws GitLabApiException { + public void mockUpdateUserActivationState(de.tum.cit.aet.artemis.domain.User user, boolean shouldFail) throws GitLabApiException { if (user.getActivated()) { mockUnblockUser(shouldFail); } diff --git a/src/test/java/de/tum/in/www1/artemis/connector/IrisRequestMockProvider.java b/src/test/java/de/tum/cit/aet/artemis/connector/IrisRequestMockProvider.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/connector/IrisRequestMockProvider.java rename to src/test/java/de/tum/cit/aet/artemis/connector/IrisRequestMockProvider.java index 3f248a9e598c..46277ed2d979 100644 --- a/src/test/java/de/tum/in/www1/artemis/connector/IrisRequestMockProvider.java +++ b/src/test/java/de/tum/cit/aet/artemis/connector/IrisRequestMockProvider.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.connector; +package de.tum.cit.aet.artemis.connector; import static org.springframework.test.web.client.match.MockRestRequestMatchers.method; import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo; @@ -27,11 +27,11 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisHealthStatusDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisModelDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.exercise.PyrisExerciseChatPipelineExecutionDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionPipelineExecutionDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisHealthStatusDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisModelDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.exercise.PyrisExerciseChatPipelineExecutionDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionPipelineExecutionDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; @Component @Profile("iris") diff --git a/src/test/java/de/tum/in/www1/artemis/connector/JenkinsRequestMockProvider.java b/src/test/java/de/tum/cit/aet/artemis/connector/JenkinsRequestMockProvider.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/connector/JenkinsRequestMockProvider.java rename to src/test/java/de/tum/cit/aet/artemis/connector/JenkinsRequestMockProvider.java index 55c9e6cbb912..0ea96204aa1a 100644 --- a/src/test/java/de/tum/in/www1/artemis/connector/JenkinsRequestMockProvider.java +++ b/src/test/java/de/tum/cit/aet/artemis/connector/JenkinsRequestMockProvider.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.connector; +package de.tum.cit.aet.artemis.connector; -import static de.tum.in.www1.artemis.util.TestResourceUtils.loadFileFromResources; +import static de.tum.cit.aet.artemis.util.TestResourceUtils.loadFileFromResources; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.doNothing; @@ -45,12 +45,12 @@ import com.offbytwo.jenkins.model.JobWithDetails; import com.offbytwo.jenkins.model.QueueReference; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.service.connectors.jenkins.dto.JenkinsUserDTO; -import de.tum.in.www1.artemis.service.connectors.jenkins.jobs.JenkinsJobPermissionsService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.service.connectors.jenkins.dto.JenkinsUserDTO; +import de.tum.cit.aet.artemis.service.connectors.jenkins.jobs.JenkinsJobPermissionsService; @Component @Profile("jenkins") diff --git a/src/test/java/de/tum/in/www1/artemis/connector/apollon/ApollonRequestMockProvider.java b/src/test/java/de/tum/cit/aet/artemis/connector/apollon/ApollonRequestMockProvider.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/connector/apollon/ApollonRequestMockProvider.java rename to src/test/java/de/tum/cit/aet/artemis/connector/apollon/ApollonRequestMockProvider.java index f160789e3944..9fc1930f03bd 100644 --- a/src/test/java/de/tum/in/www1/artemis/connector/apollon/ApollonRequestMockProvider.java +++ b/src/test/java/de/tum/cit/aet/artemis/connector/apollon/ApollonRequestMockProvider.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.connector.apollon; +package de.tum.cit.aet.artemis.connector.apollon; import static org.springframework.test.web.client.match.MockRestRequestMatchers.method; import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo; diff --git a/src/test/java/de/tum/in/www1/artemis/connectors/AeolusBuildScriptGenerationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusBuildScriptGenerationServiceTest.java similarity index 86% rename from src/test/java/de/tum/in/www1/artemis/connectors/AeolusBuildScriptGenerationServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/connectors/AeolusBuildScriptGenerationServiceTest.java index d8829db9ed65..a0ee26e0284d 100644 --- a/src/test/java/de/tum/in/www1/artemis/connectors/AeolusBuildScriptGenerationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusBuildScriptGenerationServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.connectors; +package de.tum.cit.aet.artemis.connectors; import static org.assertj.core.api.Assertions.assertThat; @@ -16,18 +16,18 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.connector.AeolusRequestMockProvider; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.in.www1.artemis.domain.enumeration.AeolusTarget; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.service.connectors.aeolus.AeolusBuildPlanService; -import de.tum.in.www1.artemis.service.connectors.aeolus.AeolusBuildScriptGenerationService; -import de.tum.in.www1.artemis.service.connectors.aeolus.AeolusTemplateService; -import de.tum.in.www1.artemis.service.connectors.aeolus.Windfile; -import de.tum.in.www1.artemis.service.connectors.aeolus.WindfileMetadata; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.connector.AeolusRequestMockProvider; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.domain.enumeration.AeolusTarget; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusBuildPlanService; +import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusBuildScriptGenerationService; +import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; +import de.tum.cit.aet.artemis.service.connectors.aeolus.WindfileMetadata; class AeolusBuildScriptGenerationServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/connectors/AeolusServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusServiceTest.java similarity index 89% rename from src/test/java/de/tum/in/www1/artemis/connectors/AeolusServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/connectors/AeolusServiceTest.java index 6764e7617e84..297899d89e64 100644 --- a/src/test/java/de/tum/in/www1/artemis/connectors/AeolusServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusServiceTest.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.connectors; +package de.tum.cit.aet.artemis.connectors; -import static de.tum.in.www1.artemis.config.Constants.ASSIGNMENT_REPO_NAME; -import static de.tum.in.www1.artemis.config.Constants.SOLUTION_REPO_NAME; -import static de.tum.in.www1.artemis.config.Constants.TEST_REPO_NAME; +import static de.tum.cit.aet.artemis.config.Constants.ASSIGNMENT_REPO_NAME; +import static de.tum.cit.aet.artemis.config.Constants.SOLUTION_REPO_NAME; +import static de.tum.cit.aet.artemis.config.Constants.TEST_REPO_NAME; import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; @@ -23,23 +23,23 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.connector.AeolusRequestMockProvider; -import de.tum.in.www1.artemis.domain.AuxiliaryRepository; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.AeolusTarget; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.service.connectors.aeolus.AeolusBuildPlanService; -import de.tum.in.www1.artemis.service.connectors.aeolus.AeolusBuildScriptGenerationService; -import de.tum.in.www1.artemis.service.connectors.aeolus.AeolusRepository; -import de.tum.in.www1.artemis.service.connectors.aeolus.AeolusTemplateService; -import de.tum.in.www1.artemis.service.connectors.aeolus.ScriptAction; -import de.tum.in.www1.artemis.service.connectors.aeolus.Windfile; -import de.tum.in.www1.artemis.service.connectors.aeolus.WindfileMetadata; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.connector.AeolusRequestMockProvider; +import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.AeolusTarget; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusBuildPlanService; +import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusBuildScriptGenerationService; +import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusRepository; +import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.service.connectors.aeolus.ScriptAction; +import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; +import de.tum.cit.aet.artemis.service.connectors.aeolus.WindfileMetadata; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; class AeolusServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/connectors/AeolusTemplateResourceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusTemplateResourceTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/connectors/AeolusTemplateResourceTest.java rename to src/test/java/de/tum/cit/aet/artemis/connectors/AeolusTemplateResourceTest.java index 42bcb41cce77..9fff01b6889b 100644 --- a/src/test/java/de/tum/in/www1/artemis/connectors/AeolusTemplateResourceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusTemplateResourceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.connectors; +package de.tum.cit.aet.artemis.connectors; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @@ -16,11 +16,11 @@ import com.fasterxml.jackson.core.JsonProcessingException; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.service.connectors.aeolus.ScriptAction; -import de.tum.in.www1.artemis.service.connectors.aeolus.Windfile; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.util.RequestUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.service.connectors.aeolus.ScriptAction; +import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.util.RequestUtilService; class AeolusTemplateResourceTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/connectors/AeolusTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusTest.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/connectors/AeolusTest.java rename to src/test/java/de/tum/cit/aet/artemis/connectors/AeolusTest.java index 16d2929ebc61..e7b78de23c4f 100644 --- a/src/test/java/de/tum/in/www1/artemis/connectors/AeolusTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.connectors; +package de.tum.cit.aet.artemis.connectors; import static org.assertj.core.api.Assertions.assertThat; @@ -8,13 +8,13 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.service.connectors.aeolus.AeolusRepository; -import de.tum.in.www1.artemis.service.connectors.aeolus.AeolusResult; -import de.tum.in.www1.artemis.service.connectors.aeolus.DockerConfig; -import de.tum.in.www1.artemis.service.connectors.aeolus.PlatformAction; -import de.tum.in.www1.artemis.service.connectors.aeolus.ScriptAction; -import de.tum.in.www1.artemis.service.connectors.aeolus.Windfile; -import de.tum.in.www1.artemis.service.connectors.aeolus.WindfileMetadata; +import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusRepository; +import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusResult; +import de.tum.cit.aet.artemis.service.connectors.aeolus.DockerConfig; +import de.tum.cit.aet.artemis.service.connectors.aeolus.PlatformAction; +import de.tum.cit.aet.artemis.service.connectors.aeolus.ScriptAction; +import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; +import de.tum.cit.aet.artemis.service.connectors.aeolus.WindfileMetadata; class AeolusTest { diff --git a/src/test/java/de/tum/in/www1/artemis/connectors/ApollonConversionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/ApollonConversionServiceTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/connectors/ApollonConversionServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/connectors/ApollonConversionServiceTest.java index c734cd287d30..8ed588a56c27 100644 --- a/src/test/java/de/tum/in/www1/artemis/connectors/ApollonConversionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/ApollonConversionServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.connectors; +package de.tum.cit.aet.artemis.connectors; import static org.assertj.core.api.Assertions.assertThat; @@ -21,9 +21,9 @@ import org.springframework.test.util.ReflectionTestUtils; import org.springframework.web.client.RestTemplate; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.connector.apollon.ApollonRequestMockProvider; -import de.tum.in.www1.artemis.service.connectors.apollon.ApollonConversionService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.connector.apollon.ApollonRequestMockProvider; +import de.tum.cit.aet.artemis.service.connectors.apollon.ApollonConversionService; class ApollonConversionServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/connectors/ApollonHealthIndicatorTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/ApollonHealthIndicatorTest.java similarity index 84% rename from src/test/java/de/tum/in/www1/artemis/connectors/ApollonHealthIndicatorTest.java rename to src/test/java/de/tum/cit/aet/artemis/connectors/ApollonHealthIndicatorTest.java index 3baafae9d3e0..39b9701fdcd3 100644 --- a/src/test/java/de/tum/in/www1/artemis/connectors/ApollonHealthIndicatorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/ApollonHealthIndicatorTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.connectors; +package de.tum.cit.aet.artemis.connectors; import static org.assertj.core.api.Assertions.assertThat; @@ -9,9 +9,9 @@ import org.springframework.boot.actuate.health.Health; import org.springframework.boot.actuate.health.Status; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.connector.apollon.ApollonRequestMockProvider; -import de.tum.in.www1.artemis.service.connectors.apollon.ApollonHealthIndicator; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.connector.apollon.ApollonRequestMockProvider; +import de.tum.cit.aet.artemis.service.connectors.apollon.ApollonHealthIndicator; class ApollonHealthIndicatorTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/connectors/Lti13ServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/connectors/Lti13ServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java index b11bae2a8cc5..7738ecb31169 100644 --- a/src/test/java/de/tum/in/www1/artemis/connectors/Lti13ServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.connectors; +package de.tum.cit.aet.artemis.connectors; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -43,31 +43,31 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.LtiPlatformConfiguration; -import de.tum.in.www1.artemis.domain.OnlineCourseConfiguration; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.lti.LtiResourceLaunch; -import de.tum.in.www1.artemis.domain.lti.Scopes; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.Lti13ResourceLaunchRepository; -import de.tum.in.www1.artemis.repository.LtiPlatformConfigurationRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.ArtemisAuthenticationProvider; -import de.tum.in.www1.artemis.security.lti.Lti13TokenRetriever; -import de.tum.in.www1.artemis.service.OnlineCourseConfigurationService; -import de.tum.in.www1.artemis.service.connectors.lti.Lti13Service; -import de.tum.in.www1.artemis.service.connectors.lti.LtiService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; +import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.lti.LtiResourceLaunch; +import de.tum.cit.aet.artemis.domain.lti.Scopes; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.Lti13ResourceLaunchRepository; +import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.ArtemisAuthenticationProvider; +import de.tum.cit.aet.artemis.security.lti.Lti13TokenRetriever; +import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; +import de.tum.cit.aet.artemis.service.connectors.lti.Lti13Service; +import de.tum.cit.aet.artemis.service.connectors.lti.LtiService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; import uk.ac.ox.ctl.lti13.lti.Claims; class Lti13ServiceTest { diff --git a/src/test/java/de/tum/in/www1/artemis/connectors/LtiDynamicRegistrationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/connectors/LtiDynamicRegistrationServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java index 0879a4599d4e..e7a61a010bf8 100644 --- a/src/test/java/de/tum/in/www1/artemis/connectors/LtiDynamicRegistrationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.connectors; +package de.tum.cit.aet.artemis.connectors; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.mockito.Mockito.any; @@ -19,14 +19,14 @@ import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.OnlineCourseConfiguration; -import de.tum.in.www1.artemis.domain.lti.Lti13ClientRegistration; -import de.tum.in.www1.artemis.domain.lti.Lti13PlatformConfiguration; -import de.tum.in.www1.artemis.repository.LtiPlatformConfigurationRepository; -import de.tum.in.www1.artemis.security.OAuth2JWKSService; -import de.tum.in.www1.artemis.service.connectors.lti.LtiDynamicRegistrationService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; +import de.tum.cit.aet.artemis.domain.lti.Lti13ClientRegistration; +import de.tum.cit.aet.artemis.domain.lti.Lti13PlatformConfiguration; +import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; +import de.tum.cit.aet.artemis.security.OAuth2JWKSService; +import de.tum.cit.aet.artemis.service.connectors.lti.LtiDynamicRegistrationService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; class LtiDynamicRegistrationServiceTest { diff --git a/src/test/java/de/tum/in/www1/artemis/connectors/LtiNewResultServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiNewResultServiceTest.java similarity index 81% rename from src/test/java/de/tum/in/www1/artemis/connectors/LtiNewResultServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/connectors/LtiNewResultServiceTest.java index 89c9263b5e50..9984f14fcec6 100644 --- a/src/test/java/de/tum/in/www1/artemis/connectors/LtiNewResultServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiNewResultServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.connectors; +package de.tum.cit.aet.artemis.connectors; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; @@ -11,12 +11,12 @@ import org.mockito.MockitoAnnotations; import org.springframework.security.core.context.SecurityContextHolder; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.service.connectors.lti.Lti13Service; -import de.tum.in.www1.artemis.service.connectors.lti.LtiNewResultService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.service.connectors.lti.Lti13Service; +import de.tum.cit.aet.artemis.service.connectors.lti.LtiNewResultService; class LtiNewResultServiceTest { diff --git a/src/test/java/de/tum/in/www1/artemis/connectors/LtiServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiServiceTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/connectors/LtiServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/connectors/LtiServiceTest.java index effc5d69160a..3b86d9866650 100644 --- a/src/test/java/de/tum/in/www1/artemis/connectors/LtiServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.connectors; +package de.tum.cit.aet.artemis.connectors; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -28,19 +28,19 @@ import org.springframework.web.util.UriComponents; import org.springframework.web.util.UriComponentsBuilder; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.OnlineCourseConfiguration; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.ArtemisAuthenticationProvider; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.security.jwt.JWTCookieService; -import de.tum.in.www1.artemis.service.connectors.ci.CIUserManagementService; -import de.tum.in.www1.artemis.service.connectors.lti.LtiService; -import de.tum.in.www1.artemis.service.connectors.vcs.VcsUserManagementService; -import de.tum.in.www1.artemis.service.user.UserCreationService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.ArtemisAuthenticationProvider; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.security.jwt.JWTCookieService; +import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; +import de.tum.cit.aet.artemis.service.connectors.lti.LtiService; +import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; +import de.tum.cit.aet.artemis.service.user.UserCreationService; class LtiServiceTest { diff --git a/src/test/java/de/tum/in/www1/artemis/course/CourseFactory.java b/src/test/java/de/tum/cit/aet/artemis/course/CourseFactory.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/course/CourseFactory.java rename to src/test/java/de/tum/cit/aet/artemis/course/CourseFactory.java index eaad8b2d11d9..94390ef4cec5 100644 --- a/src/test/java/de/tum/in/www1/artemis/course/CourseFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/course/CourseFactory.java @@ -1,14 +1,14 @@ -package de.tum.in.www1.artemis.course; +package de.tum.cit.aet.artemis.course; import java.time.ZonedDateTime; import java.util.Set; import java.util.UUID; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.LtiPlatformConfiguration; -import de.tum.in.www1.artemis.domain.OnlineCourseConfiguration; -import de.tum.in.www1.artemis.domain.enumeration.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; +import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; +import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; /** * Factory for creating Courses and related objects. diff --git a/src/test/java/de/tum/in/www1/artemis/course/CourseTestService.java b/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/course/CourseTestService.java rename to src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java index c9a91de64d4c..5c8326034d70 100644 --- a/src/test/java/de/tum/in/www1/artemis/course/CourseTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.course; +package de.tum.cit.aet.artemis.course; -import static de.tum.in.www1.artemis.config.Constants.ARTEMIS_GROUP_DEFAULT_PREFIX; +import static de.tum.cit.aet.artemis.config.Constants.ARTEMIS_GROUP_DEFAULT_PREFIX; import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -60,113 +60,113 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.assessment.ComplaintUtilService; -import de.tum.in.www1.artemis.competency.CompetencyUtilService; -import de.tum.in.www1.artemis.competency.PrerequisiteUtilService; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Complaint; -import de.tum.in.www1.artemis.domain.ComplaintResponse; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.FileUploadSubmission; -import de.tum.in.www1.artemis.domain.LtiPlatformConfiguration; -import de.tum.in.www1.artemis.domain.OnlineCourseConfiguration; -import de.tum.in.www1.artemis.domain.Organization; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.Competency; -import de.tum.in.www1.artemis.domain.competency.Prerequisite; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.ComplaintType; -import de.tum.in.www1.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.in.www1.artemis.domain.enumeration.DefaultChannelType; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseType; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.QuizMode; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.enumeration.TutorParticipationStatus; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExamUser; -import de.tum.in.www1.artemis.domain.metis.ConversationParticipant; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.participation.TutorParticipation; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.exam.ExamFactory; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.programming.MockDelegate; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.lecture.LectureUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ComplaintRepository; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.CustomAuditEventRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExamUserRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.FileUploadExerciseRepository; -import de.tum.in.www1.artemis.repository.LearningPathRepository; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.LtiPlatformConfigurationRepository; -import de.tum.in.www1.artemis.repository.ModelingExerciseRepository; -import de.tum.in.www1.artemis.repository.OnlineCourseConfigurationRepository; -import de.tum.in.www1.artemis.repository.ParticipantScoreRepository; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.TextExerciseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ConversationRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.FilePathService; -import de.tum.in.www1.artemis.service.ParticipationService; -import de.tum.in.www1.artemis.service.dto.StudentDTO; -import de.tum.in.www1.artemis.service.dto.UserDTO; -import de.tum.in.www1.artemis.service.dto.UserPublicInfoDTO; -import de.tum.in.www1.artemis.service.export.CourseExamExportService; -import de.tum.in.www1.artemis.service.export.DataExportUtil; -import de.tum.in.www1.artemis.service.notifications.GroupNotificationService; -import de.tum.in.www1.artemis.service.scheduled.ParticipantScoreScheduleService; -import de.tum.in.www1.artemis.team.TeamUtilService; -import de.tum.in.www1.artemis.user.UserFactory; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.util.PageableSearchUtilService; -import de.tum.in.www1.artemis.util.RequestUtilService; -import de.tum.in.www1.artemis.util.TestResourceUtils; -import de.tum.in.www1.artemis.util.ZipFileTestUtilService; -import de.tum.in.www1.artemis.web.rest.dto.CourseForDashboardDTO; -import de.tum.in.www1.artemis.web.rest.dto.CourseForImportDTO; -import de.tum.in.www1.artemis.web.rest.dto.CourseManagementDetailViewDTO; -import de.tum.in.www1.artemis.web.rest.dto.CourseManagementOverviewStatisticsDTO; -import de.tum.in.www1.artemis.web.rest.dto.CoursesForDashboardDTO; -import de.tum.in.www1.artemis.web.rest.dto.OnlineCourseDTO; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.in.www1.artemis.web.rest.dto.StatsForDashboardDTO; -import de.tum.in.www1.artemis.web.rest.dto.TextAssessmentUpdateDTO; -import de.tum.in.www1.artemis.web.rest.dto.TutorLeaderboardDTO; -import de.tum.in.www1.artemis.web.rest.dto.user.UserNameAndLoginDTO; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.ChannelDTO; +import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; +import de.tum.cit.aet.artemis.competency.CompetencyUtilService; +import de.tum.cit.aet.artemis.competency.PrerequisiteUtilService; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Complaint; +import de.tum.cit.aet.artemis.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; +import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; +import de.tum.cit.aet.artemis.domain.Organization; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.competency.Competency; +import de.tum.cit.aet.artemis.domain.competency.Prerequisite; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; +import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.domain.enumeration.DefaultChannelType; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExamUser; +import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.exam.ExamFactory; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.programming.MockDelegate; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.CustomAuditEventRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExamUserRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.FileUploadExerciseRepository; +import de.tum.cit.aet.artemis.repository.LearningPathRepository; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; +import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.repository.OnlineCourseConfigurationRepository; +import de.tum.cit.aet.artemis.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ConversationRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.service.dto.StudentDTO; +import de.tum.cit.aet.artemis.service.dto.UserDTO; +import de.tum.cit.aet.artemis.service.dto.UserPublicInfoDTO; +import de.tum.cit.aet.artemis.service.export.CourseExamExportService; +import de.tum.cit.aet.artemis.service.export.DataExportUtil; +import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; +import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; +import de.tum.cit.aet.artemis.team.TeamUtilService; +import de.tum.cit.aet.artemis.user.UserFactory; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.util.PageableSearchUtilService; +import de.tum.cit.aet.artemis.util.RequestUtilService; +import de.tum.cit.aet.artemis.util.TestResourceUtils; +import de.tum.cit.aet.artemis.util.ZipFileTestUtilService; +import de.tum.cit.aet.artemis.web.rest.dto.CourseForDashboardDTO; +import de.tum.cit.aet.artemis.web.rest.dto.CourseForImportDTO; +import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementDetailViewDTO; +import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementOverviewStatisticsDTO; +import de.tum.cit.aet.artemis.web.rest.dto.CoursesForDashboardDTO; +import de.tum.cit.aet.artemis.web.rest.dto.OnlineCourseDTO; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; +import de.tum.cit.aet.artemis.web.rest.dto.TextAssessmentUpdateDTO; +import de.tum.cit.aet.artemis.web.rest.dto.TutorLeaderboardDTO; +import de.tum.cit.aet.artemis.web.rest.dto.user.UserNameAndLoginDTO; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; @Service public class CourseTestService { diff --git a/src/test/java/de/tum/in/www1/artemis/course/CourseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/course/CourseUtilService.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/course/CourseUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/course/CourseUtilService.java index 5320cf9a7f85..1edcfd8f2185 100644 --- a/src/test/java/de/tum/in/www1/artemis/course/CourseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/course/CourseUtilService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.course; +package de.tum.cit.aet.artemis.course; -import static de.tum.in.www1.artemis.participation.ParticipationFactory.generateResult; +import static de.tum.cit.aet.artemis.participation.ParticipationFactory.generateResult; import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; @@ -18,76 +18,76 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.assessment.ComplaintUtilService; -import de.tum.in.www1.artemis.assessment.GradingScaleUtilService; -import de.tum.in.www1.artemis.competency.CompetencyUtilService; -import de.tum.in.www1.artemis.domain.Attachment; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.FileUploadSubmission; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.OnlineCourseConfiguration; -import de.tum.in.www1.artemis.domain.Organization; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.in.www1.artemis.domain.enumeration.DiagramType; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.enumeration.QuizMode; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.enumeration.TutorParticipationStatus; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.participation.TutorParticipation; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.exercise.fileupload.FileUploadExerciseFactory; -import de.tum.in.www1.artemis.exercise.fileupload.FileUploadExerciseUtilService; -import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseFactory; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseFactory; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.lecture.LectureFactory; -import de.tum.in.www1.artemis.lecture.LectureUtilService; -import de.tum.in.www1.artemis.organization.OrganizationUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.AttachmentRepository; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExampleSubmissionRepository; -import de.tum.in.www1.artemis.repository.ExerciseGroupRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.FileUploadSubmissionRepository; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.ModelingSubmissionRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.TextSubmissionRepository; -import de.tum.in.www1.artemis.repository.TutorParticipationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.FilePathService; -import de.tum.in.www1.artemis.service.ModelingSubmissionService; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.util.TestResourceUtils; +import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; +import de.tum.cit.aet.artemis.assessment.GradingScaleUtilService; +import de.tum.cit.aet.artemis.competency.CompetencyUtilService; +import de.tum.cit.aet.artemis.domain.Attachment; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; +import de.tum.cit.aet.artemis.domain.Organization; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseFactory; +import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.lecture.LectureFactory; +import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.organization.OrganizationUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.AttachmentRepository; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ExerciseGroupRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.FileUploadSubmissionRepository; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.ModelingSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.repository.TutorParticipationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.service.ModelingSubmissionService; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.util.TestResourceUtils; /** * Service responsible for initializing the database with specific testdata related to courses for use in integration tests. diff --git a/src/test/java/de/tum/in/www1/artemis/dataexport/DataExportResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/dataexport/DataExportResourceIntegrationTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/dataexport/DataExportResourceIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/dataexport/DataExportResourceIntegrationTest.java index a6df69ce91cc..6e3d651aac88 100644 --- a/src/test/java/de/tum/in/www1/artemis/dataexport/DataExportResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/dataexport/DataExportResourceIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.dataexport; +package de.tum.cit.aet.artemis.dataexport; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.any; @@ -26,13 +26,13 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.DataExport; -import de.tum.in.www1.artemis.domain.enumeration.DataExportState; -import de.tum.in.www1.artemis.repository.DataExportRepository; -import de.tum.in.www1.artemis.service.export.DataExportService; -import de.tum.in.www1.artemis.web.rest.dto.DataExportDTO; -import de.tum.in.www1.artemis.web.rest.dto.RequestDataExportDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.DataExport; +import de.tum.cit.aet.artemis.domain.enumeration.DataExportState; +import de.tum.cit.aet.artemis.repository.DataExportRepository; +import de.tum.cit.aet.artemis.service.export.DataExportService; +import de.tum.cit.aet.artemis.web.rest.dto.DataExportDTO; +import de.tum.cit.aet.artemis.web.rest.dto.RequestDataExportDTO; @ExtendWith(MockitoExtension.class) class DataExportResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/domain/CourseTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/CourseTest.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/domain/CourseTest.java rename to src/test/java/de/tum/cit/aet/artemis/domain/CourseTest.java index a8e5358ad53d..385d849ec567 100644 --- a/src/test/java/de/tum/in/www1/artemis/domain/CourseTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/CourseTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -10,7 +10,7 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; class CourseTest { diff --git a/src/test/java/de/tum/in/www1/artemis/domain/ExerciseTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/ExerciseTest.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/domain/ExerciseTest.java rename to src/test/java/de/tum/cit/aet/artemis/domain/ExerciseTest.java index 6efc69d43702..a39df1b2c5ce 100644 --- a/src/test/java/de/tum/in/www1/artemis/domain/ExerciseTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/ExerciseTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import static org.assertj.core.api.Assertions.assertThat; @@ -11,20 +11,20 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.course.CourseFactory; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.DiagramType; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exam.ExamFactory; -import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseFactory; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.service.ExerciseService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.course.CourseFactory; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exam.ExamFactory; +import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.service.ExerciseService; class ExerciseTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/domain/FeedbackTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/FeedbackTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/domain/FeedbackTest.java rename to src/test/java/de/tum/cit/aet/artemis/domain/FeedbackTest.java index b10efb5545ec..b077061bd247 100644 --- a/src/test/java/de/tum/in/www1/artemis/domain/FeedbackTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/FeedbackTest.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.config.Constants; +import de.tum.cit.aet.artemis.config.Constants; class FeedbackTest { diff --git a/src/test/java/de/tum/in/www1/artemis/domain/GuidedTourSettingTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/GuidedTourSettingTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/domain/GuidedTourSettingTest.java rename to src/test/java/de/tum/cit/aet/artemis/domain/GuidedTourSettingTest.java index 396aa1239f53..a383b5575ebf 100644 --- a/src/test/java/de/tum/in/www1/artemis/domain/GuidedTourSettingTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/GuidedTourSettingTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/de/tum/in/www1/artemis/domain/ObjectMethodTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/domain/ObjectMethodTest.java rename to src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTest.java index 52766c3a28a9..dd58e9b55686 100644 --- a/src/test/java/de/tum/in/www1/artemis/domain/ObjectMethodTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTest.java @@ -1,14 +1,14 @@ -package de.tum.in.www1.artemis.domain; - -import static de.tum.in.www1.artemis.domain.ObjectMethodTestExclusions.ALL_TESTS; -import static de.tum.in.www1.artemis.domain.ObjectMethodTestExclusions.ENUM_TOSTRING_NAME_EQUALITY; -import static de.tum.in.www1.artemis.domain.ObjectMethodTestExclusions.ID_EQUALS; -import static de.tum.in.www1.artemis.domain.ObjectMethodTestExclusions.ID_GET_AND_SET; -import static de.tum.in.www1.artemis.domain.ObjectMethodTestExclusions.ID_HASHCODE; -import static de.tum.in.www1.artemis.domain.ObjectMethodTestExclusions.ID_RELATED_TESTS; -import static de.tum.in.www1.artemis.domain.ObjectMethodTestExclusions.INSTANCE_TESTS; -import static de.tum.in.www1.artemis.domain.ObjectMethodTestExclusions.isClassExcludedFrom; -import static de.tum.in.www1.artemis.domain.ObjectMethodTestExclusions.isClassNotExcludedFrom; +package de.tum.cit.aet.artemis.domain; + +import static de.tum.cit.aet.artemis.domain.ObjectMethodTestExclusions.ALL_TESTS; +import static de.tum.cit.aet.artemis.domain.ObjectMethodTestExclusions.ENUM_TOSTRING_NAME_EQUALITY; +import static de.tum.cit.aet.artemis.domain.ObjectMethodTestExclusions.ID_EQUALS; +import static de.tum.cit.aet.artemis.domain.ObjectMethodTestExclusions.ID_GET_AND_SET; +import static de.tum.cit.aet.artemis.domain.ObjectMethodTestExclusions.ID_HASHCODE; +import static de.tum.cit.aet.artemis.domain.ObjectMethodTestExclusions.ID_RELATED_TESTS; +import static de.tum.cit.aet.artemis.domain.ObjectMethodTestExclusions.INSTANCE_TESTS; +import static de.tum.cit.aet.artemis.domain.ObjectMethodTestExclusions.isClassExcludedFrom; +import static de.tum.cit.aet.artemis.domain.ObjectMethodTestExclusions.isClassNotExcludedFrom; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatNoException; import static org.assertj.core.api.AssertionsForClassTypes.fail; @@ -27,11 +27,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.settings.ide.UserIdeMapping; -import de.tum.in.www1.artemis.util.classpath.ClassNode; -import de.tum.in.www1.artemis.util.classpath.ClassPathNode; -import de.tum.in.www1.artemis.util.classpath.ClassPathUtil; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.settings.ide.UserIdeMapping; +import de.tum.cit.aet.artemis.util.classpath.ClassNode; +import de.tum.cit.aet.artemis.util.classpath.ClassPathNode; +import de.tum.cit.aet.artemis.util.classpath.ClassPathUtil; import io.github.classgraph.ClassInfo; /** @@ -43,7 +43,7 @@ class ObjectMethodTest { private static final String GENERATE_TESTS = "Generate tests"; - private static final String DOMAIN_PACKAGE_NAME = "de.tum.in.www1.artemis.domain"; + private static final String DOMAIN_PACKAGE_NAME = "de.tum.cit.aet.artemis.domain"; private static final Map, List> ID_TEST_VALUES = Map.of(Long.class, List.of(1L, 42L), String.class, List.of("A", "B"), UserIdeMapping.UserIdeMappingId.class, List.of(new UserIdeMapping.UserIdeMappingId(1L, ProgrammingLanguage.JAVA), new UserIdeMapping.UserIdeMappingId(42L, ProgrammingLanguage.PYTHON))); diff --git a/src/test/java/de/tum/in/www1/artemis/domain/ObjectMethodTestExclusions.java b/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTestExclusions.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/domain/ObjectMethodTestExclusions.java rename to src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTestExclusions.java index e72497f47b74..0a7d42a8e93d 100644 --- a/src/test/java/de/tum/in/www1/artemis/domain/ObjectMethodTestExclusions.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTestExclusions.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import java.util.EnumSet; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.metis.conversation.ConversationSettings; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.metis.conversation.ConversationSettings; /** * Exclusions of domain classes for specific tests. diff --git a/src/test/java/de/tum/in/www1/artemis/domain/ResultTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/ResultTest.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/domain/ResultTest.java rename to src/test/java/de/tum/cit/aet/artemis/domain/ResultTest.java index d5b73a2d5dd4..f172f6dc8f6c 100644 --- a/src/test/java/de/tum/in/www1/artemis/domain/ResultTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/ResultTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import static org.assertj.core.api.Assertions.assertThat; @@ -10,14 +10,14 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.Visibility; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.repository.ResultRepository; class ResultTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/domain/ShortAnswerQuestionTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/ShortAnswerQuestionTest.java similarity index 82% rename from src/test/java/de/tum/in/www1/artemis/domain/ShortAnswerQuestionTest.java rename to src/test/java/de/tum/cit/aet/artemis/domain/ShortAnswerQuestionTest.java index ddf7b8dc1e14..2f490711e63a 100644 --- a/src/test/java/de/tum/in/www1/artemis/domain/ShortAnswerQuestionTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/ShortAnswerQuestionTest.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedText; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedText; class ShortAnswerQuestionTest { diff --git a/src/test/java/de/tum/in/www1/artemis/domain/ShortAnswerSubmittedTextTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/ShortAnswerSubmittedTextTest.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/domain/ShortAnswerSubmittedTextTest.java rename to src/test/java/de/tum/cit/aet/artemis/domain/ShortAnswerSubmittedTextTest.java index bc274b782f93..d958741d845a 100644 --- a/src/test/java/de/tum/in/www1/artemis/domain/ShortAnswerSubmittedTextTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/ShortAnswerSubmittedTextTest.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.domain; +package de.tum.cit.aet.artemis.domain; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedText; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedText; class ShortAnswerSubmittedTextTest { diff --git a/src/test/java/de/tum/in/www1/artemis/domain/enumeration/ExerciseTypeTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseTypeTest.java similarity index 71% rename from src/test/java/de/tum/in/www1/artemis/domain/enumeration/ExerciseTypeTest.java rename to src/test/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseTypeTest.java index 9ed9d93471d8..d07581a0c4f3 100644 --- a/src/test/java/de/tum/in/www1/artemis/domain/enumeration/ExerciseTypeTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseTypeTest.java @@ -1,16 +1,16 @@ -package de.tum.in.www1.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.domain.enumeration; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; class ExerciseTypeTest { diff --git a/src/test/java/de/tum/in/www1/artemis/domain/notification/GroupNotificationFactoryTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/notification/GroupNotificationFactoryTest.java similarity index 82% rename from src/test/java/de/tum/in/www1/artemis/domain/notification/GroupNotificationFactoryTest.java rename to src/test/java/de/tum/cit/aet/artemis/domain/notification/GroupNotificationFactoryTest.java index 3748f390206b..e951bd2bc3f5 100644 --- a/src/test/java/de/tum/in/www1/artemis/domain/notification/GroupNotificationFactoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/notification/GroupNotificationFactoryTest.java @@ -1,63 +1,63 @@ -package de.tum.in.www1.artemis.domain.notification; - -import static de.tum.in.www1.artemis.config.Constants.TEST_CASES_DUPLICATE_NOTIFICATION; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationPriority.HIGH; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationPriority.MEDIUM; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.ATTACHMENT_CHANGE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_FAILED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_FINISHED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_STARTED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.DUPLICATE_TEST_CASE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_FAILED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_FINISHED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_STARTED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXERCISE_PRACTICE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXERCISE_RELEASED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXERCISE_UPDATED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_ANNOUNCEMENT_POST; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.PROGRAMMING_TEST_CASES_CHANGED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.QUIZ_EXERCISE_STARTED; -import static de.tum.in.www1.artemis.domain.notification.GroupNotificationFactory.createAnnouncementNotification; -import static de.tum.in.www1.artemis.domain.notification.GroupNotificationFactory.createNotification; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.ATTACHMENT_CHANGE_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.ATTACHMENT_CHANGE_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.COURSE_ARCHIVE_FAILED_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.COURSE_ARCHIVE_FAILED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.COURSE_ARCHIVE_FINISHED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.COURSE_ARCHIVE_FINISHED_WITH_ERRORS_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.COURSE_ARCHIVE_STARTED_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.COURSE_ARCHIVE_STARTED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.DUPLICATE_TEST_CASE_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.EXAM_ARCHIVE_FAILED_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.EXAM_ARCHIVE_FAILED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.EXAM_ARCHIVE_FINISHED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.EXAM_ARCHIVE_FINISHED_WITH_ERRORS_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.EXAM_ARCHIVE_STARTED_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.EXAM_ARCHIVE_STARTED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.EXERCISE_PRACTICE_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.EXERCISE_PRACTICE_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.EXERCISE_RELEASED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.EXERCISE_UPDATED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.LIVE_EXAM_EXERCISE_UPDATE_NOTIFICATION_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.LIVE_EXAM_EXERCISE_UPDATE_NOTIFICATION_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.NEW_ANNOUNCEMENT_POST_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.NEW_ANNOUNCEMENT_POST_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.PROGRAMMING_TEST_CASES_CHANGED_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.PROGRAMMING_TEST_CASES_CHANGED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.QUIZ_EXERCISE_STARTED_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.QUIZ_EXERCISE_STARTED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.ATTACHMENT_UPDATED_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.COURSES_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.COURSE_ARCHIVE_UPDATED_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.EXAMS_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.EXAM_ARCHIVE_UPDATED_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.EXERCISE_RELEASED_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.EXERCISE_UPDATED_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createCoursePostTarget; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createCourseTarget; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createDuplicateTestCaseTarget; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createExerciseTarget; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createLectureTarget; +package de.tum.cit.aet.artemis.domain.notification; + +import static de.tum.cit.aet.artemis.config.Constants.TEST_CASES_DUPLICATE_NOTIFICATION; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority.HIGH; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority.MEDIUM; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.ATTACHMENT_CHANGE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_FAILED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_FINISHED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_STARTED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DUPLICATE_TEST_CASE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_FAILED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_FINISHED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_STARTED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_PRACTICE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_RELEASED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_UPDATED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_ANNOUNCEMENT_POST; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PROGRAMMING_TEST_CASES_CHANGED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.QUIZ_EXERCISE_STARTED; +import static de.tum.cit.aet.artemis.domain.notification.GroupNotificationFactory.createAnnouncementNotification; +import static de.tum.cit.aet.artemis.domain.notification.GroupNotificationFactory.createNotification; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.ATTACHMENT_CHANGE_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.ATTACHMENT_CHANGE_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.COURSE_ARCHIVE_FAILED_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.COURSE_ARCHIVE_FAILED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.COURSE_ARCHIVE_FINISHED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.COURSE_ARCHIVE_FINISHED_WITH_ERRORS_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.COURSE_ARCHIVE_STARTED_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.COURSE_ARCHIVE_STARTED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.DUPLICATE_TEST_CASE_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXAM_ARCHIVE_FAILED_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXAM_ARCHIVE_FAILED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXAM_ARCHIVE_FINISHED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXAM_ARCHIVE_FINISHED_WITH_ERRORS_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXAM_ARCHIVE_STARTED_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXAM_ARCHIVE_STARTED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXERCISE_PRACTICE_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXERCISE_PRACTICE_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXERCISE_RELEASED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXERCISE_UPDATED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.LIVE_EXAM_EXERCISE_UPDATE_NOTIFICATION_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.LIVE_EXAM_EXERCISE_UPDATE_NOTIFICATION_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_ANNOUNCEMENT_POST_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_ANNOUNCEMENT_POST_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.PROGRAMMING_TEST_CASES_CHANGED_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.PROGRAMMING_TEST_CASES_CHANGED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.QUIZ_EXERCISE_STARTED_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.QUIZ_EXERCISE_STARTED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.ATTACHMENT_UPDATED_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.COURSES_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.COURSE_ARCHIVE_UPDATED_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.EXAMS_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.EXAM_ARCHIVE_UPDATED_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.EXERCISE_RELEASED_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.EXERCISE_UPDATED_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createCoursePostTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createCourseTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createDuplicateTestCaseTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createExerciseTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createLectureTarget; import static org.assertj.core.api.Assertions.assertThat; import java.util.List; @@ -66,21 +66,21 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.domain.Attachment; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.GroupNotificationType; -import de.tum.in.www1.artemis.domain.enumeration.NotificationPriority; -import de.tum.in.www1.artemis.domain.enumeration.NotificationType; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.metis.AnswerPost; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.Attachment; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.metis.AnswerPost; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; class GroupNotificationFactoryTest { diff --git a/src/test/java/de/tum/in/www1/artemis/domain/notification/NotificationPlaceholderArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderArchitectureTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/domain/notification/NotificationPlaceholderArchitectureTest.java rename to src/test/java/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderArchitectureTest.java index e4f5da3fff6b..120adc974c35 100644 --- a/src/test/java/de/tum/in/www1/artemis/domain/notification/NotificationPlaceholderArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderArchitectureTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.notification; +package de.tum.cit.aet.artemis.domain.notification; import static com.tngtech.archunit.base.DescribedPredicate.allElements; import static com.tngtech.archunit.core.domain.JavaClass.Predicates.type; @@ -18,7 +18,7 @@ import com.tngtech.archunit.lang.ArchCondition; import com.tngtech.archunit.lang.ConditionEvents; -import de.tum.in.www1.artemis.architecture.AbstractArchitectureTest; +import de.tum.cit.aet.artemis.architecture.AbstractArchitectureTest; class NotificationPlaceholderArchitectureTest extends AbstractArchitectureTest { diff --git a/src/test/java/de/tum/in/www1/artemis/domain/notification/NotificationPlaceholderSignatureTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderSignatureTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/domain/notification/NotificationPlaceholderSignatureTest.java rename to src/test/java/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderSignatureTest.java index 2556bd92b970..bb7560d399ce 100644 --- a/src/test/java/de/tum/in/www1/artemis/domain/notification/NotificationPlaceholderSignatureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderSignatureTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.domain.notification; +package de.tum.cit.aet.artemis.domain.notification; import static org.assertj.core.api.Assertions.assertThat; @@ -15,7 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import io.github.classgraph.AnnotationEnumValue; import io.github.classgraph.ClassGraph; @@ -29,7 +29,7 @@ class NotificationPlaceholderSignatureTest extends AbstractSpringIntegrationInde * You must now do the following: * 1. Check if you really need to change these placeholders. If not, revert your changes. * 2. Write a database migration for the old placeholder JSON strings, such that they match your new signature. - * 3. Increment the {{@link de.tum.in.www1.artemis.config.Constants#PUSH_NOTIFICATION_VERSION}}. This ensures that old versions of the native apps discard your new + * 3. Increment the {{@link de.tum.cit.aet.artemis.config.Constants#PUSH_NOTIFICATION_VERSION}}. This ensures that old versions of the native apps discard your new * notifications. * 4. Update both the Android and iOS app. Only merge this server PR after they have been updated and released to the stores. Otherwise, notifications no longer work for * end users. @@ -37,7 +37,7 @@ class NotificationPlaceholderSignatureTest extends AbstractSpringIntegrationInde */ @Test void testSignatureHasNotChanged() throws URISyntaxException, IOException { - try (var scanResult = new ClassGraph().acceptPackages("de.tum.in.www1.artemis").enableAllInfo().scan()) { + try (var scanResult = new ClassGraph().acceptPackages("de.tum.cit.aet.artemis").enableAllInfo().scan()) { // Find the classes that are annotated as a notification placeholder file. var classes = scanResult.getClassesWithMethodAnnotation(NotificationPlaceholderCreator.class); diff --git a/src/test/java/de/tum/in/www1/artemis/domain/notification/SingleUserNotificationFactoryTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/notification/SingleUserNotificationFactoryTest.java similarity index 81% rename from src/test/java/de/tum/in/www1/artemis/domain/notification/SingleUserNotificationFactoryTest.java rename to src/test/java/de/tum/cit/aet/artemis/domain/notification/SingleUserNotificationFactoryTest.java index de8e4eb576da..f59d7d360b51 100644 --- a/src/test/java/de/tum/in/www1/artemis/domain/notification/SingleUserNotificationFactoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/notification/SingleUserNotificationFactoryTest.java @@ -1,52 +1,52 @@ -package de.tum.in.www1.artemis.domain.notification; - -import static de.tum.in.www1.artemis.domain.enumeration.NotificationPriority.HIGH; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationPriority.MEDIUM; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.DATA_EXPORT_CREATED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.DATA_EXPORT_FAILED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXERCISE_SUBMISSION_ASSESSED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.FILE_SUBMISSION_SUCCESSFUL; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_PLAGIARISM_CASE_STUDENT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.PLAGIARISM_CASE_VERDICT_STUDENT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_ASSIGNED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_STUDENT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_TUTOR; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_MULTIPLE_REGISTRATION_TUTOR; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_STUDENT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_TUTOR; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UNASSIGNED; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.DATA_EXPORT_CREATED_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.DATA_EXPORT_CREATED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.DATA_EXPORT_FAILED_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.DATA_EXPORT_FAILED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.EXERCISE_SUBMISSION_ASSESSED_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.EXERCISE_SUBMISSION_ASSESSED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.FILE_SUBMISSION_SUCCESSFUL_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.FILE_SUBMISSION_SUCCESSFUL_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.NEW_PLAGIARISM_CASE_STUDENT_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.NEW_PLAGIARISM_CASE_STUDENT_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.PLAGIARISM_CASE_VERDICT_STUDENT_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.PLAGIARISM_CASE_VERDICT_STUDENT_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_ASSIGNED_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_ASSIGNED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_STUDENT_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_STUDENT_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_TUTOR_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_TUTOR_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_MULTIPLE_TUTOR_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_MULTIPLE_TUTOR_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_STUDENT_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_STUDENT_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_TUTOR_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_TUTOR_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_UNASSIGNED_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_UNASSIGNED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createDataExportCreatedTarget; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createDataExportFailedTarget; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createExerciseTarget; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createPlagiarismCaseTarget; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createTutorialGroupTarget; -import static de.tum.in.www1.artemis.domain.notification.SingleUserNotificationFactory.createNotification; +package de.tum.cit.aet.artemis.domain.notification; + +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority.HIGH; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority.MEDIUM; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DATA_EXPORT_CREATED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DATA_EXPORT_FAILED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_SUBMISSION_ASSESSED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.FILE_SUBMISSION_SUCCESSFUL; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_PLAGIARISM_CASE_STUDENT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PLAGIARISM_CASE_VERDICT_STUDENT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_ASSIGNED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_STUDENT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_MULTIPLE_REGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_STUDENT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UNASSIGNED; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.DATA_EXPORT_CREATED_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.DATA_EXPORT_CREATED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.DATA_EXPORT_FAILED_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.DATA_EXPORT_FAILED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXERCISE_SUBMISSION_ASSESSED_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXERCISE_SUBMISSION_ASSESSED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.FILE_SUBMISSION_SUCCESSFUL_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.FILE_SUBMISSION_SUCCESSFUL_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_PLAGIARISM_CASE_STUDENT_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_PLAGIARISM_CASE_STUDENT_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.PLAGIARISM_CASE_VERDICT_STUDENT_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.PLAGIARISM_CASE_VERDICT_STUDENT_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_ASSIGNED_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_ASSIGNED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_STUDENT_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_STUDENT_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_TUTOR_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_TUTOR_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_MULTIPLE_TUTOR_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_MULTIPLE_TUTOR_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_STUDENT_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_STUDENT_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_TUTOR_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_TUTOR_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_UNASSIGNED_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_UNASSIGNED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createDataExportCreatedTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createDataExportFailedTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createExerciseTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createPlagiarismCaseTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createTutorialGroupTarget; +import static de.tum.cit.aet.artemis.domain.notification.SingleUserNotificationFactory.createNotification; import static org.assertj.core.api.Assertions.assertThat; import java.time.ZonedDateTime; @@ -60,23 +60,23 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.DataExport; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.NotificationPriority; -import de.tum.in.www1.artemis.domain.enumeration.NotificationType; -import de.tum.in.www1.artemis.domain.metis.AnswerPost; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismResult; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.DataExport; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.domain.metis.AnswerPost; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismResult; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; +import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; class SingleUserNotificationFactoryTest { diff --git a/src/test/java/de/tum/in/www1/artemis/domain/notification/TutorialGroupNotificationFactoryTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/notification/TutorialGroupNotificationFactoryTest.java similarity index 85% rename from src/test/java/de/tum/in/www1/artemis/domain/notification/TutorialGroupNotificationFactoryTest.java rename to src/test/java/de/tum/cit/aet/artemis/domain/notification/TutorialGroupNotificationFactoryTest.java index 6d211ccd2f9b..1a687b03e8cd 100644 --- a/src/test/java/de/tum/in/www1/artemis/domain/notification/TutorialGroupNotificationFactoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/notification/TutorialGroupNotificationFactoryTest.java @@ -1,19 +1,19 @@ -package de.tum.in.www1.artemis.domain.notification; +package de.tum.cit.aet.artemis.domain.notification; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DELETED_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DELETED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_UPDATED_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_UPDATED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createTutorialGroupTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DELETED_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DELETED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_UPDATED_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_UPDATED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createTutorialGroupTarget; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.NotificationType; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; class TutorialGroupNotificationFactoryTest { diff --git a/src/test/java/de/tum/in/www1/artemis/entitylistener/ResultListenerIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/entitylistener/ResultListenerIntegrationTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/entitylistener/ResultListenerIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/entitylistener/ResultListenerIntegrationTest.java index ae15a98c9741..33d93d4da522 100644 --- a/src/test/java/de/tum/in/www1/artemis/entitylistener/ResultListenerIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/entitylistener/ResultListenerIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.entitylistener; +package de.tum.cit.aet.artemis.entitylistener; -import static de.tum.in.www1.artemis.service.util.RoundingUtil.round; +import static de.tum.cit.aet.artemis.service.util.RoundingUtil.round; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -19,27 +19,27 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.test.util.ReflectionTestUtils; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.participation.Participant; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.scores.ParticipantScore; -import de.tum.in.www1.artemis.domain.scores.StudentScore; -import de.tum.in.www1.artemis.domain.scores.TeamScore; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ParticipantScoreRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.StudentScoreRepository; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.ResultService; -import de.tum.in.www1.artemis.service.scheduled.ParticipantScoreScheduleService; -import de.tum.in.www1.artemis.team.TeamUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.participation.Participant; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.scores.ParticipantScore; +import de.tum.cit.aet.artemis.domain.scores.StudentScore; +import de.tum.cit.aet.artemis.domain.scores.TeamScore; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.StudentScoreRepository; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.ResultService; +import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; +import de.tum.cit.aet.artemis.team.TeamUtilService; class ResultListenerIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exam/ExamFactory.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamFactory.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/exam/ExamFactory.java rename to src/test/java/de/tum/cit/aet/artemis/exam/ExamFactory.java index 9adcdb01cd2e..75c75a91cc87 100644 --- a/src/test/java/de/tum/in/www1/artemis/exam/ExamFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamFactory.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exam; +package de.tum.cit.aet.artemis.exam; import static java.time.ZonedDateTime.now; @@ -6,16 +6,16 @@ import java.util.HashSet; import java.util.Set; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExamSession; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.web.rest.dto.CourseWithIdDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExamSessionDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExamWithIdAndCourseDTO; -import de.tum.in.www1.artemis.web.rest.dto.StudentExamWithIdAndExamAndUserDTO; -import de.tum.in.www1.artemis.web.rest.dto.UserWithIdAndLoginDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExamSession; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.web.rest.dto.CourseWithIdDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExamSessionDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExamWithIdAndCourseDTO; +import de.tum.cit.aet.artemis.web.rest.dto.StudentExamWithIdAndExamAndUserDTO; +import de.tum.cit.aet.artemis.web.rest.dto.UserWithIdAndLoginDTO; /** * Factory for creating Exams and related objects. diff --git a/src/test/java/de/tum/in/www1/artemis/exam/ExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/exam/ExamIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java index d54bf231ac50..dfe827d1b983 100644 --- a/src/test/java/de/tum/in/www1/artemis/exam/ExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exam; +package de.tum.cit.aet.artemis.exam; import static java.time.ZonedDateTime.now; import static org.assertj.core.api.Assertions.assertThat; @@ -40,61 +40,61 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.FileUploadSubmission; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseType; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExamUser; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.exam.SuspiciousSessionReason; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizGroup; -import de.tum.in.www1.artemis.domain.quiz.QuizPool; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseFactory; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.repository.ExamLiveEventRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExamUserRepository; -import de.tum.in.www1.artemis.repository.QuizExerciseRepository; -import de.tum.in.www1.artemis.repository.QuizPoolRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.in.www1.artemis.service.dto.StudentDTO; -import de.tum.in.www1.artemis.service.exam.ExamDateService; -import de.tum.in.www1.artemis.service.exam.ExamService; -import de.tum.in.www1.artemis.service.quiz.QuizPoolService; -import de.tum.in.www1.artemis.service.scheduled.ParticipantScoreScheduleService; -import de.tum.in.www1.artemis.service.user.PasswordService; -import de.tum.in.www1.artemis.user.UserFactory; -import de.tum.in.www1.artemis.util.PageableSearchUtilService; -import de.tum.in.www1.artemis.util.ZipFileTestUtilService; -import de.tum.in.www1.artemis.web.rest.dto.CourseWithIdDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExamChecklistDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExamInformationDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExamScoresDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExamSessionDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExamWithIdAndCourseDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExerciseForPlagiarismCasesOverviewDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExerciseGroupWithIdAndExamDTO; -import de.tum.in.www1.artemis.web.rest.dto.SuspiciousExamSessionsDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExamUser; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.exam.SuspiciousSessionReason; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizGroup; +import de.tum.cit.aet.artemis.domain.quiz.QuizPool; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.repository.ExamLiveEventRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExamUserRepository; +import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.repository.QuizPoolRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.service.dto.StudentDTO; +import de.tum.cit.aet.artemis.service.exam.ExamDateService; +import de.tum.cit.aet.artemis.service.exam.ExamService; +import de.tum.cit.aet.artemis.service.quiz.QuizPoolService; +import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; +import de.tum.cit.aet.artemis.service.user.PasswordService; +import de.tum.cit.aet.artemis.user.UserFactory; +import de.tum.cit.aet.artemis.util.PageableSearchUtilService; +import de.tum.cit.aet.artemis.util.ZipFileTestUtilService; +import de.tum.cit.aet.artemis.web.rest.dto.CourseWithIdDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExamChecklistDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExamInformationDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExamScoresDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExamSessionDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExamWithIdAndCourseDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExerciseForPlagiarismCasesOverviewDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExerciseGroupWithIdAndExamDTO; +import de.tum.cit.aet.artemis.web.rest.dto.SuspiciousExamSessionsDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @TestInstance(TestInstance.Lifecycle.PER_CLASS) class ExamIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exam/ExamParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/exam/ExamParticipationIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java index 8a46867b0a6b..a6cae4002226 100644 --- a/src/test/java/de/tum/in/www1/artemis/exam/ExamParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exam; +package de.tum.cit.aet.artemis.exam; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.withPrecision; @@ -32,62 +32,62 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.assessment.GradingScaleUtilService; -import de.tum.in.www1.artemis.bonus.BonusFactory; -import de.tum.in.www1.artemis.domain.BonusStrategy; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.GradeType; -import de.tum.in.www1.artemis.domain.GradingScale; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExamUser; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseTestService; -import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseFactory; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.BonusRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExamUserRepository; -import de.tum.in.www1.artemis.repository.GradingScaleRepository; -import de.tum.in.www1.artemis.repository.ParticipantScoreRepository; -import de.tum.in.www1.artemis.repository.ParticipationTestRepository; -import de.tum.in.www1.artemis.repository.QuizExerciseRepository; -import de.tum.in.www1.artemis.repository.QuizSubmissionRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.in.www1.artemis.service.exam.ExamService; -import de.tum.in.www1.artemis.service.exam.StudentExamService; -import de.tum.in.www1.artemis.service.quiz.QuizSubmissionService; -import de.tum.in.www1.artemis.service.scheduled.ParticipantScoreScheduleService; -import de.tum.in.www1.artemis.team.TeamUtilService; -import de.tum.in.www1.artemis.util.ExamPrepareExercisesTestUtil; -import de.tum.in.www1.artemis.util.LocalRepository; -import de.tum.in.www1.artemis.web.rest.dto.DueDateStat; -import de.tum.in.www1.artemis.web.rest.dto.ExamChecklistDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExamScoresDTO; -import de.tum.in.www1.artemis.web.rest.dto.StatsForDashboardDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.assessment.GradingScaleUtilService; +import de.tum.cit.aet.artemis.bonus.BonusFactory; +import de.tum.cit.aet.artemis.domain.BonusStrategy; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.GradeType; +import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExamUser; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseTestService; +import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.BonusRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExamUserRepository; +import de.tum.cit.aet.artemis.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.repository.ParticipationTestRepository; +import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.service.exam.ExamService; +import de.tum.cit.aet.artemis.service.exam.StudentExamService; +import de.tum.cit.aet.artemis.service.quiz.QuizSubmissionService; +import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; +import de.tum.cit.aet.artemis.team.TeamUtilService; +import de.tum.cit.aet.artemis.util.ExamPrepareExercisesTestUtil; +import de.tum.cit.aet.artemis.util.LocalRepository; +import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; +import de.tum.cit.aet.artemis.web.rest.dto.ExamChecklistDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExamScoresDTO; +import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; class ExamParticipationIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exam/ExamRegistrationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/exam/ExamRegistrationIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java index aaeb593ea692..6544f33d98b7 100644 --- a/src/test/java/de/tum/in/www1/artemis/exam/ExamRegistrationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exam; +package de.tum.cit.aet.artemis.exam; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -18,22 +18,22 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExamUser; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExamUserRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.in.www1.artemis.service.dto.StudentDTO; -import de.tum.in.www1.artemis.service.exam.ExamRegistrationService; -import de.tum.in.www1.artemis.service.ldap.LdapUserDto; -import de.tum.in.www1.artemis.service.scheduled.ParticipantScoreScheduleService; -import de.tum.in.www1.artemis.service.user.PasswordService; -import de.tum.in.www1.artemis.user.UserFactory; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExamUser; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExamUserRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.service.dto.StudentDTO; +import de.tum.cit.aet.artemis.service.exam.ExamRegistrationService; +import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; +import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; +import de.tum.cit.aet.artemis.service.user.PasswordService; +import de.tum.cit.aet.artemis.user.UserFactory; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; class ExamRegistrationIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exam/ExamSessionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamSessionIntegrationTest.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/exam/ExamSessionIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exam/ExamSessionIntegrationTest.java index fd0bd85acf33..3fa320cd4517 100644 --- a/src/test/java/de/tum/in/www1/artemis/exam/ExamSessionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamSessionIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exam; +package de.tum.cit.aet.artemis.exam; import static org.assertj.core.api.Assertions.assertThat; @@ -7,13 +7,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.repository.ExamSessionRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.service.exam.ExamSessionService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.repository.ExamSessionRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.service.exam.ExamSessionService; import inet.ipaddr.IPAddressString; class ExamSessionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exam/ExamStartTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java similarity index 86% rename from src/test/java/de/tum/in/www1/artemis/exam/ExamStartTest.java rename to src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java index 5181383dbf1f..08e031af3216 100644 --- a/src/test/java/de/tum/in/www1/artemis/exam/ExamStartTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exam; +package de.tum.cit.aet.artemis.exam; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -26,38 +26,38 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.DiagramType; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseFactory; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseTestService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExerciseGroupRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.ParticipationTestRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlRepositoryPermission; -import de.tum.in.www1.artemis.service.scheduled.ParticipantScoreScheduleService; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.util.ExamPrepareExercisesTestUtil; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseTestService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExerciseGroupRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.ParticipationTestRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlRepositoryPermission; +import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.util.ExamPrepareExercisesTestUtil; // TODO IMPORTANT test more complex exam configurations (mixed exercise type, more variants and more registered students) class ExamStartTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exam/ExamUserIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamUserIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/exam/ExamUserIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exam/ExamUserIntegrationTest.java index 0677b7e08c7c..e50d28cfec60 100644 --- a/src/test/java/de/tum/in/www1/artemis/exam/ExamUserIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamUserIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exam; +package de.tum.cit.aet.artemis.exam; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.http.HttpStatus.OK; @@ -31,19 +31,19 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExamUser; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseTestService; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.util.LocalRepository; -import de.tum.in.www1.artemis.web.rest.dto.ExamUserAttendanceCheckDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExamUserDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExamUsersNotFoundDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExamUser; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseTestService; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.util.LocalRepository; +import de.tum.cit.aet.artemis.web.rest.dto.ExamUserAttendanceCheckDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExamUserDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExamUsersNotFoundDTO; class ExamUserIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exam/ExamUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamUtilService.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/exam/ExamUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/exam/ExamUtilService.java index 4740cb61de85..b3be58ab6d4e 100644 --- a/src/test/java/de/tum/in/www1/artemis/exam/ExamUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamUtilService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exam; +package de.tum.cit.aet.artemis.exam; import static java.time.ZonedDateTime.now; import static org.assertj.core.api.Assertions.assertThat; @@ -14,59 +14,59 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.course.CourseFactory; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.DiagramType; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExamSession; -import de.tum.in.www1.artemis.domain.exam.ExamUser; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizPool; -import de.tum.in.www1.artemis.exercise.fileupload.FileUploadExerciseFactory; -import de.tum.in.www1.artemis.exercise.fileupload.FileUploadExerciseUtilService; -import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseFactory; -import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseFactory; -import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.post.ConversationFactory; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExamSessionRepository; -import de.tum.in.www1.artemis.repository.ExamUserRepository; -import de.tum.in.www1.artemis.repository.ExerciseGroupRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ConversationRepository; -import de.tum.in.www1.artemis.service.quiz.QuizPoolService; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.course.CourseFactory; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExamSession; +import de.tum.cit.aet.artemis.domain.exam.ExamUser; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizPool; +import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseFactory; +import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; +import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; +import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.post.ConversationFactory; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExamSessionRepository; +import de.tum.cit.aet.artemis.repository.ExamUserRepository; +import de.tum.cit.aet.artemis.repository.ExerciseGroupRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ConversationRepository; +import de.tum.cit.aet.artemis.service.quiz.QuizPoolService; +import de.tum.cit.aet.artemis.user.UserUtilService; /** * Service responsible for initializing the database with specific testdata related to exams for use in integration tests. diff --git a/src/test/java/de/tum/in/www1/artemis/exam/ExerciseGroupIntegrationJenkinsGitlabTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExerciseGroupIntegrationJenkinsGitlabTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/exam/ExerciseGroupIntegrationJenkinsGitlabTest.java rename to src/test/java/de/tum/cit/aet/artemis/exam/ExerciseGroupIntegrationJenkinsGitlabTest.java index 44d0b456e4fc..4d865d8946a4 100644 --- a/src/test/java/de/tum/in/www1/artemis/exam/ExerciseGroupIntegrationJenkinsGitlabTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExerciseGroupIntegrationJenkinsGitlabTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exam; +package de.tum.cit.aet.artemis.exam; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -19,24 +19,24 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.TextExerciseRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.user.UserUtilService; class ExerciseGroupIntegrationJenkinsGitlabTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exam/ProgrammingExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ProgrammingExamIntegrationTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/exam/ProgrammingExamIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exam/ProgrammingExamIntegrationTest.java index d364d0cdbc31..df83a494069c 100644 --- a/src/test/java/de/tum/in/www1/artemis/exam/ProgrammingExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ProgrammingExamIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exam; +package de.tum.cit.aet.artemis.exam; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -27,24 +27,24 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseTestService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.service.scheduled.ParticipantScoreScheduleService; -import de.tum.in.www1.artemis.util.ExamPrepareExercisesTestUtil; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseTestService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; +import de.tum.cit.aet.artemis.util.ExamPrepareExercisesTestUtil; class ProgrammingExamIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exam/QuizPoolIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/QuizPoolIntegrationTest.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/exam/QuizPoolIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exam/QuizPoolIntegrationTest.java index 234544685a9a..85f0d82bae60 100644 --- a/src/test/java/de/tum/in/www1/artemis/exam/QuizPoolIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/QuizPoolIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exam; +package de.tum.cit.aet.artemis.exam; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.groups.Tuple.tuple; @@ -12,18 +12,18 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.in.www1.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.in.www1.artemis.domain.quiz.QuizGroup; -import de.tum.in.www1.artemis.domain.quiz.QuizPool; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseFactory; -import de.tum.in.www1.artemis.service.quiz.QuizPoolService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; +import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.domain.quiz.QuizGroup; +import de.tum.cit.aet.artemis.domain.quiz.QuizPool; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; +import de.tum.cit.aet.artemis.service.quiz.QuizPoolService; class QuizPoolIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exam/StudentExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/exam/StudentExamIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java index 53ee4b664b61..2b3d9a2d3908 100644 --- a/src/test/java/de/tum/in/www1/artemis/exam/StudentExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.exam; - -import static de.tum.in.www1.artemis.util.SensitiveInformationUtil.assertSensitiveInformationWasFilteredFileUploadExercise; -import static de.tum.in.www1.artemis.util.SensitiveInformationUtil.assertSensitiveInformationWasFilteredModelingExercise; -import static de.tum.in.www1.artemis.util.SensitiveInformationUtil.assertSensitiveInformationWasFilteredProgrammingExercise; -import static de.tum.in.www1.artemis.util.SensitiveInformationUtil.assertSensitiveInformationWasFilteredTextExercise; -import static de.tum.in.www1.artemis.util.TestConstants.COMMIT_HASH_OBJECT_ID; -import static de.tum.in.www1.artemis.util.TestConstants.COMMIT_HASH_STRING; +package de.tum.cit.aet.artemis.exam; + +import static de.tum.cit.aet.artemis.util.SensitiveInformationUtil.assertSensitiveInformationWasFilteredFileUploadExercise; +import static de.tum.cit.aet.artemis.util.SensitiveInformationUtil.assertSensitiveInformationWasFilteredModelingExercise; +import static de.tum.cit.aet.artemis.util.SensitiveInformationUtil.assertSensitiveInformationWasFilteredProgrammingExercise; +import static de.tum.cit.aet.artemis.util.SensitiveInformationUtil.assertSensitiveInformationWasFilteredTextExercise; +import static de.tum.cit.aet.artemis.util.TestConstants.COMMIT_HASH_OBJECT_ID; +import static de.tum.cit.aet.artemis.util.TestConstants.COMMIT_HASH_STRING; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.fail; @@ -58,81 +58,81 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.assessment.GradingScaleUtilService; -import de.tum.in.www1.artemis.bonus.BonusFactory; -import de.tum.in.www1.artemis.domain.BonusStrategy; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.FileUploadSubmission; -import de.tum.in.www1.artemis.domain.GradeType; -import de.tum.in.www1.artemis.domain.GradingScale; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExamUser; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict; -import de.tum.in.www1.artemis.domain.quiz.AnswerOption; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropMapping; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.in.www1.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedText; -import de.tum.in.www1.artemis.domain.quiz.SubmittedAnswer; -import de.tum.in.www1.artemis.domain.submissionpolicy.LockRepositoryPolicy; -import de.tum.in.www1.artemis.domain.submissionpolicy.SubmissionPolicy; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseTestService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.BonusRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExamSessionRepository; -import de.tum.in.www1.artemis.repository.ExamUserRepository; -import de.tum.in.www1.artemis.repository.GradingScaleRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.in.www1.artemis.repository.QuizSubmissionRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.SubmissionVersionRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.ParticipationService; -import de.tum.in.www1.artemis.service.exam.ExamQuizService; -import de.tum.in.www1.artemis.service.exam.StudentExamService; -import de.tum.in.www1.artemis.service.util.RoundingUtil; -import de.tum.in.www1.artemis.util.ExamPrepareExercisesTestUtil; -import de.tum.in.www1.artemis.util.LocalRepository; -import de.tum.in.www1.artemis.web.rest.dto.StudentExamWithGradeDTO; -import de.tum.in.www1.artemis.web.rest.dto.examevent.ExamAttendanceCheckEventDTO; -import de.tum.in.www1.artemis.web.rest.dto.examevent.ExamLiveEventBaseDTO; -import de.tum.in.www1.artemis.web.rest.dto.examevent.ExamWideAnnouncementEventDTO; -import de.tum.in.www1.artemis.web.rest.dto.examevent.WorkingTimeUpdateEventDTO; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.assessment.GradingScaleUtilService; +import de.tum.cit.aet.artemis.bonus.BonusFactory; +import de.tum.cit.aet.artemis.domain.BonusStrategy; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.domain.GradeType; +import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExamUser; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; +import de.tum.cit.aet.artemis.domain.quiz.AnswerOption; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropMapping; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedText; +import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; +import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseTestService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.BonusRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExamSessionRepository; +import de.tum.cit.aet.artemis.repository.ExamUserRepository; +import de.tum.cit.aet.artemis.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.SubmissionVersionRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.service.exam.ExamQuizService; +import de.tum.cit.aet.artemis.service.exam.StudentExamService; +import de.tum.cit.aet.artemis.service.util.RoundingUtil; +import de.tum.cit.aet.artemis.util.ExamPrepareExercisesTestUtil; +import de.tum.cit.aet.artemis.util.LocalRepository; +import de.tum.cit.aet.artemis.web.rest.dto.StudentExamWithGradeDTO; +import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamAttendanceCheckEventDTO; +import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamLiveEventBaseDTO; +import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamWideAnnouncementEventDTO; +import de.tum.cit.aet.artemis.web.rest.dto.examevent.WorkingTimeUpdateEventDTO; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; class StudentExamIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exam/TestExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/TestExamIntegrationTest.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/exam/TestExamIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exam/TestExamIntegrationTest.java index ff5d8b1f8e63..7c23a635bea4 100644 --- a/src/test/java/de/tum/in/www1/artemis/exam/TestExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/TestExamIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exam; +package de.tum.cit.aet.artemis.exam; import static java.time.ZonedDateTime.now; import static org.assertj.core.api.Assertions.assertThat; @@ -13,19 +13,19 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExamUser; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExamUserRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.in.www1.artemis.service.scheduled.ParticipantScoreScheduleService; -import de.tum.in.www1.artemis.service.user.PasswordService; -import de.tum.in.www1.artemis.user.UserFactory; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExamUser; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExamUserRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; +import de.tum.cit.aet.artemis.service.user.PasswordService; +import de.tum.cit.aet.artemis.user.UserFactory; class TestExamIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/AthenaExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaExerciseIntegrationTest.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/exercise/AthenaExerciseIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/AthenaExerciseIntegrationTest.java index bd361c303f09..d273604dc206 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/AthenaExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaExerciseIntegrationTest.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.exercise; +package de.tum.cit.aet.artemis.exercise; -import static de.tum.in.www1.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_PROGRAMMING_TEST; -import static de.tum.in.www1.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_TEXT_TEST; -import static de.tum.in.www1.artemis.connector.AthenaRequestMockProvider.ATHENA_RESTRICTED_MODULE_PROGRAMMING_TEST; -import static de.tum.in.www1.artemis.connector.AthenaRequestMockProvider.ATHENA_RESTRICTED_MODULE_TEXT_TEST; +import static de.tum.cit.aet.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_PROGRAMMING_TEST; +import static de.tum.cit.aet.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_TEXT_TEST; +import static de.tum.cit.aet.artemis.connector.AthenaRequestMockProvider.ATHENA_RESTRICTED_MODULE_PROGRAMMING_TEST; +import static de.tum.cit.aet.artemis.connector.AthenaRequestMockProvider.ATHENA_RESTRICTED_MODULE_TEXT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -19,18 +19,18 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.AbstractAthenaTest; -import de.tum.in.www1.artemis.course.CourseTestService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.AbstractAthenaTest; +import de.tum.cit.aet.artemis.course.CourseTestService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.TextExerciseRepository; class AthenaExerciseIntegrationTest extends AbstractAthenaTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/AthenaResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaResourceIntegrationTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/exercise/AthenaResourceIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/AthenaResourceIntegrationTest.java index 21e7be6c5fcc..8f8b75e5f338 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/AthenaResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaResourceIntegrationTest.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.exercise; - -import static de.tum.in.www1.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_MODELING_TEST; -import static de.tum.in.www1.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_PROGRAMMING_TEST; -import static de.tum.in.www1.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_TEXT_TEST; -import static de.tum.in.www1.artemis.connector.AthenaRequestMockProvider.ATHENA_RESTRICTED_MODULE_MODELING_TEST; -import static de.tum.in.www1.artemis.connector.AthenaRequestMockProvider.ATHENA_RESTRICTED_MODULE_PROGRAMMING_TEST; -import static de.tum.in.www1.artemis.connector.AthenaRequestMockProvider.ATHENA_RESTRICTED_MODULE_TEXT_TEST; +package de.tum.cit.aet.artemis.exercise; + +import static de.tum.cit.aet.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_MODELING_TEST; +import static de.tum.cit.aet.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_PROGRAMMING_TEST; +import static de.tum.cit.aet.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_TEXT_TEST; +import static de.tum.cit.aet.artemis.connector.AthenaRequestMockProvider.ATHENA_RESTRICTED_MODULE_MODELING_TEST; +import static de.tum.cit.aet.artemis.connector.AthenaRequestMockProvider.ATHENA_RESTRICTED_MODULE_PROGRAMMING_TEST; +import static de.tum.cit.aet.artemis.connector.AthenaRequestMockProvider.ATHENA_RESTRICTED_MODULE_TEXT_TEST; import static org.assertj.core.api.Assertions.assertThat; import java.time.ZonedDateTime; @@ -23,31 +23,31 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.AbstractAthenaTest; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.repository.FeedbackRepository; -import de.tum.in.www1.artemis.repository.ModelingExerciseRepository; -import de.tum.in.www1.artemis.repository.ModelingSubmissionRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.TextExerciseRepository; -import de.tum.in.www1.artemis.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.AbstractAthenaTest; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ModelingSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; class AthenaResourceIntegrationTest extends AbstractAthenaTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/ExerciseFactory.java b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseFactory.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/exercise/ExerciseFactory.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseFactory.java index 1d02e8449af7..f0f90f4497c7 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/ExerciseFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseFactory.java @@ -1,20 +1,20 @@ -package de.tum.in.www1.artemis.exercise; +package de.tum.cit.aet.artemis.exercise; import java.time.ZonedDateTime; import java.util.HashSet; import java.util.Set; import java.util.UUID; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.GradingInstruction; -import de.tum.in.www1.artemis.domain.enumeration.DifficultyLevel; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.GradingInstruction; +import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismDetectionConfig; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; /** * Factory for creating Exercises and related objects. diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/ExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/exercise/ExerciseIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java index c4d1bee53766..df631a131aaa 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/ExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise; +package de.tum.cit.aet.artemis.exercise; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -21,42 +21,42 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.DiagramType; -import de.tum.in.www1.artemis.domain.enumeration.DifficultyLevel; -import de.tum.in.www1.artemis.domain.enumeration.TutorParticipationStatus; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.participation.TutorParticipation; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizPointStatistic; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.TutorParticipationRepository; -import de.tum.in.www1.artemis.service.ExerciseService; -import de.tum.in.www1.artemis.util.TestResourceUtils; -import de.tum.in.www1.artemis.web.rest.dto.ExerciseDetailsDTO; -import de.tum.in.www1.artemis.web.rest.dto.StatsForDashboardDTO; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; +import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; +import de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizPointStatistic; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.TutorParticipationRepository; +import de.tum.cit.aet.artemis.service.ExerciseService; +import de.tum.cit.aet.artemis.util.TestResourceUtils; +import de.tum.cit.aet.artemis.web.rest.dto.ExerciseDetailsDTO; +import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; class ExerciseIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/ExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseUtilService.java similarity index 89% rename from src/test/java/de/tum/in/www1/artemis/exercise/ExerciseUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseUtilService.java index 2f352897184d..4acbb4afe32d 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/ExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseUtilService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise; +package de.tum.cit.aet.artemis.exercise; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @@ -14,49 +14,49 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.FileUploadSubmission; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.GradingInstruction; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.metis.AnswerPost; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict; -import de.tum.in.www1.artemis.exercise.fileupload.FileUploadExerciseUtilService; -import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.post.ConversationFactory; -import de.tum.in.www1.artemis.post.ConversationUtilService; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.metis.AnswerPostRepository; -import de.tum.in.www1.artemis.repository.metis.PostRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.in.www1.artemis.service.ModelingSubmissionService; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.GradingInstruction; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.metis.AnswerPost; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; +import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.post.ConversationFactory; +import de.tum.cit.aet.artemis.post.ConversationUtilService; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.metis.AnswerPostRepository; +import de.tum.cit.aet.artemis.repository.metis.PostRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.service.ModelingSubmissionService; +import de.tum.cit.aet.artemis.user.UserUtilService; /** * Service responsible for initializing the database with specific testdata related to exercises for use in integration tests. diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/GradingCriterionUtil.java b/src/test/java/de/tum/cit/aet/artemis/exercise/GradingCriterionUtil.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/exercise/GradingCriterionUtil.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/GradingCriterionUtil.java index 9ca38967bdb6..a2092fb8ff65 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/GradingCriterionUtil.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/GradingCriterionUtil.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.exercise; +package de.tum.cit.aet.artemis.exercise; import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.function.Predicate; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.GradingInstruction; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.GradingInstruction; public final class GradingCriterionUtil { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java index 32508188e37a..dbba27dcb882 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.fileupload; +package de.tum.cit.aet.artemis.exercise.fileupload; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.eq; @@ -22,37 +22,37 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.assessment.ComplaintUtilService; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Complaint; -import de.tum.in.www1.artemis.domain.ComplaintResponse; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.FileUploadSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.ComplaintType; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ComplaintRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.FileUploadExerciseRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.web.rest.dto.AssessmentUpdateDTO; -import de.tum.in.www1.artemis.web.rest.dto.FileUploadAssessmentDTO; -import de.tum.in.www1.artemis.web.rest.dto.ResultDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Complaint; +import de.tum.cit.aet.artemis.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.FileUploadExerciseRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; +import de.tum.cit.aet.artemis.web.rest.dto.FileUploadAssessmentDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; class FileUploadAssessmentIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadExerciseFactory.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseFactory.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadExerciseFactory.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseFactory.java index 86fbb68ec808..e5e21f127e3c 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadExerciseFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseFactory.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.exercise.fileupload; +package de.tum.cit.aet.artemis.exercise.fileupload; import java.time.ZonedDateTime; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.exercise.ExerciseFactory; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.exercise.ExerciseFactory; /** * Factory for creating FileUploadExercises and related objects. diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java index 9ae42b95d9aa..a7e8434fdb57 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.exercise.fileupload; +package de.tum.cit.aet.artemis.exercise.fileupload; -import static de.tum.in.www1.artemis.util.TestResourceUtils.HalfSecond; +import static de.tum.cit.aet.artemis.util.TestResourceUtils.HalfSecond; import static java.time.ZonedDateTime.now; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -29,35 +29,35 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.competency.CompetencyUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.FileUploadSubmission; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.GradingInstruction; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.competency.Competency; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.GradingCriterionUtil; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.FeedbackRepository; -import de.tum.in.www1.artemis.repository.FileUploadExerciseRepository; -import de.tum.in.www1.artemis.repository.GradingCriterionRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.in.www1.artemis.util.InvalidExamExerciseDatesArgumentProvider; -import de.tum.in.www1.artemis.util.InvalidExamExerciseDatesArgumentProvider.InvalidExamExerciseDateConfiguration; -import de.tum.in.www1.artemis.util.PageableSearchUtilService; -import de.tum.in.www1.artemis.web.rest.dto.CourseForDashboardDTO; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.competency.CompetencyUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.GradingInstruction; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.competency.Competency; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.repository.FileUploadExerciseRepository; +import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider; +import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider.InvalidExamExerciseDateConfiguration; +import de.tum.cit.aet.artemis.util.PageableSearchUtilService; +import de.tum.cit.aet.artemis.web.rest.dto.CourseForDashboardDTO; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; class FileUploadExerciseIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseUtilService.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadExerciseUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseUtilService.java index 66c5706aab28..9049cede28e9 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseUtilService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.fileupload; +package de.tum.cit.aet.artemis.exercise.fileupload; import static org.assertj.core.api.Assertions.assertThat; @@ -13,25 +13,25 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.course.CourseFactory; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.FileUploadSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.FileUploadSubmissionRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.course.CourseFactory; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.FileUploadSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; /** * Service responsible for initializing the database with specific testdata related to file upload exercises for use in integration tests. diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java index 783012a7b415..c59488c1a269 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.exercise.fileupload; +package de.tum.cit.aet.artemis.exercise.fileupload; -import static de.tum.in.www1.artemis.util.TestResourceUtils.HalfSecond; +import static de.tum.cit.aet.artemis.util.TestResourceUtils.HalfSecond; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; @@ -27,26 +27,26 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.FileUploadSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.FileUploadSubmissionRepository; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.service.FilePathService; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.FileUploadSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; class FileUploadSubmissionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ApollonConversionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonConversionIntegrationTest.java similarity index 88% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/ApollonConversionIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonConversionIntegrationTest.java index 0895d57719c9..48dd7cbc797f 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ApollonConversionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonConversionIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling; +package de.tum.cit.aet.artemis.exercise.modeling; import static org.assertj.core.api.Assertions.assertThat; @@ -18,10 +18,10 @@ import org.springframework.test.util.ReflectionTestUtils; import org.springframework.web.client.RestTemplate; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.connector.apollon.ApollonRequestMockProvider; -import de.tum.in.www1.artemis.service.connectors.apollon.ApollonConversionService; -import de.tum.in.www1.artemis.service.connectors.apollon.dto.ApollonModelDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.connector.apollon.ApollonRequestMockProvider; +import de.tum.cit.aet.artemis.service.connectors.apollon.ApollonConversionService; +import de.tum.cit.aet.artemis.service.connectors.apollon.dto.ApollonModelDTO; class ApollonConversionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ApollonDiagramResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonDiagramResourceIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/ApollonDiagramResourceIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonDiagramResourceIntegrationTest.java index 2dcbc9c45ba4..74cf1ac7e66c 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ApollonDiagramResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonDiagramResourceIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling; +package de.tum.cit.aet.artemis.exercise.modeling; import static org.assertj.core.api.Assertions.assertThat; @@ -13,12 +13,12 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.course.CourseFactory; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.enumeration.DiagramType; -import de.tum.in.www1.artemis.domain.modeling.ApollonDiagram; -import de.tum.in.www1.artemis.repository.ApollonDiagramRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.course.CourseFactory; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; +import de.tum.cit.aet.artemis.domain.modeling.ApollonDiagram; +import de.tum.cit.aet.artemis.repository.ApollonDiagramRepository; class ApollonDiagramResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java index 4f890b2c74fb..bb617186b954 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.exercise.modeling; +package de.tum.cit.aet.artemis.exercise.modeling; -import static de.tum.in.www1.artemis.util.TestResourceUtils.loadFileFromResources; +import static de.tum.cit.aet.artemis.util.TestResourceUtils.loadFileFromResources; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.isA; @@ -26,52 +26,52 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Complaint; -import de.tum.in.www1.artemis.domain.ComplaintResponse; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ExampleSubmission; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.ComplaintType; -import de.tum.in.www1.artemis.domain.enumeration.DiagramType; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismStatus; -import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingSubmissionElement; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.plagiarism.PlagiarismUtilService; -import de.tum.in.www1.artemis.repository.ComplaintRepository; -import de.tum.in.www1.artemis.repository.ComplaintResponseRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExampleSubmissionRepository; -import de.tum.in.www1.artemis.repository.ModelClusterRepository; -import de.tum.in.www1.artemis.repository.ModelElementRepository; -import de.tum.in.www1.artemis.repository.ModelingSubmissionRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.service.AssessmentService; -import de.tum.in.www1.artemis.service.ParticipationService; -import de.tum.in.www1.artemis.service.compass.CompassService; -import de.tum.in.www1.artemis.web.rest.dto.AssessmentUpdateDTO; -import de.tum.in.www1.artemis.web.rest.dto.ModelingAssessmentDTO; -import de.tum.in.www1.artemis.web.rest.dto.ResultDTO; -import de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Complaint; +import de.tum.cit.aet.artemis.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; +import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus; +import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingSubmissionElement; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.plagiarism.PlagiarismUtilService; +import de.tum.cit.aet.artemis.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.repository.ComplaintResponseRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ModelClusterRepository; +import de.tum.cit.aet.artemis.repository.ModelElementRepository; +import de.tum.cit.aet.artemis.repository.ModelingSubmissionRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.service.AssessmentService; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.service.compass.CompassService; +import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ModelingAssessmentDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; +import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; class ModelingAssessmentIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingComparisonTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingComparisonTest.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingComparisonTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingComparisonTest.java index 25e191e37ae0..98ae4f077b5b 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingComparisonTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingComparisonTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling; +package de.tum.cit.aet.artemis.exercise.modeling; import static org.assertj.core.api.Assertions.assertThat; @@ -7,12 +7,12 @@ import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.course.CourseFactory; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.enumeration.DiagramType; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.service.exam.StudentExamService; +import de.tum.cit.aet.artemis.course.CourseFactory; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.service.exam.StudentExamService; class ModelingComparisonTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingExerciseFactory.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseFactory.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingExerciseFactory.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseFactory.java index 4287343b27b9..8a2140f285b0 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingExerciseFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseFactory.java @@ -1,17 +1,17 @@ -package de.tum.in.www1.artemis.exercise.modeling; +package de.tum.cit.aet.artemis.exercise.modeling; import java.time.ZonedDateTime; import java.util.HashSet; -import de.tum.in.www1.artemis.course.CourseFactory; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.enumeration.DiagramType; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.modeling.ApollonDiagram; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exercise.ExerciseFactory; +import de.tum.cit.aet.artemis.course.CourseFactory; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.modeling.ApollonDiagram; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.ExerciseFactory; /** * Factory for creating ModelingExercises and related objects. diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java index 8aad27502316..144cc3e45179 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.exercise.modeling; +package de.tum.cit.aet.artemis.exercise.modeling; -import static de.tum.in.www1.artemis.util.TestResourceUtils.HalfSecond; +import static de.tum.cit.aet.artemis.util.TestResourceUtils.HalfSecond; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -29,48 +29,48 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.competency.CompetencyUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ExampleSubmission; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.GradingInstruction; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.TeamAssignmentConfig; -import de.tum.in.www1.artemis.domain.competency.Competency; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.DiagramType; -import de.tum.in.www1.artemis.domain.enumeration.DifficultyLevel; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.in.www1.artemis.domain.enumeration.TutorParticipationStatus; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.TutorParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.GradingCriterionUtil; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.FeedbackRepository; -import de.tum.in.www1.artemis.repository.GradingCriterionRepository; -import de.tum.in.www1.artemis.repository.ModelingExerciseRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.repository.TutorParticipationRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.in.www1.artemis.util.ExerciseIntegrationTestService; -import de.tum.in.www1.artemis.util.InvalidExamExerciseDatesArgumentProvider; -import de.tum.in.www1.artemis.util.InvalidExamExerciseDatesArgumentProvider.InvalidExamExerciseDateConfiguration; -import de.tum.in.www1.artemis.util.PageableSearchUtilService; -import de.tum.in.www1.artemis.util.TestResourceUtils; -import de.tum.in.www1.artemis.web.rest.dto.CourseForDashboardDTO; -import de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.competency.CompetencyUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.GradingInstruction; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.TeamAssignmentConfig; +import de.tum.cit.aet.artemis.domain.competency.Competency; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; +import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; +import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.repository.TutorParticipationRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.util.ExerciseIntegrationTestService; +import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider; +import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider.InvalidExamExerciseDateConfiguration; +import de.tum.cit.aet.artemis.util.PageableSearchUtilService; +import de.tum.cit.aet.artemis.util.TestResourceUtils; +import de.tum.cit.aet.artemis.web.rest.dto.CourseForDashboardDTO; +import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; class ModelingExerciseIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseUtilService.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingExerciseUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseUtilService.java index 1839b879fbd9..4b324600c0c2 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseUtilService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling; +package de.tum.cit.aet.artemis.exercise.modeling; import static org.assertj.core.api.Assertions.assertThat; @@ -17,35 +17,35 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.course.CourseFactory; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.DiagramType; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.FeedbackRepository; -import de.tum.in.www1.artemis.repository.ModelingExerciseRepository; -import de.tum.in.www1.artemis.repository.ModelingSubmissionRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismResultRepository; -import de.tum.in.www1.artemis.service.AssessmentService; -import de.tum.in.www1.artemis.service.ModelingSubmissionService; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.util.TestResourceUtils; +import de.tum.cit.aet.artemis.course.CourseFactory; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ModelingSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.service.AssessmentService; +import de.tum.cit.aet.artemis.service.ModelingSubmissionService; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.util.TestResourceUtils; /** * Service responsible for initializing the database with specific testdata related to modeling exercises for use in integration tests. diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java index 33d3d7035d5f..cfdfcd4b1732 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.exercise.modeling; +package de.tum.cit.aet.artemis.exercise.modeling; -import static de.tum.in.www1.artemis.util.TestResourceUtils.HalfSecond; +import static de.tum.cit.aet.artemis.util.TestResourceUtils.HalfSecond; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.within; @@ -20,44 +20,44 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.SubmissionVersion; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.DiagramType; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingSubmissionElement; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExerciseGroupRepository; -import de.tum.in.www1.artemis.repository.ModelingSubmissionRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionVersionRepository; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.repository.metis.PostRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismComparisonRepository; -import de.tum.in.www1.artemis.service.compass.CompassService; -import de.tum.in.www1.artemis.util.TestResourceUtils; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.SubmissionVersion; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; +import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingSubmissionElement; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExerciseGroupRepository; +import de.tum.cit.aet.artemis.repository.ModelingSubmissionRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionVersionRepository; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.repository.metis.PostRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.service.compass.CompassService; +import de.tum.cit.aet.artemis.util.TestResourceUtils; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; class ModelingSubmissionIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/controller/FeedbackSelectorTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/FeedbackSelectorTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/controller/FeedbackSelectorTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/FeedbackSelectorTest.java index 22c5437b285a..cf0ad0f73eb1 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/controller/FeedbackSelectorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/FeedbackSelectorTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.controller; +package de.tum.cit.aet.artemis.exercise.modeling.compass.controller; import static org.assertj.core.api.Assertions.assertThat; @@ -6,10 +6,10 @@ import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.modeling.ModelElement; -import de.tum.in.www1.artemis.service.compass.controller.FeedbackSelector; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.modeling.ModelElement; +import de.tum.cit.aet.artemis.service.compass.controller.FeedbackSelector; class FeedbackSelectorTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/controller/ModelClusterFactoryTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/ModelClusterFactoryTest.java similarity index 88% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/controller/ModelClusterFactoryTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/ModelClusterFactoryTest.java index c4b43a5f48c9..2b372ab8216f 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/controller/ModelClusterFactoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/ModelClusterFactoryTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.controller; +package de.tum.cit.aet.artemis.exercise.modeling.compass.controller; -import static de.tum.in.www1.artemis.util.TestResourceUtils.loadFileFromResources; +import static de.tum.cit.aet.artemis.util.TestResourceUtils.loadFileFromResources; import static org.assertj.core.api.Assertions.assertThat; import java.util.List; @@ -8,12 +8,12 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.domain.modeling.ModelCluster; -import de.tum.in.www1.artemis.domain.modeling.ModelElement; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.service.compass.controller.ModelClusterFactory; +import de.tum.cit.aet.artemis.domain.modeling.ModelCluster; +import de.tum.cit.aet.artemis.domain.modeling.ModelElement; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.service.compass.controller.ModelClusterFactory; class ModelClusterFactoryTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/controller/UMLModelParserTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/UMLModelParserTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/controller/UMLModelParserTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/UMLModelParserTest.java index 4ff6a35c8b88..2162ef5c34ba 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/controller/UMLModelParserTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/UMLModelParserTest.java @@ -1,19 +1,19 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.controller; +package de.tum.cit.aet.artemis.exercise.modeling.compass.controller; import static com.google.gson.JsonParser.parseString; -import static de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_ACTION_NODE; -import static de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_FINAL_NODE; -import static de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_FORK_NODE; -import static de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_INITIAL_NODE; -import static de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_MERGE_NODE; -import static de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_OBJECT_NODE; -import static de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_AGGREGATION; -import static de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_BIDIRECTIONAL; -import static de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_COMPOSITION; -import static de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_DEPENDENCY; -import static de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_INHERITANCE; -import static de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_REALIZATION; -import static de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_UNIDIRECTIONAL; +import static de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_ACTION_NODE; +import static de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_FINAL_NODE; +import static de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_FORK_NODE; +import static de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_INITIAL_NODE; +import static de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_MERGE_NODE; +import static de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_OBJECT_NODE; +import static de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_AGGREGATION; +import static de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_BIDIRECTIONAL; +import static de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_COMPOSITION; +import static de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_DEPENDENCY; +import static de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_INHERITANCE; +import static de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_REALIZATION; +import static de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_UNIDIRECTIONAL; import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; @@ -24,19 +24,19 @@ import com.google.gson.JsonObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivity; -import de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityNode; -import de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLControlFlow; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLClass; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLClass.UMLClassType; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLMethod; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLPackage; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLRelationship; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; -import de.tum.in.www1.artemis.util.TestResourceUtils; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityNode; +import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLControlFlow; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClass; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClass.UMLClassType; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLMethod; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLPackage; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.util.TestResourceUtils; class UMLModelParserTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/AbstractUMLDiagramTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/AbstractUMLDiagramTest.java similarity index 79% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/AbstractUMLDiagramTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/AbstractUMLDiagramTest.java index 4ce80ae2151f..b27039d30da7 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/AbstractUMLDiagramTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/AbstractUMLDiagramTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -8,18 +8,18 @@ import org.assertj.core.data.Offset; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponent; -import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentInterface; -import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentRelationship; -import de.tum.in.www1.artemis.service.plagiarism.ModelingPlagiarismDetectionService; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismService; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismWebsocketService; -import de.tum.in.www1.artemis.service.plagiarism.cache.PlagiarismCacheService; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponent; +import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentInterface; +import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentRelationship; +import de.tum.cit.aet.artemis.service.plagiarism.ModelingPlagiarismDetectionService; +import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismService; +import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismWebsocketService; +import de.tum.cit.aet.artemis.service.plagiarism.cache.PlagiarismCacheService; public abstract class AbstractUMLDiagramTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/UMLDiagramTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/UMLDiagramTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/UMLDiagramTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/UMLDiagramTest.java index 6ee07d0ecd79..51e4ea0d9703 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/UMLDiagramTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/UMLDiagramTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doReturn; @@ -14,10 +14,10 @@ import org.mockito.MockitoAnnotations; import org.mockito.Spy; -import de.tum.in.www1.artemis.service.compass.umlmodel.Similarity; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityDiagram; class UMLDiagramTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityDiagramTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityDiagramTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityDiagramTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityDiagramTest.java index cbb4680c5207..e3b18b1f1855 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityDiagramTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityDiagramTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.activity; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.activity; import static com.google.gson.JsonParser.parseString; import static org.assertj.core.api.Assertions.assertThat; @@ -14,14 +14,14 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivity; -import de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityNode; -import de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLControlFlow; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityNode; +import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLControlFlow; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; class UMLActivityDiagramTest extends AbstractUMLDiagramTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityDiagrams.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityDiagrams.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityDiagrams.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityDiagrams.java index 5ed95df0dc74..325dc0e9fb81 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityDiagrams.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityDiagrams.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.activity; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.activity; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityNodeTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityNodeTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityNodeTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityNodeTest.java index 608875631034..8e993e638026 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityNodeTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityNodeTest.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.activity; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.activity; -import static de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_ACTION_NODE; -import static de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_FINAL_NODE; +import static de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_ACTION_NODE; +import static de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_FINAL_NODE; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -12,8 +12,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityNode; -import de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLControlFlow; +import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityNode; +import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLControlFlow; import me.xdrop.fuzzywuzzy.FuzzySearch; class UMLActivityNodeTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityTest.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityTest.java index b96a8310161a..5853843880cc 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.activity; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.activity; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doReturn; @@ -13,8 +13,8 @@ import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; -import de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivity; -import de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLControlFlow; +import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLControlFlow; import me.xdrop.fuzzywuzzy.FuzzySearch; @ExtendWith(MockitoExtension.class) diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLControlFlowTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLControlFlowTest.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLControlFlowTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLControlFlowTest.java index c9e31636307d..43ec9caea3ff 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLControlFlowTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLControlFlowTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.activity; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.activity; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -10,9 +10,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLControlFlow; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLRelationship; +import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLControlFlow; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship; class UMLControlFlowTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/bpmn/BPMNDiagramTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/bpmn/BPMNDiagramTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/bpmn/BPMNDiagramTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/bpmn/BPMNDiagramTest.java index c71ac89973ee..55c6cb59b13d 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/bpmn/BPMNDiagramTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/bpmn/BPMNDiagramTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.bpmn; import static com.google.gson.JsonParser.parseString; import static org.assertj.core.api.Assertions.assertThat; @@ -7,26 +7,26 @@ import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNAnnotation; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNCallActivity; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNDataObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNDataStore; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNEndEvent; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNFlow; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNGateway; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNGroup; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNIntermediateEvent; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNPool; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNStartEvent; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNSubprocess; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNSwimlane; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNTask; -import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNTransaction; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNAnnotation; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNCallActivity; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNDataObject; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNDataStore; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNEndEvent; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNFlow; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNGateway; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNGroup; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNIntermediateEvent; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNPool; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNStartEvent; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNSubprocess; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNSwimlane; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNTask; +import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNTransaction; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; class BPMNDiagramTest extends AbstractUMLDiagramTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/bpmn/BPMNDiagrams.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/bpmn/BPMNDiagrams.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/bpmn/BPMNDiagrams.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/bpmn/BPMNDiagrams.java index a5f73b5552e4..984f1e4ed295 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/bpmn/BPMNDiagrams.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/bpmn/BPMNDiagrams.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.bpmn; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLAttributeTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLAttributeTest.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLAttributeTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLAttributeTest.java index e41606e5f4c3..5413e74c525e 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLAttributeTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLAttributeTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.classdiagram; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.classdiagram; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -10,10 +10,10 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLClass; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLMethod; -import de.tum.in.www1.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClass; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLMethod; +import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; import me.xdrop.fuzzywuzzy.FuzzySearch; class UMLAttributeTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassDiagramTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassDiagramTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassDiagramTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassDiagramTest.java index e10d6ab969bc..2019db31562b 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassDiagramTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassDiagramTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.classdiagram; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.classdiagram; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; @@ -12,14 +12,14 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLClass; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLClassDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLMethod; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLPackage; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLRelationship; +import de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClass; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClassDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLMethod; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLPackage; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship; class UMLClassDiagramTest extends AbstractUMLDiagramTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassDiagrams.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassDiagrams.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassDiagrams.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassDiagrams.java index 852012449fad..35933cc5ecb2 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassDiagrams.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassDiagrams.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.classdiagram; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.classdiagram; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassTest.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassTest.java index 49436cdf88c0..bf21a10c41d6 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassTest.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.classdiagram; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.classdiagram; -import static de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLClass.UMLClassType.ABSTRACT_CLASS; -import static de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLClass.UMLClassType.CLASS; +import static de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClass.UMLClassType.ABSTRACT_CLASS; +import static de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClass.UMLClassType.CLASS; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.CALLS_REAL_METHODS; import static org.mockito.Mockito.doReturn; @@ -19,13 +19,13 @@ import org.mockito.MockitoAnnotations; import org.mockito.Spy; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLClass; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLMethod; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLPackage; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLRelationship; -import de.tum.in.www1.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClass; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLMethod; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLPackage; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship; +import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; import me.xdrop.fuzzywuzzy.FuzzySearch; class UMLClassTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLMethodTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLMethodTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLMethodTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLMethodTest.java index 61e8d33f3d7e..a25878979dd1 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLMethodTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLMethodTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.classdiagram; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.classdiagram; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -12,10 +12,10 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLClass; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLMethod; -import de.tum.in.www1.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClass; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLMethod; +import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; import me.xdrop.fuzzywuzzy.FuzzySearch; class UMLMethodTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLPackageTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLPackageTest.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLPackageTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLPackageTest.java index 46f2996b460d..d046bc257e3d 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLPackageTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLPackageTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.classdiagram; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.classdiagram; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -12,8 +12,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLClass; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLPackage; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClass; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLPackage; import me.xdrop.fuzzywuzzy.FuzzySearch; class UMLPackageTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLRelationshipTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLRelationshipTest.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLRelationshipTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLRelationshipTest.java index c5fed56fb2f9..0a971ba872f5 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLRelationshipTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLRelationshipTest.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.classdiagram; - -import static de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_BIDIRECTIONAL; -import static de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_UNIDIRECTIONAL; -import static de.tum.in.www1.artemis.service.compass.utils.CompassConfiguration.RELATION_ELEMENT_WEIGHT; -import static de.tum.in.www1.artemis.service.compass.utils.CompassConfiguration.RELATION_MULTIPLICITY_WEIGHT; -import static de.tum.in.www1.artemis.service.compass.utils.CompassConfiguration.RELATION_ROLE_WEIGHT; -import static de.tum.in.www1.artemis.service.compass.utils.CompassConfiguration.RELATION_TYPE_WEIGHT; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.classdiagram; + +import static de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_BIDIRECTIONAL; +import static de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_UNIDIRECTIONAL; +import static de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration.RELATION_ELEMENT_WEIGHT; +import static de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration.RELATION_MULTIPLICITY_WEIGHT; +import static de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration.RELATION_ROLE_WEIGHT; +import static de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration.RELATION_TYPE_WEIGHT; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.offset; import static org.mockito.Mockito.doReturn; @@ -18,8 +18,8 @@ import org.mockito.MockitoAnnotations; import org.mockito.Spy; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLClass; -import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLRelationship; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClass; +import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship; class UMLRelationshipTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/UMLCommunicationDiagramTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/communication/UMLCommunicationDiagramTest.java similarity index 88% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/UMLCommunicationDiagramTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/communication/UMLCommunicationDiagramTest.java index a5b0f97bd9c9..6ab3dbbe1734 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/UMLCommunicationDiagramTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/communication/UMLCommunicationDiagramTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.communication; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.communication; import static com.google.gson.JsonParser.parseString; import static org.assertj.core.api.Assertions.assertThat; @@ -7,12 +7,12 @@ import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.communication.UMLCommunicationDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.communication.UMLCommunicationLink; -import de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.communication.UMLCommunicationDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.communication.UMLCommunicationLink; +import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObject; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; class UMLCommunicationDiagramTest extends AbstractUMLDiagramTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/UMLCommunicationDiagrams.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/communication/UMLCommunicationDiagrams.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/UMLCommunicationDiagrams.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/communication/UMLCommunicationDiagrams.java index b4dbd80204fc..7a8b02e4fe1e 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/UMLCommunicationDiagrams.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/communication/UMLCommunicationDiagrams.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.communication; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.communication; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/UMLComponentDiagramTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/component/UMLComponentDiagramTest.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/UMLComponentDiagramTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/component/UMLComponentDiagramTest.java index 647cf9570398..74ea9b7b15d4 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/UMLComponentDiagramTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/component/UMLComponentDiagramTest.java @@ -1,22 +1,22 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.component; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.component; import static com.google.gson.JsonParser.parseString; -import static de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentRelationship.UMLComponentRelationshipType.COMPONENT_DEPENDENCY; -import static de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentRelationship.UMLComponentRelationshipType.COMPONENT_INTERFACE_PROVIDED; -import static de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentRelationship.UMLComponentRelationshipType.COMPONENT_INTERFACE_REQUIRED; +import static de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentRelationship.UMLComponentRelationshipType.COMPONENT_DEPENDENCY; +import static de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentRelationship.UMLComponentRelationshipType.COMPONENT_INTERFACE_PROVIDED; +import static de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentRelationship.UMLComponentRelationshipType.COMPONENT_INTERFACE_REQUIRED; import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponent; -import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentInterface; -import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentRelationship; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponent; +import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentInterface; +import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentRelationship; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; class UMLComponentDiagramTest extends AbstractUMLDiagramTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/UMLComponentDiagrams.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/component/UMLComponentDiagrams.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/UMLComponentDiagrams.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/component/UMLComponentDiagrams.java index 8e29fd58e0bb..036befc3f56b 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/UMLComponentDiagrams.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/component/UMLComponentDiagrams.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.component; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.component; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/UMLDeploymentDiagramTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/deployment/UMLDeploymentDiagramTest.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/UMLDeploymentDiagramTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/deployment/UMLDeploymentDiagramTest.java index c91ef60a667a..e0a2a785ee98 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/UMLDeploymentDiagramTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/deployment/UMLDeploymentDiagramTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.deployment; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.deployment; import static com.google.gson.JsonParser.parseString; import static org.assertj.core.api.Assertions.assertThat; @@ -7,13 +7,13 @@ import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponent; -import de.tum.in.www1.artemis.service.compass.umlmodel.deployment.UMLArtifact; -import de.tum.in.www1.artemis.service.compass.umlmodel.deployment.UMLDeploymentDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.deployment.UMLNode; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponent; +import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLArtifact; +import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLDeploymentDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLNode; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; class UMLDeploymentDiagramTest extends AbstractUMLDiagramTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/UMLDeploymentDiagrams.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/deployment/UMLDeploymentDiagrams.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/UMLDeploymentDiagrams.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/deployment/UMLDeploymentDiagrams.java index 7b4c8c66e1e6..e992f7679851 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/UMLDeploymentDiagrams.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/deployment/UMLDeploymentDiagrams.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.deployment; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.deployment; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/FlowchartTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/flowchart/FlowchartTest.java similarity index 85% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/FlowchartTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/flowchart/FlowchartTest.java index b55fedd9c731..636a520055ab 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/FlowchartTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/flowchart/FlowchartTest.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.flowchart; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.flowchart; import static com.google.gson.JsonParser.parseString; -import static de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.flowchart.FlowchartUtil.FLOWCHART_MODEL_1A; -import static de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.flowchart.FlowchartUtil.FLOWCHART_MODEL_1A_V3; -import static de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.flowchart.FlowchartUtil.FLOWCHART_MODEL_1B; -import static de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.flowchart.FlowchartUtil.FLOWCHART_MODEL_1B_V3; -import static de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.flowchart.FlowchartUtil.FLOWCHART_MODEL_2; -import static de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.flowchart.FlowchartUtil.FLOWCHART_MODEL_2_V3; +import static de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.flowchart.FlowchartUtil.FLOWCHART_MODEL_1A; +import static de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.flowchart.FlowchartUtil.FLOWCHART_MODEL_1A_V3; +import static de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.flowchart.FlowchartUtil.FLOWCHART_MODEL_1B; +import static de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.flowchart.FlowchartUtil.FLOWCHART_MODEL_1B_V3; +import static de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.flowchart.FlowchartUtil.FLOWCHART_MODEL_2; +import static de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.flowchart.FlowchartUtil.FLOWCHART_MODEL_2_V3; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.InstanceOfAssertFactories.type; @@ -14,16 +14,16 @@ import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.Flowchart; -import de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartDecision; -import de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartFlowline; -import de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartFunctionCall; -import de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartInputOutput; -import de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartProcess; -import de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartTerminal; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.Flowchart; +import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartDecision; +import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartFlowline; +import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartFunctionCall; +import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartInputOutput; +import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartProcess; +import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartTerminal; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; class FlowchartTest extends AbstractUMLDiagramTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/FlowchartUtil.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/flowchart/FlowchartUtil.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/FlowchartUtil.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/flowchart/FlowchartUtil.java index 5f35eb4d9f89..2b601abe5767 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/FlowchartUtil.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/flowchart/FlowchartUtil.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.flowchart; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.flowchart; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/UMLObjectDiagramTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/object/UMLObjectDiagramTest.java similarity index 87% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/UMLObjectDiagramTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/object/UMLObjectDiagramTest.java index 9d920a91ceb2..65172417294c 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/UMLObjectDiagramTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/object/UMLObjectDiagramTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.object; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.object; import static com.google.gson.JsonParser.parseString; import static org.assertj.core.api.Assertions.assertThat; @@ -7,12 +7,12 @@ import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObject; -import de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObjectDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObjectLink; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObject; +import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObjectDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObjectLink; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; class UMLObjectDiagramTest extends AbstractUMLDiagramTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/UMLObjectDiagrams.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/object/UMLObjectDiagrams.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/UMLObjectDiagrams.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/object/UMLObjectDiagrams.java index 1696bcadb062..6d31fd57081d 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/UMLObjectDiagrams.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/object/UMLObjectDiagrams.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.object; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.object; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/PetriNetTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/petrinet/PetriNetTest.java similarity index 84% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/PetriNetTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/petrinet/PetriNetTest.java index d0dc0f31e331..8eda80db21cb 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/PetriNetTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/petrinet/PetriNetTest.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.petrinet; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.petrinet; import static com.google.gson.JsonParser.parseString; -import static de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.petrinet.PetriNets.PETRI_NET_MODEL_1A; -import static de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.petrinet.PetriNets.PETRI_NET_MODEL_1A_V3; -import static de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.petrinet.PetriNets.PETRI_NET_MODEL_1B; -import static de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.petrinet.PetriNets.PETRI_NET_MODEL_1B_V3; -import static de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.petrinet.PetriNets.PETRI_NET_MODEL_2; -import static de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.petrinet.PetriNets.PETRI_NET_MODEL_2_V3; +import static de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.petrinet.PetriNets.PETRI_NET_MODEL_1A; +import static de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.petrinet.PetriNets.PETRI_NET_MODEL_1A_V3; +import static de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.petrinet.PetriNets.PETRI_NET_MODEL_1B; +import static de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.petrinet.PetriNets.PETRI_NET_MODEL_1B_V3; +import static de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.petrinet.PetriNets.PETRI_NET_MODEL_2; +import static de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.petrinet.PetriNets.PETRI_NET_MODEL_2_V3; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.InstanceOfAssertFactories.type; @@ -14,13 +14,13 @@ import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; -import de.tum.in.www1.artemis.service.compass.umlmodel.petrinet.PetriNet; -import de.tum.in.www1.artemis.service.compass.umlmodel.petrinet.PetriNetArc; -import de.tum.in.www1.artemis.service.compass.umlmodel.petrinet.PetriNetPlace; -import de.tum.in.www1.artemis.service.compass.umlmodel.petrinet.PetriNetTransition; +import de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet.PetriNet; +import de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet.PetriNetArc; +import de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet.PetriNetPlace; +import de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet.PetriNetTransition; class PetriNetTest extends AbstractUMLDiagramTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/PetriNets.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/petrinet/PetriNets.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/PetriNets.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/petrinet/PetriNets.java index a762c34254d5..45f71016a8a3 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/PetriNets.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/petrinet/PetriNets.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.petrinet; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.petrinet; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/SyntaxTreeTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/syntaxtree/SyntaxTreeTest.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/SyntaxTreeTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/syntaxtree/SyntaxTreeTest.java index d793a551188a..3d29844f127e 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/SyntaxTreeTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/syntaxtree/SyntaxTreeTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.syntaxtree; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.syntaxtree; import static com.google.gson.JsonParser.parseString; import static org.assertj.core.api.Assertions.assertThat; @@ -8,13 +8,13 @@ import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; -import de.tum.in.www1.artemis.service.compass.umlmodel.syntaxtree.SyntaxTree; -import de.tum.in.www1.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeLink; -import de.tum.in.www1.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeNonterminal; -import de.tum.in.www1.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeTerminal; +import de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree.SyntaxTree; +import de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeLink; +import de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeNonterminal; +import de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeTerminal; class SyntaxTreeTest extends AbstractUMLDiagramTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/SyntaxTrees.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/syntaxtree/SyntaxTrees.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/SyntaxTrees.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/syntaxtree/SyntaxTrees.java index 4709f41b12c3..89a8bd5180f8 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/SyntaxTrees.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/syntaxtree/SyntaxTrees.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.syntaxtree; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.syntaxtree; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/UMLUseCaseDiagramTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/usecase/UMLUseCaseDiagramTest.java similarity index 87% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/UMLUseCaseDiagramTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/usecase/UMLUseCaseDiagramTest.java index 76dec8987c89..319bfd1808d6 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/UMLUseCaseDiagramTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/usecase/UMLUseCaseDiagramTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.usecase; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.usecase; import static com.google.gson.JsonParser.parseString; import static org.assertj.core.api.Assertions.assertThat; @@ -7,13 +7,13 @@ import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; -import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser; -import de.tum.in.www1.artemis.service.compass.umlmodel.usecase.UMLActor; -import de.tum.in.www1.artemis.service.compass.umlmodel.usecase.UMLUseCase; -import de.tum.in.www1.artemis.service.compass.umlmodel.usecase.UMLUseCaseAssociation; -import de.tum.in.www1.artemis.service.compass.umlmodel.usecase.UMLUseCaseDiagram; +import de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; +import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLActor; +import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLUseCase; +import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLUseCaseAssociation; +import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLUseCaseDiagram; class UMLUseCaseDiagramTest extends AbstractUMLDiagramTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/UMLUseCaseDiagrams.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/usecase/UMLUseCaseDiagrams.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/UMLUseCaseDiagrams.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/usecase/UMLUseCaseDiagrams.java index f70f751859a2..d6bc64258858 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/UMLUseCaseDiagrams.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/usecase/UMLUseCaseDiagrams.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.usecase; +package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.usecase; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ArgumentSources.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ArgumentSources.java similarity index 67% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ArgumentSources.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ArgumentSources.java index 0de0add3c503..0b307491197a 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ArgumentSources.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ArgumentSources.java @@ -1,14 +1,14 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.ASSEMBLER; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.OCAML; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.VHDL; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.ASSEMBLER; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.OCAML; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.VHDL; import java.util.EnumSet; import java.util.List; import java.util.Set; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; public class ArgumentSources { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java index 43b3d2f18790..e3ee6f8ae01c 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -10,14 +10,14 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.AuxiliaryRepository; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.repository.AuxiliaryRepositoryRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.service.programming.AuxiliaryRepositoryService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.repository.AuxiliaryRepositoryRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.service.programming.AuxiliaryRepositoryService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; class AuxiliaryRepositoryServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ConsistencyCheckGitlabJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ConsistencyCheckGitlabJenkinsIntegrationTest.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ConsistencyCheckGitlabJenkinsIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ConsistencyCheckGitlabJenkinsIntegrationTest.java index 6808cddc5fd0..069ef1b9531c 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ConsistencyCheckGitlabJenkinsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ConsistencyCheckGitlabJenkinsIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -6,8 +6,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.service.ConsistencyCheckTestService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.service.ConsistencyCheckTestService; class ConsistencyCheckGitlabJenkinsIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ContinuousIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ContinuousIntegrationTestService.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ContinuousIntegrationTestService.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ContinuousIntegrationTestService.java index 44172c3eae56..a9985f6c7835 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ContinuousIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ContinuousIntegrationTestService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doReturn; @@ -17,15 +17,15 @@ import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.util.GitUtilService; -import de.tum.in.www1.artemis.util.LocalRepository; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.util.GitUtilService; +import de.tum.cit.aet.artemis.util.LocalRepository; @Service public class ContinuousIntegrationTestService { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/CourseGitlabJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/CourseGitlabJenkinsIntegrationTest.java similarity index 99% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/CourseGitlabJenkinsIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/CourseGitlabJenkinsIntegrationTest.java index 372738639e01..cbb5b354724a 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/CourseGitlabJenkinsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/CourseGitlabJenkinsIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verifyNoInteractions; @@ -20,12 +20,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.course.CourseFactory; -import de.tum.in.www1.artemis.course.CourseTestService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.course.CourseFactory; +import de.tum.cit.aet.artemis.course.CourseTestService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; class CourseGitlabJenkinsIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/GitServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/GitServiceTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/GitServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/GitServiceTest.java index c70f47dbfab6..5b15671fac32 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/GitServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/GitServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; @@ -33,13 +33,13 @@ import org.junit.jupiter.params.provider.ValueSource; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.File; -import de.tum.in.www1.artemis.domain.FileType; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.exception.GitException; -import de.tum.in.www1.artemis.user.UserFactory; -import de.tum.in.www1.artemis.util.GitUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.File; +import de.tum.cit.aet.artemis.domain.FileType; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.exception.GitException; +import de.tum.cit.aet.artemis.user.UserFactory; +import de.tum.cit.aet.artemis.util.GitUtilService; class GitServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/GitlabServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/GitlabServiceTest.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/GitlabServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/GitlabServiceTest.java index cef27005d980..26e6379bd46a 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/GitlabServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/GitlabServiceTest.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.in.www1.artemis.exercise.programming.ProgrammingSubmissionConstants.GITLAB_PUSH_EVENT_REQUEST; -import static de.tum.in.www1.artemis.exercise.programming.ProgrammingSubmissionConstants.GITLAB_PUSH_EVENT_REQUEST_WITHOUT_COMMIT; -import static de.tum.in.www1.artemis.exercise.programming.ProgrammingSubmissionConstants.GITLAB_PUSH_EVENT_REQUEST_WRONG_COMMIT_ORDER; +import static de.tum.cit.aet.artemis.exercise.programming.ProgrammingSubmissionConstants.GITLAB_PUSH_EVENT_REQUEST; +import static de.tum.cit.aet.artemis.exercise.programming.ProgrammingSubmissionConstants.GITLAB_PUSH_EVENT_REQUEST_WITHOUT_COMMIT; +import static de.tum.cit.aet.artemis.exercise.programming.ProgrammingSubmissionConstants.GITLAB_PUSH_EVENT_REQUEST_WRONG_COMMIT_ORDER; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; @@ -28,14 +28,14 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.domain.Commit; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.exception.VersionControlException; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.domain.Commit; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.exception.VersionControlException; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; class GitlabServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/MockDelegate.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/MockDelegate.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/MockDelegate.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/MockDelegate.java index ab8e7e4591ee..5d776f36ae18 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/MockDelegate.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/MockDelegate.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; import java.io.IOException; import java.net.MalformedURLException; @@ -10,14 +10,14 @@ import com.fasterxml.jackson.core.JsonProcessingException; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.participation.AbstractBaseProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.participation.AbstractBaseProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; public interface MockDelegate { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/PlantUmlIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/PlantUmlIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/PlantUmlIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/PlantUmlIntegrationTest.java index fcebab157e99..cdc15b3b5946 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/PlantUmlIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/PlantUmlIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -17,7 +17,7 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import net.sourceforge.plantuml.SourceStringReader; import net.sourceforge.plantuml.core.DiagramDescription; diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java index f152723375ea..03c55831380e 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doNothing; @@ -25,43 +25,43 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.assessment.ComplaintUtilService; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.AssessmentNote; -import de.tum.in.www1.artemis.domain.Complaint; -import de.tum.in.www1.artemis.domain.ComplaintResponse; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.LongFeedbackText; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ComplaintRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.util.TestResourceUtils; -import de.tum.in.www1.artemis.web.rest.dto.AssessmentUpdateDTO; -import de.tum.in.www1.artemis.web.rest.dto.ResultDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.AssessmentNote; +import de.tum.cit.aet.artemis.domain.Complaint; +import de.tum.cit.aet.artemis.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.LongFeedbackText; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.util.TestResourceUtils; +import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; class ProgrammingAssessmentIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseBuildPlanTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseBuildPlanTest.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseBuildPlanTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseBuildPlanTest.java index 6db71af231b9..a5c1503fdf3b 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseBuildPlanTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseBuildPlanTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; import static org.assertj.core.api.Assertions.assertThat; @@ -8,10 +8,10 @@ import org.springframework.http.HttpStatus; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationGitlabCIGitlabSamlTest; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationGitlabCIGitlabSamlTest; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; class ProgrammingExerciseBuildPlanTest extends AbstractSpringIntegrationGitlabCIGitlabSamlTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseFactory.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseFactory.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseFactory.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseFactory.java index 2aa5caf6f3bb..8a4c8a7c0e8f 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseFactory.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.in.www1.artemis.exercise.ExerciseFactory.populateExerciseForExam; +import static de.tum.cit.aet.artemis.exercise.ExerciseFactory.populateExerciseForExam; import static java.time.ZonedDateTime.now; import java.time.ZonedDateTime; @@ -9,32 +9,32 @@ import java.util.List; import java.util.Set; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.StaticCodeAnalysisCategory; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.CategoryState; -import de.tum.in.www1.artemis.domain.enumeration.DifficultyLevel; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.enumeration.StaticCodeAnalysisTool; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.exercise.ExerciseFactory; -import de.tum.in.www1.artemis.service.connectors.ci.notification.dto.CommitDTO; -import de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestCaseDTO; -import de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestCaseDetailMessageDTO; -import de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestResultsDTO; -import de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestSuiteDTO; -import de.tum.in.www1.artemis.service.dto.StaticCodeAnalysisIssue; -import de.tum.in.www1.artemis.service.dto.StaticCodeAnalysisReportDTO; -import de.tum.in.www1.artemis.util.TestConstants; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisCategory; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.CategoryState; +import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.exercise.ExerciseFactory; +import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.CommitDTO; +import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestCaseDTO; +import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestCaseDetailMessageDTO; +import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestResultsDTO; +import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestSuiteDTO; +import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; +import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; +import de.tum.cit.aet.artemis.util.TestConstants; /** * Factory for creating ProgrammingExercises and related objects. diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java index 7e4fd4c2cb0c..5ed7e0c77d07 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -26,15 +26,15 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.util.GitUtilService; -import de.tum.in.www1.artemis.util.LocalRepository; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.util.GitUtilService; +import de.tum.cit.aet.artemis.util.LocalRepository; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; class ProgrammingExerciseGitIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseGitlabJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitlabJenkinsIntegrationTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseGitlabJenkinsIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitlabJenkinsIntegrationTest.java index 9cf69a1b4a07..0582f7eb79dc 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseGitlabJenkinsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitlabJenkinsIntegrationTest.java @@ -1,14 +1,14 @@ -package de.tum.in.www1.artemis.exercise.programming; - -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.C; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.EMPTY; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.HASKELL; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.JAVA; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.KOTLIN; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.PYTHON; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.SWIFT; -import static de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseTestService.STUDENT_LOGIN; -import static de.tum.in.www1.artemis.exercise.programming.ProgrammingSubmissionConstants.GITLAB_PUSH_EVENT_REQUEST; +package de.tum.cit.aet.artemis.exercise.programming; + +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.C; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.EMPTY; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.HASKELL; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.JAVA; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.KOTLIN; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.PYTHON; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.SWIFT; +import static de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseTestService.STUDENT_LOGIN; +import static de.tum.cit.aet.artemis.exercise.programming.ProgrammingSubmissionConstants.GITLAB_PUSH_EVENT_REQUEST; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doThrow; @@ -38,14 +38,14 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.domain.enumeration.AeolusTarget; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeatureService; -import de.tum.in.www1.artemis.util.InvalidExamExerciseDatesArgumentProvider; -import de.tum.in.www1.artemis.util.InvalidExamExerciseDatesArgumentProvider.InvalidExamExerciseDateConfiguration; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.domain.enumeration.AeolusTarget; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeatureService; +import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider; +import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider.InvalidExamExerciseDateConfiguration; class ProgrammingExerciseGitlabJenkinsIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { @@ -91,7 +91,7 @@ void createProgrammingExercise_validExercise_created(ExerciseMode mode) throws E } @ParameterizedTest(name = "{displayName} [{index}] {argumentsWithNames}") - @MethodSource("de.tum.in.www1.artemis.exercise.programming.ArgumentSources#generateJenkinsSupportedLanguages") + @MethodSource("de.tum.cit.aet.artemis.exercise.programming.ArgumentSources#generateJenkinsSupportedLanguages") @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") void createProgrammingExercise_programmingLanguage_validExercise_created(ProgrammingLanguage language) throws Exception { forceDefaultBuildPlanCreation(); @@ -100,14 +100,14 @@ void createProgrammingExercise_programmingLanguage_validExercise_created(Program } @ParameterizedTest(name = "{displayName} [{index}] {argumentsWithNames}") - @MethodSource("de.tum.in.www1.artemis.exercise.programming.ArgumentSources#generateJenkinsSupportedLanguages") + @MethodSource("de.tum.cit.aet.artemis.exercise.programming.ArgumentSources#generateJenkinsSupportedLanguages") @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") void createProgrammingExercise_custom_build_plan_validExercise_created(ProgrammingLanguage language) throws Exception { programmingExerciseTestService.createProgrammingExercise_custom_build_plan_validExercise_created(language, true); } @ParameterizedTest(name = "{displayName} [{index}] {argumentsWithNames}") - @MethodSource("de.tum.in.www1.artemis.exercise.programming.ArgumentSources#generateJenkinsSupportedLanguages") + @MethodSource("de.tum.cit.aet.artemis.exercise.programming.ArgumentSources#generateJenkinsSupportedLanguages") @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") void createProgrammingExercise_failed_custom_build_plan_validExercise_created(ProgrammingLanguage language) throws Exception { programmingExerciseTestService.createProgrammingExercise_custom_build_plan_validExercise_created(language, false); diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java index 1feab4de712f..bdcdc630d85b 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.in.www1.artemis.config.Constants.TEST_CASES_DUPLICATE_NOTIFICATION; +import static de.tum.cit.aet.artemis.config.Constants.TEST_CASES_DUPLICATE_NOTIFICATION; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.timeout; @@ -29,41 +29,41 @@ import org.springframework.security.test.context.TestSecurityContextHolder; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.CategoryState; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.Visibility; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.StaticCodeAnalysisCategoryRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseGradingService; -import de.tum.in.www1.artemis.service.util.RoundingUtil; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.web.rest.dto.ProgrammingExerciseGradingStatisticsDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.CategoryState; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.StaticCodeAnalysisCategoryRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseGradingService; +import de.tum.cit.aet.artemis.service.util.RoundingUtil; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseGradingStatisticsDTO; /** * Tests the {@link ProgrammingExerciseGradingService}. diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java similarity index 99% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java index b26898875559..90aad8193f6f 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.in.www1.artemis.domain.enumeration.BuildPlanType.SOLUTION; -import static de.tum.in.www1.artemis.domain.enumeration.BuildPlanType.TEMPLATE; +import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.SOLUTION; +import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.TEMPLATE; import static org.assertj.core.api.Assertions.assertThatNoException; import java.io.IOException; @@ -20,9 +20,9 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseService; class ProgrammingExerciseIntegrationJenkinsGitlabTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java index 5f98c5ab6a07..5e54ee627a17 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.exercise.programming; - -import static de.tum.in.www1.artemis.domain.enumeration.BuildPlanType.SOLUTION; -import static de.tum.in.www1.artemis.domain.enumeration.BuildPlanType.TEMPLATE; -import static de.tum.in.www1.artemis.util.TestResourceUtils.HalfSecond; -import static de.tum.in.www1.artemis.web.rest.programming.ProgrammingExerciseResourceErrorKeys.INVALID_SOLUTION_BUILD_PLAN_ID; -import static de.tum.in.www1.artemis.web.rest.programming.ProgrammingExerciseResourceErrorKeys.INVALID_SOLUTION_REPOSITORY_URL; -import static de.tum.in.www1.artemis.web.rest.programming.ProgrammingExerciseResourceErrorKeys.INVALID_TEMPLATE_BUILD_PLAN_ID; -import static de.tum.in.www1.artemis.web.rest.programming.ProgrammingExerciseResourceErrorKeys.INVALID_TEMPLATE_REPOSITORY_URL; +package de.tum.cit.aet.artemis.exercise.programming; + +import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.SOLUTION; +import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.TEMPLATE; +import static de.tum.cit.aet.artemis.util.TestResourceUtils.HalfSecond; +import static de.tum.cit.aet.artemis.web.rest.programming.ProgrammingExerciseResourceErrorKeys.INVALID_SOLUTION_BUILD_PLAN_ID; +import static de.tum.cit.aet.artemis.web.rest.programming.ProgrammingExerciseResourceErrorKeys.INVALID_SOLUTION_REPOSITORY_URL; +import static de.tum.cit.aet.artemis.web.rest.programming.ProgrammingExerciseResourceErrorKeys.INVALID_TEMPLATE_BUILD_PLAN_ID; +import static de.tum.cit.aet.artemis.web.rest.programming.ProgrammingExerciseResourceErrorKeys.INVALID_TEMPLATE_REPOSITORY_URL; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; import static org.mockito.Mockito.any; @@ -64,62 +64,62 @@ import com.fasterxml.jackson.core.type.TypeReference; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.AuxiliaryRepository; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.enumeration.Visibility; -import de.tum.in.www1.artemis.domain.notification.Notification; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismStatus; -import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult; -import de.tum.in.www1.artemis.domain.plagiarism.text.TextSubmissionElement; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.exercise.GradingCriterionUtil; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.plagiarism.PlagiarismUtilService; -import de.tum.in.www1.artemis.repository.AuxiliaryRepositoryRepository; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.GradingCriterionRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestRepository; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.FileService; -import de.tum.in.www1.artemis.service.UriService; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlRepositoryPermission; -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlService; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.util.GitUtilService; -import de.tum.in.www1.artemis.util.LocalRepository; -import de.tum.in.www1.artemis.util.RequestUtilService; -import de.tum.in.www1.artemis.util.TestResourceUtils; -import de.tum.in.www1.artemis.util.ZipFileTestUtilService; -import de.tum.in.www1.artemis.web.rest.dto.ProgrammingExerciseResetOptionsDTO; -import de.tum.in.www1.artemis.web.rest.dto.ProgrammingExerciseTestCaseDTO; -import de.tum.in.www1.artemis.web.rest.dto.RepositoryExportOptionsDTO; -import de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; -import de.tum.in.www1.artemis.web.websocket.dto.ProgrammingExerciseTestCaseStateDTO; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.domain.notification.Notification; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus; +import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.plagiarism.PlagiarismUtilService; +import de.tum.cit.aet.artemis.repository.AuxiliaryRepositoryRepository; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestRepository; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.UriService; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlRepositoryPermission; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.util.GitUtilService; +import de.tum.cit.aet.artemis.util.LocalRepository; +import de.tum.cit.aet.artemis.util.RequestUtilService; +import de.tum.cit.aet.artemis.util.TestResourceUtils; +import de.tum.cit.aet.artemis.util.ZipFileTestUtilService; +import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseResetOptionsDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseTestCaseDTO; +import de.tum.cit.aet.artemis.web.rest.dto.RepositoryExportOptionsDTO; +import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; +import de.tum.cit.aet.artemis.web.websocket.dto.ProgrammingExerciseTestCaseStateDTO; /** * Note: this class should be independent of the actual VCS and CIS and contains common test logic for scenarios: diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java index 97f080c074fd..81dbe75c8007 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.in.www1.artemis.config.Constants.LOCALCI_RESULTS_DIRECTORY; -import static de.tum.in.www1.artemis.config.Constants.LOCALCI_WORKING_DIRECTORY; +import static de.tum.cit.aet.artemis.config.Constants.LOCALCI_RESULTS_DIRECTORY; +import static de.tum.cit.aet.artemis.config.Constants.LOCALCI_WORKING_DIRECTORY; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -30,21 +30,21 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.competency.CompetencyUtilService; -import de.tum.in.www1.artemis.connector.AeolusRequestMockProvider; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.competency.Competency; -import de.tum.in.www1.artemis.domain.enumeration.AeolusTarget; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCRepositoryUri; -import de.tum.in.www1.artemis.util.LocalRepository; -import de.tum.in.www1.artemis.web.rest.dto.CheckoutDirectoriesDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.competency.CompetencyUtilService; +import de.tum.cit.aet.artemis.connector.AeolusRequestMockProvider; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.competency.Competency; +import de.tum.cit.aet.artemis.domain.enumeration.AeolusTarget; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; +import de.tum.cit.aet.artemis.util.LocalRepository; +import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; @TestInstance(TestInstance.Lifecycle.PER_CLASS) class ProgrammingExerciseLocalVCLocalCIIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java index 5c1f03224682..6629cb51ab38 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doReturn; @@ -25,24 +25,24 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.web.rest.dto.CommitInfoDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.web.rest.dto.CommitInfoDTO; class ProgrammingExerciseParticipationIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseRepositoryServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseRepositoryServiceTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseRepositoryServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseRepositoryServiceTest.java index 964d72f52e23..d9ea545f96b9 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseRepositoryServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseRepositoryServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.never; @@ -12,14 +12,14 @@ import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseRepositoryService; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseRepositoryService; +import de.tum.cit.aet.artemis.user.UserUtilService; class ProgrammingExerciseRepositoryServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseResultJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultJenkinsIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseResultJenkinsIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultJenkinsIntegrationTest.java index 83836a09bb17..d8ea91587f5c 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseResultJenkinsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultJenkinsIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory.DEFAULT_BRANCH; +import static de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory.DEFAULT_BRANCH; import static org.mockito.Mockito.doReturn; import java.time.ZonedDateTime; @@ -19,12 +19,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.service.connectors.ci.notification.dto.CommitDTO; -import de.tum.in.www1.artemis.util.TestConstants; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.CommitDTO; +import de.tum.cit.aet.artemis.util.TestConstants; class ProgrammingExerciseResultJenkinsIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseResultTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseResultTestService.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java index 9982da320236..8b31af0095d9 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseResultTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.in.www1.artemis.config.Constants.NEW_RESULT_TOPIC; +import static de.tum.cit.aet.artemis.config.Constants.NEW_RESULT_TOPIC; import static java.util.Comparator.comparing; import static java.util.Comparator.naturalOrder; import static java.util.Comparator.nullsFirst; @@ -33,42 +33,42 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.StaticCodeAnalysisTool; -import de.tum.in.www1.artemis.domain.enumeration.Visibility; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTestCaseType; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.hestia.TestwiseCoverageTestUtil; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.FeedbackRepository; -import de.tum.in.www1.artemis.repository.ParticipationVCSAccessTokenRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.service.StaticCodeAnalysisService; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.dto.AbstractBuildResultNotificationDTO; -import de.tum.in.www1.artemis.service.messaging.InstanceMessageSendService; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseGradingService; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.util.RequestUtilService; -import de.tum.in.www1.artemis.util.TestConstants; -import de.tum.in.www1.artemis.web.rest.dto.ResultDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTestCaseType; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.hestia.TestwiseCoverageTestUtil; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.repository.ParticipationVCSAccessTokenRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; +import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseGradingService; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.util.RequestUtilService; +import de.tum.cit.aet.artemis.util.TestConstants; +import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; /** * Note: this class should be independent of the actual VCS and CIS and contains common test logic for both scenarios: diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java index 58ae1ae3ab67..b564e9c07260 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.after; @@ -28,31 +28,31 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationGitlabCIGitlabSamlTest; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseLifecycle; -import de.tum.in.www1.artemis.domain.enumeration.ParticipationLifecycle; -import de.tum.in.www1.artemis.domain.enumeration.Visibility; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.service.messaging.InstanceMessageReceiveService; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.util.LocalRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationGitlabCIGitlabSamlTest; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; +import de.tum.cit.aet.artemis.domain.enumeration.ParticipationLifecycle; +import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.service.messaging.InstanceMessageReceiveService; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.util.LocalRepository; class ProgrammingExerciseScheduleServiceTest extends AbstractSpringIntegrationGitlabCIGitlabSamlTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceIntegrationTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseServiceIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceIntegrationTest.java index 482bfdc8baff..4117c3040daf 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; import static org.assertj.core.api.Assertions.assertThat; @@ -16,21 +16,21 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.StaticCodeAnalysisCategory; -import de.tum.in.www1.artemis.domain.hestia.CodeHint; -import de.tum.in.www1.artemis.domain.hestia.ExerciseHint; -import de.tum.in.www1.artemis.domain.submissionpolicy.LockRepositoryPolicy; -import de.tum.in.www1.artemis.domain.submissionpolicy.SubmissionPenaltyPolicy; -import de.tum.in.www1.artemis.domain.submissionpolicy.SubmissionPolicy; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseImportBasicService; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseService; -import de.tum.in.www1.artemis.util.ExerciseIntegrationTestService; -import de.tum.in.www1.artemis.util.PageableSearchUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisCategory; +import de.tum.cit.aet.artemis.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.domain.hestia.ExerciseHint; +import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; +import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPenaltyPolicy; +import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseImportBasicService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseService; +import de.tum.cit.aet.artemis.util.ExerciseIntegrationTestService; +import de.tum.cit.aet.artemis.util.PageableSearchUtilService; class ProgrammingExerciseServiceIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceTest.java similarity index 85% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceTest.java index 0218f7a9f5a1..a3d41b8ae86e 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; import static org.assertj.core.api.Assertions.assertThat; @@ -10,12 +10,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestRepository; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; class ProgrammingExerciseServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseTemplateIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTemplateIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseTemplateIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTemplateIntegrationTest.java index 334af02ba101..774b996ba7f5 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseTemplateIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTemplateIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.in.www1.artemis.util.TestConstants.COMMIT_HASH_OBJECT_ID; +import static de.tum.cit.aet.artemis.util.TestConstants.COMMIT_HASH_OBJECT_ID; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Fail.fail; import static org.mockito.ArgumentMatchers.any; @@ -51,13 +51,13 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeatureService; -import de.tum.in.www1.artemis.util.LocalRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeatureService; +import de.tum.cit.aet.artemis.util.LocalRepository; @TestInstance(TestInstance.Lifecycle.PER_CLASS) class ProgrammingExerciseTemplateIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTest.java index a863f9dcdb85..ebf6c1e7a581 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.in.www1.artemis.util.RequestUtilService.deleteProgrammingExerciseParamsFalse; +import static de.tum.cit.aet.artemis.util.RequestUtilService.deleteProgrammingExerciseParamsFalse; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; @@ -23,27 +23,27 @@ import org.springframework.http.MediaType; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; class ProgrammingExerciseTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java similarity index 89% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java index 7f5a39548019..14a76a683b4a 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.any; @@ -21,21 +21,21 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.Visibility; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseFeedbackCreationService; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseTestCaseService; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.web.rest.dto.ProgrammingExerciseTestCaseDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseFeedbackCreationService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseTestCaseService; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseTestCaseDTO; class ProgrammingExerciseTestCaseServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseTestService.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java index 6210ddacc6cb..df26a3b0e490 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java @@ -1,14 +1,14 @@ -package de.tum.in.www1.artemis.exercise.programming; - -import static de.tum.in.www1.artemis.domain.enumeration.ExerciseMode.INDIVIDUAL; -import static de.tum.in.www1.artemis.domain.enumeration.ExerciseMode.TEAM; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.C; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.JAVA; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.SWIFT; -import static de.tum.in.www1.artemis.service.export.ProgrammingExerciseExportService.BUILD_PLAN_FILE_NAME; -import static de.tum.in.www1.artemis.service.export.ProgrammingExerciseExportService.EXPORTED_EXERCISE_DETAILS_FILE_PREFIX; -import static de.tum.in.www1.artemis.service.export.ProgrammingExerciseExportService.EXPORTED_EXERCISE_PROBLEM_STATEMENT_FILE_PREFIX; -import static de.tum.in.www1.artemis.util.TestConstants.COMMIT_HASH_OBJECT_ID; +package de.tum.cit.aet.artemis.exercise.programming; + +import static de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode.INDIVIDUAL; +import static de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode.TEAM; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.C; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.JAVA; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.SWIFT; +import static de.tum.cit.aet.artemis.service.export.ProgrammingExerciseExportService.BUILD_PLAN_FILE_NAME; +import static de.tum.cit.aet.artemis.service.export.ProgrammingExerciseExportService.EXPORTED_EXERCISE_DETAILS_FILE_PREFIX; +import static de.tum.cit.aet.artemis.service.export.ProgrammingExerciseExportService.EXPORTED_EXERCISE_PROBLEM_STATEMENT_FILE_PREFIX; +import static de.tum.cit.aet.artemis.util.TestConstants.COMMIT_HASH_OBJECT_ID; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.within; @@ -70,90 +70,90 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.config.StaticCodeAnalysisConfigurer; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Authority; -import de.tum.in.www1.artemis.domain.AuxiliaryRepository; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.StaticCodeAnalysisCategory; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.TeamAssignmentConfig; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExamUser; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.hestia.ExerciseHint; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.in.www1.artemis.domain.participation.Participant; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig; -import de.tum.in.www1.artemis.domain.statistics.BuildLogStatisticsEntry; -import de.tum.in.www1.artemis.domain.submissionpolicy.LockRepositoryPolicy; -import de.tum.in.www1.artemis.exam.ExamFactory; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exception.GitException; -import de.tum.in.www1.artemis.exception.VersionControlException; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.AuxiliaryRepositoryRepository; -import de.tum.in.www1.artemis.repository.BuildLogStatisticsEntryRepository; -import de.tum.in.www1.artemis.repository.BuildPlanRepository; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExamUserRepository; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationTestRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.in.www1.artemis.repository.StaticCodeAnalysisCategoryRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseTaskRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.service.FilePathService; -import de.tum.in.www1.artemis.service.ParticipationService; -import de.tum.in.www1.artemis.service.UriService; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.in.www1.artemis.service.connectors.gitlab.GitLabException; -import de.tum.in.www1.artemis.service.connectors.jenkins.build_plan.JenkinsBuildPlanUtils; -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlRepositoryPermission; -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlService; -import de.tum.in.www1.artemis.service.export.CourseExamExportService; -import de.tum.in.www1.artemis.service.programming.JavaTemplateUpgradeService; -import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeature; -import de.tum.in.www1.artemis.service.scheduled.AutomaticProgrammingExerciseCleanupService; -import de.tum.in.www1.artemis.service.user.PasswordService; -import de.tum.in.www1.artemis.user.UserFactory; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.util.ExamPrepareExercisesTestUtil; -import de.tum.in.www1.artemis.util.GitUtilService.MockFileRepositoryUri; -import de.tum.in.www1.artemis.util.InvalidExamExerciseDatesArgumentProvider.InvalidExamExerciseDateConfiguration; -import de.tum.in.www1.artemis.util.LocalRepository; -import de.tum.in.www1.artemis.util.RequestUtilService; -import de.tum.in.www1.artemis.util.TestConstants; -import de.tum.in.www1.artemis.util.ZipFileTestUtilService; -import de.tum.in.www1.artemis.web.rest.dto.BuildLogStatisticsDTO; -import de.tum.in.www1.artemis.web.rest.dto.CourseForDashboardDTO; +import de.tum.cit.aet.artemis.config.StaticCodeAnalysisConfigurer; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Authority; +import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisCategory; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.TeamAssignmentConfig; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExamUser; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.hestia.ExerciseHint; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.domain.participation.Participant; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismDetectionConfig; +import de.tum.cit.aet.artemis.domain.statistics.BuildLogStatisticsEntry; +import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; +import de.tum.cit.aet.artemis.exam.ExamFactory; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exception.GitException; +import de.tum.cit.aet.artemis.exception.VersionControlException; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.AuxiliaryRepositoryRepository; +import de.tum.cit.aet.artemis.repository.BuildLogStatisticsEntryRepository; +import de.tum.cit.aet.artemis.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExamUserRepository; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationTestRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repository.StaticCodeAnalysisCategoryRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.service.UriService; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabException; +import de.tum.cit.aet.artemis.service.connectors.jenkins.build_plan.JenkinsBuildPlanUtils; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlRepositoryPermission; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.service.export.CourseExamExportService; +import de.tum.cit.aet.artemis.service.programming.JavaTemplateUpgradeService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeature; +import de.tum.cit.aet.artemis.service.scheduled.AutomaticProgrammingExerciseCleanupService; +import de.tum.cit.aet.artemis.service.user.PasswordService; +import de.tum.cit.aet.artemis.user.UserFactory; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.util.ExamPrepareExercisesTestUtil; +import de.tum.cit.aet.artemis.util.GitUtilService.MockFileRepositoryUri; +import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider.InvalidExamExerciseDateConfiguration; +import de.tum.cit.aet.artemis.util.LocalRepository; +import de.tum.cit.aet.artemis.util.RequestUtilService; +import de.tum.cit.aet.artemis.util.TestConstants; +import de.tum.cit.aet.artemis.util.ZipFileTestUtilService; +import de.tum.cit.aet.artemis.web.rest.dto.BuildLogStatisticsDTO; +import de.tum.cit.aet.artemis.web.rest.dto.CourseForDashboardDTO; /** * Note: this class should be independent of the actual VCS and CIS and contains common test logic for scenarios: @@ -1176,7 +1176,7 @@ void testImportProgrammingExerciseNoneSubmissionPolicyChange() throws Exception /** * Method to test the correct import of a programming exercise into an exam during an exam import - * For more Information see {@link de.tum.in.www1.artemis.service.exam.ExamImportService} + * For more Information see {@link de.tum.cit.aet.artemis.service.exam.ExamImportService} */ public void importProgrammingExerciseAsPartOfExamImport() throws Exception { // Setup existing exam and exercise diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java index 8cf190c0a68d..fd0f48c85245 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -26,61 +26,61 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.course.CourseFactory; -import de.tum.in.www1.artemis.domain.AuxiliaryRepository; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.BuildPlanType; -import de.tum.in.www1.artemis.domain.enumeration.CategoryState; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.enumeration.Visibility; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.hestia.CodeHint; -import de.tum.in.www1.artemis.domain.hestia.ExerciseHint; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.submissionpolicy.SubmissionPolicy; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.AuxiliaryRepositoryRepository; -import de.tum.in.www1.artemis.repository.BuildPlanRepository; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.repository.StaticCodeAnalysisCategoryRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionPolicyRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.TemplateProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.repository.hestia.CodeHintRepository; -import de.tum.in.www1.artemis.repository.hestia.ExerciseHintRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseTaskRepository; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.util.LocalRepository; -import de.tum.in.www1.artemis.util.TestConstants; +import de.tum.cit.aet.artemis.course.CourseFactory; +import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType; +import de.tum.cit.aet.artemis.domain.enumeration.CategoryState; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.domain.hestia.ExerciseHint; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.AuxiliaryRepositoryRepository; +import de.tum.cit.aet.artemis.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.repository.StaticCodeAnalysisCategoryRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionPolicyRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.repository.hestia.CodeHintRepository; +import de.tum.cit.aet.artemis.repository.hestia.ExerciseHintRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.util.LocalRepository; +import de.tum.cit.aet.artemis.util.TestConstants; /** * Service responsible for initializing the database with specific testdata related to programming exercises for use in integration tests. diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java index bea3a100d2fc..4fe13cb3dbca 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.JAVA; -import static de.tum.in.www1.artemis.exercise.programming.ProgrammingSubmissionConstants.GITLAB_PUSH_EVENT_REQUEST; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.JAVA; +import static de.tum.cit.aet.artemis.exercise.programming.ProgrammingSubmissionConstants.GITLAB_PUSH_EVENT_REQUEST; import static org.assertj.core.api.Assertions.assertThat; import java.time.ZonedDateTime; @@ -26,24 +26,24 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.domain.BuildLogEntry; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.BuildLogStatisticsEntryRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.connectors.ci.notification.dto.CommitDTO; -import de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestCaseDTO; -import de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestCaseDetailMessageDTO; -import de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestResultsDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.BuildLogStatisticsEntryRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.CommitDTO; +import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestCaseDTO; +import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestCaseDetailMessageDTO; +import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestResultsDTO; class ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java similarity index 87% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java index 862085f88b98..88dcc1fd39cb 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.JAVA; +import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.JAVA; import static org.assertj.core.api.Assertions.assertThat; import java.time.ZonedDateTime; @@ -14,16 +14,16 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.in.www1.artemis.util.RequestUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.util.RequestUtilService; /** * Note: this class should be independent of the actual VCS and CIS and contains common test logic for scenarios: diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingSubmissionConstants.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionConstants.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingSubmissionConstants.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionConstants.java index 5069428053cc..ec3f964a40bc 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingSubmissionConstants.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionConstants.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java index 98bbb1fe528a..6858465f38b5 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.in.www1.artemis.config.Constants.NEW_SUBMISSION_TOPIC; -import static de.tum.in.www1.artemis.config.Constants.SETUP_COMMIT_MESSAGE; -import static de.tum.in.www1.artemis.util.TestConstants.COMMIT_HASH_OBJECT_ID; -import static de.tum.in.www1.artemis.util.TestResourceUtils.HalfSecond; +import static de.tum.cit.aet.artemis.config.Constants.NEW_SUBMISSION_TOPIC; +import static de.tum.cit.aet.artemis.config.Constants.SETUP_COMMIT_MESSAGE; +import static de.tum.cit.aet.artemis.util.TestConstants.COMMIT_HASH_OBJECT_ID; +import static de.tum.cit.aet.artemis.util.TestResourceUtils.HalfSecond; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; import static org.mockito.Mockito.any; @@ -34,36 +34,36 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Commit; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exception.ContinuousIntegrationException; -import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.util.TestConstants; -import de.tum.in.www1.artemis.util.TestResourceUtils; -import de.tum.in.www1.artemis.web.rest.dto.SubmissionDTO; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Commit; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.util.TestConstants; +import de.tum.cit.aet.artemis.util.TestResourceUtils; +import de.tum.cit.aet.artemis.web.rest.dto.SubmissionDTO; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; class ProgrammingSubmissionIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/RepositoryIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/RepositoryIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java index a3b7f89eb4e1..974b9489272b 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/RepositoryIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.in.www1.artemis.util.RequestUtilService.parameters; +import static de.tum.cit.aet.artemis.util.RequestUtilService.parameters; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.within; import static org.mockito.Mockito.any; @@ -52,46 +52,46 @@ import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.read.ListAppender; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.domain.BuildLogEntry; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.FileType; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismStatus; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.in.www1.artemis.domain.plagiarism.text.TextSubmissionElement; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.metis.PostRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismComparisonRepository; -import de.tum.in.www1.artemis.service.BuildLogEntryService; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlRepositoryPermission; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseParticipationService; -import de.tum.in.www1.artemis.util.GitUtilService; -import de.tum.in.www1.artemis.util.LocalRepository; -import de.tum.in.www1.artemis.util.TestConstants; -import de.tum.in.www1.artemis.web.rest.dto.FileMove; -import de.tum.in.www1.artemis.web.rest.dto.RepositoryStatusDTO; -import de.tum.in.www1.artemis.web.rest.repository.FileSubmission; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.FileType; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; +import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.metis.PostRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.service.BuildLogEntryService; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlRepositoryPermission; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseParticipationService; +import de.tum.cit.aet.artemis.util.GitUtilService; +import de.tum.cit.aet.artemis.util.LocalRepository; +import de.tum.cit.aet.artemis.util.TestConstants; +import de.tum.cit.aet.artemis.web.rest.dto.FileMove; +import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTO; +import de.tum.cit.aet.artemis.web.rest.repository.FileSubmission; class RepositoryIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { @@ -395,8 +395,8 @@ private String getCommitHash(Git repo) throws GitAPIException { @Test @WithMockUser(username = TEST_PREFIX + "tutor1", roles = "TA") void testGetFilesWithContent_shouldNotThrowException() throws Exception { - Map mockedFiles = new HashMap<>(); - mockedFiles.put(mock(de.tum.in.www1.artemis.domain.File.class), FileType.FILE); + Map mockedFiles = new HashMap<>(); + mockedFiles.put(mock(de.tum.cit.aet.artemis.domain.File.class), FileType.FILE); doReturn(mockedFiles).when(gitService).listFilesAndFolders(any(Repository.class)); MockedStatic mockedFileUtils = mockStatic(FileUtils.class); diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/RepositoryProgrammingExerciseParticipationJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryProgrammingExerciseParticipationJenkinsIntegrationTest.java similarity index 86% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/RepositoryProgrammingExerciseParticipationJenkinsIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryProgrammingExerciseParticipationJenkinsIntegrationTest.java index f9705db11814..b3fd6edb7daf 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/RepositoryProgrammingExerciseParticipationJenkinsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryProgrammingExerciseParticipationJenkinsIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doReturn; @@ -20,14 +20,14 @@ import com.offbytwo.jenkins.model.Build; import com.offbytwo.jenkins.model.JobWithDetails; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.domain.BuildLogEntry; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.util.TestConstants; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.util.TestConstants; class RepositoryProgrammingExerciseParticipationJenkinsIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java index 90153f79386b..0b784661e58c 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -23,22 +23,22 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.config.StaticCodeAnalysisConfigurer; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.StaticCodeAnalysisCategory; -import de.tum.in.www1.artemis.domain.enumeration.CategoryState; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.StaticCodeAnalysisCategoryRepository; -import de.tum.in.www1.artemis.service.StaticCodeAnalysisService; -import de.tum.in.www1.artemis.service.dto.StaticCodeAnalysisIssue; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseFeedbackCreationService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.config.StaticCodeAnalysisConfigurer; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisCategory; +import de.tum.cit.aet.artemis.domain.enumeration.CategoryState; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.StaticCodeAnalysisCategoryRepository; +import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; +import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseFeedbackCreationService; class StaticCodeAnalysisIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java index da6e3369aedf..0e99569c3848 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.in.www1.artemis.domain.Feedback.SUBMISSION_POLICY_FEEDBACK_IDENTIFIER; -import static de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseResultTestService.convertBuildResultToJsonObject; +import static de.tum.cit.aet.artemis.domain.Feedback.SUBMISSION_POLICY_FEEDBACK_IDENTIFIER; +import static de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseResultTestService.convertBuildResultToJsonObject; import static org.assertj.core.api.Assertions.assertThat; import java.util.Collections; @@ -18,22 +18,22 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.submissionpolicy.LockRepositoryPolicy; -import de.tum.in.www1.artemis.domain.submissionpolicy.SubmissionPenaltyPolicy; -import de.tum.in.www1.artemis.domain.submissionpolicy.SubmissionPolicy; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.service.connectors.ci.notification.dto.CommitDTO; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseGradingService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; +import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPenaltyPolicy; +import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.CommitDTO; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseGradingService; class SubmissionPolicyIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java index 4657bbf4abd1..e59b40552d53 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.programming; +package de.tum.cit.aet.artemis.exercise.programming; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.any; @@ -31,20 +31,20 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.File; -import de.tum.in.www1.artemis.domain.FileType; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.util.GitUtilService; -import de.tum.in.www1.artemis.util.LocalRepository; -import de.tum.in.www1.artemis.web.rest.dto.FileMove; -import de.tum.in.www1.artemis.web.rest.dto.RepositoryStatusDTO; -import de.tum.in.www1.artemis.web.rest.repository.FileSubmission; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.File; +import de.tum.cit.aet.artemis.domain.FileType; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.util.GitUtilService; +import de.tum.cit.aet.artemis.util.LocalRepository; +import de.tum.cit.aet.artemis.web.rest.dto.FileMove; +import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTO; +import de.tum.cit.aet.artemis.web.rest.repository.FileSubmission; class TestRepositoryResourceIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizComparisonTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizComparisonTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizComparisonTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizComparisonTest.java index 7e2d411cce9a..e9809f01f848 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizComparisonTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizComparisonTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.exercise.quiz; +package de.tum.cit.aet.artemis.exercise.quiz; -import static de.tum.in.www1.artemis.service.exam.StudentExamService.isContentEqualTo; +import static de.tum.cit.aet.artemis.service.exam.StudentExamService.isContentEqualTo; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import java.time.ZonedDateTime; @@ -13,29 +13,29 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.course.CourseFactory; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.enumeration.QuizMode; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.quiz.AnswerOption; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropMapping; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.DragItem; -import de.tum.in.www1.artemis.domain.quiz.DropLocation; -import de.tum.in.www1.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.in.www1.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSpot; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedText; -import de.tum.in.www1.artemis.domain.quiz.compare.DnDMapping; -import de.tum.in.www1.artemis.domain.quiz.compare.SAMapping; -import de.tum.in.www1.artemis.exam.ExamFactory; -import de.tum.in.www1.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.course.CourseFactory; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.quiz.AnswerOption; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropMapping; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.DragItem; +import de.tum.cit.aet.artemis.domain.quiz.DropLocation; +import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSpot; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedText; +import de.tum.cit.aet.artemis.domain.quiz.compare.DnDMapping; +import de.tum.cit.aet.artemis.domain.quiz.compare.SAMapping; +import de.tum.cit.aet.artemis.exam.ExamFactory; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; class QuizComparisonTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizExerciseFactory.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseFactory.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizExerciseFactory.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseFactory.java index 3d4ba348046a..f07438c4fd91 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizExerciseFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseFactory.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.quiz; +package de.tum.cit.aet.artemis.exercise.quiz; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @@ -14,34 +14,34 @@ import org.apache.commons.io.FileUtils; import org.springframework.util.ResourceUtils; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.enumeration.QuizMode; -import de.tum.in.www1.artemis.domain.enumeration.ScoringType; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.quiz.AnswerOption; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropMapping; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.DragItem; -import de.tum.in.www1.artemis.domain.quiz.DropLocation; -import de.tum.in.www1.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.in.www1.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.QuizBatch; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizGroup; -import de.tum.in.www1.artemis.domain.quiz.QuizPointStatistic; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerMapping; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSolution; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSpot; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedText; -import de.tum.in.www1.artemis.domain.quiz.SubmittedAnswer; -import de.tum.in.www1.artemis.exercise.ExerciseFactory; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; +import de.tum.cit.aet.artemis.domain.enumeration.ScoringType; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.quiz.AnswerOption; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropMapping; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.DragItem; +import de.tum.cit.aet.artemis.domain.quiz.DropLocation; +import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizGroup; +import de.tum.cit.aet.artemis.domain.quiz.QuizPointStatistic; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerMapping; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSolution; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSpot; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedText; +import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.exercise.ExerciseFactory; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.service.FilePathService; /** * Factory for creating QuizExercises and related objects. diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizExerciseIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java index 904367591690..133d7abef89d 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.quiz; +package de.tum.cit.aet.artemis.exercise.quiz; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.byLessThan; @@ -41,51 +41,51 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.TeamAssignmentConfig; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.DifficultyLevel; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.in.www1.artemis.domain.enumeration.QuizMode; -import de.tum.in.www1.artemis.domain.enumeration.ScoringType; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.quiz.AnswerOption; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropQuestionStatistic; -import de.tum.in.www1.artemis.domain.quiz.DragItem; -import de.tum.in.www1.artemis.domain.quiz.DropLocation; -import de.tum.in.www1.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.in.www1.artemis.domain.quiz.MultipleChoiceQuestionStatistic; -import de.tum.in.www1.artemis.domain.quiz.PointCounter; -import de.tum.in.www1.artemis.domain.quiz.QuizBatch; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerMapping; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerQuestionStatistic; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSolution; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSpot; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.QuizExerciseRepository; -import de.tum.in.www1.artemis.repository.QuizSubmissionRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmittedAnswerRepository; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.ExerciseService; -import de.tum.in.www1.artemis.service.quiz.QuizExerciseService; -import de.tum.in.www1.artemis.util.ExerciseIntegrationTestService; -import de.tum.in.www1.artemis.util.PageableSearchUtilService; -import de.tum.in.www1.artemis.web.rest.dto.QuizBatchJoinDTO; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.TeamAssignmentConfig; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; +import de.tum.cit.aet.artemis.domain.enumeration.ScoringType; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.quiz.AnswerOption; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestionStatistic; +import de.tum.cit.aet.artemis.domain.quiz.DragItem; +import de.tum.cit.aet.artemis.domain.quiz.DropLocation; +import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestionStatistic; +import de.tum.cit.aet.artemis.domain.quiz.PointCounter; +import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerMapping; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestionStatistic; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSolution; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSpot; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmittedAnswerRepository; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.ExerciseService; +import de.tum.cit.aet.artemis.service.quiz.QuizExerciseService; +import de.tum.cit.aet.artemis.util.ExerciseIntegrationTestService; +import de.tum.cit.aet.artemis.util.PageableSearchUtilService; +import de.tum.cit.aet.artemis.web.rest.dto.QuizBatchJoinDTO; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; class QuizExerciseIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseUtilService.java similarity index 89% rename from src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizExerciseUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseUtilService.java index 713dfd486855..fa1db2e9f499 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseUtilService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.quiz; +package de.tum.cit.aet.artemis.exercise.quiz; import static org.assertj.core.api.Assertions.assertThat; @@ -15,44 +15,44 @@ import org.springframework.stereotype.Service; import org.springframework.util.ResourceUtils; -import de.tum.in.www1.artemis.course.CourseFactory; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.TeamAssignmentConfig; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.enumeration.QuizMode; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropMapping; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.in.www1.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.QuizBatch; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedText; -import de.tum.in.www1.artemis.exam.ExamFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.DragAndDropMappingRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.QuizBatchRepository; -import de.tum.in.www1.artemis.repository.QuizExerciseRepository; -import de.tum.in.www1.artemis.repository.QuizQuestionRepository; -import de.tum.in.www1.artemis.repository.QuizSubmissionRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmittedAnswerRepository; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.service.FilePathService; -import de.tum.in.www1.artemis.service.quiz.QuizScheduleService; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.course.CourseFactory; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.TeamAssignmentConfig; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropMapping; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedText; +import de.tum.cit.aet.artemis.exam.ExamFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.DragAndDropMappingRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.QuizBatchRepository; +import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.repository.QuizQuestionRepository; +import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmittedAnswerRepository; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.service.quiz.QuizScheduleService; +import de.tum.cit.aet.artemis.user.UserUtilService; /** * Service responsible for initializing the database with specific testdata related to quiz exercises for use in integration tests. diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java index 2d7d27fbc443..62e43a24ee25 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.quiz; +package de.tum.cit.aet.artemis.exercise.quiz; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -33,42 +33,42 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.web.multipart.MultipartFile; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.QuizMode; -import de.tum.in.www1.artemis.domain.enumeration.ScoringType; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.quiz.AnswerOption; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropMapping; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.DragItem; -import de.tum.in.www1.artemis.domain.quiz.DropLocation; -import de.tum.in.www1.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.in.www1.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.QuizBatch; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSpot; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedText; -import de.tum.in.www1.artemis.domain.quiz.SubmittedAnswer; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.QuizExerciseRepository; -import de.tum.in.www1.artemis.repository.QuizSubmissionRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.service.quiz.QuizBatchService; -import de.tum.in.www1.artemis.service.quiz.QuizExerciseService; -import de.tum.in.www1.artemis.service.quiz.QuizStatisticService; -import de.tum.in.www1.artemis.web.rest.dto.QuizBatchJoinDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; +import de.tum.cit.aet.artemis.domain.enumeration.ScoringType; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.quiz.AnswerOption; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropMapping; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.DragItem; +import de.tum.cit.aet.artemis.domain.quiz.DropLocation; +import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSpot; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedText; +import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.service.quiz.QuizBatchService; +import de.tum.cit.aet.artemis.service.quiz.QuizExerciseService; +import de.tum.cit.aet.artemis.service.quiz.QuizStatisticService; +import de.tum.cit.aet.artemis.web.rest.dto.QuizBatchJoinDTO; class QuizSubmissionIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/text/TextComparisonTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextComparisonTest.java similarity index 87% rename from src/test/java/de/tum/in/www1/artemis/exercise/text/TextComparisonTest.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/text/TextComparisonTest.java index c7f3894c69f3..d38c85db6b67 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/text/TextComparisonTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextComparisonTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.text; +package de.tum.cit.aet.artemis.exercise.text; import static org.assertj.core.api.Assertions.assertThat; @@ -7,11 +7,11 @@ import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.course.CourseFactory; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.service.exam.StudentExamService; +import de.tum.cit.aet.artemis.course.CourseFactory; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.service.exam.StudentExamService; class TextComparisonTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/text/TextExerciseFactory.java b/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextExerciseFactory.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/exercise/text/TextExerciseFactory.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/text/TextExerciseFactory.java index 564eaa018674..737f6fa1199c 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/text/TextExerciseFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextExerciseFactory.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.text; +package de.tum.cit.aet.artemis.exercise.text; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -6,17 +6,17 @@ import java.util.List; import java.util.Set; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.TextBlock; -import de.tum.in.www1.artemis.domain.TextBlockType; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.analytics.TextAssessmentEvent; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.TextAssessmentEventType; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exercise.ExerciseFactory; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.TextBlock; +import de.tum.cit.aet.artemis.domain.TextBlockType; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.analytics.TextAssessmentEvent; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.TextAssessmentEventType; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.ExerciseFactory; /** * Factory for creating TextExercises and related objects. diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/text/TextExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextExerciseUtilService.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/exercise/text/TextExerciseUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/exercise/text/TextExerciseUtilService.java index 2e0a997b7351..97314cadd0a5 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/text/TextExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextExerciseUtilService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.exercise.text; +package de.tum.cit.aet.artemis.exercise.text; import static org.assertj.core.api.Assertions.assertThat; @@ -11,43 +11,43 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.course.CourseFactory; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.TextBlock; -import de.tum.in.www1.artemis.domain.TextBlockType; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.analytics.TextAssessmentEvent; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.enumeration.TextAssessmentEventType; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.participation.Participant; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.FeedbackRepository; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.TextBlockRepository; -import de.tum.in.www1.artemis.repository.TextExerciseRepository; -import de.tum.in.www1.artemis.repository.TextSubmissionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismResultRepository; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.course.CourseFactory; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.TextBlock; +import de.tum.cit.aet.artemis.domain.TextBlockType; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.analytics.TextAssessmentEvent; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.enumeration.TextAssessmentEventType; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.participation.Participant; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.TextBlockRepository; +import de.tum.cit.aet.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; /** * Service responsible for initializing the database with specific testdata related to text exercises for use in integration tests. diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/CodeHintIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintIntegrationTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/hestia/CodeHintIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintIntegrationTest.java index af124f0f2ebb..c939f769afa3 100644 --- a/src/test/java/de/tum/in/www1/artemis/hestia/CodeHintIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.hestia; +package de.tum.cit.aet.artemis.hestia; import static org.assertj.core.api.Assertions.assertThat; @@ -13,16 +13,16 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.hestia.CodeHint; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.hestia.CodeHintRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.hestia.CodeHintRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; class CodeHintIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/CodeHintServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintServiceTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/hestia/CodeHintServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintServiceTest.java index 0d9f8fd87c91..454a0908862b 100644 --- a/src/test/java/de/tum/in/www1/artemis/hestia/CodeHintServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.hestia; +package de.tum.cit.aet.artemis.hestia; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -15,24 +15,24 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.enumeration.Visibility; -import de.tum.in.www1.artemis.domain.hestia.CodeHint; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTestCaseType; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.hestia.CodeHintRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseTaskRepository; -import de.tum.in.www1.artemis.service.hestia.CodeHintService; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTestCaseType; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.hestia.CodeHintRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.service.hestia.CodeHintService; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @SuppressWarnings("ArraysAsListWithZeroOrOneArgument") class CodeHintServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/ExerciseHintIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/hestia/ExerciseHintIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java index 0ac5d72afd02..f27c950da862 100644 --- a/src/test/java/de/tum/in/www1/artemis/hestia/ExerciseHintIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.hestia; +package de.tum.cit.aet.artemis.hestia; import static org.assertj.core.api.Assertions.assertThat; @@ -15,28 +15,28 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.Visibility; -import de.tum.in.www1.artemis.domain.hestia.CodeHint; -import de.tum.in.www1.artemis.domain.hestia.ExerciseHint; -import de.tum.in.www1.artemis.domain.hestia.ExerciseHintActivation; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.in.www1.artemis.repository.hestia.ExerciseHintActivationRepository; -import de.tum.in.www1.artemis.repository.hestia.ExerciseHintRepository; -import de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseTaskService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.domain.hestia.ExerciseHint; +import de.tum.cit.aet.artemis.domain.hestia.ExerciseHintActivation; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repository.hestia.ExerciseHintActivationRepository; +import de.tum.cit.aet.artemis.repository.hestia.ExerciseHintRepository; +import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; class ExerciseHintIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/ExerciseHintServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/hestia/ExerciseHintServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java index 1518d3966d4d..4941a1d1079c 100644 --- a/src/test/java/de/tum/in/www1/artemis/hestia/ExerciseHintServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.hestia; +package de.tum.cit.aet.artemis.hestia; import static org.assertj.core.api.Assertions.assertThat; @@ -12,34 +12,34 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.Visibility; -import de.tum.in.www1.artemis.domain.hestia.ExerciseHint; -import de.tum.in.www1.artemis.domain.hestia.ExerciseHintActivation; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.hestia.ExerciseHintActivationRepository; -import de.tum.in.www1.artemis.repository.hestia.ExerciseHintRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseTaskRepository; -import de.tum.in.www1.artemis.service.hestia.ExerciseHintService; -import de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseTaskService; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.domain.hestia.ExerciseHint; +import de.tum.cit.aet.artemis.domain.hestia.ExerciseHintActivation; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.hestia.ExerciseHintActivationRepository; +import de.tum.cit.aet.artemis.repository.hestia.ExerciseHintRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.service.hestia.ExerciseHintService; +import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; +import de.tum.cit.aet.artemis.user.UserUtilService; class ExerciseHintServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/HestiaDatabaseTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/HestiaDatabaseTest.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/hestia/HestiaDatabaseTest.java rename to src/test/java/de/tum/cit/aet/artemis/hestia/HestiaDatabaseTest.java index 3c3a049aa759..9676e01ca819 100644 --- a/src/test/java/de/tum/in/www1/artemis/hestia/HestiaDatabaseTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/HestiaDatabaseTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.hestia; +package de.tum.cit.aet.artemis.hestia; import static org.assertj.core.api.Assertions.assertThat; @@ -10,21 +10,21 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.hestia.CodeHint; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.hestia.CodeHintRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseTaskRepository; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.hestia.CodeHintRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; /** * This class tests the database relations of the Hestia domain models. diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java index dd450977531a..1a1844d53481 100644 --- a/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.hestia; +package de.tum.cit.aet.artemis.hestia; import static org.assertj.core.api.Assertions.assertThat; @@ -11,15 +11,15 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory; -import de.tum.in.www1.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest; -import de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseGitDiffReportService; -import de.tum.in.www1.artemis.util.HestiaUtilTestService; -import de.tum.in.www1.artemis.util.LocalRepository; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; +import de.tum.cit.aet.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest; +import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseGitDiffReportService; +import de.tum.cit.aet.artemis.util.HestiaUtilTestService; +import de.tum.cit.aet.artemis.util.LocalRepository; /** * Tests for the ProgrammingExerciseGitDiffReportResource diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java index 476d6c03cfba..f7b94dc12405 100644 --- a/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.hestia; +package de.tum.cit.aet.artemis.hestia; import static org.assertj.core.api.Assertions.assertThat; @@ -12,18 +12,18 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseGitDiffReportRepository; -import de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseGitDiffReportService; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.util.HestiaUtilTestService; -import de.tum.in.www1.artemis.util.LocalRepository; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseGitDiffReportRepository; +import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseGitDiffReportService; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.util.HestiaUtilTestService; +import de.tum.cit.aet.artemis.util.LocalRepository; /** * Tests for the ProgrammingExerciseGitDiffReportService diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseSolutionEntryIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseSolutionEntryIntegrationTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseSolutionEntryIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseSolutionEntryIntegrationTest.java index 0c0b1a6fd40f..a79eae2f1bb9 100644 --- a/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseSolutionEntryIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseSolutionEntryIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.hestia; +package de.tum.cit.aet.artemis.hestia; import static org.assertj.core.api.Assertions.assertThat; @@ -12,17 +12,17 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.hestia.CodeHint; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.hestia.CodeHintRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.hestia.CodeHintRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; class ProgrammingExerciseSolutionEntryIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseTaskIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskIntegrationTest.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseTaskIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskIntegrationTest.java index 47cde8da5cba..5cd53430aa75 100644 --- a/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseTaskIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.hestia; +package de.tum.cit.aet.artemis.hestia; import static org.assertj.core.api.Assertions.assertThat; @@ -14,19 +14,19 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseTaskRepository; -import de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseTaskService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; class ProgrammingExerciseTaskIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseTaskServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskServiceTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseTaskServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskServiceTest.java index 20db67bf2423..e3a80268f3d5 100644 --- a/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseTaskServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.hestia; +package de.tum.cit.aet.artemis.hestia; import static org.assertj.core.api.Assertions.assertThat; @@ -12,21 +12,21 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.hestia.CodeHint; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.hestia.CodeHintRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseTaskRepository; -import de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseTaskService; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.hestia.CodeHintRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; +import de.tum.cit.aet.artemis.user.UserUtilService; class ProgrammingExerciseTaskServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/StructuralTestCaseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/StructuralTestCaseServiceTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/hestia/StructuralTestCaseServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/hestia/StructuralTestCaseServiceTest.java index dabb33fc6702..ac762c9f9ab0 100644 --- a/src/test/java/de/tum/in/www1/artemis/hestia/StructuralTestCaseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/StructuralTestCaseServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.hestia; +package de.tum.cit.aet.artemis.hestia; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -12,20 +12,20 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.enumeration.Visibility; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTestCaseType; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory; -import de.tum.in.www1.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.service.hestia.structural.StructuralSolutionEntryGenerationException; -import de.tum.in.www1.artemis.service.hestia.structural.StructuralTestCaseService; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.util.HestiaUtilTestService; -import de.tum.in.www1.artemis.util.LocalRepository; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTestCaseType; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; +import de.tum.cit.aet.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.service.hestia.structural.StructuralSolutionEntryGenerationException; +import de.tum.cit.aet.artemis.service.hestia.structural.StructuralTestCaseService; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.util.HestiaUtilTestService; +import de.tum.cit.aet.artemis.util.LocalRepository; /** * Tests for the StructuralTestCaseService diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/TestwiseCoverageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageIntegrationTest.java similarity index 87% rename from src/test/java/de/tum/in/www1/artemis/hestia/TestwiseCoverageIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageIntegrationTest.java index 26dcae3741a9..334782fde809 100644 --- a/src/test/java/de/tum/in/www1/artemis/hestia/TestwiseCoverageIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.hestia; +package de.tum.cit.aet.artemis.hestia; import static org.assertj.core.api.Assertions.assertThat; @@ -11,22 +11,22 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.hestia.CoverageFileReport; -import de.tum.in.www1.artemis.domain.hestia.CoverageReport; -import de.tum.in.www1.artemis.domain.hestia.TestwiseCoverageReportEntry; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.repository.hestia.CoverageFileReportRepository; -import de.tum.in.www1.artemis.repository.hestia.CoverageReportRepository; -import de.tum.in.www1.artemis.repository.hestia.TestwiseCoverageReportEntryRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.hestia.CoverageFileReport; +import de.tum.cit.aet.artemis.domain.hestia.CoverageReport; +import de.tum.cit.aet.artemis.domain.hestia.TestwiseCoverageReportEntry; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.repository.hestia.CoverageFileReportRepository; +import de.tum.cit.aet.artemis.repository.hestia.CoverageReportRepository; +import de.tum.cit.aet.artemis.repository.hestia.TestwiseCoverageReportEntryRepository; class TestwiseCoverageIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/TestwiseCoverageReportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageReportServiceTest.java similarity index 84% rename from src/test/java/de/tum/in/www1/artemis/hestia/TestwiseCoverageReportServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageReportServiceTest.java index 24264d37eb52..cadd5fdea37a 100644 --- a/src/test/java/de/tum/in/www1/artemis/hestia/TestwiseCoverageReportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageReportServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.hestia; +package de.tum.cit.aet.artemis.hestia; import static org.assertj.core.api.Assertions.assertThat; @@ -13,23 +13,23 @@ import org.springframework.data.domain.Pageable; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.hestia.TestwiseCoverageReportEntry; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.repository.hestia.CoverageReportRepository; -import de.tum.in.www1.artemis.service.hestia.TestwiseCoverageService; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.util.HestiaUtilTestService; -import de.tum.in.www1.artemis.util.LocalRepository; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.hestia.TestwiseCoverageReportEntry; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.repository.hestia.CoverageReportRepository; +import de.tum.cit.aet.artemis.service.hestia.TestwiseCoverageService; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.util.HestiaUtilTestService; +import de.tum.cit.aet.artemis.util.LocalRepository; class TestwiseCoverageReportServiceTest extends AbstractLocalCILocalVCIntegrationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/TestwiseCoverageTestUtil.java b/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageTestUtil.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/hestia/TestwiseCoverageTestUtil.java rename to src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageTestUtil.java index 5a4008957db8..164836093682 100644 --- a/src/test/java/de/tum/in/www1/artemis/hestia/TestwiseCoverageTestUtil.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageTestUtil.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.hestia; +package de.tum.cit.aet.artemis.hestia; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import de.tum.in.www1.artemis.domain.hestia.CoverageFileReport; -import de.tum.in.www1.artemis.domain.hestia.TestwiseCoverageReportEntry; +import de.tum.cit.aet.artemis.domain.hestia.CoverageFileReport; +import de.tum.cit.aet.artemis.domain.hestia.TestwiseCoverageReportEntry; public class TestwiseCoverageTestUtil { diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/AddUncoveredLinesAsPotentialCodeBlocksTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/AddUncoveredLinesAsPotentialCodeBlocksTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/hestia/behavioral/AddUncoveredLinesAsPotentialCodeBlocksTest.java rename to src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/AddUncoveredLinesAsPotentialCodeBlocksTest.java index aba356632d67..8cd33345a68a 100644 --- a/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/AddUncoveredLinesAsPotentialCodeBlocksTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/AddUncoveredLinesAsPotentialCodeBlocksTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.hestia.behavioral; +package de.tum.cit.aet.artemis.hestia.behavioral; import static org.assertj.core.api.Assertions.assertThat; @@ -8,9 +8,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.in.www1.artemis.service.hestia.behavioral.GroupedFile; -import de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.AddUncoveredLinesAsPotentialCodeBlocks; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.AddUncoveredLinesAsPotentialCodeBlocks; class AddUncoveredLinesAsPotentialCodeBlocksTest { diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java similarity index 81% rename from src/test/java/de/tum/in/www1/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java index 78f6c97be9a5..3156c93c0903 100644 --- a/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.hestia.behavioral; +package de.tum.cit.aet.artemis.hestia.behavioral; import static org.assertj.core.api.Assertions.assertThat; @@ -11,31 +11,31 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.Visibility; -import de.tum.in.www1.artemis.domain.hestia.CoverageFileReport; -import de.tum.in.www1.artemis.domain.hestia.CoverageReport; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTestCaseType; -import de.tum.in.www1.artemis.domain.hestia.TestwiseCoverageReportEntry; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.repository.hestia.CoverageFileReportRepository; -import de.tum.in.www1.artemis.repository.hestia.CoverageReportRepository; -import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseGitDiffReportRepository; -import de.tum.in.www1.artemis.repository.hestia.TestwiseCoverageReportEntryRepository; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralTestCaseService; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.util.HestiaUtilTestService; -import de.tum.in.www1.artemis.util.LocalRepository; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.domain.hestia.CoverageFileReport; +import de.tum.cit.aet.artemis.domain.hestia.CoverageReport; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTestCaseType; +import de.tum.cit.aet.artemis.domain.hestia.TestwiseCoverageReportEntry; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.repository.hestia.CoverageFileReportRepository; +import de.tum.cit.aet.artemis.repository.hestia.CoverageReportRepository; +import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseGitDiffReportRepository; +import de.tum.cit.aet.artemis.repository.hestia.TestwiseCoverageReportEntryRepository; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralTestCaseService; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.util.HestiaUtilTestService; +import de.tum.cit.aet.artemis.util.LocalRepository; class BehavioralTestCaseServiceTest extends AbstractLocalCILocalVCIntegrationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/CombineChangeBlocksTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CombineChangeBlocksTest.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/hestia/behavioral/CombineChangeBlocksTest.java rename to src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CombineChangeBlocksTest.java index ee39210240a4..9e1cded9164b 100644 --- a/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/CombineChangeBlocksTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CombineChangeBlocksTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.hestia.behavioral; +package de.tum.cit.aet.artemis.hestia.behavioral; import static org.assertj.core.api.Assertions.assertThat; @@ -8,11 +8,11 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralSolutionEntryGenerationException; -import de.tum.in.www1.artemis.service.hestia.behavioral.GroupedFile; -import de.tum.in.www1.artemis.service.hestia.behavioral.GroupedFile.ChangeBlock; -import de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.CombineChangeBlocks; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralSolutionEntryGenerationException; +import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile.ChangeBlock; +import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.CombineChangeBlocks; class CombineChangeBlocksTest { diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/CreateCommonChangeBlocksTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CreateCommonChangeBlocksTest.java similarity index 88% rename from src/test/java/de/tum/in/www1/artemis/hestia/behavioral/CreateCommonChangeBlocksTest.java rename to src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CreateCommonChangeBlocksTest.java index dff7fccfdf8f..e5cde608488f 100644 --- a/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/CreateCommonChangeBlocksTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CreateCommonChangeBlocksTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.hestia.behavioral; +package de.tum.cit.aet.artemis.hestia.behavioral; import static org.assertj.core.api.Assertions.assertThat; @@ -10,9 +10,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.in.www1.artemis.service.hestia.behavioral.GroupedFile; -import de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.CreateCommonChangeBlocks; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.CreateCommonChangeBlocks; class CreateCommonChangeBlocksTest { diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/CreateSolutionEntriesTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CreateSolutionEntriesTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/hestia/behavioral/CreateSolutionEntriesTest.java rename to src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CreateSolutionEntriesTest.java index da549796ffaf..da8d1b34a93b 100644 --- a/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/CreateSolutionEntriesTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CreateSolutionEntriesTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.hestia.behavioral; +package de.tum.cit.aet.artemis.hestia.behavioral; import static org.assertj.core.api.Assertions.assertThat; @@ -8,11 +8,11 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.in.www1.artemis.service.hestia.behavioral.GroupedFile; -import de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.CreateSolutionEntries; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.CreateSolutionEntries; class CreateSolutionEntriesTest { diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/DropRemovedGitDiffEntriesTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/DropRemovedGitDiffEntriesTest.java similarity index 81% rename from src/test/java/de/tum/in/www1/artemis/hestia/behavioral/DropRemovedGitDiffEntriesTest.java rename to src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/DropRemovedGitDiffEntriesTest.java index 0bbb0c1b7b07..cb81a6aaf9bd 100644 --- a/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/DropRemovedGitDiffEntriesTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/DropRemovedGitDiffEntriesTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.hestia.behavioral; +package de.tum.cit.aet.artemis.hestia.behavioral; import static org.assertj.core.api.Assertions.assertThat; @@ -8,11 +8,11 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralSolutionEntryGenerationException; -import de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.DropRemovedGitDiffEntries; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralSolutionEntryGenerationException; +import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.DropRemovedGitDiffEntries; class DropRemovedGitDiffEntriesTest { diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/ExtractChangedLinesTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/ExtractChangedLinesTest.java similarity index 87% rename from src/test/java/de/tum/in/www1/artemis/hestia/behavioral/ExtractChangedLinesTest.java rename to src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/ExtractChangedLinesTest.java index 759cd6e4cffb..28aa677a20cf 100644 --- a/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/ExtractChangedLinesTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/ExtractChangedLinesTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.hestia.behavioral; +package de.tum.cit.aet.artemis.hestia.behavioral; import static org.assertj.core.api.Assertions.assertThat; @@ -10,10 +10,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.in.www1.artemis.service.hestia.behavioral.GroupedFile; -import de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.ExtractChangedLines; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.ExtractChangedLines; class ExtractChangedLinesTest { diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/ExtractCoveredLinesTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/ExtractCoveredLinesTest.java similarity index 88% rename from src/test/java/de/tum/in/www1/artemis/hestia/behavioral/ExtractCoveredLinesTest.java rename to src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/ExtractCoveredLinesTest.java index ef4cd8db8a6f..0aa2c5cdf95d 100644 --- a/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/ExtractCoveredLinesTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/ExtractCoveredLinesTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.hestia.behavioral; +package de.tum.cit.aet.artemis.hestia.behavioral; import static org.assertj.core.api.Assertions.assertThat; @@ -10,10 +10,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.domain.hestia.TestwiseCoverageReportEntry; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.in.www1.artemis.service.hestia.behavioral.GroupedFile; -import de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.ExtractCoveredLines; +import de.tum.cit.aet.artemis.domain.hestia.TestwiseCoverageReportEntry; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.ExtractCoveredLines; class ExtractCoveredLinesTest { diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/FindCommonLinesTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/FindCommonLinesTest.java similarity index 86% rename from src/test/java/de/tum/in/www1/artemis/hestia/behavioral/FindCommonLinesTest.java rename to src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/FindCommonLinesTest.java index 30b206d7963d..f08dae47b84a 100644 --- a/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/FindCommonLinesTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/FindCommonLinesTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.hestia.behavioral; +package de.tum.cit.aet.artemis.hestia.behavioral; import static org.assertj.core.api.Assertions.assertThat; @@ -8,9 +8,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.in.www1.artemis.service.hestia.behavioral.GroupedFile; -import de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.FindCommonLines; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.FindCommonLines; class FindCommonLinesTest { diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/GroupGitDiffAndCoverageEntriesByFilePathAndTestCaseTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/GroupGitDiffAndCoverageEntriesByFilePathAndTestCaseTest.java similarity index 88% rename from src/test/java/de/tum/in/www1/artemis/hestia/behavioral/GroupGitDiffAndCoverageEntriesByFilePathAndTestCaseTest.java rename to src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/GroupGitDiffAndCoverageEntriesByFilePathAndTestCaseTest.java index 28c1fb173597..56aaf8d39f21 100644 --- a/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/GroupGitDiffAndCoverageEntriesByFilePathAndTestCaseTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/GroupGitDiffAndCoverageEntriesByFilePathAndTestCaseTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.hestia.behavioral; +package de.tum.cit.aet.artemis.hestia.behavioral; import static org.assertj.core.api.Assertions.assertThat; @@ -9,15 +9,15 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.hestia.CoverageFileReport; -import de.tum.in.www1.artemis.domain.hestia.CoverageReport; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; -import de.tum.in.www1.artemis.domain.hestia.TestwiseCoverageReportEntry; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.in.www1.artemis.service.hestia.behavioral.GroupedFile; -import de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.GroupGitDiffAndCoverageEntriesByFilePathAndTestCase; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.hestia.CoverageFileReport; +import de.tum.cit.aet.artemis.domain.hestia.CoverageReport; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; +import de.tum.cit.aet.artemis.domain.hestia.TestwiseCoverageReportEntry; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.GroupGitDiffAndCoverageEntriesByFilePathAndTestCase; class GroupGitDiffAndCoverageEntriesByFilePathAndTestCaseTest { diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/InsertFileContentsTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/InsertFileContentsTest.java similarity index 85% rename from src/test/java/de/tum/in/www1/artemis/hestia/behavioral/InsertFileContentsTest.java rename to src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/InsertFileContentsTest.java index 79e0d1c53d51..70f1f2561942 100644 --- a/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/InsertFileContentsTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/InsertFileContentsTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.hestia.behavioral; +package de.tum.cit.aet.artemis.hestia.behavioral; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -10,10 +10,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralSolutionEntryGenerationException; -import de.tum.in.www1.artemis.service.hestia.behavioral.GroupedFile; -import de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.InsertFileContents; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralSolutionEntryGenerationException; +import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.InsertFileContents; class InsertFileContentsTest { diff --git a/src/test/java/de/tum/in/www1/artemis/iris/AbstractIrisIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java similarity index 88% rename from src/test/java/de/tum/in/www1/artemis/iris/AbstractIrisIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java index dba05fa055cd..4556c0936c24 100644 --- a/src/test/java/de/tum/in/www1/artemis/iris/AbstractIrisIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.iris; +package de.tum.cit.aet.artemis.iris; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -16,17 +16,17 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.connector.IrisRequestMockProvider; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.iris.IrisTemplate; -import de.tum.in.www1.artemis.domain.iris.settings.IrisSubSettings; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.iris.IrisSettingsRepository; -import de.tum.in.www1.artemis.repository.iris.IrisTemplateRepository; -import de.tum.in.www1.artemis.service.iris.settings.IrisSettingsService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.connector.IrisRequestMockProvider; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.iris.IrisTemplate; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettings; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.iris.IrisSettingsRepository; +import de.tum.cit.aet.artemis.repository.iris.IrisTemplateRepository; +import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; public abstract class AbstractIrisIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/iris/IrisChatMessageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatMessageIntegrationTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/iris/IrisChatMessageIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/iris/IrisChatMessageIntegrationTest.java index aefc058fee7f..8786ac87339d 100644 --- a/src/test/java/de/tum/in/www1/artemis/iris/IrisChatMessageIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatMessageIntegrationTest.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.iris; +package de.tum.cit.aet.artemis.iris; -import static de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageState.DONE; -import static de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageState.IN_PROGRESS; -import static de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageState.NOT_STARTED; +import static de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageState.DONE; +import static de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageState.IN_PROGRESS; +import static de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageState.NOT_STARTED; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatNoException; import static org.awaitility.Awaitility.await; @@ -30,26 +30,26 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.domain.iris.message.IrisMessage; -import de.tum.in.www1.artemis.domain.iris.message.IrisMessageContent; -import de.tum.in.www1.artemis.domain.iris.message.IrisMessageSender; -import de.tum.in.www1.artemis.domain.iris.message.IrisTextMessageContent; -import de.tum.in.www1.artemis.domain.iris.session.IrisSession; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.iris.IrisMessageRepository; -import de.tum.in.www1.artemis.repository.iris.IrisSessionRepository; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageState; -import de.tum.in.www1.artemis.service.iris.IrisMessageService; -import de.tum.in.www1.artemis.service.iris.dto.IrisChatWebsocketDTO; -import de.tum.in.www1.artemis.service.iris.session.IrisExerciseChatSessionService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; +import de.tum.cit.aet.artemis.domain.iris.message.IrisMessageContent; +import de.tum.cit.aet.artemis.domain.iris.message.IrisMessageSender; +import de.tum.cit.aet.artemis.domain.iris.message.IrisTextMessageContent; +import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.iris.IrisMessageRepository; +import de.tum.cit.aet.artemis.repository.iris.IrisSessionRepository; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageState; +import de.tum.cit.aet.artemis.service.iris.IrisMessageService; +import de.tum.cit.aet.artemis.service.iris.dto.IrisChatWebsocketDTO; +import de.tum.cit.aet.artemis.service.iris.session.IrisExerciseChatSessionService; class IrisChatMessageIntegrationTest extends AbstractIrisIntegrationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/iris/IrisChatWebsocketTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatWebsocketTest.java similarity index 84% rename from src/test/java/de/tum/in/www1/artemis/iris/IrisChatWebsocketTest.java rename to src/test/java/de/tum/cit/aet/artemis/iris/IrisChatWebsocketTest.java index 4ce540f175c8..787c941eef2b 100644 --- a/src/test/java/de/tum/in/www1/artemis/iris/IrisChatWebsocketTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatWebsocketTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.iris; +package de.tum.cit.aet.artemis.iris; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.times; @@ -13,14 +13,14 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.test.context.ActiveProfiles; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.iris.message.IrisTextMessageContent; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; -import de.tum.in.www1.artemis.service.iris.IrisRateLimitService; -import de.tum.in.www1.artemis.service.iris.dto.IrisChatWebsocketDTO; -import de.tum.in.www1.artemis.service.iris.session.IrisExerciseChatSessionService; -import de.tum.in.www1.artemis.service.iris.websocket.IrisChatWebsocketService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.iris.message.IrisTextMessageContent; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; +import de.tum.cit.aet.artemis.service.iris.dto.IrisChatWebsocketDTO; +import de.tum.cit.aet.artemis.service.iris.session.IrisExerciseChatSessionService; +import de.tum.cit.aet.artemis.service.iris.websocket.IrisChatWebsocketService; @ActiveProfiles("iris") class IrisChatWebsocketTest extends AbstractIrisIntegrationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/iris/IrisCompetencyGenerationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisCompetencyGenerationIntegrationTest.java similarity index 89% rename from src/test/java/de/tum/in/www1/artemis/iris/IrisCompetencyGenerationIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/iris/IrisCompetencyGenerationIntegrationTest.java index e67f52342bfc..bf6cfc9f24df 100644 --- a/src/test/java/de/tum/in/www1/artemis/iris/IrisCompetencyGenerationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisCompetencyGenerationIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.iris; +package de.tum.cit.aet.artemis.iris; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.eq; @@ -14,14 +14,14 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionInputDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyRecommendationDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageState; -import de.tum.in.www1.artemis.service.iris.IrisCompetencyGenerationService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionInputDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyRecommendationDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageState; +import de.tum.cit.aet.artemis.service.iris.IrisCompetencyGenerationService; class IrisCompetencyGenerationIntegrationTest extends AbstractIrisIntegrationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/iris/IrisExerciseChatSessionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisExerciseChatSessionIntegrationTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/iris/IrisExerciseChatSessionIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/iris/IrisExerciseChatSessionIntegrationTest.java index 4600741d012b..4f4664b7c112 100644 --- a/src/test/java/de/tum/in/www1/artemis/iris/IrisExerciseChatSessionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisExerciseChatSessionIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.iris; +package de.tum.cit.aet.artemis.iris; import static org.assertj.core.api.Assertions.assertThat; @@ -10,12 +10,12 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.iris.session.IrisExerciseChatSession; -import de.tum.in.www1.artemis.domain.iris.session.IrisSession; -import de.tum.in.www1.artemis.repository.iris.IrisExerciseChatSessionRepository; -import de.tum.in.www1.artemis.web.rest.iris.IrisStatusDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.iris.session.IrisExerciseChatSession; +import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; +import de.tum.cit.aet.artemis.repository.iris.IrisExerciseChatSessionRepository; +import de.tum.cit.aet.artemis.web.rest.iris.IrisStatusDTO; class IrisExerciseChatSessionIntegrationTest extends AbstractIrisIntegrationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/iris/IrisSessionActivationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisSessionActivationIntegrationTest.java similarity index 86% rename from src/test/java/de/tum/in/www1/artemis/iris/IrisSessionActivationIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/iris/IrisSessionActivationIntegrationTest.java index 756db540fea4..599e556f33c9 100644 --- a/src/test/java/de/tum/in/www1/artemis/iris/IrisSessionActivationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisSessionActivationIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.iris; +package de.tum.cit.aet.artemis.iris; import java.util.concurrent.ThreadLocalRandom; @@ -8,14 +8,14 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.iris.message.IrisMessage; -import de.tum.in.www1.artemis.domain.iris.message.IrisMessageSender; -import de.tum.in.www1.artemis.domain.iris.message.IrisTextMessageContent; -import de.tum.in.www1.artemis.domain.iris.session.IrisSession; -import de.tum.in.www1.artemis.service.iris.IrisMessageService; -import de.tum.in.www1.artemis.service.iris.session.IrisExerciseChatSessionService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; +import de.tum.cit.aet.artemis.domain.iris.message.IrisMessageSender; +import de.tum.cit.aet.artemis.domain.iris.message.IrisTextMessageContent; +import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; +import de.tum.cit.aet.artemis.service.iris.IrisMessageService; +import de.tum.cit.aet.artemis.service.iris.session.IrisExerciseChatSessionService; class IrisSessionActivationIntegrationTest extends AbstractIrisIntegrationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/iris/PyrisConnectorServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/PyrisConnectorServiceTest.java similarity index 89% rename from src/test/java/de/tum/in/www1/artemis/iris/PyrisConnectorServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/iris/PyrisConnectorServiceTest.java index c1ff9d381d47..db942a208241 100644 --- a/src/test/java/de/tum/in/www1/artemis/iris/PyrisConnectorServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/PyrisConnectorServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.iris; +package de.tum.cit.aet.artemis.iris; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -11,10 +11,10 @@ import org.junit.jupiter.params.provider.MethodSource; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.service.connectors.pyris.PyrisConnectorException; -import de.tum.in.www1.artemis.service.connectors.pyris.PyrisConnectorService; -import de.tum.in.www1.artemis.service.iris.exception.IrisForbiddenException; -import de.tum.in.www1.artemis.service.iris.exception.IrisInternalPyrisErrorException; +import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisConnectorException; +import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisConnectorService; +import de.tum.cit.aet.artemis.service.iris.exception.IrisForbiddenException; +import de.tum.cit.aet.artemis.service.iris.exception.IrisInternalPyrisErrorException; class PyrisConnectorServiceTest extends AbstractIrisIntegrationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/iris/PyrisLectureIngestionTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/PyrisLectureIngestionTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/iris/PyrisLectureIngestionTest.java rename to src/test/java/de/tum/cit/aet/artemis/iris/PyrisLectureIngestionTest.java index 4556660764d3..e1b4678568f0 100644 --- a/src/test/java/de/tum/in/www1/artemis/iris/PyrisLectureIngestionTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/PyrisLectureIngestionTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.iris; +package de.tum.cit.aet.artemis.iris; import static org.assertj.core.api.Assertions.assertThat; @@ -15,21 +15,21 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.iris.settings.IrisCourseSettings; -import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; -import de.tum.in.www1.artemis.lecture.LectureUtilService; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.iris.IrisSettingsRepository; -import de.tum.in.www1.artemis.service.connectors.pyris.PyrisJobService; -import de.tum.in.www1.artemis.service.connectors.pyris.PyrisStatusUpdateService; -import de.tum.in.www1.artemis.service.connectors.pyris.PyrisWebhookService; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageState; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisCourseSettings; +import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.iris.IrisSettingsRepository; +import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisJobService; +import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisStatusUpdateService; +import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisWebhookService; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageState; +import de.tum.cit.aet.artemis.user.UserUtilService; class PyrisLectureIngestionTest extends AbstractIrisIntegrationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/iris/settings/IrisSettingsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/settings/IrisSettingsIntegrationTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/iris/settings/IrisSettingsIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/iris/settings/IrisSettingsIntegrationTest.java index 300e9ae14d0d..23650865c173 100644 --- a/src/test/java/de/tum/in/www1/artemis/iris/settings/IrisSettingsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/settings/IrisSettingsIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.iris.settings; +package de.tum.cit.aet.artemis.iris.settings; import static org.assertj.core.api.Assertions.assertThat; @@ -11,19 +11,19 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.iris.settings.IrisChatSubSettings; -import de.tum.in.www1.artemis.domain.iris.settings.IrisCompetencyGenerationSubSettings; -import de.tum.in.www1.artemis.domain.iris.settings.IrisCourseSettings; -import de.tum.in.www1.artemis.domain.iris.settings.IrisExerciseSettings; -import de.tum.in.www1.artemis.domain.iris.settings.IrisHestiaSubSettings; -import de.tum.in.www1.artemis.domain.iris.settings.IrisLectureIngestionSubSettings; -import de.tum.in.www1.artemis.domain.iris.settings.IrisSettings; -import de.tum.in.www1.artemis.iris.AbstractIrisIntegrationTest; -import de.tum.in.www1.artemis.repository.iris.IrisSettingsRepository; -import de.tum.in.www1.artemis.repository.iris.IrisSubSettingsRepository; -import de.tum.in.www1.artemis.service.iris.dto.IrisCombinedSettingsDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisChatSubSettings; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisCompetencyGenerationSubSettings; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisCourseSettings; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisExerciseSettings; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisHestiaSubSettings; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisLectureIngestionSubSettings; +import de.tum.cit.aet.artemis.domain.iris.settings.IrisSettings; +import de.tum.cit.aet.artemis.iris.AbstractIrisIntegrationTest; +import de.tum.cit.aet.artemis.repository.iris.IrisSettingsRepository; +import de.tum.cit.aet.artemis.repository.iris.IrisSubSettingsRepository; +import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedSettingsDTO; class IrisSettingsIntegrationTest extends AbstractIrisIntegrationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/learninganalytics/StudentLearningAnalyticsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/learninganalytics/StudentLearningAnalyticsIntegrationTest.java similarity index 89% rename from src/test/java/de/tum/in/www1/artemis/learninganalytics/StudentLearningAnalyticsIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/learninganalytics/StudentLearningAnalyticsIntegrationTest.java index dabdaea53b2a..55587a880140 100644 --- a/src/test/java/de/tum/in/www1/artemis/learninganalytics/StudentLearningAnalyticsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/learninganalytics/StudentLearningAnalyticsIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.learninganalytics; +package de.tum.cit.aet.artemis.learninganalytics; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -11,10 +11,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.course.CourseTestService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.util.RequestUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.course.CourseTestService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.util.RequestUtilService; class StudentLearningAnalyticsIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/lecture/AttachmentResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentResourceIntegrationTest.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/lecture/AttachmentResourceIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentResourceIntegrationTest.java index 7eba2e1d7ac6..1f935aa2e1db 100644 --- a/src/test/java/de/tum/in/www1/artemis/lecture/AttachmentResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentResourceIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.lecture; +package de.tum.cit.aet.artemis.lecture; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; @@ -18,14 +18,14 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Attachment; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.repository.AttachmentRepository; -import de.tum.in.www1.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Attachment; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.repository.AttachmentRepository; +import de.tum.cit.aet.artemis.repository.LectureRepository; class AttachmentResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/lecture/AttachmentUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitIntegrationTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/lecture/AttachmentUnitIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitIntegrationTest.java index 2fd4b645a516..7f4c4d8c3ce4 100644 --- a/src/test/java/de/tum/in/www1/artemis/lecture/AttachmentUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.lecture; +package de.tum.cit.aet.artemis.lecture; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -35,19 +35,19 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.competency.CompetencyUtilService; -import de.tum.in.www1.artemis.domain.Attachment; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.competency.Competency; -import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.domain.lecture.Slide; -import de.tum.in.www1.artemis.repository.AttachmentRepository; -import de.tum.in.www1.artemis.repository.AttachmentUnitRepository; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.SlideRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.competency.CompetencyUtilService; +import de.tum.cit.aet.artemis.domain.Attachment; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.competency.Competency; +import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.domain.lecture.Slide; +import de.tum.cit.aet.artemis.repository.AttachmentRepository; +import de.tum.cit.aet.artemis.repository.AttachmentUnitRepository; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.SlideRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; class AttachmentUnitIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/lecture/AttachmentUnitsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/lecture/AttachmentUnitsIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java index cb3f7b39e44a..344a18a13d9c 100644 --- a/src/test/java/de/tum/in/www1/artemis/lecture/AttachmentUnitsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.lecture; +package de.tum.cit.aet.artemis.lecture; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -28,14 +28,14 @@ import org.springframework.util.MultiValueMap; import org.springframework.util.ResourceUtils; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; -import de.tum.in.www1.artemis.repository.AttachmentUnitRepository; -import de.tum.in.www1.artemis.repository.SlideRepository; -import de.tum.in.www1.artemis.service.LectureUnitProcessingService; -import de.tum.in.www1.artemis.web.rest.dto.LectureUnitInformationDTO; -import de.tum.in.www1.artemis.web.rest.dto.LectureUnitSplitDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.repository.AttachmentUnitRepository; +import de.tum.cit.aet.artemis.repository.SlideRepository; +import de.tum.cit.aet.artemis.service.LectureUnitProcessingService; +import de.tum.cit.aet.artemis.web.rest.dto.LectureUnitInformationDTO; +import de.tum.cit.aet.artemis.web.rest.dto.LectureUnitSplitDTO; class AttachmentUnitsIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/lecture/ExerciseUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/ExerciseUnitIntegrationTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/lecture/ExerciseUnitIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/lecture/ExerciseUnitIntegrationTest.java index 72cb78321c40..9a135ecbfb2b 100644 --- a/src/test/java/de/tum/in/www1/artemis/lecture/ExerciseUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/ExerciseUnitIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.lecture; +package de.tum.cit.aet.artemis.lecture; -import static de.tum.in.www1.artemis.util.RequestUtilService.deleteProgrammingExerciseParamsFalse; +import static de.tum.cit.aet.artemis.util.RequestUtilService.deleteProgrammingExerciseParamsFalse; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; @@ -16,21 +16,21 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.lecture.ExerciseUnit; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.repository.FileUploadExerciseRepository; -import de.tum.in.www1.artemis.repository.ModelingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.QuizExerciseRepository; -import de.tum.in.www1.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.repository.FileUploadExerciseRepository; +import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.repository.TextExerciseRepository; class ExerciseUnitIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/lecture/LectureFactory.java b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureFactory.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/lecture/LectureFactory.java rename to src/test/java/de/tum/cit/aet/artemis/lecture/LectureFactory.java index 4e15a4a77d78..fae48f254309 100644 --- a/src/test/java/de/tum/in/www1/artemis/lecture/LectureFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureFactory.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.lecture; +package de.tum.cit.aet.artemis.lecture; import static org.assertj.core.api.Assertions.fail; @@ -10,12 +10,12 @@ import org.apache.commons.io.FileUtils; import org.springframework.util.ResourceUtils; -import de.tum.in.www1.artemis.domain.Attachment; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.enumeration.AttachmentType; -import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; -import de.tum.in.www1.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.domain.Attachment; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; +import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.service.FilePathService; /** * Factory for creating Lectures and related objects. diff --git a/src/test/java/de/tum/in/www1/artemis/lecture/LectureIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureIntegrationTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/lecture/LectureIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/lecture/LectureIntegrationTest.java index e5142c551b03..babea6d79947 100644 --- a/src/test/java/de/tum/in/www1/artemis/lecture/LectureIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.lecture; +package de.tum.cit.aet.artemis.lecture; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -21,27 +21,27 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.competency.CompetencyUtilService; -import de.tum.in.www1.artemis.domain.Attachment; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.competency.Competency; -import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; -import de.tum.in.www1.artemis.domain.lecture.ExerciseUnit; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.domain.lecture.OnlineUnit; -import de.tum.in.www1.artemis.domain.lecture.TextUnit; -import de.tum.in.www1.artemis.domain.lecture.VideoUnit; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.post.ConversationUtilService; -import de.tum.in.www1.artemis.repository.AttachmentRepository; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.LectureUnitRepository; -import de.tum.in.www1.artemis.repository.TextExerciseRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.in.www1.artemis.util.PageableSearchUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.competency.CompetencyUtilService; +import de.tum.cit.aet.artemis.domain.Attachment; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.competency.Competency; +import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.domain.lecture.OnlineUnit; +import de.tum.cit.aet.artemis.domain.lecture.TextUnit; +import de.tum.cit.aet.artemis.domain.lecture.VideoUnit; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.post.ConversationUtilService; +import de.tum.cit.aet.artemis.repository.AttachmentRepository; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.LectureUnitRepository; +import de.tum.cit.aet.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.util.PageableSearchUtilService; class LectureIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/lecture/LectureUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitIntegrationTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/lecture/LectureUnitIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitIntegrationTest.java index 2d6361762584..c318a5582f96 100644 --- a/src/test/java/de/tum/in/www1/artemis/lecture/LectureUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.lecture; +package de.tum.cit.aet.artemis.lecture; import static org.assertj.core.api.Assertions.assertThat; @@ -16,20 +16,20 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.competency.CompetencyUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.domain.lecture.LectureUnitCompletion; -import de.tum.in.www1.artemis.domain.lecture.OnlineUnit; -import de.tum.in.www1.artemis.domain.lecture.TextUnit; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.LectureUnitCompletionRepository; -import de.tum.in.www1.artemis.repository.TextUnitRepository; -import de.tum.in.www1.artemis.web.rest.dto.lectureunit.LectureUnitForLearningPathNodeDetailsDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.competency.CompetencyUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnitCompletion; +import de.tum.cit.aet.artemis.domain.lecture.OnlineUnit; +import de.tum.cit.aet.artemis.domain.lecture.TextUnit; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.LectureUnitCompletionRepository; +import de.tum.cit.aet.artemis.repository.TextUnitRepository; +import de.tum.cit.aet.artemis.web.rest.dto.lectureunit.LectureUnitForLearningPathNodeDetailsDTO; class LectureUnitIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/lecture/LectureUnitServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitServiceTest.java similarity index 86% rename from src/test/java/de/tum/in/www1/artemis/lecture/LectureUnitServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitServiceTest.java index 452fd36e10cf..4826456e6aeb 100644 --- a/src/test/java/de/tum/in/www1/artemis/lecture/LectureUnitServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.lecture; +package de.tum.cit.aet.artemis.lecture; import static org.assertj.core.api.Assertions.assertThat; @@ -9,14 +9,14 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.domain.lecture.LectureUnitCompletion; -import de.tum.in.www1.artemis.repository.LectureUnitCompletionRepository; -import de.tum.in.www1.artemis.service.LectureUnitService; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnitCompletion; +import de.tum.cit.aet.artemis.repository.LectureUnitCompletionRepository; +import de.tum.cit.aet.artemis.service.LectureUnitService; +import de.tum.cit.aet.artemis.user.UserUtilService; class LectureUnitServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/lecture/LectureUtilService.java b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUtilService.java similarity index 87% rename from src/test/java/de/tum/in/www1/artemis/lecture/LectureUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/lecture/LectureUtilService.java index 96e135e5cc71..ec7ceabce32c 100644 --- a/src/test/java/de/tum/in/www1/artemis/lecture/LectureUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUtilService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.lecture; +package de.tum.cit.aet.artemis.lecture; import static org.assertj.core.api.Assertions.fail; @@ -15,39 +15,39 @@ import org.springframework.stereotype.Service; import org.springframework.util.ResourceUtils; -import de.tum.in.www1.artemis.course.CourseFactory; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Attachment; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; -import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; -import de.tum.in.www1.artemis.domain.lecture.ExerciseUnit; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.domain.lecture.LectureUnitCompletion; -import de.tum.in.www1.artemis.domain.lecture.OnlineUnit; -import de.tum.in.www1.artemis.domain.lecture.Slide; -import de.tum.in.www1.artemis.domain.lecture.TextUnit; -import de.tum.in.www1.artemis.domain.lecture.VideoUnit; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.post.ConversationFactory; -import de.tum.in.www1.artemis.repository.AttachmentRepository; -import de.tum.in.www1.artemis.repository.AttachmentUnitRepository; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExerciseUnitRepository; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.LectureUnitCompletionRepository; -import de.tum.in.www1.artemis.repository.LectureUnitRepository; -import de.tum.in.www1.artemis.repository.OnlineUnitRepository; -import de.tum.in.www1.artemis.repository.SlideRepository; -import de.tum.in.www1.artemis.repository.TextExerciseRepository; -import de.tum.in.www1.artemis.repository.TextUnitRepository; -import de.tum.in.www1.artemis.repository.VideoUnitRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ConversationRepository; -import de.tum.in.www1.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.course.CourseFactory; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Attachment; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnitCompletion; +import de.tum.cit.aet.artemis.domain.lecture.OnlineUnit; +import de.tum.cit.aet.artemis.domain.lecture.Slide; +import de.tum.cit.aet.artemis.domain.lecture.TextUnit; +import de.tum.cit.aet.artemis.domain.lecture.VideoUnit; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.post.ConversationFactory; +import de.tum.cit.aet.artemis.repository.AttachmentRepository; +import de.tum.cit.aet.artemis.repository.AttachmentUnitRepository; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExerciseUnitRepository; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.LectureUnitCompletionRepository; +import de.tum.cit.aet.artemis.repository.LectureUnitRepository; +import de.tum.cit.aet.artemis.repository.OnlineUnitRepository; +import de.tum.cit.aet.artemis.repository.SlideRepository; +import de.tum.cit.aet.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.repository.TextUnitRepository; +import de.tum.cit.aet.artemis.repository.VideoUnitRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ConversationRepository; +import de.tum.cit.aet.artemis.service.FilePathService; /** * Service responsible for initializing the database with specific testdata related to lectures for use in integration tests. diff --git a/src/test/java/de/tum/in/www1/artemis/lecture/OnlineUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/OnlineUnitIntegrationTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/lecture/OnlineUnitIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/lecture/OnlineUnitIntegrationTest.java index 74f7e9ebb1ee..97bab62ab819 100644 --- a/src/test/java/de/tum/in/www1/artemis/lecture/OnlineUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/OnlineUnitIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.lecture; +package de.tum.cit.aet.artemis.lecture; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.eq; @@ -28,15 +28,15 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.competency.CompetencyUtilService; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.competency.Competency; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.domain.lecture.OnlineUnit; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.OnlineUnitRepository; -import de.tum.in.www1.artemis.web.rest.dto.OnlineResourceDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.competency.CompetencyUtilService; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.competency.Competency; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.domain.lecture.OnlineUnit; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.OnlineUnitRepository; +import de.tum.cit.aet.artemis.web.rest.dto.OnlineResourceDTO; class OnlineUnitIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/lecture/TextUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/TextUnitIntegrationTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/lecture/TextUnitIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/lecture/TextUnitIntegrationTest.java index e66c2661c579..eaa0868aa442 100644 --- a/src/test/java/de/tum/in/www1/artemis/lecture/TextUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/TextUnitIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.lecture; +package de.tum.cit.aet.artemis.lecture; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.eq; @@ -15,14 +15,14 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.competency.CompetencyUtilService; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.competency.Competency; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.domain.lecture.TextUnit; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.TextUnitRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.competency.CompetencyUtilService; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.competency.Competency; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.domain.lecture.TextUnit; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.TextUnitRepository; class TextUnitIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/lecture/VideoUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/VideoUnitIntegrationTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/lecture/VideoUnitIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/lecture/VideoUnitIntegrationTest.java index 4ac391743fb8..d3ad4e16d07e 100644 --- a/src/test/java/de/tum/in/www1/artemis/lecture/VideoUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/VideoUnitIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.lecture; +package de.tum.cit.aet.artemis.lecture; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.eq; @@ -15,14 +15,14 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.competency.CompetencyUtilService; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.competency.Competency; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.domain.lecture.VideoUnit; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.VideoUnitRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.competency.CompetencyUtilService; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.competency.Competency; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.domain.lecture.VideoUnit; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.VideoUnitRepository; class VideoUnitIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java similarity index 86% rename from src/test/java/de/tum/in/www1/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java index 35cbbb30ae10..a4764c741d89 100644 --- a/src/test/java/de/tum/in/www1/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.localvcci; +package de.tum.cit.aet.artemis.localvcci; import java.time.ZonedDateTime; import java.util.List; @@ -13,22 +13,22 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.AuxiliaryRepositoryRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.service.StaticCodeAnalysisService; -import de.tum.in.www1.artemis.service.connectors.aeolus.AeolusTemplateService; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.AuxiliaryRepositoryRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; +import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.user.UserUtilService; public class AbstractLocalCILocalVCIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/BuildAgentConfigurationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentConfigurationTest.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/localvcci/BuildAgentConfigurationTest.java rename to src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentConfigurationTest.java index d5eff6e1f054..aeaeb207d314 100644 --- a/src/test/java/de/tum/in/www1/artemis/localvcci/BuildAgentConfigurationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentConfigurationTest.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.localvcci; +package de.tum.cit.aet.artemis.localvcci; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.config.icl.BuildAgentConfiguration; +import de.tum.cit.aet.artemis.config.icl.BuildAgentConfiguration; class BuildAgentConfigurationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/BuildAgentDockerServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentDockerServiceTest.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/localvcci/BuildAgentDockerServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentDockerServiceTest.java index 35116c968bc3..65f878d3e62e 100644 --- a/src/test/java/de/tum/in/www1/artemis/localvcci/BuildAgentDockerServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentDockerServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.localvcci; +package de.tum.cit.aet.artemis.localvcci; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; @@ -28,14 +28,14 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.map.IMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.domain.BuildJob; -import de.tum.in.www1.artemis.domain.enumeration.BuildStatus; -import de.tum.in.www1.artemis.exception.LocalCIException; -import de.tum.in.www1.artemis.service.connectors.localci.buildagent.BuildAgentDockerService; -import de.tum.in.www1.artemis.service.connectors.localci.buildagent.BuildLogsMap; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildConfig; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.domain.BuildJob; +import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; +import de.tum.cit.aet.artemis.exception.LocalCIException; +import de.tum.cit.aet.artemis.service.connectors.localci.buildagent.BuildAgentDockerService; +import de.tum.cit.aet.artemis.service.connectors.localci.buildagent.BuildLogsMap; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildConfig; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) class BuildAgentDockerServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/BuildAgentSshAuthenticationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentSshAuthenticationIntegrationTest.java similarity index 84% rename from src/test/java/de/tum/in/www1/artemis/localvcci/BuildAgentSshAuthenticationIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentSshAuthenticationIntegrationTest.java index 74b39dd2801b..a5f3a2c4d1ae 100644 --- a/src/test/java/de/tum/in/www1/artemis/localvcci/BuildAgentSshAuthenticationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentSshAuthenticationIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.localvcci; +package de.tum.cit.aet.artemis.localvcci; import static org.assertj.core.api.Assertions.assertThat; @@ -13,10 +13,10 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.map.IMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.service.connectors.localci.buildagent.BuildAgentSshKeyService; -import de.tum.in.www1.artemis.service.connectors.localci.buildagent.SharedQueueProcessingService; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.service.connectors.localci.buildagent.BuildAgentSshKeyService; +import de.tum.cit.aet.artemis.service.connectors.localci.buildagent.SharedQueueProcessingService; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; class BuildAgentSshAuthenticationIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/BuildResultTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildResultTest.java similarity index 73% rename from src/test/java/de/tum/in/www1/artemis/localvcci/BuildResultTest.java rename to src/test/java/de/tum/cit/aet/artemis/localvcci/BuildResultTest.java index 221d0f2f9055..e0d0b2c1f3d4 100644 --- a/src/test/java/de/tum/in/www1/artemis/localvcci/BuildResultTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildResultTest.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.localvcci; +package de.tum.cit.aet.artemis.localvcci; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildResult; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildResult; class BuildResultTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java index 2e8fc41172b3..99cdb09c12fc 100644 --- a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.localvcci; +package de.tum.cit.aet.artemis.localvcci; -import static de.tum.in.www1.artemis.config.Constants.LOCALCI_RESULTS_DIRECTORY; -import static de.tum.in.www1.artemis.config.Constants.LOCALCI_WORKING_DIRECTORY; +import static de.tum.cit.aet.artemis.config.Constants.LOCALCI_RESULTS_DIRECTORY; +import static de.tum.cit.aet.artemis.config.Constants.LOCALCI_WORKING_DIRECTORY; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.awaitility.Awaitility.await; @@ -50,21 +50,21 @@ import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.Frame; -import de.tum.in.www1.artemis.domain.BuildJob; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.enumeration.BuildStatus; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.exception.VersionControlException; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.in.www1.artemis.service.BuildLogEntryService; -import de.tum.in.www1.artemis.service.ParticipationVcsAccessTokenService; -import de.tum.in.www1.artemis.service.connectors.localci.dto.ResultBuildJob; -import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCServletService; -import de.tum.in.www1.artemis.util.LocalRepository; +import de.tum.cit.aet.artemis.domain.BuildJob; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.exception.VersionControlException; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.service.BuildLogEntryService; +import de.tum.cit.aet.artemis.service.ParticipationVcsAccessTokenService; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.ResultBuildJob; +import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCServletService; +import de.tum.cit.aet.artemis.util.LocalRepository; @TestInstance(TestInstance.Lifecycle.PER_CLASS) class LocalCIIntegrationTest extends AbstractLocalCILocalVCIntegrationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResourceIntegrationTest.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIResourceIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResourceIntegrationTest.java index d36e8fc760a6..7e08debdb58f 100644 --- a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResourceIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.localvcci; +package de.tum.cit.aet.artemis.localvcci; import static org.assertj.core.api.Assertions.assertThat; @@ -21,24 +21,24 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.map.IMap; -import de.tum.in.www1.artemis.domain.BuildJob; -import de.tum.in.www1.artemis.domain.BuildLogEntry; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.BuildStatus; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.enumeration.SortingOrder; -import de.tum.in.www1.artemis.service.BuildLogEntryService; -import de.tum.in.www1.artemis.service.connectors.localci.buildagent.SharedQueueProcessingService; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildAgentInformation; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildConfig; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.in.www1.artemis.service.connectors.localci.dto.JobTimingInfo; -import de.tum.in.www1.artemis.service.connectors.localci.dto.RepositoryInfo; -import de.tum.in.www1.artemis.service.dto.BuildJobsStatisticsDTO; -import de.tum.in.www1.artemis.service.dto.FinishedBuildJobDTO; -import de.tum.in.www1.artemis.util.PageableSearchUtilService; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.PageableSearchDTO; +import de.tum.cit.aet.artemis.domain.BuildJob; +import de.tum.cit.aet.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; +import de.tum.cit.aet.artemis.service.BuildLogEntryService; +import de.tum.cit.aet.artemis.service.connectors.localci.buildagent.SharedQueueProcessingService; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildConfig; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.JobTimingInfo; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.RepositoryInfo; +import de.tum.cit.aet.artemis.service.dto.BuildJobsStatisticsDTO; +import de.tum.cit.aet.artemis.service.dto.FinishedBuildJobDTO; +import de.tum.cit.aet.artemis.util.PageableSearchUtilService; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.PageableSearchDTO; class LocalCIResourceIntegrationTest extends AbstractLocalCILocalVCIntegrationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIResultServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResultServiceTest.java similarity index 81% rename from src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIResultServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResultServiceTest.java index 060014d4c0aa..98109bbcefb8 100644 --- a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIResultServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResultServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.localvcci; +package de.tum.cit.aet.artemis.localvcci; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -8,9 +8,9 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.exception.LocalCIException; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory; -import de.tum.in.www1.artemis.service.connectors.localci.LocalCIResultService; +import de.tum.cit.aet.artemis.exception.LocalCIException; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; +import de.tum.cit.aet.artemis.service.connectors.localci.LocalCIResultService; class LocalCIResultServiceTest extends AbstractLocalCILocalVCIntegrationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIServiceTest.java similarity index 88% rename from src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIServiceTest.java index 6564c27d96bc..01cd78bc393f 100644 --- a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.localvcci; +package de.tum.cit.aet.artemis.localvcci; import static org.assertj.core.api.Assertions.assertThat; @@ -23,26 +23,26 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.map.IMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.service.connectors.BuildScriptProviderService; -import de.tum.in.www1.artemis.service.connectors.aeolus.AeolusTemplateService; -import de.tum.in.www1.artemis.service.connectors.aeolus.Windfile; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationService.BuildStatus; -import de.tum.in.www1.artemis.service.connectors.localci.buildagent.SharedQueueProcessingService; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildConfig; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.in.www1.artemis.service.connectors.localci.dto.JobTimingInfo; -import de.tum.in.www1.artemis.service.connectors.localci.dto.RepositoryInfo; -import de.tum.in.www1.artemis.web.rest.dto.CheckoutDirectoriesDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.service.connectors.BuildScriptProviderService; +import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService.BuildStatus; +import de.tum.cit.aet.artemis.service.connectors.localci.buildagent.SharedQueueProcessingService; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildConfig; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.JobTimingInfo; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.RepositoryInfo; +import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; class LocalCIServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { @@ -105,9 +105,9 @@ void testReturnCorrectBuildStatus() { RepositoryInfo repositoryInfo = new RepositoryInfo("test", null, RepositoryType.USER, "test", "test", "test", null, null); BuildJobQueueItem job1 = new BuildJobQueueItem("1", "job1", "address1", participation.getId(), course.getId(), 1, 1, 1, - de.tum.in.www1.artemis.domain.enumeration.BuildStatus.SUCCESSFUL, repositoryInfo, jobTimingInfo, buildConfig, null); + de.tum.cit.aet.artemis.domain.enumeration.BuildStatus.SUCCESSFUL, repositoryInfo, jobTimingInfo, buildConfig, null); BuildJobQueueItem job2 = new BuildJobQueueItem("2", "job2", "address1", participation.getId(), course.getId(), 1, 1, 1, - de.tum.in.www1.artemis.domain.enumeration.BuildStatus.SUCCESSFUL, repositoryInfo, jobTimingInfo, buildConfig, null); + de.tum.cit.aet.artemis.domain.enumeration.BuildStatus.SUCCESSFUL, repositoryInfo, jobTimingInfo, buildConfig, null); queuedJobs = hazelcastInstance.getQueue("buildJobQueue"); processingJobs = hazelcastInstance.getMap("processingJobs"); diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCInfoContributorTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCInfoContributorTest.java similarity index 79% rename from src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCInfoContributorTest.java rename to src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCInfoContributorTest.java index c078f3e27a98..c67f9533c9be 100644 --- a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCInfoContributorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCInfoContributorTest.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.localvcci; +package de.tum.cit.aet.artemis.localvcci; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_BUILDAGENT; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; @@ -9,7 +9,7 @@ import org.springframework.boot.test.mock.mockito.SpyBean; import org.springframework.test.context.ActiveProfiles; -import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCInfoContributor; +import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCInfoContributor; @ActiveProfiles({ "artemis", PROFILE_LOCALVC, PROFILE_BUILDAGENT }) class LocalVCInfoContributorTest { diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCIntegrationTest.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCIntegrationTest.java index 83d96942ce05..29a134d25196 100644 --- a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.localvcci; +package de.tum.cit.aet.artemis.localvcci; -import static de.tum.in.www1.artemis.user.UserFactory.USER_PASSWORD; +import static de.tum.cit.aet.artemis.user.UserFactory.USER_PASSWORD; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; @@ -29,10 +29,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCRepositoryUri; -import de.tum.in.www1.artemis.service.ldap.LdapUserDto; -import de.tum.in.www1.artemis.util.LocalRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; +import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; +import de.tum.cit.aet.artemis.util.LocalRepository; /** * This class contains integration tests for edge cases pertaining to the local VC system. diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIIntegrationTest.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIIntegrationTest.java index f2f41cb0d1f1..f263bad8825e 100644 --- a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIIntegrationTest.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.localvcci; +package de.tum.cit.aet.artemis.localvcci; -import static de.tum.in.www1.artemis.config.Constants.LOCALCI_RESULTS_DIRECTORY; -import static de.tum.in.www1.artemis.config.Constants.LOCALCI_WORKING_DIRECTORY; -import static de.tum.in.www1.artemis.service.connectors.localci.LocalCITriggerService.PRIORITY_EXAM_CONDUCTION; -import static de.tum.in.www1.artemis.service.connectors.localci.LocalCITriggerService.PRIORITY_NORMAL; -import static de.tum.in.www1.artemis.service.connectors.localci.LocalCITriggerService.PRIORITY_OPTIONAL_EXERCISE; +import static de.tum.cit.aet.artemis.config.Constants.LOCALCI_RESULTS_DIRECTORY; +import static de.tum.cit.aet.artemis.config.Constants.LOCALCI_WORKING_DIRECTORY; +import static de.tum.cit.aet.artemis.service.connectors.localci.LocalCITriggerService.PRIORITY_EXAM_CONDUCTION; +import static de.tum.cit.aet.artemis.service.connectors.localci.LocalCITriggerService.PRIORITY_NORMAL; +import static de.tum.cit.aet.artemis.service.connectors.localci.LocalCITriggerService.PRIORITY_OPTIONAL_EXERCISE; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; @@ -41,21 +41,21 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.domain.AuxiliaryRepository; -import de.tum.in.www1.artemis.domain.BuildJob; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.submissionpolicy.LockRepositoryPolicy; -import de.tum.in.www1.artemis.domain.submissionpolicy.SubmissionPolicy; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.service.ldap.LdapUserDto; -import de.tum.in.www1.artemis.util.LocalRepository; +import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.domain.BuildJob; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; +import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; +import de.tum.cit.aet.artemis.util.LocalRepository; /** * This class contains integration tests for the base repositories (template, solution, tests) and the different types of assignment repositories (student assignment, teaching diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java similarity index 85% rename from src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java index cbd957d51dd1..cb77d9dfe756 100644 --- a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.localvcci; +package de.tum.cit.aet.artemis.localvcci; import static org.assertj.core.api.Assertions.assertThat; @@ -9,15 +9,15 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCRepositoryUri; -import de.tum.in.www1.artemis.util.LocalRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; +import de.tum.cit.aet.artemis.util.LocalRepository; class LocalVCLocalCIParticipationIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCITestService.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCITestService.java rename to src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java index c5fb018478c5..8b4248990dcc 100644 --- a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCITestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.localvcci; +package de.tum.cit.aet.artemis.localvcci; -import static de.tum.in.www1.artemis.user.UserFactory.USER_PASSWORD; +import static de.tum.cit.aet.artemis.user.UserFactory.USER_PASSWORD; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Fail.fail; @@ -52,23 +52,23 @@ import com.github.dockerjava.api.command.InspectImageCmd; import com.github.dockerjava.api.command.InspectImageResponse; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.Visibility; -import de.tum.in.www1.artemis.domain.participation.ParticipationVCSAccessToken; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.service.ParticipationVcsAccessTokenService; -import de.tum.in.www1.artemis.service.connectors.GitService; -import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCRepositoryUri; -import de.tum.in.www1.artemis.util.LocalRepository; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.domain.participation.ParticipationVCSAccessToken; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.service.ParticipationVcsAccessTokenService; +import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; +import de.tum.cit.aet.artemis.util.LocalRepository; /** * This class contains helper methods for all tests of the local VC and local CI system.. diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCServiceTest.java similarity index 83% rename from src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCServiceTest.java index 82b4542a23e2..e2b3173674ca 100644 --- a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.localvcci; +package de.tum.cit.aet.artemis.localvcci; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verifyNoInteractions; @@ -8,14 +8,14 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.service.connectors.ConnectorHealth; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; class LocalVCServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCSshIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCSshIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCSshIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCSshIntegrationTest.java index 033e68630472..0c535ef2b890 100644 --- a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCSshIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCSshIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.localvcci; +package de.tum.cit.aet.artemis.localvcci; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -27,10 +27,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.config.icl.ssh.HashUtils; -import de.tum.in.www1.artemis.config.icl.ssh.SshGitCommand; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.service.icl.SshGitCommandFactoryService; +import de.tum.cit.aet.artemis.config.icl.ssh.HashUtils; +import de.tum.cit.aet.artemis.config.icl.ssh.SshGitCommand; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.service.icl.SshGitCommandFactoryService; @Profile(PROFILE_LOCALVC) class LocalVCSshIntegrationTest extends LocalVCIntegrationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/MultipleHostKeyProviderTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/MultipleHostKeyProviderTest.java similarity index 76% rename from src/test/java/de/tum/in/www1/artemis/localvcci/MultipleHostKeyProviderTest.java rename to src/test/java/de/tum/cit/aet/artemis/localvcci/MultipleHostKeyProviderTest.java index 7698c1eed71f..53d561ecd819 100644 --- a/src/test/java/de/tum/in/www1/artemis/localvcci/MultipleHostKeyProviderTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/MultipleHostKeyProviderTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.localvcci; +package de.tum.cit.aet.artemis.localvcci; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; import static org.assertj.core.api.Assertions.assertThat; import java.nio.file.Path; @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Profile; -import de.tum.in.www1.artemis.config.icl.ssh.MultipleHostKeyProvider; +import de.tum.cit.aet.artemis.config.icl.ssh.MultipleHostKeyProvider; @Profile(PROFILE_LOCALVC) class MultipleHostKeyProviderTest extends LocalVCIntegrationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/SharedQueueManagementServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/SharedQueueManagementServiceTest.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/localvcci/SharedQueueManagementServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/localvcci/SharedQueueManagementServiceTest.java index 0765e9446ba3..bf3af3df3893 100644 --- a/src/test/java/de/tum/in/www1/artemis/localvcci/SharedQueueManagementServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/SharedQueueManagementServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.localvcci; +package de.tum.cit.aet.artemis.localvcci; import static org.assertj.core.api.Assertions.assertThat; @@ -11,9 +11,9 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.map.IMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.domain.BuildJob; -import de.tum.in.www1.artemis.service.connectors.localci.SharedQueueManagementService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.domain.BuildJob; +import de.tum.cit.aet.artemis.service.connectors.localci.SharedQueueManagementService; class SharedQueueManagementServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/TestBuildAgentConfiguration.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/TestBuildAgentConfiguration.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/localvcci/TestBuildAgentConfiguration.java rename to src/test/java/de/tum/cit/aet/artemis/localvcci/TestBuildAgentConfiguration.java index 48622b8b9e15..51f197dbae5b 100644 --- a/src/test/java/de/tum/in/www1/artemis/localvcci/TestBuildAgentConfiguration.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/TestBuildAgentConfiguration.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.localvcci; +package de.tum.cit.aet.artemis.localvcci; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; @@ -36,9 +36,9 @@ import com.github.dockerjava.api.model.Container; import com.github.dockerjava.api.model.Image; -import de.tum.in.www1.artemis.config.icl.BuildAgentConfiguration; -import de.tum.in.www1.artemis.service.connectors.localci.buildagent.BuildAgentDockerService; -import de.tum.in.www1.artemis.util.FixMissingServletPathProcessor; +import de.tum.cit.aet.artemis.config.icl.BuildAgentConfiguration; +import de.tum.cit.aet.artemis.service.connectors.localci.buildagent.BuildAgentDockerService; +import de.tum.cit.aet.artemis.util.FixMissingServletPathProcessor; /** * This class is used to overwrite the configuration of the local CI system ({@link BuildAgentConfiguration}). diff --git a/src/test/java/de/tum/in/www1/artemis/management/SecurityMetersServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/management/SecurityMetersServiceTest.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/management/SecurityMetersServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/management/SecurityMetersServiceTest.java index 0037ebca20f2..15f343a37500 100644 --- a/src/test/java/de/tum/in/www1/artemis/management/SecurityMetersServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/management/SecurityMetersServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.management; +package de.tum.cit.aet.artemis.management; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/de/tum/in/www1/artemis/metis/AbstractConversationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/metis/AbstractConversationTest.java rename to src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java index d1f9d3ddc0a6..0380c69756e5 100644 --- a/src/test/java/de/tum/in/www1/artemis/metis/AbstractConversationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.metis; +package de.tum.cit.aet.artemis.metis; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.any; @@ -18,29 +18,29 @@ import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.in.www1.artemis.domain.enumeration.DisplayPriority; -import de.tum.in.www1.artemis.domain.metis.ConversationParticipant; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.ConversationMessageRepository; -import de.tum.in.www1.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ConversationRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.GroupChatRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.OneToOneChatRepository; -import de.tum.in.www1.artemis.service.metis.conversation.ConversationService; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.web.rest.dto.PostContextFilterDTO; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.ChannelDTO; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.GroupChatDTO; -import de.tum.in.www1.artemis.web.websocket.dto.metis.ConversationWebsocketDTO; -import de.tum.in.www1.artemis.web.websocket.dto.metis.MetisCrudAction; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; +import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.ConversationMessageRepository; +import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ConversationRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.GroupChatRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.OneToOneChatRepository; +import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.GroupChatDTO; +import de.tum.cit.aet.artemis.web.websocket.dto.metis.ConversationWebsocketDTO; +import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; /** * Contains useful methods for testing the conversations futures diff --git a/src/test/java/de/tum/in/www1/artemis/metis/AnswerMessageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/AnswerMessageIntegrationTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/metis/AnswerMessageIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/metis/AnswerMessageIntegrationTest.java index bd1d3104a880..c00528a34e4d 100644 --- a/src/test/java/de/tum/in/www1/artemis/metis/AnswerMessageIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/AnswerMessageIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.metis; +package de.tum.cit.aet.artemis.metis; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.any; @@ -24,24 +24,24 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.in.www1.artemis.domain.enumeration.NotificationType; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.metis.AnswerPost; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.notification.SingleUserNotification; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.lecture.LectureUtilService; -import de.tum.in.www1.artemis.post.ConversationUtilService; -import de.tum.in.www1.artemis.repository.metis.AnswerPostRepository; -import de.tum.in.www1.artemis.repository.metis.ConversationMessageRepository; -import de.tum.in.www1.artemis.web.websocket.dto.metis.PostDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.metis.AnswerPost; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.notification.SingleUserNotification; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.post.ConversationUtilService; +import de.tum.cit.aet.artemis.repository.metis.AnswerPostRepository; +import de.tum.cit.aet.artemis.repository.metis.ConversationMessageRepository; +import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; class AnswerMessageIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/metis/ChannelIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/metis/ChannelIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java index 7a8b0ca230c7..fa0629e9aea4 100644 --- a/src/test/java/de/tum/in/www1/artemis/metis/ChannelIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.metis; +package de.tum.cit.aet.artemis.metis; import static org.assertj.core.api.Assertions.assertThat; @@ -19,24 +19,24 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.lecture.LectureUtilService; -import de.tum.in.www1.artemis.post.ConversationUtilService; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupRepository; -import de.tum.in.www1.artemis.service.tutorialgroups.TutorialGroupChannelManagementService; -import de.tum.in.www1.artemis.tutorialgroups.TutorialGroupUtilService; -import de.tum.in.www1.artemis.user.UserFactory; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.ChannelDTO; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.ChannelIdAndNameDTO; -import de.tum.in.www1.artemis.web.websocket.dto.metis.MetisCrudAction; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.post.ConversationUtilService; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRepository; +import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupChannelManagementService; +import de.tum.cit.aet.artemis.tutorialgroups.TutorialGroupUtilService; +import de.tum.cit.aet.artemis.user.UserFactory; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelIdAndNameDTO; +import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; class ChannelIntegrationTest extends AbstractConversationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/metis/ConversationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/ConversationIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/metis/ConversationIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/metis/ConversationIntegrationTest.java index 491e1061ae29..67ff8629f307 100644 --- a/src/test/java/de/tum/in/www1/artemis/metis/ConversationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/ConversationIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.metis; +package de.tum.cit.aet.artemis.metis; import static org.assertj.core.api.Assertions.assertThat; @@ -17,26 +17,26 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.metis.ConversationParticipant; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.lecture.LectureUtilService; -import de.tum.in.www1.artemis.post.ConversationUtilService; -import de.tum.in.www1.artemis.service.dto.ResponsibleUserDTO; -import de.tum.in.www1.artemis.user.UserFactory; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.ChannelDTO; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.ConversationDTO; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.ConversationUserDTO; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.GroupChatDTO; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.OneToOneChatDTO; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.post.ConversationUtilService; +import de.tum.cit.aet.artemis.service.dto.ResponsibleUserDTO; +import de.tum.cit.aet.artemis.user.UserFactory; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ConversationDTO; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ConversationUserDTO; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.GroupChatDTO; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.OneToOneChatDTO; class ConversationIntegrationTest extends AbstractConversationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/metis/GroupChatIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/GroupChatIntegrationTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/metis/GroupChatIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/metis/GroupChatIntegrationTest.java index ffdef9b2a1f4..2d49cec0e08e 100644 --- a/src/test/java/de/tum/in/www1/artemis/metis/GroupChatIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/GroupChatIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.metis; +package de.tum.cit.aet.artemis.metis; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.anyString; @@ -16,11 +16,11 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.in.www1.artemis.user.UserFactory; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.GroupChatDTO; -import de.tum.in.www1.artemis.web.websocket.dto.metis.MetisCrudAction; -import de.tum.in.www1.artemis.web.websocket.dto.metis.PostDTO; +import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.user.UserFactory; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.GroupChatDTO; +import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; +import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; class GroupChatIntegrationTest extends AbstractConversationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/metis/MessageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/MessageIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/metis/MessageIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/metis/MessageIntegrationTest.java index c7716b764778..1c7896bd6bfc 100644 --- a/src/test/java/de/tum/in/www1/artemis/metis/MessageIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/MessageIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.metis; +package de.tum.cit.aet.artemis.metis; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -44,29 +44,29 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.in.www1.artemis.domain.enumeration.DisplayPriority; -import de.tum.in.www1.artemis.domain.enumeration.SortingOrder; -import de.tum.in.www1.artemis.domain.metis.ConversationParticipant; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.metis.PostSortCriterion; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.metis.conversation.OneToOneChat; -import de.tum.in.www1.artemis.domain.notification.ConversationNotification; -import de.tum.in.www1.artemis.domain.notification.Notification; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.in.www1.artemis.post.ConversationUtilService; -import de.tum.in.www1.artemis.repository.metis.ConversationMessageRepository; -import de.tum.in.www1.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ConversationNotificationRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.OneToOneChatRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.web.rest.dto.PostContextFilterDTO; -import de.tum.in.www1.artemis.web.websocket.dto.metis.PostDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; +import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; +import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.metis.PostSortCriterion; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.metis.conversation.OneToOneChat; +import de.tum.cit.aet.artemis.domain.notification.ConversationNotification; +import de.tum.cit.aet.artemis.domain.notification.Notification; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.post.ConversationUtilService; +import de.tum.cit.aet.artemis.repository.metis.ConversationMessageRepository; +import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ConversationNotificationRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.OneToOneChatRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; +import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; class MessageIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/metis/OneToOneChatIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/OneToOneChatIntegrationTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/metis/OneToOneChatIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/metis/OneToOneChatIntegrationTest.java index ee852ceedf44..8aa19f4fa606 100644 --- a/src/test/java/de/tum/in/www1/artemis/metis/OneToOneChatIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/OneToOneChatIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.metis; +package de.tum.cit.aet.artemis.metis; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.anyString; @@ -16,11 +16,11 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.in.www1.artemis.user.UserFactory; -import de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.OneToOneChatDTO; -import de.tum.in.www1.artemis.web.websocket.dto.metis.MetisCrudAction; -import de.tum.in.www1.artemis.web.websocket.dto.metis.PostDTO; +import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.user.UserFactory; +import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.OneToOneChatDTO; +import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; +import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; class OneToOneChatIntegrationTest extends AbstractConversationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/metis/PostingServiceUnitTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/PostingServiceUnitTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/metis/PostingServiceUnitTest.java rename to src/test/java/de/tum/cit/aet/artemis/metis/PostingServiceUnitTest.java index 3f650e76ee09..febf94159bbd 100644 --- a/src/test/java/de/tum/in/www1/artemis/metis/PostingServiceUnitTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/PostingServiceUnitTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.metis; +package de.tum.cit.aet.artemis.metis; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -20,13 +20,13 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.metis.ConversationMessagingService; -import de.tum.in.www1.artemis.service.metis.PostingService; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.service.metis.ConversationMessagingService; +import de.tum.cit.aet.artemis.service.metis.PostingService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; class PostingServiceUnitTest { diff --git a/src/test/java/de/tum/in/www1/artemis/metis/ReactionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/ReactionIntegrationTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/metis/ReactionIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/metis/ReactionIntegrationTest.java index f4d5d7c47c08..aba8a201f752 100644 --- a/src/test/java/de/tum/in/www1/artemis/metis/ReactionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/ReactionIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.metis; +package de.tum.cit.aet.artemis.metis; -import static de.tum.in.www1.artemis.config.Constants.VOTE_EMOJI_ID; +import static de.tum.cit.aet.artemis.config.Constants.VOTE_EMOJI_ID; import static org.assertj.core.api.Assertions.assertThat; import java.util.Collection; @@ -23,19 +23,19 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.in.www1.artemis.domain.enumeration.SortingOrder; -import de.tum.in.www1.artemis.domain.metis.AnswerPost; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.metis.PostSortCriterion; -import de.tum.in.www1.artemis.domain.metis.Reaction; -import de.tum.in.www1.artemis.post.ConversationUtilService; -import de.tum.in.www1.artemis.repository.metis.ConversationMessageRepository; -import de.tum.in.www1.artemis.repository.metis.PostRepository; -import de.tum.in.www1.artemis.repository.metis.ReactionRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; +import de.tum.cit.aet.artemis.domain.metis.AnswerPost; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.metis.PostSortCriterion; +import de.tum.cit.aet.artemis.domain.metis.Reaction; +import de.tum.cit.aet.artemis.post.ConversationUtilService; +import de.tum.cit.aet.artemis.repository.metis.ConversationMessageRepository; +import de.tum.cit.aet.artemis.repository.metis.PostRepository; +import de.tum.cit.aet.artemis.repository.metis.ReactionRepository; class ReactionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/metis/linkpreview/LinkPreviewIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/linkpreview/LinkPreviewIntegrationTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/metis/linkpreview/LinkPreviewIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/metis/linkpreview/LinkPreviewIntegrationTest.java index 5280b9d12dea..1a357ebb5268 100644 --- a/src/test/java/de/tum/in/www1/artemis/metis/linkpreview/LinkPreviewIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/linkpreview/LinkPreviewIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.metis.linkpreview; +package de.tum.cit.aet.artemis.metis.linkpreview; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; @@ -21,8 +21,8 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.web.rest.dto.LinkPreviewDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.web.rest.dto.LinkPreviewDTO; class LinkPreviewIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/metis/linkpreview/mockFiles/github_home.txt b/src/test/java/de/tum/cit/aet/artemis/metis/linkpreview/mockFiles/github_home.txt similarity index 100% rename from src/test/java/de/tum/in/www1/artemis/metis/linkpreview/mockFiles/github_home.txt rename to src/test/java/de/tum/cit/aet/artemis/metis/linkpreview/mockFiles/github_home.txt diff --git a/src/test/java/de/tum/in/www1/artemis/metis/linkpreview/mockFiles/github_pull_request_6615.txt b/src/test/java/de/tum/cit/aet/artemis/metis/linkpreview/mockFiles/github_pull_request_6615.txt similarity index 100% rename from src/test/java/de/tum/in/www1/artemis/metis/linkpreview/mockFiles/github_pull_request_6615.txt rename to src/test/java/de/tum/cit/aet/artemis/metis/linkpreview/mockFiles/github_pull_request_6615.txt diff --git a/src/test/java/de/tum/in/www1/artemis/metis/linkpreview/mockFiles/github_pull_request_6618.txt b/src/test/java/de/tum/cit/aet/artemis/metis/linkpreview/mockFiles/github_pull_request_6618.txt similarity index 100% rename from src/test/java/de/tum/in/www1/artemis/metis/linkpreview/mockFiles/github_pull_request_6618.txt rename to src/test/java/de/tum/cit/aet/artemis/metis/linkpreview/mockFiles/github_pull_request_6618.txt diff --git a/src/test/java/de/tum/in/www1/artemis/metis/linkpreview/mockFiles/google.txt b/src/test/java/de/tum/cit/aet/artemis/metis/linkpreview/mockFiles/google.txt similarity index 100% rename from src/test/java/de/tum/in/www1/artemis/metis/linkpreview/mockFiles/google.txt rename to src/test/java/de/tum/cit/aet/artemis/metis/linkpreview/mockFiles/google.txt diff --git a/src/test/java/de/tum/in/www1/artemis/metis/similarity/TitleJaccardSimilarityCompareStrategyTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/similarity/TitleJaccardSimilarityCompareStrategyTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/metis/similarity/TitleJaccardSimilarityCompareStrategyTest.java rename to src/test/java/de/tum/cit/aet/artemis/metis/similarity/TitleJaccardSimilarityCompareStrategyTest.java index fae10065bca1..61ad3e937a6a 100644 --- a/src/test/java/de/tum/in/www1/artemis/metis/similarity/TitleJaccardSimilarityCompareStrategyTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/similarity/TitleJaccardSimilarityCompareStrategyTest.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.metis.similarity; +package de.tum.cit.aet.artemis.metis.similarity; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.service.metis.similarity.TitleJaccardSimilarityCompareStrategy; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.service.metis.similarity.TitleJaccardSimilarityCompareStrategy; class TitleJaccardSimilarityCompareStrategyTest { diff --git a/src/test/java/de/tum/in/www1/artemis/migration/MigrationIntegrityTest.java b/src/test/java/de/tum/cit/aet/artemis/migration/MigrationIntegrityTest.java similarity index 75% rename from src/test/java/de/tum/in/www1/artemis/migration/MigrationIntegrityTest.java rename to src/test/java/de/tum/cit/aet/artemis/migration/MigrationIntegrityTest.java index e54b9155663b..7dacb1edb2cf 100644 --- a/src/test/java/de/tum/in/www1/artemis/migration/MigrationIntegrityTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/migration/MigrationIntegrityTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.migration; +package de.tum.cit.aet.artemis.migration; import static org.assertj.core.api.Assertions.assertThat; @@ -7,10 +7,10 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.config.migration.MigrationEntry; -import de.tum.in.www1.artemis.config.migration.MigrationRegistry; -import de.tum.in.www1.artemis.config.migration.MigrationService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.config.migration.MigrationEntry; +import de.tum.cit.aet.artemis.config.migration.MigrationRegistry; +import de.tum.cit.aet.artemis.config.migration.MigrationService; class MigrationIntegrityTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/migration/MigrationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/migration/MigrationServiceTest.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/migration/MigrationServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/migration/MigrationServiceTest.java index f961e511c842..8067ec64d2d3 100644 --- a/src/test/java/de/tum/in/www1/artemis/migration/MigrationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/migration/MigrationServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.migration; +package de.tum.cit.aet.artemis.migration; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -22,16 +22,16 @@ import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.Profiles; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.config.migration.MigrationEntry; -import de.tum.in.www1.artemis.config.migration.MigrationIntegrityException; -import de.tum.in.www1.artemis.config.migration.MigrationRegistry; -import de.tum.in.www1.artemis.config.migration.MigrationService; -import de.tum.in.www1.artemis.domain.MigrationChangelog; -import de.tum.in.www1.artemis.migration.entries.TestChangeEntry20211214_231800; -import de.tum.in.www1.artemis.migration.entries.TestChangeEntry20211215_231800; -import de.tum.in.www1.artemis.migration.entries.TestChangeEntry20211216_231800; -import de.tum.in.www1.artemis.repository.MigrationChangeRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.config.migration.MigrationEntry; +import de.tum.cit.aet.artemis.config.migration.MigrationIntegrityException; +import de.tum.cit.aet.artemis.config.migration.MigrationRegistry; +import de.tum.cit.aet.artemis.config.migration.MigrationService; +import de.tum.cit.aet.artemis.domain.MigrationChangelog; +import de.tum.cit.aet.artemis.migration.entries.TestChangeEntry20211214_231800; +import de.tum.cit.aet.artemis.migration.entries.TestChangeEntry20211215_231800; +import de.tum.cit.aet.artemis.migration.entries.TestChangeEntry20211216_231800; +import de.tum.cit.aet.artemis.repository.MigrationChangeRepository; class MigrationServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/migration/entries/TestChangeEntry20211214_231800.java b/src/test/java/de/tum/cit/aet/artemis/migration/entries/TestChangeEntry20211214_231800.java similarity index 80% rename from src/test/java/de/tum/in/www1/artemis/migration/entries/TestChangeEntry20211214_231800.java rename to src/test/java/de/tum/cit/aet/artemis/migration/entries/TestChangeEntry20211214_231800.java index c5c5af37cd98..4289dbed76eb 100644 --- a/src/test/java/de/tum/in/www1/artemis/migration/entries/TestChangeEntry20211214_231800.java +++ b/src/test/java/de/tum/cit/aet/artemis/migration/entries/TestChangeEntry20211214_231800.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.migration.entries; +package de.tum.cit.aet.artemis.migration.entries; -import de.tum.in.www1.artemis.config.migration.MigrationEntry; +import de.tum.cit.aet.artemis.config.migration.MigrationEntry; public class TestChangeEntry20211214_231800 extends MigrationEntry { diff --git a/src/test/java/de/tum/in/www1/artemis/migration/entries/TestChangeEntry20211215_231800.java b/src/test/java/de/tum/cit/aet/artemis/migration/entries/TestChangeEntry20211215_231800.java similarity index 80% rename from src/test/java/de/tum/in/www1/artemis/migration/entries/TestChangeEntry20211215_231800.java rename to src/test/java/de/tum/cit/aet/artemis/migration/entries/TestChangeEntry20211215_231800.java index 5908d8d09809..f2e09df3a247 100644 --- a/src/test/java/de/tum/in/www1/artemis/migration/entries/TestChangeEntry20211215_231800.java +++ b/src/test/java/de/tum/cit/aet/artemis/migration/entries/TestChangeEntry20211215_231800.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.migration.entries; +package de.tum.cit.aet.artemis.migration.entries; -import de.tum.in.www1.artemis.config.migration.MigrationEntry; +import de.tum.cit.aet.artemis.config.migration.MigrationEntry; public class TestChangeEntry20211215_231800 extends MigrationEntry { diff --git a/src/test/java/de/tum/in/www1/artemis/migration/entries/TestChangeEntry20211216_231800.java b/src/test/java/de/tum/cit/aet/artemis/migration/entries/TestChangeEntry20211216_231800.java similarity index 80% rename from src/test/java/de/tum/in/www1/artemis/migration/entries/TestChangeEntry20211216_231800.java rename to src/test/java/de/tum/cit/aet/artemis/migration/entries/TestChangeEntry20211216_231800.java index 5ed1fda10b64..cf2067dc01f0 100644 --- a/src/test/java/de/tum/in/www1/artemis/migration/entries/TestChangeEntry20211216_231800.java +++ b/src/test/java/de/tum/cit/aet/artemis/migration/entries/TestChangeEntry20211216_231800.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.migration.entries; +package de.tum.cit.aet.artemis.migration.entries; -import de.tum.in.www1.artemis.config.migration.MigrationEntry; +import de.tum.cit.aet.artemis.config.migration.MigrationEntry; public class TestChangeEntry20211216_231800 extends MigrationEntry { diff --git a/src/test/java/de/tum/in/www1/artemis/notification/GroupNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/GroupNotificationServiceTest.java similarity index 89% rename from src/test/java/de/tum/in/www1/artemis/notification/GroupNotificationServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/notification/GroupNotificationServiceTest.java index d8e48ec2611c..03feab66015c 100644 --- a/src/test/java/de/tum/in/www1/artemis/notification/GroupNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/GroupNotificationServiceTest.java @@ -1,29 +1,29 @@ -package de.tum.in.www1.artemis.notification; - -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_FAILED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_FINISHED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_STARTED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_FAILED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_FINISHED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_STARTED; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.ATTACHMENT_CHANGE_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.COURSE_ARCHIVE_FAILED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.COURSE_ARCHIVE_FINISHED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.COURSE_ARCHIVE_STARTED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.DUPLICATE_TEST_CASE_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.EXAM_ARCHIVE_FAILED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.EXAM_ARCHIVE_FINISHED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.EXAM_ARCHIVE_STARTED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.EXERCISE_PRACTICE_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.EXERCISE_RELEASED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.EXERCISE_UPDATED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.ILLEGAL_SUBMISSION_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.PROGRAMMING_TEST_CASES_CHANGED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.QUIZ_EXERCISE_STARTED_TITLE; -import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EDITOR_NOTIFICATION__PROGRAMMING_TEST_CASES_CHANGED; -import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_OPEN_FOR_PRACTICE; -import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_RELEASED; -import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__LECTURE_NOTIFICATION__ATTACHMENT_CHANGES; +package de.tum.cit.aet.artemis.notification; + +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_FAILED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_FINISHED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_STARTED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_FAILED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_FINISHED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_STARTED; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.ATTACHMENT_CHANGE_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.COURSE_ARCHIVE_FAILED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.COURSE_ARCHIVE_FINISHED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.COURSE_ARCHIVE_STARTED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.DUPLICATE_TEST_CASE_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXAM_ARCHIVE_FAILED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXAM_ARCHIVE_FINISHED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXAM_ARCHIVE_STARTED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXERCISE_PRACTICE_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXERCISE_RELEASED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXERCISE_UPDATED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.ILLEGAL_SUBMISSION_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.PROGRAMMING_TEST_CASES_CHANGED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.QUIZ_EXERCISE_STARTED_TITLE; +import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EDITOR_NOTIFICATION__PROGRAMMING_TEST_CASES_CHANGED; +import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_OPEN_FOR_PRACTICE; +import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_RELEASED; +import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__LECTURE_NOTIFICATION__ATTACHMENT_CHANGES; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; import static org.mockito.Mockito.any; @@ -43,34 +43,34 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Attachment; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.NotificationSetting; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.QuizMode; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.metis.AnswerPost; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.notification.Notification; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseFactory; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.NotificationRepository; -import de.tum.in.www1.artemis.repository.NotificationSettingRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.notifications.GroupNotificationScheduleService; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Attachment; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.NotificationSetting; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.metis.AnswerPost; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.notification.Notification; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.NotificationRepository; +import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; +import de.tum.cit.aet.artemis.user.UserUtilService; class GroupNotificationServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/notification/NotificationFactory.java b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationFactory.java similarity index 85% rename from src/test/java/de/tum/in/www1/artemis/notification/NotificationFactory.java rename to src/test/java/de/tum/cit/aet/artemis/notification/NotificationFactory.java index 3b817fab1da6..28b91db9b491 100644 --- a/src/test/java/de/tum/in/www1/artemis/notification/NotificationFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationFactory.java @@ -1,13 +1,13 @@ -package de.tum.in.www1.artemis.notification; +package de.tum.cit.aet.artemis.notification; import java.time.ZonedDateTime; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.GroupNotificationType; -import de.tum.in.www1.artemis.domain.notification.GroupNotification; -import de.tum.in.www1.artemis.domain.notification.SingleUserNotification; -import de.tum.in.www1.artemis.domain.notification.SystemNotification; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType; +import de.tum.cit.aet.artemis.domain.notification.GroupNotification; +import de.tum.cit.aet.artemis.domain.notification.SingleUserNotification; +import de.tum.cit.aet.artemis.domain.notification.SystemNotification; /** * Factory for creating Notifications and related objects. diff --git a/src/test/java/de/tum/in/www1/artemis/notification/NotificationResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationResourceIntegrationTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/notification/NotificationResourceIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/notification/NotificationResourceIntegrationTest.java index c8cf7e40b261..e3fb9abfe0fe 100644 --- a/src/test/java/de/tum/in/www1/artemis/notification/NotificationResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationResourceIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.notification; +package de.tum.cit.aet.artemis.notification; import static org.assertj.core.api.Assertions.assertThat; @@ -12,19 +12,19 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.NotificationSetting; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.GroupNotificationType; -import de.tum.in.www1.artemis.domain.enumeration.NotificationType; -import de.tum.in.www1.artemis.domain.notification.GroupNotification; -import de.tum.in.www1.artemis.domain.notification.Notification; -import de.tum.in.www1.artemis.domain.notification.NotificationConstants; -import de.tum.in.www1.artemis.domain.notification.SingleUserNotification; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.repository.NotificationRepository; -import de.tum.in.www1.artemis.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.NotificationSetting; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.domain.notification.GroupNotification; +import de.tum.cit.aet.artemis.domain.notification.Notification; +import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; +import de.tum.cit.aet.artemis.domain.notification.SingleUserNotification; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.repository.NotificationRepository; +import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; class NotificationResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/notification/NotificationScheduleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationScheduleServiceTest.java similarity index 80% rename from src/test/java/de/tum/in/www1/artemis/notification/NotificationScheduleServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/notification/NotificationScheduleServiceTest.java index acc58c6b7964..69d196dbd4a5 100644 --- a/src/test/java/de/tum/in/www1/artemis/notification/NotificationScheduleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationScheduleServiceTest.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.notification; +package de.tum.cit.aet.artemis.notification; -import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_RELEASED; -import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_SUBMISSION_ASSESSED; +import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_RELEASED; +import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_SUBMISSION_ASSESSED; import static java.time.ZonedDateTime.now; import static org.awaitility.Awaitility.await; import static org.mockito.Mockito.any; @@ -19,23 +19,23 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.NotificationSetting; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.NotificationRepository; -import de.tum.in.www1.artemis.repository.NotificationSettingRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.service.messaging.InstanceMessageReceiveService; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.NotificationSetting; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.NotificationRepository; +import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.service.messaging.InstanceMessageReceiveService; +import de.tum.cit.aet.artemis.user.UserUtilService; class NotificationScheduleServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/notification/NotificationSettingsResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsResourceIntegrationTest.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/notification/NotificationSettingsResourceIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsResourceIntegrationTest.java index d4074bef509c..e04b12ab930e 100644 --- a/src/test/java/de/tum/in/www1/artemis/notification/NotificationSettingsResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsResourceIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.notification; +package de.tum.cit.aet.artemis.notification; -import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsService.DEFAULT_NOTIFICATION_SETTINGS; +import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.DEFAULT_NOTIFICATION_SETTINGS; import static org.assertj.core.api.Assertions.assertThat; import java.util.List; @@ -12,13 +12,13 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.NotificationSetting; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.post.ConversationUtilService; -import de.tum.in.www1.artemis.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.NotificationSetting; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.post.ConversationUtilService; +import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; class NotificationSettingsResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/notification/NotificationSettingsServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsServiceTest.java similarity index 88% rename from src/test/java/de/tum/in/www1/artemis/notification/NotificationSettingsServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsServiceTest.java index a223e74e11f4..df975e30c041 100644 --- a/src/test/java/de/tum/in/www1/artemis/notification/NotificationSettingsServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsServiceTest.java @@ -1,17 +1,17 @@ -package de.tum.in.www1.artemis.notification; - -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.ATTACHMENT_CHANGE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_STARTED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.DATA_EXPORT_CREATED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.DATA_EXPORT_FAILED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_STARTED; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.EXERCISE_PRACTICE; -import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsCommunicationChannel.EMAIL; -import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsCommunicationChannel.PUSH; -import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsService.DEFAULT_NOTIFICATION_SETTINGS; -import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_OPEN_FOR_PRACTICE; -import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__INSTRUCTOR_NOTIFICATION__COURSE_AND_EXAM_ARCHIVING_STARTED; -import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__LECTURE_NOTIFICATION__ATTACHMENT_CHANGES; +package de.tum.cit.aet.artemis.notification; + +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.ATTACHMENT_CHANGE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_STARTED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DATA_EXPORT_CREATED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DATA_EXPORT_FAILED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_STARTED; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_PRACTICE; +import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel.EMAIL; +import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel.PUSH; +import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.DEFAULT_NOTIFICATION_SETTINGS; +import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_OPEN_FOR_PRACTICE; +import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__INSTRUCTOR_NOTIFICATION__COURSE_AND_EXAM_ARCHIVING_STARTED; +import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__LECTURE_NOTIFICATION__ATTACHMENT_CHANGES; import static org.assertj.core.api.Assertions.assertThat; import java.util.Arrays; @@ -23,18 +23,18 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.NotificationSetting; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.NotificationType; -import de.tum.in.www1.artemis.domain.notification.GroupNotification; -import de.tum.in.www1.artemis.domain.notification.Notification; -import de.tum.in.www1.artemis.domain.notification.NotificationConstants; -import de.tum.in.www1.artemis.repository.NotificationSettingRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.notifications.NotificationSettingsCommunicationChannel; -import de.tum.in.www1.artemis.service.notifications.NotificationSettingsService; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.NotificationSetting; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.domain.notification.GroupNotification; +import de.tum.cit.aet.artemis.domain.notification.Notification; +import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; +import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel; +import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService; +import de.tum.cit.aet.artemis.user.UserUtilService; class NotificationSettingsServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/notification/NotificationTargetFactoryTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationTargetFactoryTest.java similarity index 81% rename from src/test/java/de/tum/in/www1/artemis/notification/NotificationTargetFactoryTest.java rename to src/test/java/de/tum/cit/aet/artemis/notification/NotificationTargetFactoryTest.java index c97014991558..55176ea80a6f 100644 --- a/src/test/java/de/tum/in/www1/artemis/notification/NotificationTargetFactoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationTargetFactoryTest.java @@ -1,34 +1,34 @@ -package de.tum.in.www1.artemis.notification; - -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.FILE_SUBMISSION_SUCCESSFUL_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.COURSES_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.COURSE_MANAGEMENT_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.DUPLICATE_TEST_CASE_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.EXAMS_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.EXERCISES_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.LECTURES_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.PROGRAMMING_EXERCISES_TEXT; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createAttachmentUpdatedTarget; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createExamProgrammingExerciseOrTestCaseTarget; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createExerciseReleasedTarget; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createExerciseTarget; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.createExerciseUpdatedTarget; -import static de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory.extractNotificationUrl; +package de.tum.cit.aet.artemis.notification; + +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.FILE_SUBMISSION_SUCCESSFUL_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.COURSES_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.COURSE_MANAGEMENT_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.DUPLICATE_TEST_CASE_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.EXAMS_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.EXERCISES_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.LECTURES_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.PROGRAMMING_EXERCISES_TEXT; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createAttachmentUpdatedTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createExamProgrammingExerciseOrTestCaseTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createExerciseReleasedTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createExerciseTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createExerciseUpdatedTarget; +import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.extractNotificationUrl; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.notification.GroupNotification; -import de.tum.in.www1.artemis.domain.notification.Notification; -import de.tum.in.www1.artemis.domain.notification.NotificationTarget; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.notification.GroupNotification; +import de.tum.cit.aet.artemis.domain.notification.Notification; +import de.tum.cit.aet.artemis.domain.notification.NotificationTarget; class NotificationTargetFactoryTest { diff --git a/src/test/java/de/tum/in/www1/artemis/notification/PushNotificationResourceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/PushNotificationResourceTest.java similarity index 84% rename from src/test/java/de/tum/in/www1/artemis/notification/PushNotificationResourceTest.java rename to src/test/java/de/tum/cit/aet/artemis/notification/PushNotificationResourceTest.java index d59af769f8dd..4619181cc8bb 100644 --- a/src/test/java/de/tum/in/www1/artemis/notification/PushNotificationResourceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/PushNotificationResourceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.notification; +package de.tum.cit.aet.artemis.notification; import static org.assertj.core.api.Assertions.assertThat; @@ -13,16 +13,16 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.push_notification.PushNotificationDeviceConfiguration; -import de.tum.in.www1.artemis.domain.push_notification.PushNotificationDeviceType; -import de.tum.in.www1.artemis.repository.PushNotificationDeviceConfigurationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.web.rest.push_notification.PushNotificationRegisterBody; -import de.tum.in.www1.artemis.web.rest.push_notification.PushNotificationRegisterDTO; -import de.tum.in.www1.artemis.web.rest.push_notification.PushNotificationUnregisterRequest; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfiguration; +import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceType; +import de.tum.cit.aet.artemis.repository.PushNotificationDeviceConfigurationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.web.rest.push_notification.PushNotificationRegisterBody; +import de.tum.cit.aet.artemis.web.rest.push_notification.PushNotificationRegisterDTO; +import de.tum.cit.aet.artemis.web.rest.push_notification.PushNotificationUnregisterRequest; @TestInstance(TestInstance.Lifecycle.PER_CLASS) class PushNotificationResourceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/notification/SingleUserNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/SingleUserNotificationServiceTest.java similarity index 85% rename from src/test/java/de/tum/in/www1/artemis/notification/SingleUserNotificationServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/notification/SingleUserNotificationServiceTest.java index c839bd53444b..cf70a560d36f 100644 --- a/src/test/java/de/tum/in/www1/artemis/notification/SingleUserNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/SingleUserNotificationServiceTest.java @@ -1,42 +1,42 @@ -package de.tum.in.www1.artemis.notification; - -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_CHANNEL; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_GROUP_CHAT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_CREATE_GROUP_CHAT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_CREATE_ONE_TO_ONE_CHAT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_DELETE_CHANNEL; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_REPLY_MESSAGE; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_REMOVE_USER_CHANNEL; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.CONVERSATION_REMOVE_USER_GROUP_CHAT; -import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_EXERCISE_POST; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_CHANNEL_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_GROUP_CHAT_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.CONVERSATION_CREATE_GROUP_CHAT_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.CONVERSATION_DELETE_CHANNEL_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.CONVERSATION_REMOVE_USER_CHANNEL_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.CONVERSATION_REMOVE_USER_GROUP_CHAT_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.DATA_EXPORT_CREATED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.DATA_EXPORT_FAILED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.EXERCISE_SUBMISSION_ASSESSED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.FILE_SUBMISSION_SUCCESSFUL_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.MESSAGE_REPLY_IN_CONVERSATION_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.NEW_PLAGIARISM_CASE_STUDENT_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.PLAGIARISM_CASE_VERDICT_STUDENT_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_ASSIGNED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_STUDENT_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_TUTOR_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_MULTIPLE_TUTOR_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_STUDENT_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_TUTOR_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_UNASSIGNED_TITLE; -import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsService.NOTIFICATION_USER_NOTIFICATION_DATA_EXPORT_CREATED; -import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsService.NOTIFICATION_USER_NOTIFICATION_DATA_EXPORT_FAILED; -import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_SUBMISSION_ASSESSED; -import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__FILE_SUBMISSION_SUCCESSFUL; -import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__NEW_REPLY_FOR_EXERCISE_POST; -import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__TUTORIAL_GROUP_NOTIFICATION__TUTORIAL_GROUP_REGISTRATION; -import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__TUTOR_NOTIFICATION__TUTORIAL_GROUP_ASSIGN_UNASSIGN; -import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__TUTOR_NOTIFICATION__TUTORIAL_GROUP_REGISTRATION; +package de.tum.cit.aet.artemis.notification; + +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_CHANNEL; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_GROUP_CHAT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_CREATE_GROUP_CHAT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_CREATE_ONE_TO_ONE_CHAT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_DELETE_CHANNEL; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_REPLY_MESSAGE; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_REMOVE_USER_CHANNEL; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_REMOVE_USER_GROUP_CHAT; +import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_EXERCISE_POST; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_CHANNEL_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_GROUP_CHAT_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_CREATE_GROUP_CHAT_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_DELETE_CHANNEL_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_REMOVE_USER_CHANNEL_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_REMOVE_USER_GROUP_CHAT_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.DATA_EXPORT_CREATED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.DATA_EXPORT_FAILED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXERCISE_SUBMISSION_ASSESSED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.FILE_SUBMISSION_SUCCESSFUL_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.MESSAGE_REPLY_IN_CONVERSATION_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_PLAGIARISM_CASE_STUDENT_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.PLAGIARISM_CASE_VERDICT_STUDENT_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_ASSIGNED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_STUDENT_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_TUTOR_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_MULTIPLE_TUTOR_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_STUDENT_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_TUTOR_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_UNASSIGNED_TITLE; +import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION_USER_NOTIFICATION_DATA_EXPORT_CREATED; +import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION_USER_NOTIFICATION_DATA_EXPORT_FAILED; +import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_SUBMISSION_ASSESSED; +import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__FILE_SUBMISSION_SUCCESSFUL; +import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__NEW_REPLY_FOR_EXERCISE_POST; +import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__TUTORIAL_GROUP_NOTIFICATION__TUTORIAL_GROUP_REGISTRATION; +import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__TUTOR_NOTIFICATION__TUTORIAL_GROUP_ASSIGN_UNASSIGN; +import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__TUTOR_NOTIFICATION__TUTORIAL_GROUP_REGISTRATION; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anySet; @@ -65,45 +65,45 @@ import org.mockito.ArgumentCaptor; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.DataExport; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.NotificationSetting; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.NotificationType; -import de.tum.in.www1.artemis.domain.metis.AnswerPost; -import de.tum.in.www1.artemis.domain.metis.ConversationParticipant; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.metis.conversation.GroupChat; -import de.tum.in.www1.artemis.domain.metis.conversation.OneToOneChat; -import de.tum.in.www1.artemis.domain.notification.Notification; -import de.tum.in.www1.artemis.domain.notification.SingleUserNotification; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict; -import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult; -import de.tum.in.www1.artemis.domain.plagiarism.text.TextSubmissionElement; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.in.www1.artemis.exercise.fileupload.FileUploadExerciseUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.NotificationRepository; -import de.tum.in.www1.artemis.repository.NotificationSettingRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.notifications.SingleUserNotificationService; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.DataExport; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.NotificationSetting; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.domain.metis.AnswerPost; +import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; +import de.tum.cit.aet.artemis.domain.metis.conversation.OneToOneChat; +import de.tum.cit.aet.artemis.domain.notification.Notification; +import de.tum.cit.aet.artemis.domain.notification.SingleUserNotification; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; +import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.NotificationRepository; +import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; +import de.tum.cit.aet.artemis.user.UserUtilService; class SingleUserNotificationServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/notification/SystemNotificationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/SystemNotificationIntegrationTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/notification/SystemNotificationIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/notification/SystemNotificationIntegrationTest.java index 5a6382a23f36..eddaffe6c2ad 100644 --- a/src/test/java/de/tum/in/www1/artemis/notification/SystemNotificationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/SystemNotificationIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.notification; +package de.tum.cit.aet.artemis.notification; import static org.assertj.core.api.Assertions.assertThat; @@ -13,9 +13,9 @@ import org.springframework.security.test.context.support.WithAnonymousUser; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.notification.SystemNotification; -import de.tum.in.www1.artemis.repository.SystemNotificationRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.notification.SystemNotification; +import de.tum.cit.aet.artemis.repository.SystemNotificationRepository; class SystemNotificationIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/organization/OrganizationFactory.java b/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationFactory.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/organization/OrganizationFactory.java rename to src/test/java/de/tum/cit/aet/artemis/organization/OrganizationFactory.java index 80e01a2638d3..207a47fa61ef 100644 --- a/src/test/java/de/tum/in/www1/artemis/organization/OrganizationFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationFactory.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.organization; +package de.tum.cit.aet.artemis.organization; -import de.tum.in.www1.artemis.domain.Organization; +import de.tum.cit.aet.artemis.domain.Organization; /** * Factory for creating Organizations and related objects. diff --git a/src/test/java/de/tum/in/www1/artemis/organization/OrganizationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationIntegrationTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/organization/OrganizationIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/organization/OrganizationIntegrationTest.java index e55e23e323d5..93e95c22e21c 100644 --- a/src/test/java/de/tum/in/www1/artemis/organization/OrganizationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.organization; +package de.tum.cit.aet.artemis.organization; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -13,14 +13,14 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.course.CourseFactory; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Organization; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.OrganizationRepository; -import de.tum.in.www1.artemis.web.rest.dto.OrganizationCountDTO; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.course.CourseFactory; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Organization; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.OrganizationRepository; +import de.tum.cit.aet.artemis.web.rest.dto.OrganizationCountDTO; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; class OrganizationIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/organization/OrganizationUtilService.java b/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationUtilService.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/organization/OrganizationUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/organization/OrganizationUtilService.java index 75b6ecf595e1..4e2edf98053d 100644 --- a/src/test/java/de/tum/in/www1/artemis/organization/OrganizationUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationUtilService.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.organization; +package de.tum.cit.aet.artemis.organization; import java.util.UUID; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Organization; -import de.tum.in.www1.artemis.repository.OrganizationRepository; +import de.tum.cit.aet.artemis.domain.Organization; +import de.tum.cit.aet.artemis.repository.OrganizationRepository; /** * Service responsible for initializing the database with specific testdata related to organizations for use in integration tests. diff --git a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationFactory.java b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationFactory.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/participation/ParticipationFactory.java rename to src/test/java/de/tum/cit/aet/artemis/participation/ParticipationFactory.java index d23d751731ab..033457ff0e92 100644 --- a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationFactory.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.participation; +package de.tum.cit.aet.artemis.participation; -import static de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory.DEFAULT_BRANCH; +import static de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory.DEFAULT_BRANCH; import static java.time.ZonedDateTime.now; import java.time.ZonedDateTime; @@ -9,31 +9,31 @@ import jakarta.validation.constraints.NotNull; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.ExampleSubmission; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.FileUploadSubmission; -import de.tum.in.www1.artemis.domain.GradingInstruction; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.SubmissionVersion; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.exercise.GradingCriterionUtil; -import de.tum.in.www1.artemis.util.GitUtilService; -import de.tum.in.www1.artemis.util.LocalRepository; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.domain.GradingInstruction; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.SubmissionVersion; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.util.GitUtilService; +import de.tum.cit.aet.artemis.util.LocalRepository; /** * Factory for creating Participations and related objects. diff --git a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java index d2f5c0676c5f..99cb2f3afc1f 100644 --- a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.participation; +package de.tum.cit.aet.artemis.participation; -import static de.tum.in.www1.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_PROGRAMMING_TEST; -import static de.tum.in.www1.artemis.util.TestResourceUtils.HalfSecond; +import static de.tum.cit.aet.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_PROGRAMMING_TEST; +import static de.tum.cit.aet.artemis.util.TestResourceUtils.HalfSecond; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.any; @@ -40,60 +40,60 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.AbstractAthenaTest; -import de.tum.in.www1.artemis.assessment.GradingScaleUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.GradingScale; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.enumeration.QuizMode; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.quiz.QuizBatch; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizPointStatistic; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSpot; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedText; -import de.tum.in.www1.artemis.exam.ExamFactory; -import de.tum.in.www1.artemis.exercise.fileupload.FileUploadExerciseUtilService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseTestService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseFactory; -import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.service.GradingScaleService; -import de.tum.in.www1.artemis.service.ParticipationService; -import de.tum.in.www1.artemis.service.feature.Feature; -import de.tum.in.www1.artemis.service.feature.FeatureToggleService; -import de.tum.in.www1.artemis.service.quiz.QuizBatchService; -import de.tum.in.www1.artemis.service.quiz.QuizScheduleService; -import de.tum.in.www1.artemis.util.LocalRepository; -import de.tum.in.www1.artemis.web.rest.dto.QuizBatchJoinDTO; +import de.tum.cit.aet.artemis.AbstractAthenaTest; +import de.tum.cit.aet.artemis.assessment.GradingScaleUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizPointStatistic; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSpot; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedText; +import de.tum.cit.aet.artemis.exam.ExamFactory; +import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseTestService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; +import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.service.GradingScaleService; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.service.feature.Feature; +import de.tum.cit.aet.artemis.service.feature.FeatureToggleService; +import de.tum.cit.aet.artemis.service.quiz.QuizBatchService; +import de.tum.cit.aet.artemis.service.quiz.QuizScheduleService; +import de.tum.cit.aet.artemis.util.LocalRepository; +import de.tum.cit.aet.artemis.web.rest.dto.QuizBatchJoinDTO; class ParticipationIntegrationTest extends AbstractAthenaTest { diff --git a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationSubmissionIntegrationTest.java similarity index 87% rename from src/test/java/de/tum/in/www1/artemis/participation/ParticipationSubmissionIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/participation/ParticipationSubmissionIntegrationTest.java index 8565d5f78386..0cbbd14f6b1a 100644 --- a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationSubmissionIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.participation; +package de.tum.cit.aet.artemis.participation; import static org.assertj.core.api.Assertions.assertThat; @@ -10,13 +10,13 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; class ParticipationSubmissionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationUtilService.java b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/participation/ParticipationUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java index 74e28ad44ea6..05be8e5931d3 100644 --- a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.participation; +package de.tum.cit.aet.artemis.participation; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -21,57 +21,57 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ExampleSubmission; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.FileUploadSubmission; -import de.tum.in.www1.artemis.domain.GradingInstruction; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Rating; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.enumeration.Visibility; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.Participant; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.exercise.GradingCriterionUtil; -import de.tum.in.www1.artemis.repository.ExampleSubmissionRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.FeedbackRepository; -import de.tum.in.www1.artemis.repository.ModelingSubmissionRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.in.www1.artemis.repository.RatingRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.repository.TextSubmissionRepository; -import de.tum.in.www1.artemis.service.ParticipationService; -import de.tum.in.www1.artemis.service.ParticipationVcsAccessTokenService; -import de.tum.in.www1.artemis.service.UriService; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlService; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.util.TestResourceUtils; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.domain.GradingInstruction; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Rating; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.Participant; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.repository.ModelingSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repository.RatingRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.service.ParticipationVcsAccessTokenService; +import de.tum.cit.aet.artemis.service.UriService; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.util.TestResourceUtils; /** * Service responsible for initializing the database with specific testdata related to participations, submissions and results. diff --git a/src/test/java/de/tum/in/www1/artemis/participation/SubmissionExportIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionExportIntegrationTest.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/participation/SubmissionExportIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/participation/SubmissionExportIntegrationTest.java index 396bedb10a23..ed9d8322b10b 100644 --- a/src/test/java/de/tum/in/www1/artemis/participation/SubmissionExportIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionExportIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.participation; +package de.tum.cit.aet.artemis.participation; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @@ -18,22 +18,22 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.FileUploadSubmission; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exercise.fileupload.FileUploadExerciseUtilService; -import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.web.rest.dto.SubmissionExportOptionsDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; class SubmissionExportIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/participation/SubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionIntegrationTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/participation/SubmissionIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/participation/SubmissionIntegrationTest.java index 82169b667015..f31f8bc0ba8e 100644 --- a/src/test/java/de/tum/in/www1/artemis/participation/SubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.participation; +package de.tum.cit.aet.artemis.participation; import static org.assertj.core.api.Assertions.assertThat; @@ -11,22 +11,22 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.SubmissionVersion; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.SubmissionVersionRepository; -import de.tum.in.www1.artemis.util.PageableSearchUtilService; -import de.tum.in.www1.artemis.web.rest.dto.SubmissionVersionDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.SubmissionVersion; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.SubmissionVersionRepository; +import de.tum.cit.aet.artemis.util.PageableSearchUtilService; +import de.tum.cit.aet.artemis.web.rest.dto.SubmissionVersionDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; class SubmissionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java similarity index 88% rename from src/test/java/de/tum/in/www1/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java index 957238bac53e..211ac0fba386 100644 --- a/src/test/java/de/tum/in/www1/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.plagiarism; +package de.tum.cit.aet.artemis.plagiarism; import static java.util.Collections.emptySet; import static java.util.Collections.singleton; @@ -21,33 +21,33 @@ import de.jplag.exceptions.BasecodeException; import de.jplag.exceptions.ExitException; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismStatus; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; -import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult; -import de.tum.in.www1.artemis.domain.plagiarism.text.TextSubmissionElement; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismComparisonRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismResultRepository; -import de.tum.in.www1.artemis.service.plagiarism.ContinuousPlagiarismControlService; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismCaseService; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionService; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismPostService; -import de.tum.in.www1.artemis.service.plagiarism.ProgrammingLanguageNotSupportedForPlagiarismDetectionException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismDetectionConfig; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; +import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; +import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.service.plagiarism.ContinuousPlagiarismControlService; +import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismCaseService; +import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionService; +import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismPostService; +import de.tum.cit.aet.artemis.service.plagiarism.ProgrammingLanguageNotSupportedForPlagiarismDetectionException; class ContinuousPlagiarismControlServiceTest { diff --git a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismAnswerPostIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismAnswerPostIntegrationTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismAnswerPostIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismAnswerPostIntegrationTest.java index a1be543ac89b..550f7efb0048 100644 --- a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismAnswerPostIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismAnswerPostIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.plagiarism; +package de.tum.cit.aet.artemis.plagiarism; import static org.assertj.core.api.Assertions.assertThat; @@ -15,14 +15,14 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.in.www1.artemis.domain.metis.AnswerPost; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.post.ConversationUtilService; -import de.tum.in.www1.artemis.repository.metis.AnswerPostRepository; -import de.tum.in.www1.artemis.repository.metis.PostRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.domain.metis.AnswerPost; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.post.ConversationUtilService; +import de.tum.cit.aet.artemis.repository.metis.AnswerPostRepository; +import de.tum.cit.aet.artemis.repository.metis.PostRepository; class PlagiarismAnswerPostIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismCaseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCaseIntegrationTest.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismCaseIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCaseIntegrationTest.java index 456177e38925..2bc7cfa8f61d 100644 --- a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismCaseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCaseIntegrationTest.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.plagiarism; +package de.tum.cit.aet.artemis.plagiarism; -import static de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict.NO_PLAGIARISM; -import static de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict.POINT_DEDUCTION; -import static de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict.WARNING; +import static de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict.NO_PLAGIARISM; +import static de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict.POINT_DEDUCTION; +import static de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict.WARNING; import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; @@ -15,26 +15,26 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismResult; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict; -import de.tum.in.www1.artemis.domain.plagiarism.text.TextSubmissionElement; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.repository.metis.PostRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismComparisonRepository; -import de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; -import de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismVerdictDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismResult; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; +import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.repository.metis.PostRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; +import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismVerdictDTO; class PlagiarismCaseIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismCheckIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCheckIntegrationTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismCheckIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCheckIntegrationTest.java index 181d263ffc6d..7a1803470d2d 100644 --- a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismCheckIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCheckIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.plagiarism; +package de.tum.cit.aet.artemis.plagiarism; import static org.assertj.core.api.Assertions.assertThat; @@ -11,9 +11,9 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.util.TestResourceUtils; -import de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.util.TestResourceUtils; +import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; class PlagiarismCheckIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismDetectionConfigHelperTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionConfigHelperTest.java similarity index 89% rename from src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismDetectionConfigHelperTest.java rename to src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionConfigHelperTest.java index 1672a44291af..c9369dcb7ec7 100644 --- a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismDetectionConfigHelperTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionConfigHelperTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.plagiarism; +package de.tum.cit.aet.artemis.plagiarism; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -7,12 +7,12 @@ import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig; -import de.tum.in.www1.artemis.repository.ModelingExerciseRepository; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionConfigHelper; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismDetectionConfig; +import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionConfigHelper; class PlagiarismDetectionConfigHelperTest { diff --git a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismDetectionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionServiceTest.java similarity index 87% rename from src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismDetectionServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionServiceTest.java index 39ab8d09aad3..a2331dc88439 100644 --- a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismDetectionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.plagiarism; +package de.tum.cit.aet.artemis.plagiarism; import static java.util.Collections.emptyList; import static java.util.Collections.emptySet; @@ -15,20 +15,20 @@ import org.junit.jupiter.api.Test; import de.jplag.exceptions.ExitException; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig; -import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; -import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismResultRepository; -import de.tum.in.www1.artemis.service.plagiarism.ModelingPlagiarismDetectionService; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionService; -import de.tum.in.www1.artemis.service.plagiarism.ProgrammingLanguageNotSupportedForPlagiarismDetectionException; -import de.tum.in.www1.artemis.service.plagiarism.ProgrammingPlagiarismDetectionService; -import de.tum.in.www1.artemis.service.plagiarism.TextPlagiarismDetectionService; -import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeature; -import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeatureService; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismDetectionConfig; +import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; +import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.service.plagiarism.ModelingPlagiarismDetectionService; +import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionService; +import de.tum.cit.aet.artemis.service.plagiarism.ProgrammingLanguageNotSupportedForPlagiarismDetectionException; +import de.tum.cit.aet.artemis.service.plagiarism.ProgrammingPlagiarismDetectionService; +import de.tum.cit.aet.artemis.service.plagiarism.TextPlagiarismDetectionService; +import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeature; +import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeatureService; class PlagiarismDetectionServiceTest { diff --git a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismIntegrationTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismIntegrationTest.java index ba884947d781..5ef04337a8f2 100644 --- a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismIntegrationTest.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.plagiarism; +package de.tum.cit.aet.artemis.plagiarism; -import static de.tum.in.www1.artemis.domain.plagiarism.PlagiarismStatus.CONFIRMED; -import static de.tum.in.www1.artemis.domain.plagiarism.PlagiarismStatus.DENIED; -import static de.tum.in.www1.artemis.domain.plagiarism.PlagiarismStatus.NONE; +import static de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus.CONFIRMED; +import static de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus.DENIED; +import static de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus.NONE; import static org.assertj.core.api.Assertions.assertThat; import java.util.Optional; @@ -13,24 +13,24 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult; -import de.tum.in.www1.artemis.domain.plagiarism.text.TextSubmissionElement; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.TextExerciseRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismComparisonRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismResultRepository; -import de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismComparisonStatusDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; +import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismComparisonStatusDTO; class PlagiarismIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismPostIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismPostIntegrationTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismPostIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismPostIntegrationTest.java index f2f3006bd051..03c079e8ba3a 100644 --- a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismPostIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismPostIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.plagiarism; +package de.tum.cit.aet.artemis.plagiarism; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.any; @@ -24,22 +24,22 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.in.www1.artemis.domain.enumeration.DisplayPriority; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.metis.UserRole; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.in.www1.artemis.post.ConversationUtilService; -import de.tum.in.www1.artemis.repository.metis.ConversationMessageRepository; -import de.tum.in.www1.artemis.repository.metis.PostRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.in.www1.artemis.service.notifications.GroupNotificationService; -import de.tum.in.www1.artemis.web.rest.dto.PostContextFilterDTO; -import de.tum.in.www1.artemis.web.websocket.dto.metis.PostDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.metis.UserRole; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.post.ConversationUtilService; +import de.tum.cit.aet.artemis.repository.metis.ConversationMessageRepository; +import de.tum.cit.aet.artemis.repository.metis.PostRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; +import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; +import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; class PlagiarismPostIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismUtilService.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismUtilService.java similarity index 88% rename from src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismUtilService.java index c08709ccf4b1..b39b9fdbe5cd 100644 --- a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismUtilService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.plagiarism; +package de.tum.cit.aet.artemis.plagiarism; import java.time.ZonedDateTime; import java.util.HashSet; @@ -10,26 +10,26 @@ import org.springframework.stereotype.Service; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.course.CourseFactory; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.enumeration.DiagramType; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseFactory; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.team.TeamUtilService; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.course.CourseFactory; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.team.TeamUtilService; +import de.tum.cit.aet.artemis.user.UserUtilService; /** * Service responsible for initializing the database with specific testdata related to plagiarisms for use in integration tests. diff --git a/src/test/java/de/tum/in/www1/artemis/post/ConversationFactory.java b/src/test/java/de/tum/cit/aet/artemis/post/ConversationFactory.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/post/ConversationFactory.java rename to src/test/java/de/tum/cit/aet/artemis/post/ConversationFactory.java index 250e6f2dfdc3..25e9ff6e9181 100644 --- a/src/test/java/de/tum/in/www1/artemis/post/ConversationFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/post/ConversationFactory.java @@ -1,16 +1,16 @@ -package de.tum.in.www1.artemis.post; +package de.tum.cit.aet.artemis.post; import java.time.ZoneId; import java.time.ZonedDateTime; import java.util.HashSet; import java.util.Set; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.DisplayPriority; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.metis.Reaction; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.metis.Reaction; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; /** * Factory for creating objects related to Conversations. diff --git a/src/test/java/de/tum/in/www1/artemis/post/ConversationUtilService.java b/src/test/java/de/tum/cit/aet/artemis/post/ConversationUtilService.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/post/ConversationUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/post/ConversationUtilService.java index e4d03559795c..0dbd01c2d7b4 100644 --- a/src/test/java/de/tum/in/www1/artemis/post/ConversationUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/post/ConversationUtilService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.post; +package de.tum.cit.aet.artemis.post; import static org.assertj.core.api.Assertions.assertThat; @@ -14,39 +14,39 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.course.CourseFactory; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.in.www1.artemis.domain.enumeration.DisplayPriority; -import de.tum.in.www1.artemis.domain.metis.AnswerPost; -import de.tum.in.www1.artemis.domain.metis.ConversationParticipant; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.metis.Posting; -import de.tum.in.www1.artemis.domain.metis.Reaction; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.metis.conversation.Conversation; -import de.tum.in.www1.artemis.domain.metis.conversation.GroupChat; -import de.tum.in.www1.artemis.domain.metis.conversation.OneToOneChat; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.lecture.LectureFactory; -import de.tum.in.www1.artemis.lecture.LectureUtilService; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.metis.AnswerPostRepository; -import de.tum.in.www1.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.in.www1.artemis.repository.metis.PostRepository; -import de.tum.in.www1.artemis.repository.metis.ReactionRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ConversationRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.OneToOneChatRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.course.CourseFactory; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; +import de.tum.cit.aet.artemis.domain.metis.AnswerPost; +import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.metis.Posting; +import de.tum.cit.aet.artemis.domain.metis.Reaction; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; +import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; +import de.tum.cit.aet.artemis.domain.metis.conversation.OneToOneChat; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.lecture.LectureFactory; +import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.metis.AnswerPostRepository; +import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.repository.metis.PostRepository; +import de.tum.cit.aet.artemis.repository.metis.ReactionRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ConversationRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.OneToOneChatRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; /** * Service responsible for initializing the database with specific testdata related to conversations for use in integration tests. diff --git a/src/test/java/de/tum/in/www1/artemis/repository/ParticipationTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/repository/ParticipationTestRepository.java similarity index 73% rename from src/test/java/de/tum/in/www1/artemis/repository/ParticipationTestRepository.java rename to src/test/java/de/tum/cit/aet/artemis/repository/ParticipationTestRepository.java index e5f11fba9f24..a3573dc2d092 100644 --- a/src/test/java/de/tum/in/www1/artemis/repository/ParticipationTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/repository/ParticipationTestRepository.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -7,8 +7,8 @@ import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Repository public interface ParticipationTestRepository extends ArtemisJpaRepository { diff --git a/src/test/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseStudentParticipationTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseStudentParticipationTestRepository.java similarity index 85% rename from src/test/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseStudentParticipationTestRepository.java rename to src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseStudentParticipationTestRepository.java index 93c09bcaa14f..df20e33c0170 100644 --- a/src/test/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseStudentParticipationTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseStudentParticipationTestRepository.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; @@ -6,8 +6,8 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA testing repository for the ProgrammingExerciseStudentParticipation entity. diff --git a/src/test/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseTestRepository.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseTestRepository.java rename to src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseTestRepository.java index 99de1527d64a..4ed41a1cfd1a 100644 --- a/src/test/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseTestRepository.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -11,8 +11,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Repository public interface ProgrammingExerciseTestRepository extends ArtemisJpaRepository { diff --git a/src/test/java/de/tum/in/www1/artemis/repository/ProgrammingSubmissionTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionTestRepository.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/repository/ProgrammingSubmissionTestRepository.java rename to src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionTestRepository.java index 7567788bd4b8..1b593b6a4ee7 100644 --- a/src/test/java/de/tum/in/www1/artemis/repository/ProgrammingSubmissionTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionTestRepository.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -12,9 +12,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the ProgrammingSubmission entity tests. @@ -92,13 +92,13 @@ default ProgrammingSubmission findByIdWithResultsFeedbacksAssessorTestCases(long SELECT s FROM ProgrammingSubmission s LEFT JOIN FETCH s.results - WHERE (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + WHERE (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) AND s.participation.id = :participationId AND s.id = ( SELECT MAX(s2.id) FROM ProgrammingSubmission s2 WHERE s2.participation.id = :participationId - AND (s2.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s2.type IS NULL)) + AND (s2.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s2.type IS NULL)) """) Optional findFirstByParticipationIdOrderByLegalSubmissionDateDesc(@Param("participationId") Long participationId); } diff --git a/src/test/java/de/tum/in/www1/artemis/repository/StatisticsRepositoryTest.java b/src/test/java/de/tum/cit/aet/artemis/repository/StatisticsRepositoryTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/repository/StatisticsRepositoryTest.java rename to src/test/java/de/tum/cit/aet/artemis/repository/StatisticsRepositoryTest.java index 5634ce479334..1ae396bc1051 100644 --- a/src/test/java/de/tum/in/www1/artemis/repository/StatisticsRepositoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/repository/StatisticsRepositoryTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -15,14 +15,14 @@ import org.junit.jupiter.params.provider.EnumSource; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.PersistentAuditEvent; -import de.tum.in.www1.artemis.domain.enumeration.GraphType; -import de.tum.in.www1.artemis.domain.enumeration.SpanType; -import de.tum.in.www1.artemis.domain.enumeration.StatisticsView; -import de.tum.in.www1.artemis.domain.statistics.StatisticsEntry; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.PersistentAuditEvent; +import de.tum.cit.aet.artemis.domain.enumeration.GraphType; +import de.tum.cit.aet.artemis.domain.enumeration.SpanType; +import de.tum.cit.aet.artemis.domain.enumeration.StatisticsView; +import de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.user.UserUtilService; class StatisticsRepositoryTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/repository/UserRepositoryTest.java b/src/test/java/de/tum/cit/aet/artemis/repository/UserRepositoryTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/repository/UserRepositoryTest.java rename to src/test/java/de/tum/cit/aet/artemis/repository/UserRepositoryTest.java index 7c2f2483326d..1a680d50da1c 100644 --- a/src/test/java/de/tum/in/www1/artemis/repository/UserRepositoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/repository/UserRepositoryTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; -import static de.tum.in.www1.artemis.user.UserFactory.USER_PASSWORD; +import static de.tum.cit.aet.artemis.user.UserFactory.USER_PASSWORD; import static org.assertj.core.api.Assertions.assertThat; import java.time.ZonedDateTime; @@ -11,11 +11,11 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Authority; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.service.user.PasswordService; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Authority; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.service.user.PasswordService; +import de.tum.cit.aet.artemis.user.UserUtilService; class UserRepositoryTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/repository/UserTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/repository/UserTestRepository.java similarity index 50% rename from src/test/java/de/tum/in/www1/artemis/repository/UserTestRepository.java rename to src/test/java/de/tum/cit/aet/artemis/repository/UserTestRepository.java index 0e221b8d8f0e..113125339180 100644 --- a/src/test/java/de/tum/in/www1/artemis/repository/UserTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/repository/UserTestRepository.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.repository; +package de.tum.cit.aet.artemis.repository; import java.util.Set; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; public interface UserTestRepository extends ArtemisJpaRepository { diff --git a/src/test/java/de/tum/in/www1/artemis/science/ScienceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/science/ScienceIntegrationTest.java similarity index 81% rename from src/test/java/de/tum/in/www1/artemis/science/ScienceIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/science/ScienceIntegrationTest.java index bde1b5ae2fe0..9d48bb239d6b 100644 --- a/src/test/java/de/tum/in/www1/artemis/science/ScienceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/science/ScienceIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.science; +package de.tum.cit.aet.artemis.science; import static org.assertj.core.api.Assertions.assertThat; @@ -11,12 +11,12 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.science.ScienceEventType; -import de.tum.in.www1.artemis.repository.science.ScienceEventRepository; -import de.tum.in.www1.artemis.service.feature.Feature; -import de.tum.in.www1.artemis.service.feature.FeatureToggleService; -import de.tum.in.www1.artemis.web.rest.dto.science.ScienceEventDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.science.ScienceEventType; +import de.tum.cit.aet.artemis.repository.science.ScienceEventRepository; +import de.tum.cit.aet.artemis.service.feature.Feature; +import de.tum.cit.aet.artemis.service.feature.FeatureToggleService; +import de.tum.cit.aet.artemis.web.rest.dto.science.ScienceEventDTO; class ScienceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/science/ScienceSettingsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/science/ScienceSettingsIntegrationTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/science/ScienceSettingsIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/science/ScienceSettingsIntegrationTest.java index 0171591eadc8..1a30f9340700 100644 --- a/src/test/java/de/tum/in/www1/artemis/science/ScienceSettingsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/science/ScienceSettingsIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.science; +package de.tum.cit.aet.artemis.science; import static org.assertj.core.api.Assertions.assertThat; @@ -11,10 +11,10 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.science.ScienceSetting; -import de.tum.in.www1.artemis.repository.science.ScienceSettingRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.science.ScienceSetting; +import de.tum.cit.aet.artemis.repository.science.ScienceSettingRepository; class ScienceSettingsIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/science/ScienceUtilService.java b/src/test/java/de/tum/cit/aet/artemis/science/ScienceUtilService.java similarity index 88% rename from src/test/java/de/tum/in/www1/artemis/science/ScienceUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/science/ScienceUtilService.java index d7cbc1010b9e..de91936dca7d 100644 --- a/src/test/java/de/tum/in/www1/artemis/science/ScienceUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/science/ScienceUtilService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.science; +package de.tum.cit.aet.artemis.science; import java.time.Duration; import java.time.ZonedDateTime; @@ -7,9 +7,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.science.ScienceEvent; -import de.tum.in.www1.artemis.domain.science.ScienceEventType; -import de.tum.in.www1.artemis.repository.science.ScienceEventRepository; +import de.tum.cit.aet.artemis.domain.science.ScienceEvent; +import de.tum.cit.aet.artemis.domain.science.ScienceEventType; +import de.tum.cit.aet.artemis.repository.science.ScienceEventRepository; @Service public class ScienceUtilService { diff --git a/src/test/java/de/tum/in/www1/artemis/security/Lti13LaunchFilterTest.java b/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/security/Lti13LaunchFilterTest.java rename to src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java index 05ffdba6e84a..f395ed691d1e 100644 --- a/src/test/java/de/tum/in/www1/artemis/security/Lti13LaunchFilterTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.security; +package de.tum.cit.aet.artemis.security; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.any; @@ -44,12 +44,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import de.tum.in.www1.artemis.config.lti.CustomLti13Configurer; -import de.tum.in.www1.artemis.domain.LtiPlatformConfiguration; -import de.tum.in.www1.artemis.exception.LtiEmailAlreadyInUseException; -import de.tum.in.www1.artemis.repository.LtiPlatformConfigurationRepository; -import de.tum.in.www1.artemis.service.connectors.lti.Lti13Service; -import de.tum.in.www1.artemis.web.filter.Lti13LaunchFilter; +import de.tum.cit.aet.artemis.config.lti.CustomLti13Configurer; +import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; +import de.tum.cit.aet.artemis.exception.LtiEmailAlreadyInUseException; +import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; +import de.tum.cit.aet.artemis.service.connectors.lti.Lti13Service; +import de.tum.cit.aet.artemis.web.filter.Lti13LaunchFilter; import uk.ac.ox.ctl.lti13.lti.Claims; import uk.ac.ox.ctl.lti13.security.oauth2.client.lti.authentication.OidcAuthenticationToken; import uk.ac.ox.ctl.lti13.security.oauth2.client.lti.web.OAuth2LoginAuthenticationFilter; diff --git a/src/test/java/de/tum/in/www1/artemis/security/OAuth2JWKSServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/security/OAuth2JWKSServiceTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/security/OAuth2JWKSServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/security/OAuth2JWKSServiceTest.java index 742099ca10e2..85b0efc99bcc 100644 --- a/src/test/java/de/tum/in/www1/artemis/security/OAuth2JWKSServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/security/OAuth2JWKSServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.security; +package de.tum.cit.aet.artemis.security; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -17,7 +17,7 @@ import com.nimbusds.jose.jwk.JWK; -import de.tum.in.www1.artemis.service.OnlineCourseConfigurationService; +import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; class OAuth2JWKSServiceTest { diff --git a/src/test/java/de/tum/in/www1/artemis/security/SecurityUtilsUnitTest.java b/src/test/java/de/tum/cit/aet/artemis/security/SecurityUtilsUnitTest.java similarity index 99% rename from src/test/java/de/tum/in/www1/artemis/security/SecurityUtilsUnitTest.java rename to src/test/java/de/tum/cit/aet/artemis/security/SecurityUtilsUnitTest.java index f6842adab3f5..5c9f247b51dd 100644 --- a/src/test/java/de/tum/in/www1/artemis/security/SecurityUtilsUnitTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/security/SecurityUtilsUnitTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.security; +package de.tum.cit.aet.artemis.security; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/de/tum/in/www1/artemis/security/jwt/JWTFilterTest.java b/src/test/java/de/tum/cit/aet/artemis/security/jwt/JWTFilterTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/security/jwt/JWTFilterTest.java rename to src/test/java/de/tum/cit/aet/artemis/security/jwt/JWTFilterTest.java index 943645c9dd50..1276fc1c375f 100644 --- a/src/test/java/de/tum/in/www1/artemis/security/jwt/JWTFilterTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/security/jwt/JWTFilterTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.security.jwt; +package de.tum.cit.aet.artemis.security.jwt; import static org.assertj.core.api.Assertions.assertThat; @@ -17,8 +17,8 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.test.util.ReflectionTestUtils; -import de.tum.in.www1.artemis.management.SecurityMetersService; -import de.tum.in.www1.artemis.security.Role; +import de.tum.cit.aet.artemis.management.SecurityMetersService; +import de.tum.cit.aet.artemis.security.Role; import io.jsonwebtoken.io.Decoders; import io.jsonwebtoken.security.Keys; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; diff --git a/src/test/java/de/tum/in/www1/artemis/security/jwt/TokenProviderSecurityMetersTest.java b/src/test/java/de/tum/cit/aet/artemis/security/jwt/TokenProviderSecurityMetersTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/security/jwt/TokenProviderSecurityMetersTest.java rename to src/test/java/de/tum/cit/aet/artemis/security/jwt/TokenProviderSecurityMetersTest.java index 90edaed8d5a0..55b2976ccddc 100644 --- a/src/test/java/de/tum/in/www1/artemis/security/jwt/TokenProviderSecurityMetersTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/security/jwt/TokenProviderSecurityMetersTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.security.jwt; +package de.tum.cit.aet.artemis.security.jwt; import static org.assertj.core.api.Assertions.assertThat; @@ -17,8 +17,8 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.test.util.ReflectionTestUtils; -import de.tum.in.www1.artemis.management.SecurityMetersService; -import de.tum.in.www1.artemis.security.Role; +import de.tum.cit.aet.artemis.management.SecurityMetersService; +import de.tum.cit.aet.artemis.security.Role; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.io.Decoders; import io.jsonwebtoken.security.Keys; diff --git a/src/test/java/de/tum/in/www1/artemis/security/jwt/TokenProviderTest.java b/src/test/java/de/tum/cit/aet/artemis/security/jwt/TokenProviderTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/security/jwt/TokenProviderTest.java rename to src/test/java/de/tum/cit/aet/artemis/security/jwt/TokenProviderTest.java index 34169dbfecca..57bccb1e7206 100644 --- a/src/test/java/de/tum/in/www1/artemis/security/jwt/TokenProviderTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/security/jwt/TokenProviderTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.security.jwt; +package de.tum.cit.aet.artemis.security.jwt; import static org.assertj.core.api.Assertions.assertThat; @@ -18,8 +18,8 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.test.util.ReflectionTestUtils; -import de.tum.in.www1.artemis.management.SecurityMetersService; -import de.tum.in.www1.artemis.security.Role; +import de.tum.cit.aet.artemis.management.SecurityMetersService; +import de.tum.cit.aet.artemis.security.Role; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.io.Decoders; import io.jsonwebtoken.security.Keys; diff --git a/src/test/java/de/tum/in/www1/artemis/security/lti/Lti13TokenRetrieverTest.java b/src/test/java/de/tum/cit/aet/artemis/security/lti/Lti13TokenRetrieverTest.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/security/lti/Lti13TokenRetrieverTest.java rename to src/test/java/de/tum/cit/aet/artemis/security/lti/Lti13TokenRetrieverTest.java index 49eb3576fd4e..a08eebc05981 100644 --- a/src/test/java/de/tum/in/www1/artemis/security/lti/Lti13TokenRetrieverTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/security/lti/Lti13TokenRetrieverTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.security.lti; +package de.tum.cit.aet.artemis.security.lti; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; @@ -47,8 +47,8 @@ import com.nimbusds.jwt.JWTClaimsSet; import com.nimbusds.jwt.SignedJWT; -import de.tum.in.www1.artemis.domain.lti.Scopes; -import de.tum.in.www1.artemis.security.OAuth2JWKSService; +import de.tum.cit.aet.artemis.domain.lti.Scopes; +import de.tum.cit.aet.artemis.security.OAuth2JWKSService; class Lti13TokenRetrieverTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/AssessmentServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/AssessmentServiceTest.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/service/AssessmentServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/AssessmentServiceTest.java index 8145b7fb87f9..e5919b4cc73e 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/AssessmentServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/AssessmentServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; @@ -15,34 +15,34 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.course.CourseFactory; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.FileUploadSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.enumeration.DiagramType; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.exercise.GradingCriterionUtil; -import de.tum.in.www1.artemis.exercise.fileupload.FileUploadExerciseFactory; -import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseFactory; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.course.CourseFactory; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseFactory; +import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; class AssessmentServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/AuthorizationCheckServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/AuthorizationCheckServiceTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/service/AuthorizationCheckServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/AuthorizationCheckServiceTest.java index d73b6a443c2a..5021ec00ac19 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/AuthorizationCheckServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/AuthorizationCheckServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; @@ -13,18 +13,18 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.stereotype.Component; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; class AuthorizationCheckServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { @@ -182,7 +182,7 @@ void testIsUserAllowedToEnrollInCourseForRegistrationDisabled() { void testIsUserAllowedToEnrollInCourseForDifferentOrganizations() { var courseWithOrganizations = courseUtilService.createCourseWithOrganizations(); // load the user with organizations, otherwise the following check would lead to - // JpaSystemException: failed to lazily initialize a collection of role: de.tum.in.www1.artemis.domain.User.organizations + // JpaSystemException: failed to lazily initialize a collection of role: de.tum.cit.aet.artemis.domain.User.organizations this.student1 = userRepository.findByIdWithGroupsAndAuthoritiesAndOrganizationsElseThrow(this.student1.getId()); assertThatExceptionOfType(AccessForbiddenException.class) .isThrownBy(() -> authCheckService.checkUserAllowedToEnrollInCourseElseThrow(this.student1, courseWithOrganizations)) diff --git a/src/test/java/de/tum/in/www1/artemis/service/BuildLogEntryServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/BuildLogEntryServiceTest.java similarity index 99% rename from src/test/java/de/tum/in/www1/artemis/service/BuildLogEntryServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/BuildLogEntryServiceTest.java index 398572dc7613..158d1a8ccb40 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/BuildLogEntryServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/BuildLogEntryServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; @@ -14,9 +14,9 @@ import org.junit.jupiter.params.provider.ValueSource; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.BuildLogEntry; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; class BuildLogEntryServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/ComplaintResponseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ComplaintResponseServiceTest.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/service/ComplaintResponseServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/ComplaintResponseServiceTest.java index 91c6fb84bf0f..2e7a1b1d31bc 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/ComplaintResponseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ComplaintResponseServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; @@ -10,24 +10,24 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.assessment.ComplaintUtilService; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Complaint; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.ComplaintType; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ComplaintRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.team.TeamUtilService; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Complaint; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.team.TeamUtilService; +import de.tum.cit.aet.artemis.user.UserUtilService; class ComplaintResponseServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/ConductAgreementServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ConductAgreementServiceTest.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/service/ConductAgreementServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/ConductAgreementServiceTest.java index b19b84287cdd..9e0cb3a22c96 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/ConductAgreementServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ConductAgreementServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; @@ -9,9 +9,9 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.course.CourseFactory; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.course.CourseFactory; +import de.tum.cit.aet.artemis.user.UserUtilService; class ConductAgreementServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/ConsistencyCheckTestService.java b/src/test/java/de/tum/cit/aet/artemis/service/ConsistencyCheckTestService.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/service/ConsistencyCheckTestService.java rename to src/test/java/de/tum/cit/aet/artemis/service/ConsistencyCheckTestService.java index 8d2bd164bb95..db618e314e05 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/ConsistencyCheckTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ConsistencyCheckTestService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; @@ -11,16 +11,16 @@ import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.exercise.programming.MockDelegate; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.dto.ConsistencyErrorDTO; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.util.RequestUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.programming.MockDelegate; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.dto.ConsistencyErrorDTO; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.util.RequestUtilService; /** * Note: this class should be independent of the actual VCS and CIS and contains common test logic for scenarios: diff --git a/src/test/java/de/tum/in/www1/artemis/service/CourseScoreCalculationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationServiceTest.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/service/CourseScoreCalculationServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationServiceTest.java index e7e3ec44e562..a22aecd895dc 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/CourseScoreCalculationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; @@ -17,29 +17,29 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.assessment.GradingScaleFactory; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.GradingScale; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.GradingScaleRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.service.dto.MaxAndReachablePoints; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.web.rest.dto.BonusSourceResultDTO; -import de.tum.in.www1.artemis.web.rest.dto.CourseForDashboardDTO; -import de.tum.in.www1.artemis.web.rest.dto.CourseScoresDTO; -import de.tum.in.www1.artemis.web.rest.dto.score.StudentScoresDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.GradingScaleFactory; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.service.dto.MaxAndReachablePoints; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.web.rest.dto.BonusSourceResultDTO; +import de.tum.cit.aet.artemis.web.rest.dto.CourseForDashboardDTO; +import de.tum.cit.aet.artemis.web.rest.dto.CourseScoresDTO; +import de.tum.cit.aet.artemis.web.rest.dto.score.StudentScoresDTO; class CourseScoreCalculationServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/CourseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/service/CourseServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java index 0e7c32f799dd..58aae6d40b90 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/CourseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doReturn; @@ -20,21 +20,21 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.dto.StudentDTO; -import de.tum.in.www1.artemis.service.ldap.LdapUserDto; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.dto.StudentDTO; +import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; +import de.tum.cit.aet.artemis.user.UserUtilService; class CourseServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/DataExportCreationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/DataExportCreationServiceTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/service/DataExportCreationServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/DataExportCreationServiceTest.java index 98f8b97e07e3..494aecd6e38d 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/DataExportCreationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/DataExportCreationServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @@ -40,44 +40,44 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.web.client.RestTemplate; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.connector.apollon.ApollonRequestMockProvider; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.DataExport; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.DataExportState; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.Visibility; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict; -import de.tum.in.www1.artemis.domain.science.ScienceEvent; -import de.tum.in.www1.artemis.domain.science.ScienceEventType; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseTestService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.post.ConversationUtilService; -import de.tum.in.www1.artemis.repository.DataExportRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.repository.metis.AnswerPostRepository; -import de.tum.in.www1.artemis.repository.metis.PostRepository; -import de.tum.in.www1.artemis.science.ScienceUtilService; -import de.tum.in.www1.artemis.service.connectors.apollon.ApollonConversionService; -import de.tum.in.www1.artemis.service.export.DataExportCreationService; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.util.TestResourceUtils; -import de.tum.in.www1.artemis.util.ZipFileTestUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.connector.apollon.ApollonRequestMockProvider; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.DataExport; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.DataExportState; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; +import de.tum.cit.aet.artemis.domain.science.ScienceEvent; +import de.tum.cit.aet.artemis.domain.science.ScienceEventType; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseTestService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.post.ConversationUtilService; +import de.tum.cit.aet.artemis.repository.DataExportRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.repository.metis.AnswerPostRepository; +import de.tum.cit.aet.artemis.repository.metis.PostRepository; +import de.tum.cit.aet.artemis.science.ScienceUtilService; +import de.tum.cit.aet.artemis.service.connectors.apollon.ApollonConversionService; +import de.tum.cit.aet.artemis.service.export.DataExportCreationService; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.util.TestResourceUtils; +import de.tum.cit.aet.artemis.util.ZipFileTestUtilService; class DataExportCreationServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/EmailSummaryServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/EmailSummaryServiceTest.java similarity index 89% rename from src/test/java/de/tum/in/www1/artemis/service/EmailSummaryServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/EmailSummaryServiceTest.java index 7ff9cff06050..d9f635e18fc7 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/EmailSummaryServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/EmailSummaryServiceTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__WEEKLY_SUMMARY__BASIC_WEEKLY_SUMMARY; +import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__WEEKLY_SUMMARY__BASIC_WEEKLY_SUMMARY; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doNothing; @@ -21,17 +21,17 @@ import org.mockito.ArgumentCaptor; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.NotificationSetting; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.DifficultyLevel; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.NotificationSettingRepository; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.NotificationSetting; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; class EmailSummaryServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/ExerciseDateServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ExerciseDateServiceTest.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/service/ExerciseDateServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/ExerciseDateServiceTest.java index 272966577f87..20a9eedfd093 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/ExerciseDateServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ExerciseDateServiceTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.util.TestResourceUtils.HalfSecond; +import static de.tum.cit.aet.artemis.util.TestResourceUtils.HalfSecond; import static org.assertj.core.api.Assertions.assertThat; import java.time.ZonedDateTime; @@ -12,25 +12,25 @@ import org.junit.jupiter.params.provider.ValueSource; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.enumeration.DiagramType; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseFactory; -import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ModelingExerciseRepository; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; +import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.user.UserUtilService; class ExerciseDateServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/ExerciseLifecycleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleServiceTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/service/ExerciseLifecycleServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleServiceTest.java index fb58edf4774b..f09a37ff054c 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/ExerciseLifecycleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -12,10 +12,10 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseLifecycle; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; class ExerciseLifecycleServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/FeatureToggleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/FeatureToggleServiceTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/service/FeatureToggleServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/FeatureToggleServiceTest.java index 998411678b69..a950855c6bce 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/FeatureToggleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/FeatureToggleServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; @@ -9,9 +9,9 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.service.feature.Feature; -import de.tum.in.www1.artemis.service.feature.FeatureToggleService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.service.feature.Feature; +import de.tum.cit.aet.artemis.service.feature.FeatureToggleService; class FeatureToggleServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/FeedbackServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/FeedbackServiceTest.java similarity index 87% rename from src/test/java/de/tum/in/www1/artemis/service/FeedbackServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/FeedbackServiceTest.java index 96871064132d..c232d74d77fc 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/FeedbackServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/FeedbackServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; @@ -7,12 +7,12 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.LongFeedbackText; -import de.tum.in.www1.artemis.repository.FeedbackRepository; -import de.tum.in.www1.artemis.repository.LongFeedbackTextRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.LongFeedbackText; +import de.tum.cit.aet.artemis.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.repository.LongFeedbackTextRepository; class FeedbackServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/FilePathServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/FilePathServiceTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/service/FilePathServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/FilePathServiceTest.java index 60caf6e3fd76..3a41b65768dd 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/FilePathServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/FilePathServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -8,8 +8,8 @@ import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.exception.FilePathParsingException; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.exception.FilePathParsingException; class FilePathServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/FileServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/FileServiceTest.java similarity index 99% rename from src/test/java/de/tum/in/www1/artemis/service/FileServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/FileServiceTest.java index 55d55346bfae..8b4037aa9099 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/FileServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/FileServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -42,7 +42,7 @@ import org.springframework.util.ResourceUtils; import org.springframework.web.multipart.MultipartFile; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; class FileServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/GitlabCIServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/service/GitlabCIServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java index f7c48c8df17a..8336d743904a 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/GitlabCIServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -27,27 +27,27 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationGitlabCIGitlabSamlTest; -import de.tum.in.www1.artemis.domain.BuildLogEntry; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.exception.GitLabCIException; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.BuildLogStatisticsEntryRepository; -import de.tum.in.www1.artemis.repository.BuildPlanRepository; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.in.www1.artemis.service.connectors.gitlabci.GitLabCIResultService; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationGitlabCIGitlabSamlTest; +import de.tum.cit.aet.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.exception.GitLabCIException; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.BuildLogStatisticsEntryRepository; +import de.tum.cit.aet.artemis.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.service.connectors.gitlabci.GitLabCIResultService; +import de.tum.cit.aet.artemis.user.UserUtilService; class GitlabCIServiceTest extends AbstractSpringIntegrationGitlabCIGitlabSamlTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/GradingScaleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/service/GradingScaleServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java index fb0aca636f3b..863640645ad0 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/GradingScaleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -15,20 +15,20 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.assessment.GradingScaleUtilService; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.GradeStep; -import de.tum.in.www1.artemis.domain.GradeType; -import de.tum.in.www1.artemis.domain.GradingScale; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.GradingScaleRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.GradingScaleUtilService; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.GradeStep; +import de.tum.cit.aet.artemis.domain.GradeType; +import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; class GradingScaleServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/JenkinsAuthorizationInterceptorTest.java b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsAuthorizationInterceptorTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/service/JenkinsAuthorizationInterceptorTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/JenkinsAuthorizationInterceptorTest.java index d0354350a577..c2948607b857 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/JenkinsAuthorizationInterceptorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsAuthorizationInterceptorTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doReturn; @@ -30,8 +30,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsAuthorizationInterceptor; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsAuthorizationInterceptor; class JenkinsAuthorizationInterceptorTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/JenkinsInternalUriServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsInternalUriServiceTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/service/JenkinsInternalUriServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/JenkinsInternalUriServiceTest.java index c44461f54e98..187575752559 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/JenkinsInternalUriServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsInternalUriServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.any; @@ -17,9 +17,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.util.ReflectionTestUtils; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsInternalUrlService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsInternalUrlService; class JenkinsInternalUriServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/JenkinsJobPermissionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsJobPermissionServiceTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/service/JenkinsJobPermissionServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/JenkinsJobPermissionServiceTest.java index 9f2dc38c830b..1bf7a5ed7a85 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/JenkinsJobPermissionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsJobPermissionServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThatIOException; import static org.mockito.ArgumentMatchers.any; @@ -17,10 +17,10 @@ import org.w3c.dom.DOMException; import org.w3c.dom.Document; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.service.connectors.jenkins.jobs.JenkinsJobPermission; -import de.tum.in.www1.artemis.service.connectors.jenkins.jobs.JenkinsJobPermissionsService; -import de.tum.in.www1.artemis.service.connectors.jenkins.jobs.JenkinsJobPermissionsUtils; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.service.connectors.jenkins.jobs.JenkinsJobPermission; +import de.tum.cit.aet.artemis.service.connectors.jenkins.jobs.JenkinsJobPermissionsService; +import de.tum.cit.aet.artemis.service.connectors.jenkins.jobs.JenkinsJobPermissionsUtils; class JenkinsJobPermissionServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/JenkinsJobServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsJobServiceTest.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/service/JenkinsJobServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/JenkinsJobServiceTest.java index cd203209b11d..1a50bbe38933 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/JenkinsJobServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsJobServiceTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsXmlFileUtils.getDocumentBuilderFactory; +import static de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsXmlFileUtils.getDocumentBuilderFactory; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIOException; import static org.mockito.Mockito.any; @@ -27,11 +27,11 @@ import com.offbytwo.jenkins.model.FolderJob; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.exception.JenkinsException; -import de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsXmlFileUtils; -import de.tum.in.www1.artemis.service.connectors.jenkins.jobs.JenkinsJobService; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.exception.JenkinsException; +import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsXmlFileUtils; +import de.tum.cit.aet.artemis.service.connectors.jenkins.jobs.JenkinsJobService; +import de.tum.cit.aet.artemis.user.UserUtilService; class JenkinsJobServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/JenkinsServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsServiceTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/service/JenkinsServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/JenkinsServiceTest.java index 5893700498fb..0a476474b8de 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/JenkinsServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsServiceTest.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.config.Constants.ASSIGNMENT_REPO_NAME; -import static de.tum.in.www1.artemis.domain.enumeration.BuildPlanType.SOLUTION; -import static de.tum.in.www1.artemis.domain.enumeration.BuildPlanType.TEMPLATE; +import static de.tum.cit.aet.artemis.config.Constants.ASSIGNMENT_REPO_NAME; +import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.SOLUTION; +import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.TEMPLATE; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIllegalStateException; @@ -31,21 +31,21 @@ import com.offbytwo.jenkins.model.JobWithDetails; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.BuildPlan; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.exception.JenkinsException; -import de.tum.in.www1.artemis.exercise.programming.ContinuousIntegrationTestService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.BuildPlanRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.service.connectors.jenkins.build_plan.JenkinsBuildPlanUtils; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseImportService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.BuildPlan; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.exception.JenkinsException; +import de.tum.cit.aet.artemis.exercise.programming.ContinuousIntegrationTestService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.service.connectors.jenkins.build_plan.JenkinsBuildPlanUtils; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseImportService; class JenkinsServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/LearningObjectServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/LearningObjectServiceTest.java similarity index 84% rename from src/test/java/de/tum/in/www1/artemis/service/LearningObjectServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/LearningObjectServiceTest.java index 22fe0ffc6542..f7386b74513a 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/LearningObjectServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/LearningObjectServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; @@ -14,18 +14,18 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.StudentScoreUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.LearningObject; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.lecture.LectureFactory; -import de.tum.in.www1.artemis.lecture.LectureUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.StudentScoreUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.LearningObject; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.lecture.LectureFactory; +import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; class LearningObjectServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/LearningPathServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/service/LearningPathServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java index de3b7c2c199b..8e6eaa178c95 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/LearningPathServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; @@ -18,36 +18,36 @@ import org.junit.jupiter.params.provider.MethodSource; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.StudentScoreUtilService; -import de.tum.in.www1.artemis.competency.CompetencyProgressUtilService; -import de.tum.in.www1.artemis.competency.CompetencyUtilService; -import de.tum.in.www1.artemis.competency.LearningPathUtilService; -import de.tum.in.www1.artemis.course.CourseFactory; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.LearningObject; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.Competency; -import de.tum.in.www1.artemis.domain.competency.LearningPath; -import de.tum.in.www1.artemis.domain.competency.RelationType; -import de.tum.in.www1.artemis.domain.enumeration.DifficultyLevel; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.lecture.LectureUtilService; -import de.tum.in.www1.artemis.repository.CompetencyRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.LectureUnitRepository; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.service.learningpath.LearningPathNgxService; -import de.tum.in.www1.artemis.service.learningpath.LearningPathRecommendationService; -import de.tum.in.www1.artemis.service.learningpath.LearningPathService; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.web.rest.LearningPathResource; -import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathHealthDTO; -import de.tum.in.www1.artemis.web.rest.dto.competency.NgxLearningPathDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.StudentScoreUtilService; +import de.tum.cit.aet.artemis.competency.CompetencyProgressUtilService; +import de.tum.cit.aet.artemis.competency.CompetencyUtilService; +import de.tum.cit.aet.artemis.competency.LearningPathUtilService; +import de.tum.cit.aet.artemis.course.CourseFactory; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.LearningObject; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.competency.Competency; +import de.tum.cit.aet.artemis.domain.competency.LearningPath; +import de.tum.cit.aet.artemis.domain.competency.RelationType; +import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.repository.CompetencyRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.LectureUnitRepository; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.service.learningpath.LearningPathNgxService; +import de.tum.cit.aet.artemis.service.learningpath.LearningPathRecommendationService; +import de.tum.cit.aet.artemis.service.learningpath.LearningPathService; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.web.rest.LearningPathResource; +import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathHealthDTO; +import de.tum.cit.aet.artemis.web.rest.dto.competency.NgxLearningPathDTO; class LearningPathServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/LectureImportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/LectureImportServiceTest.java similarity index 86% rename from src/test/java/de/tum/in/www1/artemis/service/LectureImportServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/LectureImportServiceTest.java index e29e4c179bd0..0a4b1b984a14 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/LectureImportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/LectureImportServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; @@ -10,16 +10,16 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Attachment; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.lecture.ExerciseUnit; -import de.tum.in.www1.artemis.domain.lecture.LectureUnit; -import de.tum.in.www1.artemis.lecture.LectureUtilService; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Attachment; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; +import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; class LectureImportServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/LectureServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/LectureServiceTest.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/service/LectureServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/LectureServiceTest.java index a1675f83c8e5..8584b94bf8d1 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/LectureServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/LectureServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; @@ -13,19 +13,19 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Attachment; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.lecture.LectureFactory; -import de.tum.in.www1.artemis.lecture.LectureUtilService; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.util.PageableSearchUtilService; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Attachment; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.lecture.LectureFactory; +import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.util.PageableSearchUtilService; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; class LectureServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/OnlineCourseConfigurationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationServiceTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/service/OnlineCourseConfigurationServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationServiceTest.java index 3ba2e9c74d7c..30f863517a9c 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/OnlineCourseConfigurationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -18,11 +18,11 @@ import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.core.AuthorizationGrantType; -import de.tum.in.www1.artemis.domain.LtiPlatformConfiguration; -import de.tum.in.www1.artemis.domain.OnlineCourseConfiguration; -import de.tum.in.www1.artemis.repository.LtiPlatformConfigurationRepository; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; +import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; +import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; class OnlineCourseConfigurationServiceTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/ParticipationAuthorizationCheckServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckServiceTest.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/service/ParticipationAuthorizationCheckServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckServiceTest.java index 2a2e064108d4..22d4e4305d95 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/ParticipationAuthorizationCheckServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; @@ -11,18 +11,18 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.participation.ParticipationInterface; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.participation.ParticipationInterface; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; class ParticipationAuthorizationCheckServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/ParticipationLifecycleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleServiceTest.java similarity index 88% rename from src/test/java/de/tum/in/www1/artemis/service/ParticipationLifecycleServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleServiceTest.java index df0007e3268c..937a78fd24ba 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/ParticipationLifecycleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; @@ -12,16 +12,16 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.enumeration.ParticipationLifecycle; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.security.SecurityUtils; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.enumeration.ParticipationLifecycle; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.user.UserUtilService; class ParticipationLifecycleServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/ParticipationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/service/ParticipationServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java index 23ea15e34c48..95b98301c277 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/ParticipationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; @@ -17,28 +17,28 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.domain.BuildLogEntry; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.participation.Participant; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.BuildLogEntryRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.participation.Participant; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.BuildLogEntryRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; class ParticipationServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { @@ -109,7 +109,7 @@ void tearDown() throws Exception { } /** - * Test for methods of {@link ParticipationService} used by {@link de.tum.in.www1.artemis.web.rest.ResultResource#createResultForExternalSubmission(Long, String, Result)}. + * Test for methods of {@link ParticipationService} used by {@link de.tum.cit.aet.artemis.web.rest.ResultResource#createResultForExternalSubmission(Long, String, Result)}. */ @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") diff --git a/src/test/java/de/tum/in/www1/artemis/service/ParticipationTeamWebsocketServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationTeamWebsocketServiceTest.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/service/ParticipationTeamWebsocketServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/ParticipationTeamWebsocketServiceTest.java index 57ccb7daead3..71626528ef02 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/ParticipationTeamWebsocketServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationTeamWebsocketServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.RETURNS_MOCKS; @@ -19,21 +19,21 @@ import org.springframework.messaging.simp.stomp.StompHeaderAccessor; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.web.websocket.dto.SubmissionPatch; -import de.tum.in.www1.artemis.web.websocket.team.ParticipationTeamWebsocketService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.web.websocket.dto.SubmissionPatch; +import de.tum.cit.aet.artemis.web.websocket.team.ParticipationTeamWebsocketService; class ParticipationTeamWebsocketServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/PresentationPointsCalculationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationServiceTest.java similarity index 85% rename from src/test/java/de/tum/in/www1/artemis/service/PresentationPointsCalculationServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationServiceTest.java index cdac6403e9d8..f80eceffdba6 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/PresentationPointsCalculationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; @@ -7,20 +7,20 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.assessment.GradingScaleFactory; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.GradingScale; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.GradingScaleFactory; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; class PresentationPointsCalculationServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/RepositoryAccessServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/RepositoryAccessServiceTest.java similarity index 81% rename from src/test/java/de/tum/in/www1/artemis/service/RepositoryAccessServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/RepositoryAccessServiceTest.java index a6704f662b99..cd4ff60c242b 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/RepositoryAccessServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/RepositoryAccessServiceTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; -import static de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseResultTestService.convertBuildResultToJsonObject; +import static de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseResultTestService.convertBuildResultToJsonObject; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.catchThrowableOfType; @@ -18,23 +18,23 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.submissionpolicy.LockRepositoryPolicy; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseGradingService; -import de.tum.in.www1.artemis.service.programming.RepositoryAccessService; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.util.TestConstants; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.repository.RepositoryActionType; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseGradingService; +import de.tum.cit.aet.artemis.service.programming.RepositoryAccessService; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.util.TestConstants; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.repository.RepositoryActionType; class RepositoryAccessServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/ResourceLoaderServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ResourceLoaderServiceTest.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/service/ResourceLoaderServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/ResourceLoaderServiceTest.java index 2a625d49d7b8..122f57800d97 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/ResourceLoaderServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ResourceLoaderServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; @@ -27,7 +27,7 @@ import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; class ResourceLoaderServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/ResultServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ResultServiceTest.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/service/ResultServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/ResultServiceTest.java index 26af3ac48456..86f2d19aa2f9 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/ResultServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ResultServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; @@ -12,24 +12,24 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exercise.ExerciseUtilService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; class ResultServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/SubmissionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/service/SubmissionServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java index b3343af99e08..3dd740248062 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/SubmissionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -15,38 +15,38 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.assessment.ComplaintUtilService; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Complaint; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.FileUploadSubmission; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.ComplaintType; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ComplaintRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ResultRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.web.rest.dto.SubmissionWithComplaintDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Complaint; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.web.rest.dto.SubmissionWithComplaintDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; class SubmissionServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/TeamWebsocketServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/TeamWebsocketServiceTest.java similarity index 87% rename from src/test/java/de/tum/in/www1/artemis/service/TeamWebsocketServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/TeamWebsocketServiceTest.java index 1384c26218f4..a465a6d37019 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/TeamWebsocketServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/TeamWebsocketServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.timeout; @@ -14,22 +14,22 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.enumeration.TeamImportStrategyType; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.team.TeamUtilService; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.web.websocket.dto.TeamAssignmentPayload; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.enumeration.TeamImportStrategyType; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.team.TeamUtilService; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.web.websocket.dto.TeamAssignmentPayload; class TeamWebsocketServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/TextBlockServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/TextBlockServiceTest.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/service/TextBlockServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/TextBlockServiceTest.java index bd5250a5e5c6..bfc22de26139 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/TextBlockServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/TextBlockServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; @@ -9,8 +9,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.domain.TextBlock; -import de.tum.in.www1.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.TextBlock; +import de.tum.cit.aet.artemis.domain.TextSubmission; class TextBlockServiceTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/TitleCacheEvictionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionServiceTest.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/service/TitleCacheEvictionServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionServiceTest.java index 6464ccbf63d1..763ee30a7d93 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/TitleCacheEvictionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; @@ -9,23 +9,23 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.CacheManager; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.enumeration.DiagramType; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseFactory; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.lecture.LectureUtilService; -import de.tum.in.www1.artemis.organization.OrganizationUtilService; -import de.tum.in.www1.artemis.repository.ApollonDiagramRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.OrganizationRepository; -import de.tum.in.www1.artemis.repository.hestia.ExerciseHintRepository; -import de.tum.in.www1.artemis.service.util.Tuple; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.organization.OrganizationUtilService; +import de.tum.cit.aet.artemis.repository.ApollonDiagramRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.repository.OrganizationRepository; +import de.tum.cit.aet.artemis.repository.hestia.ExerciseHintRepository; +import de.tum.cit.aet.artemis.service.util.Tuple; /** * Test for {@link TitleCacheEvictionService} that should evict entity titles from the title caches if the titles are diff --git a/src/test/java/de/tum/in/www1/artemis/service/UriServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/UriServiceTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/service/UriServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/UriServiceTest.java index 2c651b76ea76..1d5d24c075a0 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/UriServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/UriServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -8,12 +8,12 @@ import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.in.www1.artemis.exception.VersionControlException; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exception.VersionControlException; class UriServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/WeeklyEmailSummaryScheduleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/WeeklyEmailSummaryScheduleServiceTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/service/WeeklyEmailSummaryScheduleServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/WeeklyEmailSummaryScheduleServiceTest.java index e4953eb39583..95d5adad7c5a 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/WeeklyEmailSummaryScheduleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/WeeklyEmailSummaryScheduleServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.any; @@ -24,7 +24,7 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; -import de.tum.in.www1.artemis.service.scheduled.WeeklyEmailSummaryScheduleService; +import de.tum.cit.aet.artemis.service.scheduled.WeeklyEmailSummaryScheduleService; /** * Tests if the WeeklyEmailSummaryScheduleService correctly calls the EmailSummaryService with the expected times and intervals diff --git a/src/test/java/de/tum/in/www1/artemis/service/ZipFileServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ZipFileServiceTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/service/ZipFileServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/ZipFileServiceTest.java index b296f3eb4e9c..1c954a6b2c73 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/ZipFileServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ZipFileServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service; +package de.tum.cit.aet.artemis.service; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; @@ -12,7 +12,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; class ZipFileServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java similarity index 88% rename from src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java index 1647529b0b7a..13a518945a70 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.connectors.athena; +package de.tum.cit.aet.artemis.service.connectors.athena; -import static de.tum.in.www1.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_PROGRAMMING_TEST; -import static de.tum.in.www1.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_TEXT_TEST; +import static de.tum.cit.aet.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_PROGRAMMING_TEST; +import static de.tum.cit.aet.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_TEXT_TEST; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.when; import static org.springframework.test.web.client.match.MockRestRequestMatchers.jsonPath; @@ -15,27 +15,27 @@ import org.mockito.Mock; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractAthenaTest; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.GradingInstruction; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.TextBlock; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exercise.GradingCriterionUtil; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.repository.GradingCriterionRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.TextBlockRepository; -import de.tum.in.www1.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.AbstractAthenaTest; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.GradingInstruction; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.TextBlock; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.TextBlockRepository; +import de.tum.cit.aet.artemis.repository.TextExerciseRepository; class AthenaFeedbackSendingServiceTest extends AbstractAthenaTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java similarity index 82% rename from src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java index 8a0954cc6140..4eb6efca97e4 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.connectors.athena; +package de.tum.cit.aet.artemis.service.connectors.athena; -import static de.tum.in.www1.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_PROGRAMMING_TEST; -import static de.tum.in.www1.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_TEXT_TEST; +import static de.tum.cit.aet.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_PROGRAMMING_TEST; +import static de.tum.cit.aet.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_TEXT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType; import static org.springframework.test.web.client.match.MockRestRequestMatchers.jsonPath; @@ -13,18 +13,18 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractAthenaTest; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exception.NetworkingException; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.service.dto.athena.ProgrammingFeedbackDTO; -import de.tum.in.www1.artemis.service.dto.athena.TextFeedbackDTO; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.AbstractAthenaTest; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exception.NetworkingException; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.service.dto.athena.ProgrammingFeedbackDTO; +import de.tum.cit.aet.artemis.service.dto.athena.TextFeedbackDTO; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; class AthenaFeedbackSuggestionsServiceTest extends AbstractAthenaTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaHealthIndicatorTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaHealthIndicatorTest.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaHealthIndicatorTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaHealthIndicatorTest.java index a43b9d210eae..fefbd5a73728 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaHealthIndicatorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaHealthIndicatorTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.athena; +package de.tum.cit.aet.artemis.service.connectors.athena; import static org.assertj.core.api.Assertions.assertThat; @@ -7,7 +7,7 @@ import org.springframework.boot.actuate.health.Health; import org.springframework.boot.actuate.health.Status; -import de.tum.in.www1.artemis.AbstractAthenaTest; +import de.tum.cit.aet.artemis.AbstractAthenaTest; class AthenaHealthIndicatorTest extends AbstractAthenaTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java similarity index 84% rename from src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java index 2484c46adbfa..76ccf98a98ef 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.connectors.athena; +package de.tum.cit.aet.artemis.service.connectors.athena; -import static de.tum.in.www1.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_PROGRAMMING_TEST; +import static de.tum.cit.aet.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_PROGRAMMING_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -16,17 +16,17 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.enumeration.RepositoryType; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.util.LocalRepository; -import de.tum.in.www1.artemis.web.rest.errors.ServiceUnavailableException; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.util.LocalRepository; +import de.tum.cit.aet.artemis.web.rest.errors.ServiceUnavailableException; class AthenaRepositoryExportServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java index 99853700d473..00dfb512caf2 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.connectors.athena; +package de.tum.cit.aet.artemis.service.connectors.athena; -import static de.tum.in.www1.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_PROGRAMMING_TEST; -import static de.tum.in.www1.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_TEXT_TEST; +import static de.tum.cit.aet.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_PROGRAMMING_TEST; +import static de.tum.cit.aet.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_TEXT_TEST; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatNoException; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -15,16 +15,16 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractAthenaTest; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.AbstractAthenaTest; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.TextExerciseRepository; class AthenaSubmissionSelectionServiceTest extends AbstractAthenaTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java index 16fe2babdfb4..17ee1f82db68 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.service.connectors.athena; +package de.tum.cit.aet.artemis.service.connectors.athena; -import static de.tum.in.www1.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_PROGRAMMING_TEST; -import static de.tum.in.www1.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_TEXT_TEST; +import static de.tum.cit.aet.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_PROGRAMMING_TEST; +import static de.tum.cit.aet.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_TEXT_TEST; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.springframework.test.web.client.match.MockRestRequestMatchers.jsonPath; @@ -11,18 +11,18 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractAthenaTest; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractAthenaTest; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; class AthenaSubmissionSendingServiceTest extends AbstractAthenaTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementServiceTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementServiceTest.java index bcff9e9f0c89..ab49f92a62e4 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.gitlab; +package de.tum.cit.aet.artemis.service.connectors.gitlab; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; @@ -29,11 +29,11 @@ import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.service.connectors.gitlab.dto.GitLabPersonalAccessTokenListResponseDTO; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.service.connectors.gitlab.dto.GitLabPersonalAccessTokenListResponseDTO; +import de.tum.cit.aet.artemis.user.UserUtilService; class GitLabPersonalAccessTokenManagementServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreatorTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreatorTest.java similarity index 84% rename from src/test/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreatorTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreatorTest.java index 58fe02d93ad1..db6032e333dc 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreatorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreatorTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.jenkins.build_plan; +package de.tum.cit.aet.artemis.service.connectors.jenkins.build_plan; import static org.assertj.core.api.Assertions.assertThat; @@ -8,16 +8,16 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.BuildPlan; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.repository.BuildPlanRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.BuildPlan; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; class JenkinsPipelineScriptCreatorTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtilsTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtilsTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtilsTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtilsTest.java index 53694e39220d..2b7d394a9fa8 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtilsTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtilsTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.jenkins.jobs; +package de.tum.cit.aet.artemis.service.connectors.jenkins.jobs; import static org.assertj.core.api.Assertions.assertThat; @@ -13,7 +13,7 @@ import org.w3c.dom.Document; import org.w3c.dom.NodeList; -import de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsXmlFileUtils; +import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsXmlFileUtils; class JenkinsJobPermissionsUtilsTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/TestResultXmlParserTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/TestResultXmlParserTest.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/TestResultXmlParserTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/TestResultXmlParserTest.java index 4f6f7f44acfb..6a4d22f405c7 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/TestResultXmlParserTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/TestResultXmlParserTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.service.connectors.localci.buildagent; import static org.assertj.core.api.Assertions.assertThat; @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildResult; +import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildResult; class TestResultXmlParserTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java index db1ef62c884c..de28a5397680 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.lti; +package de.tum.cit.aet.artemis.service.connectors.lti; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -32,13 +32,13 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.OnlineCourseConfiguration; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.security.lti.Lti13TokenRetriever; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.security.lti.Lti13TokenRetriever; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import uk.ac.ox.ctl.lti13.lti.Claims; class LtiDeepLinkingServiceTest { @@ -125,7 +125,7 @@ void testEmptyReturnUrlBuildLtiDeepLinkResponse() throws JsonProcessingException """; Map deepLinkingSettingsAsMap = mapper.readValue(deepLinkingSettingsAsJsonString, new TypeReference<>() { }); - when(oidcIdToken.getClaim(de.tum.in.www1.artemis.domain.lti.Claims.DEEP_LINKING_SETTINGS)).thenReturn(deepLinkingSettingsAsMap); + when(oidcIdToken.getClaim(de.tum.cit.aet.artemis.domain.lti.Claims.DEEP_LINKING_SETTINGS)).thenReturn(deepLinkingSettingsAsMap); DeepLinkCourseExercises result = createTestExercisesForDeepLinking(); assertThatExceptionOfType(BadRequestAlertException.class) @@ -138,7 +138,7 @@ void testEmptyReturnUrlBuildLtiDeepLinkResponse() throws JsonProcessingException void testEmptyDeploymentIdBuildLtiDeepLinkResponse() throws MalformedURLException, URISyntaxException { createMockOidcIdToken(); when(tokenRetriever.createDeepLinkingJWT(anyString(), anyMap())).thenReturn("test_jwt"); - when(oidcIdToken.getClaim(de.tum.in.www1.artemis.domain.lti.Claims.LTI_DEPLOYMENT_ID)).thenReturn(null); + when(oidcIdToken.getClaim(de.tum.cit.aet.artemis.domain.lti.Claims.LTI_DEPLOYMENT_ID)).thenReturn(null); DeepLinkCourseExercises result = createTestExercisesForDeepLinking(); assertThatExceptionOfType(IllegalArgumentException.class) diff --git a/src/test/java/de/tum/in/www1/artemis/service/connectors/vcs/VcsTokenRenewalServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalServiceTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/service/connectors/vcs/VcsTokenRenewalServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalServiceTest.java index 51dd6f8efac3..f7e6af788b75 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/connectors/vcs/VcsTokenRenewalServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.vcs; +package de.tum.cit.aet.artemis.service.connectors.vcs; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; @@ -22,8 +22,8 @@ import org.junit.jupiter.params.provider.MethodSource; import org.mockito.Mockito; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.UserRepository; class VcsTokenRenewalServiceTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/exam/ExamAccessServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/service/exam/ExamAccessServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java index 0532e1567693..357d58a438c6 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/exam/ExamAccessServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.exam; +package de.tum.cit.aet.artemis.service.exam; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -14,26 +14,26 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExamUser; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExamUserRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.service.scheduled.ParticipantScoreScheduleService; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExamUser; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExamUserRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; class ExamAccessServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/exam/ExamQuizServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamQuizServiceTest.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/service/exam/ExamQuizServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/exam/ExamQuizServiceTest.java index 90a754bcb4f8..79d2438447d6 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/exam/ExamQuizServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamQuizServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.exam; +package de.tum.cit.aet.artemis.service.exam; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -14,29 +14,29 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.in.www1.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.domain.quiz.QuizQuestion; -import de.tum.in.www1.artemis.domain.quiz.QuizSubmission; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseFactory; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExerciseGroupRepository; -import de.tum.in.www1.artemis.repository.QuizExerciseRepository; -import de.tum.in.www1.artemis.repository.QuizSubmissionRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.service.quiz.QuizExerciseService; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; +import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExerciseGroupRepository; +import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.service.quiz.QuizExerciseService; +import de.tum.cit.aet.artemis.user.UserUtilService; class ExamQuizServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/exam/ExamServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/service/exam/ExamServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java index 00d57dc3eabd..968eb3371855 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/exam/ExamServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.exam; +package de.tum.cit.aet.artemis.service.exam; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -14,25 +14,25 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.quiz.QuizExercise; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.web.rest.dto.ExamChecklistDTO; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.web.rest.dto.ExamChecklistDTO; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; class ExamServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/exam/ExamSubmissionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionServiceTest.java similarity index 86% rename from src/test/java/de/tum/in/www1/artemis/service/exam/ExamSubmissionServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionServiceTest.java index d58fe109354f..b8891ce10686 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/exam/ExamSubmissionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.exam; +package de.tum.cit.aet.artemis.service.exam; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -10,27 +10,27 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; class ExamSubmissionServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/exam/StudentExamAccessServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessServiceTest.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/service/exam/StudentExamAccessServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessServiceTest.java index 70a689b169bc..f353eaa6956a 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/exam/StudentExamAccessServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.exam; +package de.tum.cit.aet.artemis.service.exam; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatNoException; @@ -10,18 +10,18 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.StudentExam; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.repository.StudentExamRepository; -import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.in.www1.artemis.web.rest.errors.ConflictException; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; class StudentExamAccessServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/export/CourseExamExportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/export/CourseExamExportServiceTest.java similarity index 86% rename from src/test/java/de/tum/in/www1/artemis/service/export/CourseExamExportServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/export/CourseExamExportServiceTest.java index 63cb143f31b0..2b8bbe4dcd81 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/export/CourseExamExportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/export/CourseExamExportServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.export; +package de.tum.cit.aet.artemis.service.export; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatNoException; @@ -14,13 +14,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; class CourseExamExportServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/notifications/ConversationNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationServiceTest.java similarity index 80% rename from src/test/java/de/tum/in/www1/artemis/service/notifications/ConversationNotificationServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationServiceTest.java index 55ea6b22e7e1..e9dad4f7cd9e 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/notifications/ConversationNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationServiceTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.notifications; +package de.tum.cit.aet.artemis.service.notifications; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.NEW_MESSAGE_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_MESSAGE_TITLE; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; @@ -14,23 +14,23 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.metis.ConversationParticipant; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.metis.conversation.OneToOneChat; -import de.tum.in.www1.artemis.domain.notification.ConversationNotification; -import de.tum.in.www1.artemis.domain.notification.Notification; -import de.tum.in.www1.artemis.repository.NotificationRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.ConversationMessageRepository; -import de.tum.in.www1.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ConversationNotificationRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ConversationRepository; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.metis.conversation.OneToOneChat; +import de.tum.cit.aet.artemis.domain.notification.ConversationNotification; +import de.tum.cit.aet.artemis.domain.notification.Notification; +import de.tum.cit.aet.artemis.repository.NotificationRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.ConversationMessageRepository; +import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ConversationNotificationRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ConversationRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; class ConversationNotificationServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/notifications/GeneralInstantNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationServiceTest.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/service/notifications/GeneralInstantNotificationServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationServiceTest.java index 275c2076d630..953e62bec1b6 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/notifications/GeneralInstantNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.notifications; +package de.tum.cit.aet.artemis.service.notifications; import static org.mockito.Mockito.any; import static org.mockito.Mockito.never; @@ -14,14 +14,14 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.GroupNotificationType; -import de.tum.in.www1.artemis.domain.enumeration.NotificationType; -import de.tum.in.www1.artemis.domain.notification.GroupNotification; -import de.tum.in.www1.artemis.domain.notification.Notification; -import de.tum.in.www1.artemis.domain.notification.NotificationConstants; -import de.tum.in.www1.artemis.service.notifications.push_notifications.ApplePushNotificationService; -import de.tum.in.www1.artemis.service.notifications.push_notifications.FirebasePushNotificationService; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType; +import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.domain.notification.GroupNotification; +import de.tum.cit.aet.artemis.domain.notification.Notification; +import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; +import de.tum.cit.aet.artemis.service.notifications.push_notifications.ApplePushNotificationService; +import de.tum.cit.aet.artemis.service.notifications.push_notifications.FirebasePushNotificationService; class GeneralInstantNotificationServiceTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/notifications/MailServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/notifications/MailServiceTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/service/notifications/MailServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/notifications/MailServiceTest.java index 9f40abf7b9d6..d39a6a5bdead 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/notifications/MailServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/notifications/MailServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.notifications; +package de.tum.cit.aet.artemis.service.notifications; import static org.assertj.core.api.Assertions.assertThatNoException; import static org.mockito.Mockito.any; @@ -24,14 +24,14 @@ import org.springframework.test.util.ReflectionTestUtils; import org.thymeleaf.spring6.SpringTemplateEngine; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.GroupNotificationType; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.notification.GroupNotification; -import de.tum.in.www1.artemis.domain.notification.NotificationConstants; -import de.tum.in.www1.artemis.service.TimeService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.notification.GroupNotification; +import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; +import de.tum.cit.aet.artemis.service.TimeService; import tech.jhipster.config.JHipsterProperties; /** diff --git a/src/test/java/de/tum/in/www1/artemis/service/notifications/TutorialGroupNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationServiceTest.java similarity index 85% rename from src/test/java/de/tum/in/www1/artemis/service/notifications/TutorialGroupNotificationServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationServiceTest.java index 31298e355d13..14476d19db37 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/notifications/TutorialGroupNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationServiceTest.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.service.notifications; +package de.tum.cit.aet.artemis.service.notifications; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DELETED_TITLE; -import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_UPDATED_TITLE; -import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__TUTORIAL_GROUP_NOTIFICATION__TUTORIAL_GROUP_DELETE_UPDATE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DELETED_TITLE; +import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_UPDATED_TITLE; +import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__TUTORIAL_GROUP_NOTIFICATION__TUTORIAL_GROUP_DELETE_UPDATE; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doNothing; @@ -25,23 +25,23 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.NotificationSetting; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; -import de.tum.in.www1.artemis.domain.notification.Notification; -import de.tum.in.www1.artemis.domain.notification.TutorialGroupNotification; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupRegistration; -import de.tum.in.www1.artemis.repository.NotificationSettingRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupNotificationRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupRegistrationRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupRepository; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.NotificationSetting; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; +import de.tum.cit.aet.artemis.domain.notification.Notification; +import de.tum.cit.aet.artemis.domain.notification.TutorialGroupNotification; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupRegistration; +import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupNotificationRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRegistrationRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; class TutorialGroupNotificationServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/notifications/push_notifications/AppleFirebasePushNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/AppleFirebasePushNotificationServiceTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/service/notifications/push_notifications/AppleFirebasePushNotificationServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/AppleFirebasePushNotificationServiceTest.java index c52848ac92ae..3bc7c63de09f 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/notifications/push_notifications/AppleFirebasePushNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/AppleFirebasePushNotificationServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.notifications.push_notifications; +package de.tum.cit.aet.artemis.service.notifications.push_notifications; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -24,14 +24,14 @@ import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.GroupNotificationType; -import de.tum.in.www1.artemis.domain.notification.GroupNotification; -import de.tum.in.www1.artemis.domain.notification.Notification; -import de.tum.in.www1.artemis.domain.notification.NotificationConstants; -import de.tum.in.www1.artemis.domain.push_notification.PushNotificationDeviceConfiguration; -import de.tum.in.www1.artemis.domain.push_notification.PushNotificationDeviceType; -import de.tum.in.www1.artemis.repository.PushNotificationDeviceConfigurationRepository; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType; +import de.tum.cit.aet.artemis.domain.notification.GroupNotification; +import de.tum.cit.aet.artemis.domain.notification.Notification; +import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; +import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfiguration; +import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceType; +import de.tum.cit.aet.artemis.repository.PushNotificationDeviceConfigurationRepository; class AppleFirebasePushNotificationServiceTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java index 025ea730fade..b3e242f81e0f 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.programming; +package de.tum.cit.aet.artemis.service.programming; import static org.assertj.core.api.Assertions.assertThat; @@ -12,27 +12,27 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.enumeration.ProjectType; -import de.tum.in.www1.artemis.domain.enumeration.StaticCodeAnalysisTool; -import de.tum.in.www1.artemis.domain.enumeration.Visibility; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTestCaseType; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.in.www1.artemis.service.dto.AbstractBuildResultNotificationDTO; -import de.tum.in.www1.artemis.service.dto.StaticCodeAnalysisIssue; -import de.tum.in.www1.artemis.service.dto.StaticCodeAnalysisReportDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTestCaseType; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; +import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; +import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; class ProgrammingExerciseFeedbackCreationServiceTest extends AbstractSpringIntegrationIndependentTest { @@ -154,13 +154,13 @@ void createFeedbackFromTestCaseWithStackTrace() { @Test void createFeedbackFromTestCaseWithStackTraceAndCause() { String msgWithStackTrace = """ - org.springframework.orm.jpa.JpaSystemException: org.springframework.orm.jpa.JpaSystemException: null index column for collection: de.tum.in.www1.artemis.domain.exam.Exam.exerciseGroups + org.springframework.orm.jpa.JpaSystemException: org.springframework.orm.jpa.JpaSystemException: null index column for collection: de.tum.cit.aet.artemis.domain.exam.Exam.exerciseGroups \tat org.springframework.orm.jpa.vendor.HibernateJpaDialect.convertHibernateAccessException(HibernateJpaDialect.java:353) \tat org.springframework.orm.jpa.vendor.HibernateJpaDialect.translateExceptionIfPossible(HibernateJpaDialect.java:255) \tat org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.translateExceptionIfPossible(AbstractEntityManagerFactoryBean.java:528) \tat org.springframework.dao.support.ChainedPersistenceExceptionTranslator.translateExceptionIfPossible(ChainedPersistenceExceptionTranslator.java:61) \tat org.springframework.dao.support.DataAccessUtils.translateIfNecessary(DataAccessUtils.java:242) - Caused by: org.hibernate.HibernateException: null index column for collection: de.tum.in.www1.artemis.domain.exam.Exam.exerciseGroups + Caused by: org.hibernate.HibernateException: null index column for collection: de.tum.cit.aet.artemis.domain.exam.Exam.exerciseGroups \tat org.hibernate.persister.collection.AbstractCollectionPersister.readIndex(AbstractCollectionPersister.java:874) \tat org.hibernate.collection.internal.PersistentList.readFrom(PersistentList.java:401) \tat org.hibernate.loader.plan.exec.process.internal.CollectionReferenceInitializerImpl.finishUpRow(CollectionReferenceInitializerImpl.java:76) @@ -169,7 +169,7 @@ void createFeedbackFromTestCaseWithStackTraceAndCause() { \tat org.hibernate.loader.plan.exec.process.internal.ResultSetProcessorImpl.extractResults(ResultSetProcessorImpl.java:94)"""; String actualFeedback = createFeedbackFromTestCase("test1", List.of(msgWithStackTrace), false); assertThat(actualFeedback).isEqualTo( - "org.springframework.orm.jpa.JpaSystemException: org.springframework.orm.jpa.JpaSystemException: null index column for collection: de.tum.in.www1.artemis.domain.exam.Exam.exerciseGroups"); + "org.springframework.orm.jpa.JpaSystemException: org.springframework.orm.jpa.JpaSystemException: null index column for collection: de.tum.cit.aet.artemis.domain.exam.Exam.exerciseGroups"); } @Test @@ -195,7 +195,7 @@ void createFeedbackFromTestCaseOfAssertJ() { \tat java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:64) \tat java.base/jdk.internal.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) \tat java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:500) - \tat de.tum.in.www1.artemis.FeedbackServiceTest.createFeedbackFromTestCaseMatchMultiple(FeedbackServiceTest.java:66) + \tat de.tum.cit.aet.artemis.FeedbackServiceTest.createFeedbackFromTestCaseMatchMultiple(FeedbackServiceTest.java:66) """; String actualFeedback = createFeedbackFromTestCase("test1", List.of(msgWithStackTrace), false); assertThat(actualFeedback).isEqualTo(""" diff --git a/src/test/java/de/tum/in/www1/artemis/service/scheduled/DataExportScheduleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleServiceTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/service/scheduled/DataExportScheduleServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleServiceTest.java index 9beabe446b90..316eca21fdcd 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/scheduled/DataExportScheduleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.scheduled; +package de.tum.cit.aet.artemis.service.scheduled; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.any; @@ -26,12 +26,12 @@ import org.springframework.scheduling.config.ScheduledTask; import org.springframework.scheduling.config.ScheduledTaskHolder; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.DataExport; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.DataExportState; -import de.tum.in.www1.artemis.repository.DataExportRepository; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.DataExport; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.DataExportState; +import de.tum.cit.aet.artemis.repository.DataExportRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; @ExtendWith(MockitoExtension.class) class DataExportScheduleServiceTest extends AbstractSpringIntegrationIndependentTest { @@ -126,7 +126,7 @@ private static Stream provideCreationDatesAndExpectedToDelete() { @Test void testCronDataExportCreationTaskScheduledEveryDayAt4AMByDefault() { final String cronExpression = "0 0 4 * * *"; - final String cronTaskName = "de.tum.in.www1.artemis.service.scheduled.DataExportScheduleService.createDataExportsAndDeleteOldOnes"; + final String cronTaskName = "de.tum.cit.aet.artemis.service.scheduled.DataExportScheduleService.createDataExportsAndDeleteOldOnes"; Set scheduledTasks = scheduledTaskHolder.getScheduledTasks(); long scheduledCronTasksToCreateDataExportsAt4AM = scheduledTasks.stream().filter(scheduledTask -> scheduledTask.getTask() instanceof CronTask) .map(scheduledTask -> (CronTask) scheduledTask.getTask()).filter(cronTask -> (cronExpression).equals(cronTask.getExpression())) diff --git a/src/test/java/de/tum/in/www1/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupServiceTest.java similarity index 82% rename from src/test/java/de/tum/in/www1/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupServiceTest.java index 24d1f9f67beb..ad4693325a03 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.scheduled; +package de.tum.cit.aet.artemis.service.scheduled; import static org.springframework.test.util.AssertionErrors.assertEquals; @@ -13,12 +13,12 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.push_notification.PushNotificationDeviceConfiguration; -import de.tum.in.www1.artemis.domain.push_notification.PushNotificationDeviceType; -import de.tum.in.www1.artemis.repository.PushNotificationDeviceConfigurationRepository; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfiguration; +import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceType; +import de.tum.cit.aet.artemis.repository.PushNotificationDeviceConfigurationRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; class PushNotificationDeviceConfigurationCleanupServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/util/HttpRequestUtilsTest.java b/src/test/java/de/tum/cit/aet/artemis/service/util/HttpRequestUtilsTest.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/service/util/HttpRequestUtilsTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/util/HttpRequestUtilsTest.java index 4d2b31fefd79..3816e6af0aa4 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/util/HttpRequestUtilsTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/util/HttpRequestUtilsTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.util; +package de.tum.cit.aet.artemis.service.util; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.anyString; diff --git a/src/test/java/de/tum/in/www1/artemis/service/util/TimeUtilTest.java b/src/test/java/de/tum/cit/aet/artemis/service/util/TimeUtilTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/service/util/TimeUtilTest.java rename to src/test/java/de/tum/cit/aet/artemis/service/util/TimeUtilTest.java index f712c049019f..285240cf1c46 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/util/TimeUtilTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/util/TimeUtilTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.service.util; +package de.tum.cit.aet.artemis.service.util; -import static de.tum.in.www1.artemis.service.util.TimeUtil.toRelativeTime; +import static de.tum.cit.aet.artemis.service.util.TimeUtil.toRelativeTime; import static org.assertj.core.api.Assertions.assertThat; import java.time.ZonedDateTime; diff --git a/src/test/java/de/tum/in/www1/artemis/settings/ide/IdePreferencesIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/settings/ide/IdePreferencesIntegrationTest.java similarity index 89% rename from src/test/java/de/tum/in/www1/artemis/settings/ide/IdePreferencesIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/settings/ide/IdePreferencesIntegrationTest.java index d52b044af011..2584bee606c0 100644 --- a/src/test/java/de/tum/in/www1/artemis/settings/ide/IdePreferencesIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/settings/ide/IdePreferencesIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.settings.ide; +package de.tum.cit.aet.artemis.settings.ide; import static org.assertj.core.api.Assertions.assertThat; @@ -13,15 +13,15 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.in.www1.artemis.domain.settings.ide.Ide; -import de.tum.in.www1.artemis.domain.settings.ide.UserIdeMapping; -import de.tum.in.www1.artemis.repository.settings.IdeRepository; -import de.tum.in.www1.artemis.repository.settings.UserIdeMappingRepository; -import de.tum.in.www1.artemis.web.rest.dto.settings.ide.IdeDTO; -import de.tum.in.www1.artemis.web.rest.dto.settings.ide.IdeMappingDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.domain.settings.ide.Ide; +import de.tum.cit.aet.artemis.domain.settings.ide.UserIdeMapping; +import de.tum.cit.aet.artemis.repository.settings.IdeRepository; +import de.tum.cit.aet.artemis.repository.settings.UserIdeMappingRepository; +import de.tum.cit.aet.artemis.web.rest.dto.settings.ide.IdeDTO; +import de.tum.cit.aet.artemis.web.rest.dto.settings.ide.IdeMappingDTO; class IdePreferencesIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/staticcodeanalysis/StaticCodeAnalysisParserUnitTest.java b/src/test/java/de/tum/cit/aet/artemis/staticcodeanalysis/StaticCodeAnalysisParserUnitTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/staticcodeanalysis/StaticCodeAnalysisParserUnitTest.java rename to src/test/java/de/tum/cit/aet/artemis/staticcodeanalysis/StaticCodeAnalysisParserUnitTest.java index be2c2a729a2c..a30bbc1bbaae 100644 --- a/src/test/java/de/tum/in/www1/artemis/staticcodeanalysis/StaticCodeAnalysisParserUnitTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/staticcodeanalysis/StaticCodeAnalysisParserUnitTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.staticcodeanalysis; +package de.tum.cit.aet.artemis.staticcodeanalysis; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; @@ -15,8 +15,8 @@ import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.service.connectors.localci.scaparser.ReportParser; -import de.tum.in.www1.artemis.service.connectors.localci.scaparser.exception.ParserException; +import de.tum.cit.aet.artemis.service.connectors.localci.scaparser.ReportParser; +import de.tum.cit.aet.artemis.service.connectors.localci.scaparser.exception.ParserException; /** * Tests each parser with an example file diff --git a/src/test/java/de/tum/in/www1/artemis/team/TeamFactory.java b/src/test/java/de/tum/cit/aet/artemis/team/TeamFactory.java similarity index 89% rename from src/test/java/de/tum/in/www1/artemis/team/TeamFactory.java rename to src/test/java/de/tum/cit/aet/artemis/team/TeamFactory.java index 82476fadbc9d..79531404b40d 100644 --- a/src/test/java/de/tum/in/www1/artemis/team/TeamFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/team/TeamFactory.java @@ -1,15 +1,15 @@ -package de.tum.in.www1.artemis.team; +package de.tum.cit.aet.artemis.team; import java.util.HashSet; import java.util.List; import java.util.Set; -import de.tum.in.www1.artemis.domain.Authority; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.user.UserFactory; +import de.tum.cit.aet.artemis.domain.Authority; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.user.UserFactory; /** * Factory for creating Teams and related objects. diff --git a/src/test/java/de/tum/in/www1/artemis/team/TeamImportIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/team/TeamImportIntegrationTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/team/TeamImportIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/team/TeamImportIntegrationTest.java index 078ae554c0d2..68f7f28a20f0 100644 --- a/src/test/java/de/tum/in/www1/artemis/team/TeamImportIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/team/TeamImportIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.team; +package de.tum.cit.aet.artemis.team; import static org.assertj.core.api.Assertions.assertThat; @@ -17,14 +17,14 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.enumeration.TeamImportStrategyType; -import de.tum.in.www1.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.enumeration.TeamImportStrategyType; +import de.tum.cit.aet.artemis.repository.TeamRepository; class TeamImportIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/team/TeamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/team/TeamIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/team/TeamIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/team/TeamIntegrationTest.java index 87cd07a663be..aea4ee83bd8c 100644 --- a/src/test/java/de/tum/in/www1/artemis/team/TeamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/team/TeamIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.team; +package de.tum.cit.aet.artemis.team; import static org.assertj.core.api.Assertions.assertThat; @@ -16,27 +16,27 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.TeamAssignmentConfig; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.service.dto.TeamSearchUserDTO; -import de.tum.in.www1.artemis.web.rest.dto.CoursesForDashboardDTO; -import de.tum.in.www1.artemis.web.rest.dto.ExerciseDetailsDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.TeamAssignmentConfig; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.service.dto.TeamSearchUserDTO; +import de.tum.cit.aet.artemis.web.rest.dto.CoursesForDashboardDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ExerciseDetailsDTO; class TeamIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/team/TeamUtilService.java b/src/test/java/de/tum/cit/aet/artemis/team/TeamUtilService.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/team/TeamUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/team/TeamUtilService.java index 646d91a77ada..175c742766fb 100644 --- a/src/test/java/de/tum/in/www1/artemis/team/TeamUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/team/TeamUtilService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.team; +package de.tum.cit.aet.artemis.team; import java.util.ArrayList; import java.util.Collection; @@ -9,14 +9,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Authority; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.domain.Authority; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.user.UserUtilService; /** * Service responsible for initializing the database with specific testdata related to teams for use in integration tests. diff --git a/src/test/java/de/tum/in/www1/artemis/telemetry/TelemetryServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/telemetry/TelemetryServiceTest.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/telemetry/TelemetryServiceTest.java rename to src/test/java/de/tum/cit/aet/artemis/telemetry/TelemetryServiceTest.java index 9ff3a4db9874..c779e7e1acdb 100644 --- a/src/test/java/de/tum/in/www1/artemis/telemetry/TelemetryServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/telemetry/TelemetryServiceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.telemetry; +package de.tum.cit.aet.artemis.telemetry; import static org.mockito.Mockito.spy; import static org.springframework.test.web.client.match.MockRestRequestMatchers.method; @@ -23,8 +23,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.service.telemetry.TelemetryService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.service.telemetry.TelemetryService; @ExtendWith(MockitoExtension.class) class TelemetryServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/text/AssessmentEventIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/AssessmentEventIntegrationTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/text/AssessmentEventIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/text/AssessmentEventIntegrationTest.java index 60785033bab2..93b68002aa40 100644 --- a/src/test/java/de/tum/in/www1/artemis/text/AssessmentEventIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/AssessmentEventIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.text; +package de.tum.cit.aet.artemis.text; import static org.assertj.core.api.Assertions.assertThat; @@ -10,18 +10,18 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.analytics.TextAssessmentEvent; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.TextAssessmentEventRepository; -import de.tum.in.www1.artemis.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.analytics.TextAssessmentEvent; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.TextAssessmentEventRepository; +import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; class AssessmentEventIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/text/TextAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/text/TextAssessmentIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java index da91d6d8f766..3cd3b092ac60 100644 --- a/src/test/java/de/tum/in/www1/artemis/text/TextAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.text; +package de.tum.cit.aet.artemis.text; -import static de.tum.in.www1.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_TEXT_TEST; +import static de.tum.cit.aet.artemis.connector.AthenaRequestMockProvider.ATHENA_MODULE_TEXT_TEST; import static java.time.ZonedDateTime.now; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; @@ -34,52 +34,52 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.assessment.ComplaintUtilService; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.connector.AthenaRequestMockProvider; -import de.tum.in.www1.artemis.domain.Complaint; -import de.tum.in.www1.artemis.domain.ComplaintResponse; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.FileUploadSubmission; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Submission; -import de.tum.in.www1.artemis.domain.TextBlock; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.FeedbackType; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.fileupload.FileUploadExerciseFactory; -import de.tum.in.www1.artemis.exercise.fileupload.FileUploadExerciseUtilService; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ComplaintRepository; -import de.tum.in.www1.artemis.repository.ExamRepository; -import de.tum.in.www1.artemis.repository.ExampleSubmissionRepository; -import de.tum.in.www1.artemis.repository.ExerciseGroupRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.TextBlockRepository; -import de.tum.in.www1.artemis.repository.TextExerciseRepository; -import de.tum.in.www1.artemis.repository.TextSubmissionRepository; -import de.tum.in.www1.artemis.service.TextAssessmentService; -import de.tum.in.www1.artemis.web.rest.dto.AssessmentUpdateDTO; -import de.tum.in.www1.artemis.web.rest.dto.ResultDTO; -import de.tum.in.www1.artemis.web.rest.dto.TextAssessmentDTO; -import de.tum.in.www1.artemis.web.rest.dto.TextAssessmentUpdateDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.connector.AthenaRequestMockProvider; +import de.tum.cit.aet.artemis.domain.Complaint; +import de.tum.cit.aet.artemis.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.domain.TextBlock; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseFactory; +import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.repository.ExerciseGroupRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.TextBlockRepository; +import de.tum.cit.aet.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.service.TextAssessmentService; +import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; +import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; +import de.tum.cit.aet.artemis.web.rest.dto.TextAssessmentDTO; +import de.tum.cit.aet.artemis.web.rest.dto.TextAssessmentUpdateDTO; class TextAssessmentIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/text/TextEmbeddingIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/TextEmbeddingIntegrationTest.java similarity index 84% rename from src/test/java/de/tum/in/www1/artemis/text/TextEmbeddingIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/text/TextEmbeddingIntegrationTest.java index 35aaae538d41..6e4a5173c146 100644 --- a/src/test/java/de/tum/in/www1/artemis/text/TextEmbeddingIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/TextEmbeddingIntegrationTest.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.text; +package de.tum.cit.aet.artemis.text; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.domain.TextEmbedding; +import de.tum.cit.aet.artemis.domain.TextEmbedding; class TextEmbeddingIntegrationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/text/TextExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/TextExerciseIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/text/TextExerciseIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/text/TextExerciseIntegrationTest.java index 02ae1dc217cd..4b7382babf7f 100644 --- a/src/test/java/de/tum/in/www1/artemis/text/TextExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/TextExerciseIntegrationTest.java @@ -1,9 +1,9 @@ -package de.tum.in.www1.artemis.text; +package de.tum.cit.aet.artemis.text; -import static de.tum.in.www1.artemis.domain.plagiarism.PlagiarismStatus.CONFIRMED; -import static de.tum.in.www1.artemis.domain.plagiarism.PlagiarismStatus.DENIED; -import static de.tum.in.www1.artemis.domain.plagiarism.PlagiarismStatus.NONE; -import static de.tum.in.www1.artemis.util.TestResourceUtils.HalfSecond; +import static de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus.CONFIRMED; +import static de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus.DENIED; +import static de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus.NONE; +import static de.tum.cit.aet.artemis.util.TestResourceUtils.HalfSecond; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -34,55 +34,55 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.competency.CompetencyUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ExampleSubmission; -import de.tum.in.www1.artemis.domain.Feedback; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.GradingInstruction; -import de.tum.in.www1.artemis.domain.Result; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.TeamAssignmentConfig; -import de.tum.in.www1.artemis.domain.TextBlock; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.competency.Competency; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.DifficultyLevel; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismStatus; -import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult; -import de.tum.in.www1.artemis.domain.plagiarism.text.TextSubmissionElement; -import de.tum.in.www1.artemis.exam.ExamUtilService; -import de.tum.in.www1.artemis.exercise.GradingCriterionUtil; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.plagiarism.PlagiarismUtilService; -import de.tum.in.www1.artemis.repository.ExampleSubmissionRepository; -import de.tum.in.www1.artemis.repository.FeedbackRepository; -import de.tum.in.www1.artemis.repository.GradingCriterionRepository; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.repository.TextExerciseRepository; -import de.tum.in.www1.artemis.repository.TextSubmissionRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismComparisonRepository; -import de.tum.in.www1.artemis.util.ExerciseIntegrationTestService; -import de.tum.in.www1.artemis.util.InvalidExamExerciseDatesArgumentProvider; -import de.tum.in.www1.artemis.util.InvalidExamExerciseDatesArgumentProvider.InvalidExamExerciseDateConfiguration; -import de.tum.in.www1.artemis.util.PageableSearchUtilService; -import de.tum.in.www1.artemis.web.rest.dto.CourseForDashboardDTO; -import de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismComparisonStatusDTO; -import de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.competency.CompetencyUtilService; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.domain.GradingInstruction; +import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.TeamAssignmentConfig; +import de.tum.cit.aet.artemis.domain.TextBlock; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.competency.Competency; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus; +import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; +import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.plagiarism.PlagiarismUtilService; +import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.util.ExerciseIntegrationTestService; +import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider; +import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider.InvalidExamExerciseDateConfiguration; +import de.tum.cit.aet.artemis.util.PageableSearchUtilService; +import de.tum.cit.aet.artemis.web.rest.dto.CourseForDashboardDTO; +import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismComparisonStatusDTO; +import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; class TextExerciseIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/text/TextSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/text/TextSubmissionIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java index 627a5f4de61b..7b9bb40e9632 100644 --- a/src/test/java/de/tum/in/www1/artemis/text/TextSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.text; +package de.tum.cit.aet.artemis.text; -import static de.tum.in.www1.artemis.util.TestResourceUtils.HalfSecond; +import static de.tum.cit.aet.artemis.util.TestResourceUtils.HalfSecond; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.within; @@ -18,38 +18,38 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.SubmissionVersion; -import de.tum.in.www1.artemis.domain.Team; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.TextSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; -import de.tum.in.www1.artemis.domain.enumeration.ExerciseMode; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingSubmissionElement; -import de.tum.in.www1.artemis.domain.plagiarism.text.TextSubmissionElement; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.StudentParticipationRepository; -import de.tum.in.www1.artemis.repository.SubmissionVersionRepository; -import de.tum.in.www1.artemis.repository.TeamRepository; -import de.tum.in.www1.artemis.repository.TextSubmissionRepository; -import de.tum.in.www1.artemis.repository.metis.PostRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismComparisonRepository; -import de.tum.in.www1.artemis.web.rest.dto.ExerciseDetailsDTO; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.SubmissionVersion; +import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; +import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingSubmissionElement; +import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.SubmissionVersionRepository; +import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.repository.metis.PostRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.web.rest.dto.ExerciseDetailsDTO; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; class TextSubmissionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/theia/TheiaInfoContributorTest.java b/src/test/java/de/tum/cit/aet/artemis/theia/TheiaInfoContributorTest.java similarity index 78% rename from src/test/java/de/tum/in/www1/artemis/theia/TheiaInfoContributorTest.java rename to src/test/java/de/tum/cit/aet/artemis/theia/TheiaInfoContributorTest.java index 8b3b6738b219..547c22b342d2 100644 --- a/src/test/java/de/tum/in/www1/artemis/theia/TheiaInfoContributorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/theia/TheiaInfoContributorTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.theia; +package de.tum.cit.aet.artemis.theia; -import static de.tum.in.www1.artemis.config.Constants.PROFILE_THEIA; +import static de.tum.cit.aet.artemis.config.Constants.PROFILE_THEIA; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; @@ -8,8 +8,8 @@ import org.springframework.boot.actuate.info.Info; import org.springframework.context.annotation.Profile; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.service.theia.TheiaInfoContributor; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.service.theia.TheiaInfoContributor; @Profile(PROFILE_THEIA) class TheiaInfoContributorTest { diff --git a/src/test/java/de/tum/in/www1/artemis/tutorialgroups/AbstractTutorialGroupIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/AbstractTutorialGroupIntegrationTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/tutorialgroups/AbstractTutorialGroupIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/tutorialgroups/AbstractTutorialGroupIntegrationTest.java index 61e55efa801a..203a38adcfbc 100644 --- a/src/test/java/de/tum/in/www1/artemis/tutorialgroups/AbstractTutorialGroupIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/AbstractTutorialGroupIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroups; -import static de.tum.in.www1.artemis.tutorialgroups.AbstractTutorialGroupIntegrationTest.RandomTutorialGroupGenerator.generateRandomTitle; +import static de.tum.cit.aet.artemis.tutorialgroups.AbstractTutorialGroupIntegrationTest.RandomTutorialGroupGenerator.generateRandomTitle; import static org.assertj.core.api.Assertions.assertThat; import java.time.LocalDate; @@ -21,33 +21,33 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.in.www1.artemis.course.CourseTestService; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.enumeration.TutorialGroupSessionStatus; -import de.tum.in.www1.artemis.domain.metis.ConversationParticipant; -import de.tum.in.www1.artemis.domain.metis.conversation.Channel; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupRegistration; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupSchedule; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupSession; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupFreePeriodRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupNotificationRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupRegistrationRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupScheduleRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupSessionRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupsConfigurationRepository; -import de.tum.in.www1.artemis.service.tutorialgroups.TutorialGroupChannelManagementService; -import de.tum.in.www1.artemis.service.tutorialgroups.TutorialGroupService; -import de.tum.in.www1.artemis.user.UserUtilService; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.course.CourseTestService; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; +import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; +import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupRegistration; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSchedule; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupFreePeriodRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupNotificationRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRegistrationRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupScheduleRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupSessionRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupsConfigurationRepository; +import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupChannelManagementService; +import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupService; +import de.tum.cit.aet.artemis.user.UserUtilService; /** * Contains useful methods for testing the tutorial groups feature. diff --git a/src/test/java/de/tum/in/www1/artemis/tutorialgroups/TutorialGroupFactory.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFactory.java similarity index 93% rename from src/test/java/de/tum/in/www1/artemis/tutorialgroups/TutorialGroupFactory.java rename to src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFactory.java index 7a9ecbcd482f..2d7e996bbcce 100644 --- a/src/test/java/de/tum/in/www1/artemis/tutorialgroups/TutorialGroupFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFactory.java @@ -1,10 +1,10 @@ -package de.tum.in.www1.artemis.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroups; import java.time.LocalDate; import java.time.format.DateTimeFormatter; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; /** * Factory for creating TutorialGroups and related objects. diff --git a/src/test/java/de/tum/in/www1/artemis/tutorialgroups/TutorialGroupFreePeriodIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFreePeriodIntegrationTest.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/tutorialgroups/TutorialGroupFreePeriodIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFreePeriodIntegrationTest.java index eb8e9348e28a..cc8f17a69399 100644 --- a/src/test/java/de/tum/in/www1/artemis/tutorialgroups/TutorialGroupFreePeriodIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFreePeriodIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroups; -import static de.tum.in.www1.artemis.tutorialgroups.AbstractTutorialGroupIntegrationTest.RandomTutorialGroupGenerator.generateRandomTitle; +import static de.tum.cit.aet.artemis.tutorialgroups.AbstractTutorialGroupIntegrationTest.RandomTutorialGroupGenerator.generateRandomTitle; import static org.assertj.core.api.Assertions.assertThat; import java.time.LocalDateTime; @@ -16,12 +16,12 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.web.client.HttpClientErrorException; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupSession; -import de.tum.in.www1.artemis.user.UserFactory; -import de.tum.in.www1.artemis.web.rest.dto.TutorialGroupFreePeriodDTO; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; +import de.tum.cit.aet.artemis.user.UserFactory; +import de.tum.cit.aet.artemis.web.rest.dto.TutorialGroupFreePeriodDTO; class TutorialGroupFreePeriodIntegrationTest extends AbstractTutorialGroupIntegrationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/tutorialgroups/TutorialGroupIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/tutorialgroups/TutorialGroupIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java index a8f8938e4067..b92322f2f360 100644 --- a/src/test/java/de/tum/in/www1/artemis/tutorialgroups/TutorialGroupIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java @@ -1,7 +1,7 @@ -package de.tum.in.www1.artemis.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroups; -import static de.tum.in.www1.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType.INSTRUCTOR_REGISTRATION; -import static de.tum.in.www1.artemis.tutorialgroups.AbstractTutorialGroupIntegrationTest.RandomTutorialGroupGenerator.generateRandomTitle; +import static de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType.INSTRUCTOR_REGISTRATION; +import static de.tum.cit.aet.artemis.tutorialgroups.AbstractTutorialGroupIntegrationTest.RandomTutorialGroupGenerator.generateRandomTitle; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; import static org.mockito.ArgumentMatchers.any; @@ -31,20 +31,20 @@ import com.google.common.collect.ImmutableSet; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.DisplayPriority; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; -import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupRegistration; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupSession; -import de.tum.in.www1.artemis.post.ConversationUtilService; -import de.tum.in.www1.artemis.repository.metis.PostRepository; -import de.tum.in.www1.artemis.service.dto.StudentDTO; -import de.tum.in.www1.artemis.user.UserFactory; -import de.tum.in.www1.artemis.web.rest.tutorialgroups.TutorialGroupResource; -import de.tum.in.www1.artemis.web.rest.tutorialgroups.TutorialGroupResource.TutorialGroupRegistrationImportDTO; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; +import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupRegistration; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; +import de.tum.cit.aet.artemis.post.ConversationUtilService; +import de.tum.cit.aet.artemis.repository.metis.PostRepository; +import de.tum.cit.aet.artemis.service.dto.StudentDTO; +import de.tum.cit.aet.artemis.user.UserFactory; +import de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupResource; +import de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupResource.TutorialGroupRegistrationImportDTO; class TutorialGroupIntegrationTest extends AbstractTutorialGroupIntegrationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/tutorialgroups/TutorialGroupScheduleIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupScheduleIntegrationTest.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/tutorialgroups/TutorialGroupScheduleIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupScheduleIntegrationTest.java index 9a00717e7a9c..9c91307bba1f 100644 --- a/src/test/java/de/tum/in/www1/artemis/tutorialgroups/TutorialGroupScheduleIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupScheduleIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroups; import static org.assertj.core.api.Assertions.assertThat; @@ -10,9 +10,9 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.in.www1.artemis.web.rest.tutorialgroups.TutorialGroupResource; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupResource; class TutorialGroupScheduleIntegrationTest extends AbstractTutorialGroupIntegrationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/tutorialgroups/TutorialGroupSessionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupSessionIntegrationTest.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/tutorialgroups/TutorialGroupSessionIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupSessionIntegrationTest.java index b669fe06de81..6f676ac0d85c 100644 --- a/src/test/java/de/tum/in/www1/artemis/tutorialgroups/TutorialGroupSessionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupSessionIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroups; -import static de.tum.in.www1.artemis.tutorialgroups.AbstractTutorialGroupIntegrationTest.RandomTutorialGroupGenerator.generateRandomTitle; +import static de.tum.cit.aet.artemis.tutorialgroups.AbstractTutorialGroupIntegrationTest.RandomTutorialGroupGenerator.generateRandomTitle; import static org.assertj.core.api.Assertions.assertThat; import java.time.LocalDate; @@ -14,11 +14,11 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.enumeration.TutorialGroupSessionStatus; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupSession; -import de.tum.in.www1.artemis.web.rest.tutorialgroups.TutorialGroupSessionResource; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; +import de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupSessionResource; class TutorialGroupSessionIntegrationTest extends AbstractTutorialGroupIntegrationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/tutorialgroups/TutorialGroupUtilService.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupUtilService.java similarity index 88% rename from src/test/java/de/tum/in/www1/artemis/tutorialgroups/TutorialGroupUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupUtilService.java index 67c15316b16f..e93a518c8a2c 100644 --- a/src/test/java/de/tum/in/www1/artemis/tutorialgroups/TutorialGroupUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupUtilService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroups; -import static de.tum.in.www1.artemis.web.rest.util.DateUtil.interpretInTimeZone; +import static de.tum.cit.aet.artemis.web.rest.util.DateUtil.interpretInTimeZone; import static org.assertj.core.api.Assertions.assertThat; import java.time.LocalDate; @@ -14,22 +14,22 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.course.CourseFactory; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.TutorialGroupSessionStatus; -import de.tum.in.www1.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupRegistration; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupSession; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupFreePeriodRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupRegistrationRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupSessionRepository; -import de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupsConfigurationRepository; +import de.tum.cit.aet.artemis.course.CourseFactory; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; +import de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupRegistration; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupFreePeriodRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRegistrationRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupSessionRepository; +import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupsConfigurationRepository; /** * Service responsible for initializing the database with specific testdata related to tutorial groups for use in integration tests. diff --git a/src/test/java/de/tum/in/www1/artemis/tutorialgroups/TutorialGroupsConfigurationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupsConfigurationIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/tutorialgroups/TutorialGroupsConfigurationIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupsConfigurationIntegrationTest.java index 12ae54a2c204..b4c5860a59e3 100644 --- a/src/test/java/de/tum/in/www1/artemis/tutorialgroups/TutorialGroupsConfigurationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupsConfigurationIntegrationTest.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroups; -import static de.tum.in.www1.artemis.tutorialgroups.AbstractTutorialGroupIntegrationTest.RandomTutorialGroupGenerator.generateRandomTitle; +import static de.tum.cit.aet.artemis.tutorialgroups.AbstractTutorialGroupIntegrationTest.RandomTutorialGroupGenerator.generateRandomTitle; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -15,13 +15,13 @@ import org.springframework.security.test.context.TestSecurityContextHolder; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.enumeration.Language; -import de.tum.in.www1.artemis.domain.enumeration.TutorialGroupSessionStatus; -import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; -import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory; -import de.tum.in.www1.artemis.user.UserFactory; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; +import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; +import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.user.UserFactory; class TutorialGroupsConfigurationIntegrationTest extends AbstractTutorialGroupIntegrationTest { diff --git a/src/test/java/de/tum/in/www1/artemis/uri/RepositoryUriTest.java b/src/test/java/de/tum/cit/aet/artemis/uri/RepositoryUriTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/uri/RepositoryUriTest.java rename to src/test/java/de/tum/cit/aet/artemis/uri/RepositoryUriTest.java index f7828846a85e..d60e6c7c4c58 100644 --- a/src/test/java/de/tum/in/www1/artemis/uri/RepositoryUriTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/uri/RepositoryUriTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.uri; +package de.tum.cit.aet.artemis.uri; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; @@ -15,9 +15,9 @@ import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.exception.localvc.LocalVCInternalException; -import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCRepositoryUri; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.exception.localvc.LocalVCInternalException; +import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; class RepositoryUriTest { diff --git a/src/test/java/de/tum/in/www1/artemis/user/AccountResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/user/AccountResourceIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java index db9b9f119906..bfbd86b7435b 100644 --- a/src/test/java/de/tum/in/www1/artemis/user/AccountResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.user; +package de.tum.cit.aet.artemis.user; import static org.assertj.core.api.Assertions.assertThat; @@ -13,18 +13,18 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.service.AccountService; -import de.tum.in.www1.artemis.service.dto.PasswordChangeDTO; -import de.tum.in.www1.artemis.service.dto.UserDTO; -import de.tum.in.www1.artemis.service.user.PasswordService; -import de.tum.in.www1.artemis.util.ConfigUtil; -import de.tum.in.www1.artemis.web.rest.AccountResource; -import de.tum.in.www1.artemis.web.rest.open.PublicAccountResource; -import de.tum.in.www1.artemis.web.rest.vm.KeyAndPasswordVM; -import de.tum.in.www1.artemis.web.rest.vm.ManagedUserVM; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.service.AccountService; +import de.tum.cit.aet.artemis.service.dto.PasswordChangeDTO; +import de.tum.cit.aet.artemis.service.dto.UserDTO; +import de.tum.cit.aet.artemis.service.user.PasswordService; +import de.tum.cit.aet.artemis.util.ConfigUtil; +import de.tum.cit.aet.artemis.web.rest.AccountResource; +import de.tum.cit.aet.artemis.web.rest.open.PublicAccountResource; +import de.tum.cit.aet.artemis.web.rest.vm.KeyAndPasswordVM; +import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; /** * Tests {@link AccountResource}. Several Tests rely on overwriting AccountResource.registrationEnabled and other attributes with reflections. Any changes to the internal diff --git a/src/test/java/de/tum/in/www1/artemis/user/AccountResourceWithGitLabIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceWithGitLabIntegrationTest.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/user/AccountResourceWithGitLabIntegrationTest.java rename to src/test/java/de/tum/cit/aet/artemis/user/AccountResourceWithGitLabIntegrationTest.java index df7213536d61..ad7efeb0bc45 100644 --- a/src/test/java/de/tum/in/www1/artemis/user/AccountResourceWithGitLabIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceWithGitLabIntegrationTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.user; +package de.tum.cit.aet.artemis.user; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.anyLong; @@ -18,10 +18,10 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.connector.GitlabRequestMockProvider; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.web.rest.vm.ManagedUserVM; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.connector.GitlabRequestMockProvider; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; class AccountResourceWithGitLabIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/in/www1/artemis/user/UserFactory.java b/src/test/java/de/tum/cit/aet/artemis/user/UserFactory.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/user/UserFactory.java rename to src/test/java/de/tum/cit/aet/artemis/user/UserFactory.java index 384cb73ddcb8..a39183aec2e4 100644 --- a/src/test/java/de/tum/in/www1/artemis/user/UserFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/UserFactory.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.user; +package de.tum.cit.aet.artemis.user; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -6,9 +6,9 @@ import java.util.List; import java.util.Set; -import de.tum.in.www1.artemis.domain.Authority; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.service.dto.StudentDTO; +import de.tum.cit.aet.artemis.domain.Authority; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.service.dto.StudentDTO; /** * Factory for creating Users and related objects. diff --git a/src/test/java/de/tum/in/www1/artemis/user/UserTestService.java b/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/user/UserTestService.java rename to src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java index c1f5161a58d4..f8d6d3916f14 100644 --- a/src/test/java/de/tum/in/www1/artemis/user/UserTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.user; +package de.tum.cit.aet.artemis.user; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -27,34 +27,34 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.springframework.util.LinkedMultiValueMap; -import de.tum.in.www1.artemis.config.Constants; -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Authority; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.domain.science.ScienceEvent; -import de.tum.in.www1.artemis.domain.science.ScienceEventType; -import de.tum.in.www1.artemis.exercise.programming.MockDelegate; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.repository.AuthorityRepository; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.ParticipationRepository; -import de.tum.in.www1.artemis.repository.ParticipationVCSAccessTokenRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.science.ScienceEventRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.service.connectors.ci.CIUserManagementService; -import de.tum.in.www1.artemis.service.connectors.lti.LtiService; -import de.tum.in.www1.artemis.service.connectors.vcs.VcsUserManagementService; -import de.tum.in.www1.artemis.service.dto.UserDTO; -import de.tum.in.www1.artemis.service.dto.UserInitializationDTO; -import de.tum.in.www1.artemis.service.user.PasswordService; -import de.tum.in.www1.artemis.util.RequestUtilService; -import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.in.www1.artemis.web.rest.vm.ManagedUserVM; +import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.domain.Authority; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.domain.science.ScienceEvent; +import de.tum.cit.aet.artemis.domain.science.ScienceEventType; +import de.tum.cit.aet.artemis.exercise.programming.MockDelegate; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.repository.AuthorityRepository; +import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.repository.ParticipationVCSAccessTokenRepository; +import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.science.ScienceEventRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; +import de.tum.cit.aet.artemis.service.connectors.lti.LtiService; +import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; +import de.tum.cit.aet.artemis.service.dto.UserDTO; +import de.tum.cit.aet.artemis.service.dto.UserInitializationDTO; +import de.tum.cit.aet.artemis.service.user.PasswordService; +import de.tum.cit.aet.artemis.util.RequestUtilService; +import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; /** * Note: this class should be independent of the actual VCS and CIS and contains common test logic for scenarios: diff --git a/src/test/java/de/tum/in/www1/artemis/user/UserUtilService.java b/src/test/java/de/tum/cit/aet/artemis/user/UserUtilService.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/user/UserUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/user/UserUtilService.java index a55828288a85..d67449b16a35 100644 --- a/src/test/java/de/tum/in/www1/artemis/user/UserUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/UserUtilService.java @@ -1,6 +1,6 @@ -package de.tum.in.www1.artemis.user; +package de.tum.cit.aet.artemis.user; -import static de.tum.in.www1.artemis.user.UserFactory.USER_PASSWORD; +import static de.tum.cit.aet.artemis.user.UserFactory.USER_PASSWORD; import static org.assertj.core.api.Assertions.assertThat; import java.time.ZonedDateTime; @@ -20,13 +20,13 @@ import org.springframework.security.test.context.TestSecurityContextHolder; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.Authority; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.repository.AuthorityRepository; -import de.tum.in.www1.artemis.repository.UserRepository; -import de.tum.in.www1.artemis.repository.UserTestRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.service.user.PasswordService; +import de.tum.cit.aet.artemis.domain.Authority; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.repository.AuthorityRepository; +import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.repository.UserTestRepository; +import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.service.user.PasswordService; /** * Service responsible for initializing the database with specific testdata related to Users for use in integration tests. diff --git a/src/test/java/de/tum/in/www1/artemis/util/ConfigUtil.java b/src/test/java/de/tum/cit/aet/artemis/util/ConfigUtil.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/util/ConfigUtil.java rename to src/test/java/de/tum/cit/aet/artemis/util/ConfigUtil.java index c965d5ba1ebf..d7482faf4925 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/ConfigUtil.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/ConfigUtil.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.util; +package de.tum.cit.aet.artemis.util; import org.junit.jupiter.api.function.Executable; import org.springframework.test.util.ReflectionTestUtils; diff --git a/src/test/java/de/tum/in/www1/artemis/util/ExamPrepareExercisesTestUtil.java b/src/test/java/de/tum/cit/aet/artemis/util/ExamPrepareExercisesTestUtil.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/util/ExamPrepareExercisesTestUtil.java rename to src/test/java/de/tum/cit/aet/artemis/util/ExamPrepareExercisesTestUtil.java index d04ba17004a5..e375d877e485 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/ExamPrepareExercisesTestUtil.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/ExamPrepareExercisesTestUtil.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.util; +package de.tum.cit.aet.artemis.util; import static org.assertj.core.api.Assertions.fail; @@ -6,9 +6,9 @@ import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.service.util.ExamExerciseStartPreparationStatus; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.service.util.ExamExerciseStartPreparationStatus; public class ExamPrepareExercisesTestUtil { diff --git a/src/test/java/de/tum/in/www1/artemis/util/ExerciseIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/util/ExerciseIntegrationTestService.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/util/ExerciseIntegrationTestService.java rename to src/test/java/de/tum/cit/aet/artemis/util/ExerciseIntegrationTestService.java index 5501459b44ec..01c699be84d9 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/ExerciseIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/ExerciseIntegrationTestService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.util; +package de.tum.cit.aet.artemis.util; import static org.assertj.core.api.Assertions.assertThat; @@ -10,10 +10,10 @@ import org.springframework.stereotype.Service; import org.springframework.util.MultiValueMap; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.enumeration.SortingOrder; -import de.tum.in.www1.artemis.web.rest.util.PageUtil; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; +import de.tum.cit.aet.artemis.web.rest.util.PageUtil; /** * Service responsible for util methods / shared code that is helpful or common for testing all exercise types diff --git a/src/test/java/de/tum/in/www1/artemis/util/FixMissingServletPathProcessor.java b/src/test/java/de/tum/cit/aet/artemis/util/FixMissingServletPathProcessor.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/util/FixMissingServletPathProcessor.java rename to src/test/java/de/tum/cit/aet/artemis/util/FixMissingServletPathProcessor.java index 3cf5201ea86b..d5b9521e7467 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/FixMissingServletPathProcessor.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/FixMissingServletPathProcessor.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.util; +package de.tum.cit.aet.artemis.util; import jakarta.servlet.http.HttpServletMapping; import jakarta.servlet.http.MappingMatch; @@ -8,7 +8,7 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.test.web.servlet.request.RequestPostProcessor; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; /** * The {@link WebEnvironment} set for example in {@link AbstractSpringIntegrationLocalCILocalVCTest} causes the MockMvc to not set the servlet path correctly. diff --git a/src/test/java/de/tum/in/www1/artemis/util/GitUtilService.java b/src/test/java/de/tum/cit/aet/artemis/util/GitUtilService.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/util/GitUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/util/GitUtilService.java index 754236901671..eccbc6670cfc 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/GitUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/GitUtilService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.util; +package de.tum.cit.aet.artemis.util; import static org.assertj.core.api.Fail.fail; @@ -22,17 +22,17 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.course.CourseFactory; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.VcsRepositoryUri; -import de.tum.in.www1.artemis.domain.enumeration.InitializationState; -import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.course.CourseFactory; +import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.service.connectors.GitService; @Service public class GitUtilService { diff --git a/src/test/java/de/tum/in/www1/artemis/util/HestiaUtilTestService.java b/src/test/java/de/tum/cit/aet/artemis/util/HestiaUtilTestService.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/util/HestiaUtilTestService.java rename to src/test/java/de/tum/cit/aet/artemis/util/HestiaUtilTestService.java index ac3640e5324b..7a794aad4f0d 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/HestiaUtilTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/HestiaUtilTestService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.util; +package de.tum.cit.aet.artemis.util; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; @@ -18,20 +18,20 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.ProgrammingSubmission; -import de.tum.in.www1.artemis.domain.Repository; -import de.tum.in.www1.artemis.domain.enumeration.SubmissionType; -import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.in.www1.artemis.participation.ParticipationFactory; -import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; -import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.in.www1.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.repository.TemplateProgrammingExerciseParticipationRepository; -import de.tum.in.www1.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.service.connectors.GitService; /** * Utility service specifically used for testing Hestia related functionality. diff --git a/src/test/java/de/tum/in/www1/artemis/util/HibernateQueryInterceptor.java b/src/test/java/de/tum/cit/aet/artemis/util/HibernateQueryInterceptor.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/util/HibernateQueryInterceptor.java rename to src/test/java/de/tum/cit/aet/artemis/util/HibernateQueryInterceptor.java index bce9a74f092f..786af7bc04e7 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/HibernateQueryInterceptor.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/HibernateQueryInterceptor.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.util; +package de.tum.cit.aet.artemis.util; import org.hibernate.resource.jdbc.spi.StatementInspector; import org.springframework.stereotype.Component; diff --git a/src/test/java/de/tum/in/www1/artemis/util/InvalidExamExerciseDatesArgumentProvider.java b/src/test/java/de/tum/cit/aet/artemis/util/InvalidExamExerciseDatesArgumentProvider.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/util/InvalidExamExerciseDatesArgumentProvider.java rename to src/test/java/de/tum/cit/aet/artemis/util/InvalidExamExerciseDatesArgumentProvider.java index fd3d44cd2cb7..a1d8d9ade4d0 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/InvalidExamExerciseDatesArgumentProvider.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/InvalidExamExerciseDatesArgumentProvider.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.util; +package de.tum.cit.aet.artemis.util; import java.time.ZonedDateTime; import java.util.stream.Stream; @@ -8,7 +8,7 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.ArgumentsProvider; -import de.tum.in.www1.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Exercise; /** * Provides arguments in form of a for parameterized JUnit 5 tests (see {@link ParameterizedTest}) that are not a valid date configuration for exam exercises. diff --git a/src/test/java/de/tum/in/www1/artemis/util/InvalidExerciseConfiguration.java b/src/test/java/de/tum/cit/aet/artemis/util/InvalidExerciseConfiguration.java similarity index 92% rename from src/test/java/de/tum/in/www1/artemis/util/InvalidExerciseConfiguration.java rename to src/test/java/de/tum/cit/aet/artemis/util/InvalidExerciseConfiguration.java index 282b2cdf9df7..233716f58be0 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/InvalidExerciseConfiguration.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/InvalidExerciseConfiguration.java @@ -1,8 +1,8 @@ -package de.tum.in.www1.artemis.util; +package de.tum.cit.aet.artemis.util; import org.springframework.http.HttpStatus; -import de.tum.in.www1.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.Exercise; /** * Represents an invalid exercise configuration that can be {@linkplain #applyTo(Exercise) applied} to any given exercise of type E. diff --git a/src/test/java/de/tum/in/www1/artemis/util/LocalRepository.java b/src/test/java/de/tum/cit/aet/artemis/util/LocalRepository.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/util/LocalRepository.java rename to src/test/java/de/tum/cit/aet/artemis/util/LocalRepository.java index b31f7bb7f36b..604fff6658fa 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/LocalRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/LocalRepository.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.util; +package de.tum.cit.aet.artemis.util; import java.io.File; import java.io.IOException; @@ -17,7 +17,7 @@ import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.transport.URIish; -import de.tum.in.www1.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.service.connectors.GitService; /** * This class describes a local repository cloned from an origin repository. diff --git a/src/test/java/de/tum/in/www1/artemis/util/PageableSearchUtilService.java b/src/test/java/de/tum/cit/aet/artemis/util/PageableSearchUtilService.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/util/PageableSearchUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/util/PageableSearchUtilService.java index 39065744e6cb..3fda3116918c 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/PageableSearchUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/PageableSearchUtilService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.util; +package de.tum.cit.aet.artemis.util; import java.util.Map; @@ -8,10 +8,10 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.domain.enumeration.SortingOrder; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.CompetencyPageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.PageableSearchDTO; -import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.CompetencyPageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.PageableSearchDTO; +import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; /** * Service responsible for initializing the database with specific testdata related to searches for use in integration tests. diff --git a/src/test/java/de/tum/in/www1/artemis/util/QueryCountAssert.java b/src/test/java/de/tum/cit/aet/artemis/util/QueryCountAssert.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/util/QueryCountAssert.java rename to src/test/java/de/tum/cit/aet/artemis/util/QueryCountAssert.java index e9633face05b..7d76859cf1f5 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/QueryCountAssert.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/QueryCountAssert.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.util; +package de.tum.cit.aet.artemis.util; import org.assertj.core.api.AbstractAssert; import org.slf4j.Logger; diff --git a/src/test/java/de/tum/in/www1/artemis/util/RequestUtilService.java b/src/test/java/de/tum/cit/aet/artemis/util/RequestUtilService.java similarity index 99% rename from src/test/java/de/tum/in/www1/artemis/util/RequestUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/util/RequestUtilService.java index 4707ce1383ae..4be757c8b41e 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/RequestUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/RequestUtilService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.util; +package de.tum.cit.aet.artemis.util; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.forwardedUrl; @@ -45,7 +45,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; @Service public class RequestUtilService { diff --git a/src/test/java/de/tum/in/www1/artemis/util/SensitiveInformationUtil.java b/src/test/java/de/tum/cit/aet/artemis/util/SensitiveInformationUtil.java similarity index 86% rename from src/test/java/de/tum/in/www1/artemis/util/SensitiveInformationUtil.java rename to src/test/java/de/tum/cit/aet/artemis/util/SensitiveInformationUtil.java index 7f3bf58f9065..836f4dcb8e04 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/SensitiveInformationUtil.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/SensitiveInformationUtil.java @@ -1,12 +1,12 @@ -package de.tum.in.www1.artemis.util; +package de.tum.cit.aet.artemis.util; import static org.assertj.core.api.Assertions.assertThat; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.FileUploadExercise; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.TextExercise; -import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; public class SensitiveInformationUtil { diff --git a/src/test/java/de/tum/in/www1/artemis/util/TestConstants.java b/src/test/java/de/tum/cit/aet/artemis/util/TestConstants.java similarity index 89% rename from src/test/java/de/tum/in/www1/artemis/util/TestConstants.java rename to src/test/java/de/tum/cit/aet/artemis/util/TestConstants.java index a401a1426468..33d7d025df9d 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/TestConstants.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/TestConstants.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.util; +package de.tum.cit.aet.artemis.util; import org.eclipse.jgit.lib.ObjectId; diff --git a/src/test/java/de/tum/in/www1/artemis/util/TestResourceUtils.java b/src/test/java/de/tum/cit/aet/artemis/util/TestResourceUtils.java similarity index 96% rename from src/test/java/de/tum/in/www1/artemis/util/TestResourceUtils.java rename to src/test/java/de/tum/cit/aet/artemis/util/TestResourceUtils.java index 876044e9924a..96b55bdb54c1 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/TestResourceUtils.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/TestResourceUtils.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.util; +package de.tum.cit.aet.artemis.util; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.within; diff --git a/src/test/java/de/tum/in/www1/artemis/util/TestUriParamsUtil.java b/src/test/java/de/tum/cit/aet/artemis/util/TestUriParamsUtil.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/util/TestUriParamsUtil.java rename to src/test/java/de/tum/cit/aet/artemis/util/TestUriParamsUtil.java index aa17cc982705..ae5a416b28f7 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/TestUriParamsUtil.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/TestUriParamsUtil.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.util; +package de.tum.cit.aet.artemis.util; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/de/tum/in/www1/artemis/util/ThrowingProducer.java b/src/test/java/de/tum/cit/aet/artemis/util/ThrowingProducer.java similarity index 74% rename from src/test/java/de/tum/in/www1/artemis/util/ThrowingProducer.java rename to src/test/java/de/tum/cit/aet/artemis/util/ThrowingProducer.java index d91d7446da08..5441a0afbc72 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/ThrowingProducer.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/ThrowingProducer.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.util; +package de.tum.cit.aet.artemis.util; @FunctionalInterface public interface ThrowingProducer { diff --git a/src/test/java/de/tum/in/www1/artemis/util/Verifiable.java b/src/test/java/de/tum/cit/aet/artemis/util/Verifiable.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/util/Verifiable.java rename to src/test/java/de/tum/cit/aet/artemis/util/Verifiable.java index 3a1ada2658a5..284aae3c34fa 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/Verifiable.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/Verifiable.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.util; +package de.tum.cit.aet.artemis.util; /** * Wrapper interface for bundling multiple {@link org.mockito.Mockito} verifications for execution after all tests ran. diff --git a/src/test/java/de/tum/in/www1/artemis/util/ZipFileTestUtilService.java b/src/test/java/de/tum/cit/aet/artemis/util/ZipFileTestUtilService.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/util/ZipFileTestUtilService.java rename to src/test/java/de/tum/cit/aet/artemis/util/ZipFileTestUtilService.java index 72b491da59b5..22b81aa17be2 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/ZipFileTestUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/ZipFileTestUtilService.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.util; +package de.tum.cit.aet.artemis.util; import static org.assertj.core.api.Assertions.fail; diff --git a/src/test/java/de/tum/in/www1/artemis/util/classpath/ClassNode.java b/src/test/java/de/tum/cit/aet/artemis/util/classpath/ClassNode.java similarity index 97% rename from src/test/java/de/tum/in/www1/artemis/util/classpath/ClassNode.java rename to src/test/java/de/tum/cit/aet/artemis/util/classpath/ClassNode.java index 0fdfd7598531..26179c778511 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/classpath/ClassNode.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/classpath/ClassNode.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.util.classpath; +package de.tum.cit.aet.artemis.util.classpath; import java.util.Objects; import java.util.function.Function; diff --git a/src/test/java/de/tum/in/www1/artemis/util/classpath/ClassPathNode.java b/src/test/java/de/tum/cit/aet/artemis/util/classpath/ClassPathNode.java similarity index 99% rename from src/test/java/de/tum/in/www1/artemis/util/classpath/ClassPathNode.java rename to src/test/java/de/tum/cit/aet/artemis/util/classpath/ClassPathNode.java index ec14ea5682f7..4f41a71a24a2 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/classpath/ClassPathNode.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/classpath/ClassPathNode.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.util.classpath; +package de.tum.cit.aet.artemis.util.classpath; import java.util.Iterator; import java.util.Objects; diff --git a/src/test/java/de/tum/in/www1/artemis/util/classpath/ClassPathUtil.java b/src/test/java/de/tum/cit/aet/artemis/util/classpath/ClassPathUtil.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/util/classpath/ClassPathUtil.java rename to src/test/java/de/tum/cit/aet/artemis/util/classpath/ClassPathUtil.java index 7c55409a75ce..163ef0d8a947 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/classpath/ClassPathUtil.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/classpath/ClassPathUtil.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.util.classpath; +package de.tum.cit.aet.artemis.util.classpath; import java.util.List; diff --git a/src/test/java/de/tum/in/www1/artemis/util/classpath/PackageNode.java b/src/test/java/de/tum/cit/aet/artemis/util/classpath/PackageNode.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/util/classpath/PackageNode.java rename to src/test/java/de/tum/cit/aet/artemis/util/classpath/PackageNode.java index 24f1aac2db79..43b4fa0ba77a 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/classpath/PackageNode.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/classpath/PackageNode.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.util.classpath; +package de.tum.cit.aet.artemis.util.classpath; import java.util.Collection; import java.util.Collections; diff --git a/src/test/java/de/tum/in/www1/artemis/util/classpath/RootNode.java b/src/test/java/de/tum/cit/aet/artemis/util/classpath/RootNode.java similarity index 98% rename from src/test/java/de/tum/in/www1/artemis/util/classpath/RootNode.java rename to src/test/java/de/tum/cit/aet/artemis/util/classpath/RootNode.java index 077b90ece19b..8240255519f5 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/classpath/RootNode.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/classpath/RootNode.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.util.classpath; +package de.tum.cit.aet.artemis.util.classpath; import java.util.Collection; import java.util.List; diff --git a/src/test/java/de/tum/in/www1/artemis/util/junit_extensions/AwaitilityExtension.java b/src/test/java/de/tum/cit/aet/artemis/util/junit_extensions/AwaitilityExtension.java similarity index 95% rename from src/test/java/de/tum/in/www1/artemis/util/junit_extensions/AwaitilityExtension.java rename to src/test/java/de/tum/cit/aet/artemis/util/junit_extensions/AwaitilityExtension.java index 0107dce57243..980aa598c260 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/junit_extensions/AwaitilityExtension.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/junit_extensions/AwaitilityExtension.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.util.junit_extensions; +package de.tum.cit.aet.artemis.util.junit_extensions; import java.time.Duration; diff --git a/src/test/java/de/tum/in/www1/artemis/util/junit_extensions/ParallelLoggingExtension.java b/src/test/java/de/tum/cit/aet/artemis/util/junit_extensions/ParallelLoggingExtension.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/util/junit_extensions/ParallelLoggingExtension.java rename to src/test/java/de/tum/cit/aet/artemis/util/junit_extensions/ParallelLoggingExtension.java index 5a5120796019..05675571e49d 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/junit_extensions/ParallelLoggingExtension.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/junit_extensions/ParallelLoggingExtension.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.util.junit_extensions; +package de.tum.cit.aet.artemis.util.junit_extensions; import static org.awaitility.Awaitility.await; @@ -9,7 +9,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tum.in.www1.artemis.util.junit_parallel_logging.ParallelConsoleAppender; +import de.tum.cit.aet.artemis.util.junit_parallel_logging.ParallelConsoleAppender; /** * A JUnit 5 extension that uses {@link ParallelConsoleAppender} to collect logs from parallel test execution. diff --git a/src/test/java/de/tum/in/www1/artemis/util/junit_parallel_logging/ParallelConsoleAppender.java b/src/test/java/de/tum/cit/aet/artemis/util/junit_parallel_logging/ParallelConsoleAppender.java similarity index 94% rename from src/test/java/de/tum/in/www1/artemis/util/junit_parallel_logging/ParallelConsoleAppender.java rename to src/test/java/de/tum/cit/aet/artemis/util/junit_parallel_logging/ParallelConsoleAppender.java index a9838708502f..b92375705526 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/junit_parallel_logging/ParallelConsoleAppender.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/junit_parallel_logging/ParallelConsoleAppender.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.util.junit_parallel_logging; +package de.tum.cit.aet.artemis.util.junit_parallel_logging; import static org.assertj.core.api.Assertions.fail; @@ -10,11 +10,11 @@ import ch.qos.logback.classic.encoder.PatternLayoutEncoder; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.AppenderBase; -import de.tum.in.www1.artemis.AbstractArtemisIntegrationTest; -import de.tum.in.www1.artemis.AbstractSpringIntegrationGitlabCIGitlabSamlTest; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.in.www1.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.AbstractArtemisIntegrationTest; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationGitlabCIGitlabSamlTest; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; /** * This custom appender is used to capture the logs of multiple tests running in parallel. diff --git a/src/test/java/de/tum/in/www1/artemis/util/junit_parallel_logging/ThreadIdConverter.java b/src/test/java/de/tum/cit/aet/artemis/util/junit_parallel_logging/ThreadIdConverter.java similarity index 89% rename from src/test/java/de/tum/in/www1/artemis/util/junit_parallel_logging/ThreadIdConverter.java rename to src/test/java/de/tum/cit/aet/artemis/util/junit_parallel_logging/ThreadIdConverter.java index f39a05622891..2aeb13b52d7c 100644 --- a/src/test/java/de/tum/in/www1/artemis/util/junit_parallel_logging/ThreadIdConverter.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/junit_parallel_logging/ThreadIdConverter.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.util.junit_parallel_logging; +package de.tum.cit.aet.artemis.util.junit_parallel_logging; import ch.qos.logback.classic.pattern.ClassicConverter; import ch.qos.logback.classic.spi.ILoggingEvent; diff --git a/src/test/java/de/tum/in/www1/artemis/web/rest/AndroidAppSiteAssociationResourceTest.java b/src/test/java/de/tum/cit/aet/artemis/web/rest/AndroidAppSiteAssociationResourceTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/web/rest/AndroidAppSiteAssociationResourceTest.java rename to src/test/java/de/tum/cit/aet/artemis/web/rest/AndroidAppSiteAssociationResourceTest.java index f310d95b9803..ca5fe6b157aa 100644 --- a/src/test/java/de/tum/in/www1/artemis/web/rest/AndroidAppSiteAssociationResourceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/web/rest/AndroidAppSiteAssociationResourceTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; import static org.assertj.core.api.Assertions.assertThat; @@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; class AndroidAppSiteAssociationResourceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/web/rest/AppleAppSiteAssociationResourceTest.java b/src/test/java/de/tum/cit/aet/artemis/web/rest/AppleAppSiteAssociationResourceTest.java similarity index 90% rename from src/test/java/de/tum/in/www1/artemis/web/rest/AppleAppSiteAssociationResourceTest.java rename to src/test/java/de/tum/cit/aet/artemis/web/rest/AppleAppSiteAssociationResourceTest.java index fc89211686d4..e01d303eb434 100644 --- a/src/test/java/de/tum/in/www1/artemis/web/rest/AppleAppSiteAssociationResourceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/web/rest/AppleAppSiteAssociationResourceTest.java @@ -1,11 +1,11 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.cit.aet.artemis.web.rest; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; class AppleAppSiteAssociationResourceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/in/www1/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilderTest.java b/src/test/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilderTest.java similarity index 91% rename from src/test/java/de/tum/in/www1/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilderTest.java rename to src/test/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilderTest.java index fd782a3ef16d..3bd46383a02a 100644 --- a/src/test/java/de/tum/in/www1/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilderTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilderTest.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.web.rest.plagiarism; +package de.tum.cit.aet.artemis.web.rest.plagiarism; import static org.assertj.core.api.Assertions.assertThat; @@ -7,10 +7,10 @@ import org.junit.jupiter.api.Test; import org.springframework.http.HttpStatus; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult; -import de.tum.in.www1.artemis.domain.plagiarism.text.TextSubmissionElement; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; +import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; +import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; class PlagiarismResultResponseBuilderTest { diff --git a/src/test/javascript/spec/service/profile.service.spec.ts b/src/test/javascript/spec/service/profile.service.spec.ts index 45d63d7f9482..cdca0124e906 100644 --- a/src/test/javascript/spec/service/profile.service.spec.ts +++ b/src/test/javascript/spec/service/profile.service.spec.ts @@ -63,7 +63,7 @@ describe('ProfileService', () => { name: 'Artemis', time: '2021-05-26T23:13:30.212Z', version: '5.0.0', - group: 'de.tum.in.www1.artemis', + group: 'de.tum.cit.aet.artemis', }, features: ['ProgrammingExercises', 'PlagiarismChecks'], programmingLanguageFeatures: [ diff --git a/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension index 8dfc3c5b68c1..29dc14fdab36 100644 --- a/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension +++ b/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension @@ -1,2 +1,2 @@ -de.tum.in.www1.artemis.util.junit_extensions.AwaitilityExtension -de.tum.in.www1.artemis.util.junit_extensions.ParallelLoggingExtension +de.tum.cit.aet.artemis.util.junit_extensions.AwaitilityExtension +de.tum.cit.aet.artemis.util.junit_extensions.ParallelLoggingExtension diff --git a/src/test/resources/config/application.yml b/src/test/resources/config/application.yml index 6de99b3986d9..f7d8bc06ea1b 100644 --- a/src/test/resources/config/application.yml +++ b/src/test/resources/config/application.yml @@ -13,7 +13,7 @@ logging: level: ROOT: INFO - de.tum.in.www1.artemis: DEBUG + de.tum.cit.aet.artemis: DEBUG tech.jhipster: INFO artemis: diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/activityModel1.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/activityModel1.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/activityModel1.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/activityModel1.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/activityModel1v3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/activityModel1v3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/activityModel1v3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/activityModel1v3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/activityModel2.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/activityModel2.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/activityModel2.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/activityModel2.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/activityModel2v3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/activityModel2v3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/activityModel2v3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/activityModel2v3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/activityModel3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/activityModel3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/activityModel3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/activityModel3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/activityModel3v3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/activityModel3v3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/activityModel3v3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/activityModel3v3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/bpmn/bpmnModel1.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/bpmn/bpmnModel1.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/bpmn/bpmnModel1.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/bpmn/bpmnModel1.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/bpmn/bpmnModel2.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/bpmn/bpmnModel2.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/bpmn/bpmnModel2.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/bpmn/bpmnModel2.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/bpmn/bpmnModel3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/bpmn/bpmnModel3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/bpmn/bpmnModel3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/bpmn/bpmnModel3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel1.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel1.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel1.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel1.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel1v3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel1v3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel1v3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel1v3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel2.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel2.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel2.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel2.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel2v3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel2v3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel2v3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel2v3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel1.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel1.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel1.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel1.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel1v3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel1v3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel1v3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel1v3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel2.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel2.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel2.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel2.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel2v3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel2v3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel2v3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel2v3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/componentModel1.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/component/componentModel1.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/componentModel1.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/component/componentModel1.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/componentModel1v3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/component/componentModel1v3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/componentModel1v3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/component/componentModel1v3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/componentModel2.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/component/componentModel2.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/componentModel2.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/component/componentModel2.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/componentModel2v3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/component/componentModel2v3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/componentModel2v3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/component/componentModel2v3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/componentModel3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/component/componentModel3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/componentModel3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/component/componentModel3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/componentModel3v3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/component/componentModel3v3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/componentModel3v3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/component/componentModel3v3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel1.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel1.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel1.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel1.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel1v3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel1v3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel1v3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel1v3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel2.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel2.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel2.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel2.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel2v3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel2v3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel2v3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel2v3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel3v3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel3v3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel3v3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel3v3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1a.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1a.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1a.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1a.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1av3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1av3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1av3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1av3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1b.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1b.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1b.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1b.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1bv3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1bv3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1bv3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1bv3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel2.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel2.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel2.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel2.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel2v3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel2v3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel2v3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel2v3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/objectModel1.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/object/objectModel1.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/objectModel1.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/object/objectModel1.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/objectModel1v3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/object/objectModel1v3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/objectModel1v3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/object/objectModel1v3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/objectModel2.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/object/objectModel2.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/objectModel2.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/object/objectModel2.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/objectModel2v3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/object/objectModel2v3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/objectModel2v3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/object/objectModel2v3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1a.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1a.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1a.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1a.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1av3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1av3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1av3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1av3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1b.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1b.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1b.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1b.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1bv3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1bv3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1bv3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1bv3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel2.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel2.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel2.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel2.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel2v3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel2v3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel2v3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel2v3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1a.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1a.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1a.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1a.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1av3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1av3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1av3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1av3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1b.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1b.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1b.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1b.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1bv3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1bv3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1bv3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1bv3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel2.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel2.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel2.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel2.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel2v3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel2v3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel2v3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel2v3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel1.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel1.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel1.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel1.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel1v3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel1v3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel1v3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel1v3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel2.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel2.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel2.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel2.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel2v3.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel2v3.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel2v3.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel2v3.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/programming/gitlabPushEventRequest.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/programming/gitlabPushEventRequest.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/programming/gitlabPushEventRequest.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/programming/gitlabPushEventRequest.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/programming/gitlabPushEventRequestWithoutCommit.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/programming/gitlabPushEventRequestWithoutCommit.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/programming/gitlabPushEventRequestWithoutCommit.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/programming/gitlabPushEventRequestWithoutCommit.json diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/programming/gitlabPushEventRequestWrongCommitOrder.json b/src/test/resources/de/tum/cit/aet/artemis/exercise/programming/gitlabPushEventRequestWrongCommitOrder.json similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/exercise/programming/gitlabPushEventRequestWrongCommitOrder.json rename to src/test/resources/de/tum/cit/aet/artemis/exercise/programming/gitlabPushEventRequestWrongCommitOrder.json diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml index 697bf790df01..f98c7180ec7b 100644 --- a/src/test/resources/logback.xml +++ b/src/test/resources/logback.xml @@ -4,15 +4,15 @@ - + - + %16.16d{HH:mm:ss.SSS} | %3.3threadId %-16.16thread | %-5level | %-36.36logger{36} : %msg%n - + diff --git a/src/test/resources/test-data/static-code-analysis/expected/invalid_name.txt b/src/test/resources/test-data/static-code-analysis/expected/invalid_name.txt index 8eba9e3ca601..67ff374babdb 100644 --- a/src/test/resources/test-data/static-code-analysis/expected/invalid_name.txt +++ b/src/test/resources/test-data/static-code-analysis/expected/invalid_name.txt @@ -1 +1 @@ -{"issues":[{"filePath":"invalid_name.xml","startLine":1,"endLine":1,"startColumn":0,"endColumn":0,"rule":"ExceptionDuringParsing","category":"miscellaneous","message":"An exception occurred during parsing the report for file invalid_name.xml. Exception: de.tum.in.www1.artemis.service.connectors.localci.scaparser.exception.UnsupportedToolException: Tool for identifying filePattern invalid_name.xml not found"}]} +{"issues":[{"filePath":"invalid_name.xml","startLine":1,"endLine":1,"startColumn":0,"endColumn":0,"rule":"ExceptionDuringParsing","category":"miscellaneous","message":"An exception occurred during parsing the report for file invalid_name.xml. Exception: de.tum.cit.aet.artemis.service.connectors.localci.scaparser.exception.UnsupportedToolException: Tool for identifying filePattern invalid_name.xml not found"}]} diff --git a/src/test/resources/test-data/static-code-analysis/expected/invalid_xml.txt b/src/test/resources/test-data/static-code-analysis/expected/invalid_xml.txt index 3bd79947435b..927c4af06008 100644 --- a/src/test/resources/test-data/static-code-analysis/expected/invalid_xml.txt +++ b/src/test/resources/test-data/static-code-analysis/expected/invalid_xml.txt @@ -1 +1 @@ -{"issues":[{"filePath":"invalid_xml.xml","startLine":1,"endLine":1,"startColumn":0,"endColumn":0,"rule":"ExceptionDuringParsing","category":"miscellaneous","message":"An exception occurred during parsing the report for file invalid_xml.xml. Exception: de.tum.in.www1.artemis.service.connectors.localci.scaparser.exception.UnsupportedToolException: Tool for identifying filePattern invalid_xml.xml not found"}]} +{"issues":[{"filePath":"invalid_xml.xml","startLine":1,"endLine":1,"startColumn":0,"endColumn":0,"rule":"ExceptionDuringParsing","category":"miscellaneous","message":"An exception occurred during parsing the report for file invalid_xml.xml. Exception: de.tum.cit.aet.artemis.service.connectors.localci.scaparser.exception.UnsupportedToolException: Tool for identifying filePattern invalid_xml.xml not found"}]} diff --git a/supporting_scripts/analysis-of-endpoint-connections/build.gradle b/supporting_scripts/analysis-of-endpoint-connections/build.gradle index 226588714dd0..706ba847be1c 100644 --- a/supporting_scripts/analysis-of-endpoint-connections/build.gradle +++ b/supporting_scripts/analysis-of-endpoint-connections/build.gradle @@ -3,7 +3,7 @@ plugins { id "application" } -group "de.tum.in.www1.artemis" +group "de.tum.cit.aet.artemis" version "1.0.0" repositories { From aac0b84ea51501696f0fffdb7312594aa3045c20 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Wed, 11 Sep 2024 13:44:33 +0200 Subject: [PATCH 02/43] update package path in IntelliJ files --- .idea/runConfigurations/Artemis__BuildAgent_.xml | 2 +- .idea/runConfigurations/Artemis__Server_.xml | 2 +- .idea/runConfigurations/Artemis__Server__Aeolus_.xml | 2 +- .../runConfigurations/Artemis__Server__GitLabCI___Gitlab_.xml | 2 +- .../runConfigurations/Artemis__Server__Jenkins___Gitlab_.xml | 2 +- .../runConfigurations/Artemis__Server__Jenkins___LocalVC_.xml | 2 +- .../runConfigurations/Artemis__Server__LocalVC___LocalCI_.xml | 2 +- .../Artemis__Server__LocalVC___LocalCI__Athena_.xml | 2 +- .../Artemis__Server__LocalVC___LocalCI__IRIS_.xml | 2 +- .../Artemis__Server__LocalVC___LocalCI__Theia_.xml | 4 ++-- .idea/runConfigurations/Artemis__Server___Client_.xml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.idea/runConfigurations/Artemis__BuildAgent_.xml b/.idea/runConfigurations/Artemis__BuildAgent_.xml index e05f29e2085f..61dd070826e0 100644 --- a/.idea/runConfigurations/Artemis__BuildAgent_.xml +++ b/.idea/runConfigurations/Artemis__BuildAgent_.xml @@ -4,7 +4,7 @@ - \ No newline at end of file + diff --git a/.idea/runConfigurations/Artemis__Server___Client_.xml b/.idea/runConfigurations/Artemis__Server___Client_.xml index bc5c50d2769d..043a3824cb97 100644 --- a/.idea/runConfigurations/Artemis__Server___Client_.xml +++ b/.idea/runConfigurations/Artemis__Server___Client_.xml @@ -5,7 +5,7 @@

* Always stores the whole detail text. - * In case the feedback is shorter than {@link de.tum.cit.aet.artemis.config.Constants#FEEDBACK_DETAIL_TEXT_SOFT_MAX_LENGTH}, + * In case the feedback is shorter than {@link Constants#FEEDBACK_DETAIL_TEXT_SOFT_MAX_LENGTH}, * the feedback is stored directly in the detail text. * Otherwise, an associated {@link LongFeedbackText} is attached that holds the full feedback. * In this case the actual detail text stored in this feedback only contains a short preview. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/LongFeedbackText.java b/src/main/java/de/tum/cit/aet/artemis/domain/LongFeedbackText.java index 16a73d1a1ded..d618cfc51852 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/LongFeedbackText.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/LongFeedbackText.java @@ -13,7 +13,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; @Entity @Table(name = "long_feedback_text") diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/Result.java b/src/main/java/de/tum/cit/aet/artemis/domain/Result.java index adcda65906d5..da5afa8d5505 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/Result.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/Result.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.domain; -import static de.tum.cit.aet.artemis.config.Constants.PROGRAMMING_GRACE_PERIOD_SECONDS; -import static de.tum.cit.aet.artemis.config.Constants.SIZE_OF_UNSIGNED_TINYINT; +import static de.tum.cit.aet.artemis.core.config.Constants.PROGRAMMING_GRACE_PERIOD_SECONDS; +import static de.tum.cit.aet.artemis.core.config.Constants.SIZE_OF_UNSIGNED_TINYINT; import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundToNDecimalPlaces; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/TeamAssignmentConfig.java b/src/main/java/de/tum/cit/aet/artemis/domain/TeamAssignmentConfig.java index 915deddec02d..b552ac5680a0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/TeamAssignmentConfig.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/TeamAssignmentConfig.java @@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.validation.constraints.TeamAssignmentConfigConstraints; +import de.tum.cit.aet.artemis.core.validation.constraints.TeamAssignmentConfigConstraints; /** * A team assignment configuration. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/TextSubmission.java b/src/main/java/de/tum/cit/aet/artemis/domain/TextSubmission.java index 064c36615621..2905cef15d4c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/TextSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/TextSubmission.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.domain; -import static de.tum.cit.aet.artemis.config.Constants.MAX_SUBMISSION_TEXT_LENGTH; +import static de.tum.cit.aet.artemis.core.config.Constants.MAX_SUBMISSION_TEXT_LENGTH; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/User.java b/src/main/java/de/tum/cit/aet/artemis/domain/User.java index 8f09633eb41b..08cf44e9eb15 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/User.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/User.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.domain; -import static de.tum.cit.aet.artemis.config.Constants.USERNAME_MAX_LENGTH; -import static de.tum.cit.aet.artemis.config.Constants.USERNAME_MIN_LENGTH; +import static de.tum.cit.aet.artemis.core.config.Constants.USERNAME_MAX_LENGTH; +import static de.tum.cit.aet.artemis.core.config.Constants.USERNAME_MIN_LENGTH; import java.time.Instant; import java.time.ZonedDateTime; @@ -38,7 +38,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; import de.tum.cit.aet.artemis.domain.competency.LearningPath; import de.tum.cit.aet.artemis.domain.exam.ExamUser; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13ClientRegistration.java b/src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13ClientRegistration.java index 61e43c88ab2f..9eb12d5beb1b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13ClientRegistration.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13ClientRegistration.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; -import de.tum.cit.aet.artemis.config.lti.CustomLti13Configurer; +import de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer; /** * Represents the client registration details for an LTI 1.3 integration. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/GroupChat.java b/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/GroupChat.java index 46e1a469c293..282edef7f6d0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/GroupChat.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/GroupChat.java @@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelingSubmission.java b/src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelingSubmission.java index a6be24a2688a..894d94306106 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelingSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelingSubmission.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.domain.modeling; -import static de.tum.cit.aet.artemis.config.Constants.MAX_SUBMISSION_MODEL_LENGTH; -import static de.tum.cit.aet.artemis.config.Constants.MAX_SUBMISSION_TEXT_LENGTH; +import static de.tum.cit.aet.artemis.core.config.Constants.MAX_SUBMISSION_MODEL_LENGTH; +import static de.tum.cit.aet.artemis.core.config.Constants.MAX_SUBMISSION_TEXT_LENGTH; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropQuestion.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropQuestion.java index a4a24ae9fd69..d87ac4521e0b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropQuestion.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropQuestion.java @@ -28,13 +28,13 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategy; import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategyDragAndDropAllOrNothing; import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategyDragAndDropProportionalWithPenalty; import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategyDragAndDropProportionalWithoutPenalty; import de.tum.cit.aet.artemis.domain.view.QuizView; -import de.tum.cit.aet.artemis.exception.FilePathParsingException; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragItem.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragItem.java index b0eef0fa6fcb..542a394314a5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragItem.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragItem.java @@ -24,10 +24,10 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; import de.tum.cit.aet.artemis.domain.TempIdObject; import de.tum.cit.aet.artemis.domain.view.QuizView; -import de.tum.cit.aet.artemis.exception.FilePathParsingException; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizBatch.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizBatch.java index f85432319e60..aa45d10b98c5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizBatch.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizBatch.java @@ -16,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.domain.view.QuizView; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSubmittedText.java b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSubmittedText.java index 1e0881a422c4..e81a7e73169a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSubmittedText.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSubmittedText.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.domain.quiz; -import static de.tum.cit.aet.artemis.config.Constants.MAX_QUIZ_SHORT_ANSWER_TEXT_LENGTH; +import static de.tum.cit.aet.artemis.core.config.Constants.MAX_QUIZ_SHORT_ANSWER_TEXT_LENGTH; import java.util.Objects; diff --git a/src/main/java/de/tum/cit/aet/artemis/config/lti/CustomLti13Configurer.java b/src/main/java/de/tum/cit/aet/artemis/lti/config/CustomLti13Configurer.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/config/lti/CustomLti13Configurer.java rename to src/main/java/de/tum/cit/aet/artemis/lti/config/CustomLti13Configurer.java index 3388e6ba5741..1ed660170a40 100644 --- a/src/main/java/de/tum/cit/aet/artemis/config/lti/CustomLti13Configurer.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/config/CustomLti13Configurer.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.config.lti; +package de.tum.cit.aet.artemis.lti.config; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Profile; @@ -7,10 +7,10 @@ import org.springframework.security.web.authentication.logout.LogoutFilter; import org.springframework.stereotype.Component; -import de.tum.cit.aet.artemis.security.jwt.JWTFilter; +import de.tum.cit.aet.artemis.core.security.jwt.JWTFilter; +import de.tum.cit.aet.artemis.core.web.filter.Lti13LaunchFilter; import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; import de.tum.cit.aet.artemis.service.connectors.lti.Lti13Service; -import de.tum.cit.aet.artemis.web.filter.Lti13LaunchFilter; import uk.ac.ox.ctl.lti13.Lti13Configurer; import uk.ac.ox.ctl.lti13.security.oauth2.client.lti.authentication.OidcLaunchFlowAuthenticationProvider; import uk.ac.ox.ctl.lti13.security.oauth2.client.lti.web.HttpSessionOAuth2AuthorizationRequestRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/config/lti/DistributedStateAuthorizationRequestRepository.java b/src/main/java/de/tum/cit/aet/artemis/lti/config/DistributedStateAuthorizationRequestRepository.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/config/lti/DistributedStateAuthorizationRequestRepository.java rename to src/main/java/de/tum/cit/aet/artemis/lti/config/DistributedStateAuthorizationRequestRepository.java index 69b4f2941af6..785731fbe9b4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/config/lti/DistributedStateAuthorizationRequestRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/config/DistributedStateAuthorizationRequestRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.config.lti; +package de.tum.cit.aet.artemis.lti.config; import java.util.Map; import java.util.Objects; diff --git a/src/main/java/de/tum/cit/aet/artemis/config/lti/StateBasedOptimisticAuthorizationRequestRepository.java b/src/main/java/de/tum/cit/aet/artemis/lti/config/StateBasedOptimisticAuthorizationRequestRepository.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/config/lti/StateBasedOptimisticAuthorizationRequestRepository.java rename to src/main/java/de/tum/cit/aet/artemis/lti/config/StateBasedOptimisticAuthorizationRequestRepository.java index 1817c557200b..b8e2f304ee0f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/config/lti/StateBasedOptimisticAuthorizationRequestRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/config/StateBasedOptimisticAuthorizationRequestRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.config.lti; +package de.tum.cit.aet.artemis.lti.config; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/src/main/java/de/tum/cit/aet/artemis/config/icl/BuildAgentConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/programming/icl/BuildAgentConfiguration.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/config/icl/BuildAgentConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/programming/icl/BuildAgentConfiguration.java index c32a487556b5..d4fa8eb607aa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/config/icl/BuildAgentConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/icl/BuildAgentConfiguration.java @@ -1,6 +1,6 @@ -package de.tum.cit.aet.artemis.config.icl; +package de.tum.cit.aet.artemis.programming.icl; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; import java.util.List; import java.util.concurrent.ExecutorService; @@ -27,8 +27,8 @@ import com.github.dockerjava.transport.DockerHttpClient; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import de.tum.cit.aet.artemis.config.ProgrammingLanguageConfiguration; -import de.tum.cit.aet.artemis.exception.LocalCIException; +import de.tum.cit.aet.artemis.core.config.ProgrammingLanguageConfiguration; +import de.tum.cit.aet.artemis.core.exception.LocalCIException; /** * Creates beans needed for the local CI system. diff --git a/src/main/java/de/tum/cit/aet/artemis/config/icl/JGitServletConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/programming/icl/JGitServletConfiguration.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/config/icl/JGitServletConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/programming/icl/JGitServletConfiguration.java index 7bac9a2bb522..ce5451cee5c5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/config/icl/JGitServletConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/icl/JGitServletConfiguration.java @@ -1,6 +1,6 @@ -package de.tum.cit.aet.artemis.config.icl; +package de.tum.cit.aet.artemis.programming.icl; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; import org.eclipse.jgit.http.server.GitServlet; import org.slf4j.Logger; diff --git a/src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/HashUtils.java b/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/HashUtils.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/HashUtils.java rename to src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/HashUtils.java index 0f71338a1a58..fb88e5b5c957 100644 --- a/src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/HashUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/HashUtils.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.config.icl.ssh; +package de.tum.cit.aet.artemis.programming.icl.ssh; import java.security.PublicKey; diff --git a/src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/MultipleHostKeyProvider.java b/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/MultipleHostKeyProvider.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/MultipleHostKeyProvider.java rename to src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/MultipleHostKeyProvider.java index 383dca871a7e..b0a04875c4e8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/MultipleHostKeyProvider.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/MultipleHostKeyProvider.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.config.icl.ssh; +package de.tum.cit.aet.artemis.programming.icl.ssh; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/SshConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshConfiguration.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/SshConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshConfiguration.java index 407fda1f2b8a..90df714dac23 100644 --- a/src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/SshConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshConfiguration.java @@ -1,6 +1,6 @@ -package de.tum.cit.aet.artemis.config.icl.ssh; +package de.tum.cit.aet.artemis.programming.icl.ssh; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; import java.net.URI; import java.net.URISyntaxException; diff --git a/src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/SshConstants.java b/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshConstants.java similarity index 78% rename from src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/SshConstants.java rename to src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshConstants.java index bb722842f508..245f38d4530c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/SshConstants.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshConstants.java @@ -1,6 +1,6 @@ -package de.tum.cit.aet.artemis.config.icl.ssh; +package de.tum.cit.aet.artemis.programming.icl.ssh; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; import org.apache.sshd.common.AttributeRepository; import org.springframework.context.annotation.Profile; diff --git a/src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/SshGitCommand.java b/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshGitCommand.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/SshGitCommand.java rename to src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshGitCommand.java index ef9be8db4992..ace2d54bc32a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/config/icl/ssh/SshGitCommand.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshGitCommand.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.config.icl.ssh; +package de.tum.cit.aet.artemis.programming.icl.ssh; import java.io.IOException; import java.nio.file.Path; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ApollonDiagramRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ApollonDiagramRepository.java index 512307e1acd8..1b7108782e6a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ApollonDiagramRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ApollonDiagramRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/AttachmentRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/AttachmentRepository.java index 08a5b09375f7..46b70d51c869 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/AttachmentRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/AttachmentRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/AttachmentUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/AttachmentUnitRepository.java index e2b4d1745f3f..9bb67031b9d5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/AttachmentUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/AttachmentUnitRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/AuxiliaryRepositoryRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/AuxiliaryRepositoryRepository.java index 18b7ac9a7a2e..7670388680e4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/AuxiliaryRepositoryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/AuxiliaryRepositoryRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/BonusRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/BonusRepository.java index 117ba8020217..9f6a3addc312 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/BonusRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/BonusRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/BuildJobRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/BuildJobRepository.java index 5127d1e1eb97..340e77efdfc7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/BuildJobRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/BuildJobRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.time.Duration; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/BuildLogEntryRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/BuildLogEntryRepository.java index 38fdd57c8d53..7f8439e7e81a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/BuildLogEntryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/BuildLogEntryRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.data.jpa.repository.Modifying; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/BuildLogStatisticsEntryRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/BuildLogStatisticsEntryRepository.java index 37aba09b696e..7d6cc30e6ca0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/BuildLogStatisticsEntryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/BuildLogStatisticsEntryRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.domain.statistics.BuildLogStatisticsEntry.BuildJobPartDuration; import org.springframework.context.annotation.Profile; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/CompetencyProgressRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/CompetencyProgressRepository.java index 2bcaf1ed5d99..53f4f029ad29 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/CompetencyProgressRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/CompetencyProgressRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Collection; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/CompetencyRelationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/CompetencyRelationRepository.java index 708147c3c43b..5a3ecb62a034 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/CompetencyRelationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/CompetencyRelationRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/CompetencyRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/CompetencyRepository.java index 749c9a85deca..5eff52100384 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/CompetencyRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/CompetencyRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ComplaintRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ComplaintRepository.java index 78ad81e894f7..fca454dfe66f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ComplaintRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ComplaintRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ComplaintResponseRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ComplaintResponseRepository.java index 5d7ed18b9449..9db01bf4d7e5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ComplaintResponseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ComplaintResponseRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ConductAgreementRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ConductAgreementRepository.java index 5ac610eabbb6..7b20d28dc914 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ConductAgreementRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ConductAgreementRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/CourseRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/CourseRepository.java index 189a6d75810b..b6ddaa608921 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/CourseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/CourseRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.AUTOMATIC; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/CustomAuditEventRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/CustomAuditEventRepository.java index 3cca41922a98..37d06c5ac1ef 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/CustomAuditEventRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/CustomAuditEventRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.Instant; import java.util.HashMap; @@ -14,7 +14,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; -import de.tum.cit.aet.artemis.config.audit.AuditEventConverter; +import de.tum.cit.aet.artemis.core.config.audit.AuditEventConverter; import de.tum.cit.aet.artemis.domain.PersistentAuditEvent; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/DataExportRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/DataExportRepository.java index 9efccee29729..9086e5a49497 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/DataExportRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/DataExportRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/DragAndDropMappingRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/DragAndDropMappingRepository.java index 93d849819d9c..cf3220d25ed1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/DragAndDropMappingRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/DragAndDropMappingRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/DragItemRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/DragItemRepository.java index b85e175fc91c..d7092d7d9f56 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/DragItemRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/DragItemRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ExamLiveEventRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ExamLiveEventRepository.java index 2efd7a6916c0..30c7b3087e88 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ExamLiveEventRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ExamLiveEventRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ExamRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ExamRepository.java index d2169bd2a05d..401c7650933e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ExamRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ExamRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ExamSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ExamSessionRepository.java index fdf67995704b..fda3a2b8b269 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ExamSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ExamSessionRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ExamUserRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ExamUserRepository.java index 45ecaf3e6420..fa565815c63a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ExamUserRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ExamUserRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ExampleSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ExampleSubmissionRepository.java index 4b40724b6e5c..447761da7de5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ExampleSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ExampleSubmissionRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ExerciseGroupRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ExerciseGroupRepository.java index 14101def33e2..7808fbb320eb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ExerciseGroupRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ExerciseGroupRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ExerciseRepository.java index fbc525f788e5..f3272ef1ef9d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ExerciseRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ExerciseUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ExerciseUnitRepository.java index 848c9f926764..4cb064e242ad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ExerciseUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ExerciseUnitRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/FeedbackRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/FeedbackRepository.java index 46e0db7bc9ab..5f36f5c084cb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/FeedbackRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/FeedbackRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/FileUploadExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/FileUploadExerciseRepository.java index af7beb412610..c24f90cca778 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/FileUploadExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/FileUploadExerciseRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/FileUploadSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/FileUploadSubmissionRepository.java index 69b751b52ee4..4bcac3b2162a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/FileUploadSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/FileUploadSubmissionRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/GradeStepRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/GradeStepRepository.java index 768160036faa..06152d75babe 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/GradeStepRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/GradeStepRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/GradingCriterionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/GradingCriterionRepository.java index 8e7f56000793..7ef46b2a7282 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/GradingCriterionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/GradingCriterionRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/GradingInstructionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/GradingInstructionRepository.java index 98d255a2f104..66b1ccab3066 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/GradingInstructionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/GradingInstructionRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/GradingScaleRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/GradingScaleRepository.java index f88ee3066cd4..c15a412b93a4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/GradingScaleRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/GradingScaleRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.Comparator; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/GroupNotificationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/GroupNotificationRepository.java index b4a4bdcf17e2..8c0b9d936b79 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/GroupNotificationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/GroupNotificationRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/GuidedTourSettingsRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/GuidedTourSettingsRepository.java index d0e9277afe78..4c631e82f5d3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/GuidedTourSettingsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/GuidedTourSettingsRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/LearningPathRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/LearningPathRepository.java index 32a4f51f4bd0..f061fe73837a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/LearningPathRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/LearningPathRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/LectureRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/LectureRepository.java index 25ea7247b21e..a733ad1aaaf9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/LectureRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/LectureRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/LectureUnitCompletionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/LectureUnitCompletionRepository.java index 922011265864..353e51264d15 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/LectureUnitCompletionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/LectureUnitCompletionRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Collection; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/LectureUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/LectureUnitRepository.java index 87bd2b438368..c4bf95a505d9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/LectureUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/LectureUnitRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/LtiPlatformConfigurationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/LtiPlatformConfigurationRepository.java index 0ba0de6071b2..ed455a471d54 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/LtiPlatformConfigurationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/LtiPlatformConfigurationRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ModelClusterRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ModelClusterRepository.java index 6a464197f397..ec5fa383b567 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ModelClusterRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ModelClusterRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ModelElementRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ModelElementRepository.java index f55e5c196f42..8be8d8220b7d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ModelElementRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ModelElementRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ModelingExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ModelingExerciseRepository.java index fc4c60445612..0e692ad54abb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ModelingExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ModelingExerciseRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ModelingSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ModelingSubmissionRepository.java index 84b1adbb60bb..072fd7e359a8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ModelingSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ModelingSubmissionRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/NotificationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/NotificationRepository.java index c91dd7abf95a..0967f115d59b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/NotificationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/NotificationRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/NotificationSettingRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/NotificationSettingRepository.java index 27923bee7bfb..647fa6c9d980 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/NotificationSettingRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/NotificationSettingRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/OnlineCourseConfigurationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/OnlineCourseConfigurationRepository.java index 6de499025be6..3066174493fc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/OnlineCourseConfigurationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/OnlineCourseConfigurationRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/OnlineUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/OnlineUnitRepository.java index fbf23ff11011..aca3cabd38e5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/OnlineUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/OnlineUnitRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/OrganizationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/OrganizationRepository.java index 0606881b4803..9c7d22255ed4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/OrganizationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/OrganizationRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.HashSet; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ParticipantScoreRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ParticipantScoreRepository.java index f0b2611f5bde..4396cc667aa7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ParticipantScoreRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ParticipantScoreRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.time.Instant; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ParticipationRepository.java index d22657c7879c..829e603071e1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ParticipationRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.ArrayList; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ParticipationVCSAccessTokenRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ParticipationVCSAccessTokenRepository.java index d4da7c2bd205..5d7aa3993fd7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ParticipationVCSAccessTokenRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ParticipationVCSAccessTokenRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseBuildConfigRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseBuildConfigRepository.java index ff1b18ca64c1..0a224b9d643a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseBuildConfigRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseBuildConfigRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseRepository.java index 8a743b354612..61b9b4d41c23 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseRepository.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.config.Constants.SHORT_NAME_PATTERN; -import static de.tum.cit.aet.artemis.config.Constants.TITLE_NAME_PATTERN; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.SHORT_NAME_PATTERN; +import static de.tum.cit.aet.artemis.core.config.Constants.TITLE_NAME_PATTERN; import static de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository.ProgrammingExerciseFetchOptions; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseStudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseStudentParticipationRepository.java index 4e580da3d340..7e49bdef56e1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseStudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseStudentParticipationRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseTestCaseRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseTestCaseRepository.java index 200ecc9c5159..30e8de4ab874 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseTestCaseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseTestCaseRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionRepository.java index dc04290215bf..e8cf3154ec30 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.Collections; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/PushNotificationDeviceConfigurationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/PushNotificationDeviceConfigurationRepository.java index 7332ebe5fdc6..dc367e027cb0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/PushNotificationDeviceConfigurationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/PushNotificationDeviceConfigurationRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/QuizBatchRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/QuizBatchRepository.java index fe37598f5dd2..9f439ef24540 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/QuizBatchRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/QuizBatchRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/QuizExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/QuizExerciseRepository.java index 021d84abc3c9..da730c022015 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/QuizExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/QuizExerciseRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/QuizGroupRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/QuizGroupRepository.java index 3da1b1adda9d..e6319b3070d5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/QuizGroupRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/QuizGroupRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/QuizPointStatisticRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/QuizPointStatisticRepository.java index b41e34c08761..03aa1f2e7302 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/QuizPointStatisticRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/QuizPointStatisticRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/QuizPoolRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/QuizPoolRepository.java index ba7f41d980c7..fcb7be634379 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/QuizPoolRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/QuizPoolRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/QuizQuestionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/QuizQuestionRepository.java index 4ea93f686c5d..cddddbd3e0ad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/QuizQuestionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/QuizQuestionRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/QuizQuestionStatisticRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/QuizQuestionStatisticRepository.java index 276bb12de62e..75e340badaf0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/QuizQuestionStatisticRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/QuizQuestionStatisticRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/QuizSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/QuizSubmissionRepository.java index bb13922b3e08..6e847cbefa6e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/QuizSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/QuizSubmissionRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/RatingRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/RatingRepository.java index 90e382c55164..698910dcc80c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/RatingRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/RatingRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ResultRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ResultRepository.java index 9d82f39b7215..97379c39f9f3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ResultRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ResultRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static java.util.Arrays.asList; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ShortAnswerMappingRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/ShortAnswerMappingRepository.java index 107bf2f8a925..bff9f95ddccc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ShortAnswerMappingRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/ShortAnswerMappingRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/SingleUserNotificationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/SingleUserNotificationRepository.java index 2a9212b96b2a..b3983e488aa1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/SingleUserNotificationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/SingleUserNotificationRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/SlideRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/SlideRepository.java index 44c79b814f62..23e84249a3ce 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/SlideRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/SlideRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/SolutionProgrammingExerciseParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/SolutionProgrammingExerciseParticipationRepository.java index 6de6f943b2b1..c61eb5ee0195 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/SolutionProgrammingExerciseParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/SolutionProgrammingExerciseParticipationRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository.SolutionParticipationFetchOptions; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/SourceRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/SourceRepository.java index 425d0df13bb0..fb88fab7c385 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/SourceRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/SourceRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/StaticCodeAnalysisCategoryRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/StaticCodeAnalysisCategoryRepository.java index 489ce53be2af..4a484153e595 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/StaticCodeAnalysisCategoryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/StaticCodeAnalysisCategoryRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/StatisticsRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/StatisticsRepository.java index 7dbf711e3d8b..37a81e5b9b31 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/StatisticsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/StatisticsRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.DayOfWeek; import java.time.Instant; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/StudentExamRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/StudentExamRepository.java index 663a1dd627d7..7863e4264ef9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/StudentExamRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/StudentExamRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.security.SecureRandom; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/StudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/StudentParticipationRepository.java index 296426d9bab9..41d3dcc220a0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/StudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/StudentParticipationRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static java.util.stream.Collectors.toMap; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/StudentScoreRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/StudentScoreRepository.java index 6c9e1112cf2a..41d18ce87439 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/StudentScoreRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/StudentScoreRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/SubmissionPolicyRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/SubmissionPolicyRepository.java index 8f00ef86d241..18708c53e6d3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/SubmissionPolicyRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/SubmissionPolicyRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Collection; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/SubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/SubmissionRepository.java index 32507b714263..9e557237cf0b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/SubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/SubmissionRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/SubmissionVersionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/SubmissionVersionRepository.java index 00fe5c70b08d..2249ab47099c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/SubmissionVersionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/SubmissionVersionRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/SubmittedAnswerRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/SubmittedAnswerRepository.java index f241a4db9585..6aefdb80b5c3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/SubmittedAnswerRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/SubmittedAnswerRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Collection; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/SystemNotificationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/SystemNotificationRepository.java index b4a0c0073277..d55a42c708ef 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/SystemNotificationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/SystemNotificationRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/TeamRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/TeamRepository.java index 9507e67a304e..a355b63651c8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/TeamRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/TeamRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.time.Instant; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/TeamScoreRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/TeamScoreRepository.java index c83fe5dc4eef..ef3a6c3aef00 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/TeamScoreRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/TeamScoreRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/TemplateProgrammingExerciseParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/TemplateProgrammingExerciseParticipationRepository.java index 4c643661c9d7..9b22faed0a9a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/TemplateProgrammingExerciseParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/TemplateProgrammingExerciseParticipationRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository.TemplateParticipationFetchOptions; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/TextAssessmentEventRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/TextAssessmentEventRepository.java index 55570a938e7b..37b9c714263b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/TextAssessmentEventRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/TextAssessmentEventRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static java.util.stream.Collectors.toMap; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/TextBlockRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/TextBlockRepository.java index e0e746aec6fc..cd6e1d520601 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/TextBlockRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/TextBlockRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/TextExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/TextExerciseRepository.java index b3e5f4dec101..eec0b6470fc6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/TextExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/TextExerciseRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/TextSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/TextSubmissionRepository.java index 85600b1ebba9..36580f7019f0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/TextSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/TextSubmissionRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/TextUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/TextUnitRepository.java index 8418ca89e835..8462947e37c8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/TextUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/TextUnitRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/TutorParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/TutorParticipationRepository.java index 44a2cb51fc74..d7117894cd2a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/TutorParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/TutorParticipationRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/UserRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/UserRepository.java index 68132b3120d3..58b93a372d4c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/UserRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/UserRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.repository.specs.UserSpecs.distinct; import static de.tum.cit.aet.artemis.repository.specs.UserSpecs.getActivatedOrDeactivatedSpecification; import static de.tum.cit.aet.artemis.repository.specs.UserSpecs.getAllUsersWithoutUserGroups; @@ -38,6 +38,8 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.ConversationNotificationRecipientSummary; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.DomainObject; @@ -45,8 +47,6 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.service.dto.UserRoleDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.UserPageableSearchDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/VideoUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/VideoUnitRepository.java index 863a28c699f2..91a93f7401da 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/VideoUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/VideoUnitRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/competency/CompetencyJolRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/competency/CompetencyJolRepository.java index 5f0f46a26c2e..5402d1ef17ad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/competency/CompetencyJolRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/competency/CompetencyJolRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.competency; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/competency/KnowledgeAreaRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/competency/KnowledgeAreaRepository.java index f03358dd86d4..8797e93e4ca7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/competency/KnowledgeAreaRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/competency/KnowledgeAreaRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.competency; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/competency/StandardizedCompetencyRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/competency/StandardizedCompetencyRepository.java index 4d134277ded3..f3cd7b594135 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/competency/StandardizedCompetencyRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/competency/StandardizedCompetencyRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.competency; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/CoverageFileReportRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/CoverageFileReportRepository.java index 192326ffdffc..34b6fa81ed11 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/CoverageFileReportRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/CoverageFileReportRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.hestia; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/CoverageReportRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/CoverageReportRepository.java index 08ff3714d887..09fbaa65d0de 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/CoverageReportRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/CoverageReportRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.hestia; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.Collections; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ExerciseHintRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ExerciseHintRepository.java index 2b5418452b5e..d8939ac88708 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ExerciseHintRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ExerciseHintRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.hestia; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ProgrammingExerciseGitDiffReportRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ProgrammingExerciseGitDiffReportRepository.java index 453dcee1ed96..da5a713363bd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ProgrammingExerciseGitDiffReportRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ProgrammingExerciseGitDiffReportRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.hestia; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/TestwiseCoverageReportEntryRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/TestwiseCoverageReportEntryRepository.java index c775fc466efe..dfec328ab9a2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/TestwiseCoverageReportEntryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/hestia/TestwiseCoverageReportEntryRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.hestia; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metis/AnswerPostRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/metis/AnswerPostRepository.java index 85b8ccdfd4f4..a8e7207085e5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metis/AnswerPostRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/metis/AnswerPostRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.metis; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metis/ConversationMessageRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/metis/ConversationMessageRepository.java index 639b80752c07..169a23c894e7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metis/ConversationMessageRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/metis/ConversationMessageRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.metis; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.repository.specs.MessageSpecs.getAnsweredOrReactedSpecification; import static de.tum.cit.aet.artemis.repository.specs.MessageSpecs.getConversationSpecification; import static de.tum.cit.aet.artemis.repository.specs.MessageSpecs.getConversationsSpecification; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metis/ConversationParticipantRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/metis/ConversationParticipantRepository.java index d6eeea268f34..88dba06a1fff 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metis/ConversationParticipantRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/metis/ConversationParticipantRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.metis; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metis/PostRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/metis/PostRepository.java index 7c870dcdf03e..4d79e147c680 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metis/PostRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/metis/PostRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.metis; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metis/ReactionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/metis/ReactionRepository.java index 557d160e5c56..0e056117a36f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metis/ReactionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/metis/ReactionRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.metis; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ChannelRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ChannelRepository.java index 3abf2941fd63..7182b36c4548 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ChannelRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ChannelRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.metis.conversation; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ConversationNotificationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ConversationNotificationRepository.java index 62f24251d0a1..b190c17af4cf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ConversationNotificationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ConversationNotificationRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.metis.conversation; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ConversationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ConversationRepository.java index 2b5919f8a325..6d014c7a18d4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ConversationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ConversationRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.metis.conversation; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/GroupChatRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/GroupChatRepository.java index c8602de41ea7..8b0693fb5dc1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/GroupChatRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/GroupChatRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.metis.conversation; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/OneToOneChatRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/OneToOneChatRepository.java index 53b9a0c602ff..eee37c2e4231 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/OneToOneChatRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/OneToOneChatRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.metis.conversation; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metrics/CompetencyMetricsRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/metrics/CompetencyMetricsRepository.java index 9ac3394637d1..89abf7b52ebf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metrics/CompetencyMetricsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/metrics/CompetencyMetricsRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.metrics; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metrics/ExerciseMetricsRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/metrics/ExerciseMetricsRepository.java index 45fc542060a1..2faa89b566df 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metrics/ExerciseMetricsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/metrics/ExerciseMetricsRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.metrics; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Map.Entry; import java.util.Set; @@ -10,7 +10,7 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.dto.metrics.ExerciseInformationDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metrics/LectureUnitMetricsRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/metrics/LectureUnitMetricsRepository.java index 57482d6aba56..77c741ffdcdd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metrics/LectureUnitMetricsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/metrics/LectureUnitMetricsRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.metrics; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismCaseRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismCaseRepository.java index b867845cb1d2..03b03d35f43f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismCaseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismCaseRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.plagiarism; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismComparisonRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismComparisonRepository.java index 04cf9b844ef7..2af663c6f5d0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismComparisonRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismComparisonRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.plagiarism; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismResultRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismResultRepository.java index 6e42d0bec86c..8029f6403eba 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismResultRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismResultRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.plagiarism; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismSubmissionRepository.java index d8bee1992274..8dee59501d11 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismSubmissionRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.plagiarism; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.data.jpa.repository.Modifying; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/science/ScienceEventRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/science/ScienceEventRepository.java index 4a92781bc9b6..8fdbfb28b9ea 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/science/ScienceEventRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/science/ScienceEventRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.science; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/science/ScienceSettingRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/science/ScienceSettingRepository.java index bfa38c1b8c67..c26133adbf82 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/science/ScienceSettingRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/science/ScienceSettingRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.science; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/settings/IdeRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/settings/IdeRepository.java index 84168bd4e950..4ec7e987d38d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/settings/IdeRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/settings/IdeRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.settings; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/settings/UserIdeMappingRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/settings/UserIdeMappingRepository.java index 1b0f10af0be5..bcb77645300e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/settings/UserIdeMappingRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/settings/UserIdeMappingRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.settings; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupFreePeriodRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupFreePeriodRepository.java index 66470bccadea..c054b2fc44f6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupFreePeriodRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupFreePeriodRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.tutorialgroups; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupNotificationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupNotificationRepository.java index c8248a2e158a..a2a57857f7e8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupNotificationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupNotificationRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.tutorialgroups; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.data.jpa.repository.Modifying; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupRegistrationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupRegistrationRepository.java index 179abb642816..7c93f7720726 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupRegistrationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupRegistrationRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.tutorialgroups; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupRepository.java index dc667f54252c..590f5ac9c3e4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.tutorialgroups; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupScheduleRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupScheduleRepository.java index 2460834ce39f..9b9d71775696 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupScheduleRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupScheduleRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.tutorialgroups; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupSessionRepository.java index 0ff4d2319d03..84c1fc3a8d10 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupSessionRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.tutorialgroups; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupsConfigurationRepository.java b/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupsConfigurationRepository.java index f76c2b101df9..8b076774820f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupsConfigurationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupsConfigurationRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.repository.tutorialgroups; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/security/package-info.java b/src/main/java/de/tum/cit/aet/artemis/security/package-info.java deleted file mode 100644 index 45dc8a8b83c2..000000000000 --- a/src/main/java/de/tum/cit/aet/artemis/security/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Spring Security configuration. - */ -package de.tum.cit.aet.artemis.security; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AbstractQuizSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/AbstractQuizSubmissionService.java index ba1532ad2a77..dbca98fbc092 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AbstractQuizSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AbstractQuizSubmissionService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.ArrayList; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AccountService.java b/src/main/java/de/tum/cit/aet/artemis/service/AccountService.java index dfaaf8d4fb91..97e5422596dd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AccountService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AccountService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; @@ -9,7 +9,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.web.rest.AccountResource; import de.tum.cit.aet.artemis.web.rest.open.PublicAccountResource; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AssessmentDashboardService.java b/src/main/java/de/tum/cit/aet/artemis/service/AssessmentDashboardService.java index c473557068ac..8ddcfb6fd377 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AssessmentDashboardService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AssessmentDashboardService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/service/AssessmentService.java index 86b553d3a3ca..0f73a8ca50db 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AssessmentService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java b/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java index 97991f11c7c2..c3e5d8acd469 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.nio.file.Path; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AuditEventService.java b/src/main/java/de/tum/cit/aet/artemis/service/AuditEventService.java index 01b1c0a20f96..546d8854c8a6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AuditEventService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AuditEventService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.Instant; import java.util.Optional; @@ -11,7 +11,7 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.config.audit.AuditEventConverter; +import de.tum.cit.aet.artemis.core.config.audit.AuditEventConverter; import de.tum.cit.aet.artemis.repository.PersistenceAuditEventRepository; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AuthorizationCheckService.java b/src/main/java/de/tum/cit/aet/artemis/service/AuthorizationCheckService.java index 489115a28b63..99a2936082a8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AuthorizationCheckService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AuthorizationCheckService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; import java.util.Set; @@ -19,6 +19,8 @@ import com.google.errorprone.annotations.CheckReturnValue; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Authority; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -33,8 +35,6 @@ import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.repository.TeamRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.exam.ExamDateService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/BonusService.java b/src/main/java/de/tum/cit/aet/artemis/service/BonusService.java index 04d9a2fa5211..cdbc39b57f93 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/BonusService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/BonusService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/BuildLogEntryService.java b/src/main/java/de/tum/cit/aet/artemis/service/BuildLogEntryService.java index ba1adf8804d1..2313735479fa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/BuildLogEntryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/BuildLogEntryService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ComplaintResponseService.java b/src/main/java/de/tum/cit/aet/artemis/service/ComplaintResponseService.java index e4f6427ad32a..9a24ec688b88 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ComplaintResponseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ComplaintResponseService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ComplaintService.java b/src/main/java/de/tum/cit/aet/artemis/service/ComplaintService.java index f49540c43a75..1dcdc1e00487 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ComplaintService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ComplaintService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.security.Principal; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ConductAgreementService.java b/src/main/java/de/tum/cit/aet/artemis/service/ConductAgreementService.java index af82c2782a5c..f4b3ce53007d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ConductAgreementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ConductAgreementService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ConsistencyCheckService.java b/src/main/java/de/tum/cit/aet/artemis/service/ConsistencyCheckService.java index 3b345c14f0e6..8fc9ee642a9e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ConsistencyCheckService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ConsistencyCheckService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationService.java b/src/main/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationService.java index 27e942baf289..61c7d7df8995 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java b/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java index a6787cdb6ea3..c45fffcaf0dc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.domain.enumeration.ComplaintType.COMPLAINT; import static de.tum.cit.aet.artemis.domain.enumeration.ComplaintType.MORE_FEEDBACK; import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; @@ -43,7 +43,9 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.domain.Exercise; @@ -82,8 +84,6 @@ import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupNotificationRepository; import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.exam.ExamDeletionService; import de.tum.cit.aet.artemis.service.export.CourseExamExportService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/DragAndDropQuizAnswerConversionService.java b/src/main/java/de/tum/cit/aet/artemis/service/DragAndDropQuizAnswerConversionService.java index c6aa6726eca4..4075c8df0229 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/DragAndDropQuizAnswerConversionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/DragAndDropQuizAnswerConversionService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.awt.BasicStroke; import java.awt.Color; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/EmailSummaryService.java b/src/main/java/de/tum/cit/aet/artemis/service/EmailSummaryService.java index bf9e13ccaaf9..93a80c5ded42 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/EmailSummaryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/EmailSummaryService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__WEEKLY_SUMMARY__BASIC_WEEKLY_SUMMARY; import java.time.Duration; @@ -12,12 +12,12 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.repository.ExerciseRepository; import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.notifications.MailService; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExampleSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExampleSubmissionService.java index 65dfd0cd3992..4ce2d83ddc57 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExampleSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExampleSubmissionService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDateService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDateService.java index b90df44af949..a3a45b3abd96 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDateService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDeletionService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDeletionService.java index 6b1b0de59726..f492249a703c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDeletionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDeletionService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleService.java index e3868cc4ce65..73e079c440d1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.HashSet; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseScoresChartService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseScoresChartService.java index 815304f24619..62b377bb53b0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseScoresChartService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseScoresChartService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseService.java index c6eb1996632f..aec718eb25f7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.EXAM_START_WAIT_TIME_MINUTES; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.EXAM_START_WAIT_TIME_MINUTES; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; import static java.time.ZonedDateTime.now; @@ -27,7 +27,7 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ExampleSubmission; import de.tum.cit.aet.artemis.domain.Exercise; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseSpecificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseSpecificationService.java index 00ad3f9f3e15..f3883698c508 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseSpecificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseSpecificationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import jakarta.persistence.criteria.Join; import jakarta.persistence.criteria.JoinType; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/FeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/service/FeedbackService.java index f7bcb80496f5..ce4f9e9ddcf5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/FeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/FeedbackService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Objects; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/FilePathService.java b/src/main/java/de/tum/cit/aet/artemis/service/FilePathService.java index b3b3168cd53d..be6fb05ca971 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/FilePathService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/FilePathService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.nio.file.Path; @@ -11,9 +11,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; import de.tum.cit.aet.artemis.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.exception.FilePathParsingException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/FileService.java b/src/main/java/de/tum/cit/aet/artemis/service/FileService.java index 39e4f3da2204..43bb2668a84a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/FileService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/FileService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static java.nio.charset.StandardCharsets.UTF_8; import java.io.BufferedReader; @@ -63,7 +63,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.ibm.icu.text.CharsetDetector; -import de.tum.cit.aet.artemis.exception.FilePathParsingException; +import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; import de.tum.cit.aet.artemis.service.util.CommonsMultipartFile; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseImportService.java index 8ccfb3ea6440..a5602fd3dcc9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseImportService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.HashMap; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseService.java index 14e09a38423c..0f53d1ebd0d1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Collections; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadSubmissionService.java index a391241ad742..71384028b9ae 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadSubmissionService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.File; import java.io.IOException; @@ -19,6 +19,7 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.server.ResponseStatusException; +import de.tum.cit.aet.artemis.core.exception.EmptyFileException; import de.tum.cit.aet.artemis.domain.FileUploadExercise; import de.tum.cit.aet.artemis.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.domain.Submission; @@ -26,7 +27,6 @@ import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.exception.EmptyFileException; import de.tum.cit.aet.artemis.repository.ComplaintRepository; import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.repository.FeedbackRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/GradingScaleService.java b/src/main/java/de/tum/cit/aet/artemis/service/GradingScaleService.java index e0a5be29bfea..a74cfa74c93c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/GradingScaleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/GradingScaleService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/HazelcastPathSerializer.java b/src/main/java/de/tum/cit/aet/artemis/service/HazelcastPathSerializer.java index 476984b92274..62d9a1454410 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/HazelcastPathSerializer.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/HazelcastPathSerializer.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.HAZELCAST_PATH_SERIALIZER_ID; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.HAZELCAST_PATH_SERIALIZER_ID; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/InternalUrlService.java b/src/main/java/de/tum/cit/aet/artemis/service/InternalUrlService.java index 638ee53dd4c9..b55df1188089 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/InternalUrlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/InternalUrlService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URISyntaxException; import java.net.URL; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java b/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java index 6e4435363da6..3acbe24ac656 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.MIN_SCORE_GREEN; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.MIN_SCORE_GREEN; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LectureImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/LectureImportService.java index af3bf6d9c487..3c4625cfb68d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LectureImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LectureImportService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.nio.file.Path; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LectureService.java b/src/main/java/de/tum/cit/aet/artemis/service/LectureService.java index 8d4e6a7e74b1..70d42b3ffded 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LectureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LectureService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.ArrayList; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitProcessingService.java index f840b3e3e547..88734d00aafe 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitProcessingService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitService.java b/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitService.java index 0f0ae640e79c..bff100d88cdf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.MalformedURLException; import java.net.URI; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LegalDocumentService.java b/src/main/java/de/tum/cit/aet/artemis/service/LegalDocumentService.java index cec0eac5c9e8..a3aeba6e30aa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LegalDocumentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LegalDocumentService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseImportService.java index 1aa29e372849..d2302f8af727 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseImportService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.HashMap; import java.util.HashSet; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseService.java index 9e49d63f2d88..8d770775ba0b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Collections; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ModelingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/ModelingSubmissionService.java index 4f2235a10641..885ac2c2f1fb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ModelingSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ModelingSubmissionService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.ArrayList; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationService.java b/src/main/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationService.java index fa506ead0bf2..73f7f3687a6f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.LOGIN_REGEX; +import static de.tum.cit.aet.artemis.core.config.Constants.LOGIN_REGEX; import static de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration.ENTITY_NAME; import java.util.List; @@ -17,10 +17,10 @@ import org.springframework.security.oauth2.core.AuthorizationGrantType; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.config.lti.CustomLti13Configurer; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; +import de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer; import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/OrganizationService.java b/src/main/java/de/tum/cit/aet/artemis/service/OrganizationService.java index 361d7a2e8c61..575e743348d4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/OrganizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/OrganizationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipantScoreService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipantScoreService.java index 2e4af8019bf6..0a0da3260f31 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipantScoreService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipantScoreService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java index d68f883b98da..a5adc49e6325 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleService.java index eb5497741f8e..c08cf9b3eaeb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java index 8447867353d1..053ffac9fa2b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -18,6 +18,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; @@ -35,8 +37,6 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; -import de.tum.cit.aet.artemis.exception.VersionControlException; import de.tum.cit.aet.artemis.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.repository.ParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationVcsAccessTokenService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationVcsAccessTokenService.java index 3af15bdd30af..f5f09ea282c3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationVcsAccessTokenService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationVcsAccessTokenService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/PlantUmlService.java b/src/main/java/de/tum/cit/aet/artemis/service/PlantUmlService.java index 79964e21bad0..7f15c348aef5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/PlantUmlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/PlantUmlService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationService.java b/src/main/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationService.java index 353190752045..0435648222b7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; import java.util.Map; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ProfileService.java b/src/main/java/de/tum/cit/aet/artemis/service/ProfileService.java index 3d3cb825a440..64bd29be6ad8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ProfileService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ProfileService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import java.util.Set; @@ -9,7 +9,7 @@ import org.springframework.core.env.Environment; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import tech.jhipster.config.JHipsterConstants; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/RatingService.java b/src/main/java/de/tum/cit/aet/artemis/service/RatingService.java index 13e1891edba9..86a8241d9862 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/RatingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/RatingService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ResourceLoaderService.java b/src/main/java/de/tum/cit/aet/artemis/service/ResourceLoaderService.java index b58e47378a1b..fb4bcdc57bd0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ResourceLoaderService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ResourceLoaderService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.File; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/ResultService.java index 69ba3b14b1c6..9142a2b45dba 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ResultService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -23,6 +23,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Feedback; @@ -54,7 +55,6 @@ import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; -import de.tum.cit.aet.artemis.security.Role; import de.tum.cit.aet.artemis.service.connectors.localci.dto.ResultBuildJob; import de.tum.cit.aet.artemis.service.connectors.lti.LtiNewResultService; import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SlideSplitterService.java b/src/main/java/de/tum/cit/aet/artemis/service/SlideSplitterService.java index d81202d5cf96..4deb12121b5b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SlideSplitterService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SlideSplitterService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/StaticCodeAnalysisService.java b/src/main/java/de/tum/cit/aet/artemis/service/StaticCodeAnalysisService.java index 472647414ad9..bf6dec5a9ef2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/StaticCodeAnalysisService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/StaticCodeAnalysisService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Collection; import java.util.List; @@ -14,7 +14,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.config.StaticCodeAnalysisConfigurer; +import de.tum.cit.aet.artemis.core.config.StaticCodeAnalysisConfigurer; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisCategory; import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisDefaultCategory; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java b/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java index bbcb67112eca..1787023a1067 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; import java.time.DayOfWeek; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionPolicyService.java b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionPolicyService.java index 27b5a83cf266..dd2a4812b2b3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionPolicyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionPolicyService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.apache.commons.lang3.NotImplementedException; import org.springframework.context.annotation.Profile; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java index 849fa4444283..e1fac41fd629 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.MAX_NUMBER_OF_LOCKED_SUBMISSIONS_PER_TUTOR; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.MAX_NUMBER_OF_LOCKED_SUBMISSIONS_PER_TUTOR; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.ArrayList; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionVersionService.java b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionVersionService.java index 2ea48f0bf5c5..2526042dff94 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionVersionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionVersionService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SystemNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/SystemNotificationService.java index da2d1a36c300..2c50a2a114ec 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SystemNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SystemNotificationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.List; @@ -8,9 +8,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.notification.SystemNotification; import de.tum.cit.aet.artemis.repository.SystemNotificationRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TeamService.java b/src/main/java/de/tum/cit/aet/artemis/service/TeamService.java index b9cd5e507385..e2b9558a2d76 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TeamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TeamService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextAssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextAssessmentService.java index 6d061302ea43..cd90851fcfc8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextAssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextAssessmentService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.hibernate.Hibernate.isInitialized; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextBlockService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextBlockService.java index e4e4f20dd567..5ee1f1a1bc27 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextBlockService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextBlockService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static java.lang.Integer.compare; import java.text.BreakIterator; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseFeedbackService.java index 7a5f0fb59f33..40e1538d750c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseFeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseFeedbackService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseImportService.java index c6fe359f52b1..c3a9cfa4713e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseImportService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.HashMap; import java.util.HashSet; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseService.java index a6f919f60a8f..125a7fd86c52 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Collections; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextSubmissionService.java index 4f41337d1463..0750dd2e1356 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextSubmissionService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.ArrayList; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TimeService.java b/src/main/java/de/tum/cit/aet/artemis/service/TimeService.java index d85e25124d53..8a989265e92a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TimeService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TimeService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionService.java b/src/main/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionService.java index ad5f99978dd5..6ec646151b07 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import jakarta.persistence.EntityManagerFactory; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TutorEffortService.java b/src/main/java/de/tum/cit/aet/artemis/service/TutorEffortService.java index 8a1326d756b1..a6e7a9b19dd8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TutorEffortService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TutorEffortService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static java.lang.Math.toIntExact; import static java.util.stream.Collectors.groupingBy; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TutorLeaderboardService.java b/src/main/java/de/tum/cit/aet/artemis/service/TutorLeaderboardService.java index aa4971dbe864..9dc0167b2825 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TutorLeaderboardService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TutorLeaderboardService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TutorParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/service/TutorParticipationService.java index 450e91f5500a..8d7f7183fe16 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TutorParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TutorParticipationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.domain.enumeration.FeedbackType.MANUAL_UNREFERENCED; import static de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus.NOT_PARTICIPATED; import static de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus.REVIEWED_INSTRUCTIONS; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/UriService.java b/src/main/java/de/tum/cit/aet/artemis/service/UriService.java index 1299ca5c1c10..c520a929e8fc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/UriService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/UriService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -10,8 +10,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.exception.VersionControlException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/WebsocketMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/service/WebsocketMessagingService.java index 59619a52a650..b2cdc29d4974 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/WebsocketMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/WebsocketMessagingService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ZipFileService.java b/src/main/java/de/tum/cit/aet/artemis/service/ZipFileService.java index b765b03bdbc6..bfa34547deff 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ZipFileService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ZipFileService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.IOException; import java.nio.file.Files; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/CompassService.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/CompassService.java index f070a2877768..26ff294753e9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/CompassService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/CompassService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.compass; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyJolService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyJolService.java index c90d88b70472..d23076cacf36 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyJolService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyJolService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.competency; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static java.util.stream.Collectors.toMap; import static java.util.stream.Collectors.toSet; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyProgressService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyProgressService.java index 6d6515829531..1914df822661 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyProgressService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyProgressService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.competency; -import static de.tum.cit.aet.artemis.config.Constants.MIN_SCORE_GREEN; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.MIN_SCORE_GREEN; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.util.TimeUtil.toRelativeTime; import java.time.Instant; @@ -19,6 +19,7 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.LearningObject; @@ -34,7 +35,6 @@ import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.ParticipantScoreService; import de.tum.cit.aet.artemis.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.service.util.RoundingUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyRelationService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyRelationService.java index 06882253ae01..a971fd1c102d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyRelationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyRelationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.competency; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyService.java index 8331737e5ba0..f17ab580dc63 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.competency; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/CourseCompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/CourseCompetencyService.java index 603ae1177be8..04a9eeabb8a5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/CourseCompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/CourseCompetencyService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.competency; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/KnowledgeAreaService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/KnowledgeAreaService.java index eb32e8dc878d..ce0b9b94fb56 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/KnowledgeAreaService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/KnowledgeAreaService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.competency; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import jakarta.ws.rs.BadRequestException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/PrerequisiteService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/PrerequisiteService.java index b42eebf3f16c..1cb8e4a25a12 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/PrerequisiteService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/PrerequisiteService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.competency; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/StandardizedCompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/StandardizedCompetencyService.java index deb05073e812..84aea2944f6b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/StandardizedCompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/StandardizedCompetencyService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.competency; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency.FIRST_VERSION; import java.util.ArrayList; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/GitService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/GitService.java index c4b25df6da6f..f72df3c04914 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/GitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/GitService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.connectors; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.IOException; import java.io.UncheckedIOException; @@ -71,6 +71,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.exception.GitException; import de.tum.cit.aet.artemis.domain.File; import de.tum.cit.aet.artemis.domain.FileType; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; @@ -82,7 +83,6 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.exception.GitException; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.ZipFileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/HazelcastHealthIndicator.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/HazelcastHealthIndicator.java index 5ac22608bd5f..bd09e2bafe0f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/HazelcastHealthIndicator.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/HazelcastHealthIndicator.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.connectors; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/SAML2Service.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/SAML2Service.java index a998fed4d46a..dca6750c4018 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/SAML2Service.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/SAML2Service.java @@ -21,12 +21,12 @@ import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticatedPrincipal; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.config.SAML2Properties; +import de.tum.cit.aet.artemis.core.config.SAML2Properties; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.UserNotActivatedException; import de.tum.cit.aet.artemis.domain.Authority; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.UserNotActivatedException; import de.tum.cit.aet.artemis.service.notifications.MailService; import de.tum.cit.aet.artemis.service.user.UserCreationService; import de.tum.cit.aet.artemis.service.user.UserService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusBuildPlanService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusBuildPlanService.java index e0466fc0eda4..965adec3af4e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusBuildPlanService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusBuildPlanService.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.service.connectors.aeolus; -import static de.tum.cit.aet.artemis.config.Constants.ASSIGNMENT_REPO_NAME; -import static de.tum.cit.aet.artemis.config.Constants.SOLUTION_REPO_NAME; -import static de.tum.cit.aet.artemis.config.Constants.TEST_REPO_NAME; +import static de.tum.cit.aet.artemis.core.config.Constants.ASSIGNMENT_REPO_NAME; +import static de.tum.cit.aet.artemis.core.config.Constants.SOLUTION_REPO_NAME; +import static de.tum.cit.aet.artemis.core.config.Constants.TEST_REPO_NAME; import static de.tum.cit.aet.artemis.domain.enumeration.AeolusTarget.JENKINS; import java.net.URL; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusTemplateService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusTemplateService.java index f29c59246557..7ccf7b47df29 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusTemplateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusTemplateService.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import de.tum.cit.aet.artemis.config.ProgrammingLanguageConfiguration; +import de.tum.cit.aet.artemis.core.config.ProgrammingLanguageConfiguration; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaConnector.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaConnector.java index cd57eb0005b5..0f1347b94050 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaConnector.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaConnector.java @@ -11,7 +11,7 @@ import org.springframework.web.client.ResourceAccessException; import org.springframework.web.client.RestTemplate; -import de.tum.cit.aet.artemis.exception.NetworkingException; +import de.tum.cit.aet.artemis.core.exception.NetworkingException; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaDTOConverterService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaDTOConverterService.java index 20ca8b84114e..b9707b9ad32f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaDTOConverterService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaDTOConverterService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.connectors.athena; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingService.java index 8f8d7a73eb78..7fa97d3d2f31 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingService.java @@ -12,10 +12,10 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.exception.NetworkingException; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.exception.NetworkingException; import de.tum.cit.aet.artemis.service.dto.athena.ExerciseBaseDTO; import de.tum.cit.aet.artemis.service.dto.athena.FeedbackBaseDTO; import de.tum.cit.aet.artemis.service.dto.athena.SubmissionBaseDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsService.java index 7ff5dbea978a..2e3cd9900bac 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsService.java @@ -12,13 +12,13 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.exception.NetworkingException; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.exception.NetworkingException; import de.tum.cit.aet.artemis.service.dto.athena.ExerciseBaseDTO; import de.tum.cit.aet.artemis.service.dto.athena.ModelingFeedbackDTO; import de.tum.cit.aet.artemis.service.dto.athena.ProgrammingFeedbackDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaModuleService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaModuleService.java index 2fbf15ffc55e..03af74304857 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaModuleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaModuleService.java @@ -20,10 +20,10 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.core.exception.NetworkingException; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; -import de.tum.cit.aet.artemis.exception.NetworkingException; import de.tum.cit.aet.artemis.repository.ExerciseRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionService.java index 23e3f56d99ac..8dc856086110 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionService.java @@ -15,8 +15,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +import de.tum.cit.aet.artemis.core.exception.NetworkingException; import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.exception.NetworkingException; import de.tum.cit.aet.artemis.service.dto.athena.ExerciseBaseDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingService.java index 10bbeff77cf9..ea240624d06d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingService.java @@ -17,9 +17,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.exception.NetworkingException; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.exception.NetworkingException; import de.tum.cit.aet.artemis.repository.SubmissionRepository; import de.tum.cit.aet.artemis.service.dto.athena.ExerciseBaseDTO; import de.tum.cit.aet.artemis.service.dto.athena.SubmissionBaseDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/CIUserManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/CIUserManagementService.java index 773a623b8241..414534fab251 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/CIUserManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/CIUserManagementService.java @@ -2,9 +2,9 @@ import java.util.Set; +import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; public interface CIUserManagementService { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationServerHealthIndicator.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationServerHealthIndicator.java index 343ca13b8676..ec2109254e17 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationServerHealthIndicator.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationServerHealthIndicator.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.connectors.ci; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationService.java index 1cf9959d1b9c..a105bfe9dddc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.connectors.ci; -import static de.tum.cit.aet.artemis.config.Constants.ASSIGNMENT_DIRECTORY; -import static de.tum.cit.aet.artemis.config.Constants.ASSIGNMENT_REPO_NAME; +import static de.tum.cit.aet.artemis.core.config.Constants.ASSIGNMENT_DIRECTORY; +import static de.tum.cit.aet.artemis.core.config.Constants.ASSIGNMENT_REPO_NAME; import java.util.List; import java.util.Optional; @@ -11,11 +11,11 @@ import com.fasterxml.jackson.core.JsonProcessingException; +import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationTriggerService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationTriggerService.java index 640e9e7c4a33..4bb0ae71d621 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationTriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationTriggerService.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.service.connectors.ci; +import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; /** * Abstract service for managing entities related to continuous integration. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabException.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabException.java index 1123f2205438..ed8855feda30 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabException.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabException.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.connectors.gitlab; -import de.tum.cit.aet.artemis.exception.VersionControlException; +import de.tum.cit.aet.artemis.core.exception.VersionControlException; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabService.java index 81bc020bbb3c..07536fa84eee 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabService.java @@ -45,6 +45,7 @@ import com.fasterxml.jackson.databind.JsonNode; +import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.domain.Commit; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; @@ -52,7 +53,6 @@ import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.exception.VersionControlException; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabUserManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabUserManagementService.java index fa1b1dacd1d4..0c047295e314 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabUserManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabUserManagementService.java @@ -19,10 +19,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.exception.VersionControlException; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.connectors.vcs.VcsTokenManagementService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitlabInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitlabInfoContributor.java index de2b352e3e37..18036c18f781 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitlabInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitlabInfoContributor.java @@ -9,7 +9,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIInfoContributor.java index e4e2dc0986c0..cb7e46f9a480 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIInfoContributor.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIService.java index ebae5f51783a..595b0b7c060e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.connectors.gitlabci; -import static de.tum.cit.aet.artemis.config.Constants.NEW_RESULT_RESOURCE_API_PATH; +import static de.tum.cit.aet.artemis.core.config.Constants.NEW_RESULT_RESOURCE_API_PATH; import java.net.URL; import java.util.Comparator; @@ -23,7 +23,9 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.config.ProgrammingLanguageConfiguration; +import de.tum.cit.aet.artemis.core.config.ProgrammingLanguageConfiguration; +import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.core.exception.GitLabCIException; import de.tum.cit.aet.artemis.domain.BuildPlan; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; @@ -31,8 +33,6 @@ import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; -import de.tum.cit.aet.artemis.exception.GitLabCIException; import de.tum.cit.aet.artemis.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.UriService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCITriggerService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCITriggerService.java index a1cb7d2fe46b..8048f1b9f0bf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCITriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCITriggerService.java @@ -6,11 +6,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.core.exception.GitLabCIException; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; -import de.tum.cit.aet.artemis.exception.GitLabCIException; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.UriService; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java index b57af6ec0447..26938451a911 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java @@ -7,9 +7,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsInfoContributor.java index 2b2f26dd69e3..1d039908a6d9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsInfoContributor.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; @Component @Profile("jenkins") diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsService.java index 3f66a7d7665e..8132c34f5270 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsService.java @@ -19,14 +19,14 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.offbytwo.jenkins.JenkinsServer; +import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.core.exception.JenkinsException; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; -import de.tum.cit.aet.artemis.exception.JenkinsException; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsUserManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsUserManagementService.java index d7dc1d4f9da2..b011e40cd589 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsUserManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsUserManagementService.java @@ -27,11 +27,11 @@ import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; +import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.core.exception.JenkinsException; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; -import de.tum.cit.aet.artemis.exception.JenkinsException; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanCreator.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanCreator.java index 172dc7733fb0..e8e5a3e043fb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanCreator.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanCreator.java @@ -17,10 +17,10 @@ import org.springframework.stereotype.Component; import org.w3c.dom.Document; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationBuildPlanException; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; -import de.tum.cit.aet.artemis.exception.ContinuousIntegrationBuildPlanException; import de.tum.cit.aet.artemis.service.ResourceLoaderService; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsXmlConfigBuilder; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanLinkInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanLinkInfoContributor.java index f58f4455d619..082ad62e9085 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanLinkInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanLinkInfoContributor.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; @Component @Profile("jenkins") diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java index 799366ab1779..a891f2d2367b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.connectors.jenkins.build_plan; -import static de.tum.cit.aet.artemis.config.Constants.NEW_RESULT_RESOURCE_API_PATH; +import static de.tum.cit.aet.artemis.core.config.Constants.NEW_RESULT_RESOURCE_API_PATH; import java.io.IOException; import java.net.URI; @@ -35,6 +35,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.offbytwo.jenkins.JenkinsServer; +import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationBuildPlanException; +import de.tum.cit.aet.artemis.core.exception.JenkinsException; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; @@ -45,8 +47,6 @@ import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.exception.ContinuousIntegrationBuildPlanException; -import de.tum.cit.aet.artemis.exception.JenkinsException; import de.tum.cit.aet.artemis.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java index 195b4624514e..4c75be83478f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.connectors.jenkins.build_plan; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.IOException; import java.io.InputStream; @@ -16,11 +16,11 @@ import org.springframework.core.io.Resource; import org.springframework.stereotype.Component; -import de.tum.cit.aet.artemis.config.ProgrammingLanguageConfiguration; +import de.tum.cit.aet.artemis.core.config.ProgrammingLanguageConfiguration; +import de.tum.cit.aet.artemis.core.exception.JenkinsException; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; -import de.tum.cit.aet.artemis.exception.JenkinsException; import de.tum.cit.aet.artemis.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.ResourceLoaderService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobService.java index 64e6f4eecf18..2fbf0f6cbf10 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobService.java @@ -16,7 +16,7 @@ import com.offbytwo.jenkins.model.FolderJob; import com.offbytwo.jenkins.model.JobWithDetails; -import de.tum.cit.aet.artemis.exception.JenkinsException; +import de.tum.cit.aet.artemis.core.exception.JenkinsException; import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsXmlFileUtils; @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ldap/LdapAuthenticationProvider.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ldap/LdapAuthenticationProvider.java index a1a6f0821cb6..312814400e67 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ldap/LdapAuthenticationProvider.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ldap/LdapAuthenticationProvider.java @@ -18,11 +18,11 @@ import org.springframework.security.ldap.SpringSecurityLdapTemplate; import org.springframework.stereotype.Component; +import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProvider; +import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProviderImpl; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.ArtemisAuthenticationProvider; -import de.tum.cit.aet.artemis.security.ArtemisAuthenticationProviderImpl; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; import de.tum.cit.aet.artemis.service.ldap.LdapUserService; import de.tum.cit.aet.artemis.service.user.AuthorityService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIBuildConfigurationService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIBuildConfigurationService.java index 1af144f0bdff..a212f33dfcf3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIBuildConfigurationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIBuildConfigurationService.java @@ -1,16 +1,16 @@ package de.tum.cit.aet.artemis.service.connectors.localci; -import static de.tum.cit.aet.artemis.config.Constants.LOCALCI_WORKING_DIRECTORY; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALCI; +import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_WORKING_DIRECTORY; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; import java.util.List; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.exception.LocalCIException; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.cit.aet.artemis.exception.LocalCIException; import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; import de.tum.cit.aet.artemis.service.connectors.aeolus.ScriptAction; import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIInfoContributor.java index 51d150369be5..6c2762923cd2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIInfoContributor.java @@ -1,13 +1,13 @@ package de.tum.cit.aet.artemis.service.connectors.localci; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALCI; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; import org.springframework.boot.actuate.info.Info; import org.springframework.boot.actuate.info.InfoContributor; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; @Component @Profile(PROFILE_LOCALCI) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java index aa6957868a3d..9adb3dd7da6c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.connectors.localci; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALCI; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.ASSEMBLER; import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.C; import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.HASKELL; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultProcessingService.java index 9d251188ae99..296b0caf221f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultProcessingService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.connectors.localci; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALCI; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; import java.util.List; import java.util.Optional; @@ -22,6 +22,7 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.map.IMap; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.BuildJob; import de.tum.cit.aet.artemis.domain.BuildLogEntry; import de.tum.cit.aet.artemis.domain.Result; @@ -33,7 +34,6 @@ import de.tum.cit.aet.artemis.repository.BuildJobRepository; import de.tum.cit.aet.artemis.repository.ParticipationRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultService.java index 37825e630385..dce2db8b42fc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultService.java @@ -1,17 +1,17 @@ package de.tum.cit.aet.artemis.service.connectors.localci; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALCI; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; import java.util.List; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.exception.LocalCIException; import de.tum.cit.aet.artemis.domain.BuildLogEntry; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; -import de.tum.cit.aet.artemis.exception.LocalCIException; import de.tum.cit.aet.artemis.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIService.java index 85c572ddec8d..d5f09c365f0b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.connectors.localci; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALCI; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; import java.util.List; import java.util.Map; @@ -16,12 +16,12 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.core.exception.LocalCIException; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.exception.LocalCIException; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.connectors.BuildScriptProviderService; import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCITriggerService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCITriggerService.java index 17cb5cf6ef3f..a4063f919729 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCITriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCITriggerService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.connectors.localci; -import static de.tum.cit.aet.artemis.config.Constants.LOCALCI_WORKING_DIRECTORY; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALCI; +import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_WORKING_DIRECTORY; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -22,7 +22,9 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.map.IMap; -import de.tum.cit.aet.artemis.config.ProgrammingLanguageConfiguration; +import de.tum.cit.aet.artemis.core.config.ProgrammingLanguageConfiguration; +import de.tum.cit.aet.artemis.core.exception.LocalCIException; +import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; @@ -32,8 +34,6 @@ import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.exception.LocalCIException; -import de.tum.cit.aet.artemis.exception.localvc.LocalVCInternalException; import de.tum.cit.aet.artemis.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/SharedQueueManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/SharedQueueManagementService.java index f070ff4c4502..4c7832c63881 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/SharedQueueManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/SharedQueueManagementService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.connectors.localci; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALCI; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; import java.time.Duration; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildAgentDockerService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildAgentDockerService.java index b7ee7c8a5cd3..9376b51f8969 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildAgentDockerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildAgentDockerService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.connectors.localci.buildagent; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; import java.io.File; import java.time.Duration; @@ -38,7 +38,7 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.map.IMap; -import de.tum.cit.aet.artemis.exception.LocalCIException; +import de.tum.cit.aet.artemis.core.exception.LocalCIException; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildAgentSshKeyService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildAgentSshKeyService.java index ae6aa9852a38..6524a0bffb46 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildAgentSshKeyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildAgentSshKeyService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.connectors.localci.buildagent; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobContainerService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobContainerService.java index 5f7596023cd7..652a6475278e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobContainerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobContainerService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.connectors.localci.buildagent; -import static de.tum.cit.aet.artemis.config.Constants.LOCALCI_WORKING_DIRECTORY; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_WORKING_DIRECTORY; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -42,9 +42,9 @@ import com.github.dockerjava.api.model.Frame; import com.github.dockerjava.api.model.HostConfig; +import de.tum.cit.aet.artemis.core.exception.LocalCIException; import de.tum.cit.aet.artemis.domain.BuildLogEntry; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.exception.LocalCIException; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService.RepositoryCheckoutPath; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobExecutionService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobExecutionService.java index f0d5f16b24ff..5279ec59084d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobExecutionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobExecutionService.java @@ -1,9 +1,9 @@ package de.tum.cit.aet.artemis.service.connectors.localci.buildagent; -import static de.tum.cit.aet.artemis.config.Constants.CHECKED_OUT_REPOS_TEMP_DIR; -import static de.tum.cit.aet.artemis.config.Constants.LOCALCI_RESULTS_DIRECTORY; -import static de.tum.cit.aet.artemis.config.Constants.LOCALCI_WORKING_DIRECTORY; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.core.config.Constants.CHECKED_OUT_REPOS_TEMP_DIR; +import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_RESULTS_DIRECTORY; +import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_WORKING_DIRECTORY; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; import static de.tum.cit.aet.artemis.service.connectors.localci.buildagent.TestResultXmlParser.processTestResultFile; import java.io.IOException; @@ -33,12 +33,12 @@ import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.exception.NotFoundException; +import de.tum.cit.aet.artemis.core.exception.GitException; +import de.tum.cit.aet.artemis.core.exception.LocalCIException; import de.tum.cit.aet.artemis.domain.Repository; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; -import de.tum.cit.aet.artemis.exception.GitException; -import de.tum.cit.aet.artemis.exception.LocalCIException; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildResult; import de.tum.cit.aet.artemis.service.connectors.localci.scaparser.ReportParser; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobGitService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobGitService.java index 5d878b13431d..15bf5d49e6a0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobGitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobGitService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.connectors.localci.buildagent; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; import java.io.IOException; import java.net.URI; @@ -28,9 +28,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.exception.GitException; import de.tum.cit.aet.artemis.domain.Repository; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.exception.GitException; import de.tum.cit.aet.artemis.service.connectors.AbstractGitService; @Profile(PROFILE_BUILDAGENT) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobManagementService.java index ae773f4bd763..fd406097b455 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobManagementService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.connectors.localci.buildagent; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; import java.io.PrintWriter; import java.io.StringWriter; @@ -31,8 +31,8 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.topic.ITopic; +import de.tum.cit.aet.artemis.core.exception.LocalCIException; import de.tum.cit.aet.artemis.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.exception.LocalCIException; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildResult; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildLogsMap.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildLogsMap.java index 281c973e758a..a4ffdd0779e9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildLogsMap.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildLogsMap.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.connectors.localci.buildagent; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; import java.time.ZonedDateTime; import java.util.ArrayList; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java index 30187bd8f682..c6a55ac38cfd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.connectors.localci.buildagent; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -34,9 +34,9 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.map.IMap; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.BuildLogEntry; import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildResult; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCFetchFilter.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCFetchFilter.java index be7ece5f61a7..e6965304468c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCFetchFilter.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCFetchFilter.java @@ -12,9 +12,9 @@ import org.slf4j.LoggerFactory; import org.springframework.web.filter.OncePerRequestFilter; -import de.tum.cit.aet.artemis.exception.localvc.LocalVCAuthException; -import de.tum.cit.aet.artemis.exception.localvc.LocalVCForbiddenException; -import de.tum.cit.aet.artemis.exception.localvc.LocalVCInternalException; +import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCAuthException; +import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCForbiddenException; +import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; import de.tum.cit.aet.artemis.web.rest.repository.RepositoryActionType; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCInfoContributor.java index 8e133fa2e4e6..6fc2056bc402 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCInfoContributor.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.connectors.localvc; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; import java.net.URI; import java.net.URISyntaxException; @@ -14,7 +14,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; @Component @Profile(PROFILE_LOCALVC) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPersonalAccessTokenManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPersonalAccessTokenManagementService.java index e9f28c03a7d4..129900184328 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPersonalAccessTokenManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPersonalAccessTokenManagementService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.connectors.localvc; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; import java.security.SecureRandom; import java.util.stream.Collectors; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPostPushHook.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPostPushHook.java index 28803a7f857c..dec418d03ce1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPostPushHook.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPostPushHook.java @@ -8,8 +8,8 @@ import org.eclipse.jgit.transport.ReceiveCommand; import org.eclipse.jgit.transport.ReceivePack; -import de.tum.cit.aet.artemis.exception.LocalCIException; -import de.tum.cit.aet.artemis.exception.VersionControlException; +import de.tum.cit.aet.artemis.core.exception.LocalCIException; +import de.tum.cit.aet.artemis.core.exception.VersionControlException; /** * Contains an onPostReceive method that is called by JGit after a push has been received (i.e. after the pushed files were successfully written to disk). diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPrePushHook.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPrePushHook.java index 232371a5eb5b..19dfdb310d15 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPrePushHook.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPrePushHook.java @@ -12,8 +12,8 @@ import org.eclipse.jgit.transport.ReceiveCommand; import org.eclipse.jgit.transport.ReceivePack; +import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.exception.localvc.LocalVCInternalException; /** * Contains an onPreReceive method that is called by JGit before a push is received (i.e. before the pushed files are written to disk but after the authorization check was diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPushFilter.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPushFilter.java index 219d1fb70920..1bf8e3f0c2ee 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPushFilter.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPushFilter.java @@ -12,9 +12,9 @@ import org.slf4j.LoggerFactory; import org.springframework.web.filter.OncePerRequestFilter; -import de.tum.cit.aet.artemis.exception.localvc.LocalVCAuthException; -import de.tum.cit.aet.artemis.exception.localvc.LocalVCForbiddenException; -import de.tum.cit.aet.artemis.exception.localvc.LocalVCInternalException; +import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCAuthException; +import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCForbiddenException; +import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; import de.tum.cit.aet.artemis.web.rest.repository.RepositoryActionType; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCRepositoryUri.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCRepositoryUri.java index 22b1ee67e1cc..f95fab514a47 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCRepositoryUri.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCRepositoryUri.java @@ -6,8 +6,8 @@ import java.nio.file.Path; import java.nio.file.Paths; +import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.exception.localvc.LocalVCInternalException; /** * Represents a URI for a local version control (VC) repository. This class extends {@link VcsRepositoryUri} by adding specific properties diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCService.java index 88ea357c1b3c..2f95a7f86aac 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.connectors.localvc; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; import java.io.IOException; import java.net.URL; @@ -30,13 +30,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; import de.tum.cit.aet.artemis.domain.Commit; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.exception.localvc.LocalVCInternalException; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCServletService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCServletService.java index d70f739faf83..8277bb862ddf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCServletService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCServletService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.connectors.localvc; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; import static de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCPersonalAccessTokenManagementService.TOKEN_PREFIX; import static de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCPersonalAccessTokenManagementService.VCS_ACCESS_TOKEN_LENGTH; @@ -37,6 +37,12 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.core.exception.VersionControlException; +import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCAuthException; +import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCForbiddenException; +import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Commit; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; @@ -45,15 +51,9 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; -import de.tum.cit.aet.artemis.exception.VersionControlException; -import de.tum.cit.aet.artemis.exception.localvc.LocalVCAuthException; -import de.tum.cit.aet.artemis.exception.localvc.LocalVCForbiddenException; -import de.tum.cit.aet.artemis.exception.localvc.LocalVCInternalException; import de.tum.cit.aet.artemis.repository.ParticipationVCSAccessTokenRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; import de.tum.cit.aet.artemis.service.programming.AuxiliaryRepositoryService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/ExternalPasswordResetInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/ExternalPasswordResetInfoContributor.java index 93b4dad013f8..fbee555875c0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/ExternalPasswordResetInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/ExternalPasswordResetInfoContributor.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.connectors.lti; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Map; @@ -12,7 +12,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; @Profile(PROFILE_CORE) @Component diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/Lti13Service.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/Lti13Service.java index 7f12d28bce2d..c49178bb7b0d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/Lti13Service.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/Lti13Service.java @@ -31,6 +31,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; +import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProvider; +import de.tum.cit.aet.artemis.core.security.lti.Lti13TokenRetriever; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Feedback; @@ -50,8 +52,6 @@ import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.repository.ResultRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.ArtemisAuthenticationProvider; -import de.tum.cit.aet.artemis.security.lti.Lti13TokenRetriever; import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingService.java index 897a5f95b35a..c7f3ceb12c58 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingService.java @@ -13,11 +13,11 @@ import org.springframework.stereotype.Service; import org.springframework.web.util.UriComponentsBuilder; +import de.tum.cit.aet.artemis.core.security.lti.Lti13TokenRetriever; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; import de.tum.cit.aet.artemis.domain.lti.Lti13DeepLinkingResponse; import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.security.lti.Lti13TokenRetriever; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDynamicRegistrationService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDynamicRegistrationService.java index 54e0cb3e6457..114851a5afb8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDynamicRegistrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDynamicRegistrationService.java @@ -15,11 +15,11 @@ import org.springframework.web.client.HttpServerErrorException; import org.springframework.web.client.RestTemplate; +import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.domain.lti.Lti13ClientRegistration; import de.tum.cit.aet.artemis.domain.lti.Lti13PlatformConfiguration; import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; -import de.tum.cit.aet.artemis.security.OAuth2JWKSService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiService.java index 8e575e699095..c28cb0391f62 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiService.java @@ -24,16 +24,16 @@ import org.springframework.util.StringUtils; import org.springframework.web.util.UriComponentsBuilder; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.exception.LtiEmailAlreadyInUseException; +import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProvider; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.security.jwt.JWTCookieService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.exception.LtiEmailAlreadyInUseException; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.ArtemisAuthenticationProvider; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.SecurityUtils; -import de.tum.cit.aet.artemis.security.jwt.JWTCookieService; import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; import de.tum.cit.aet.artemis.service.user.UserCreationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/AbstractVersionControlService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/AbstractVersionControlService.java index dea5615fdc37..602d794a88e5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/AbstractVersionControlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/AbstractVersionControlService.java @@ -12,13 +12,13 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; +import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Repository; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.exception.VersionControlException; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalService.java index c69cfd4569b3..cb868430cea1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.connectors.vcs; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import java.time.Duration; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsUserManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsUserManagementService.java index aba8820e1d86..3e773d22f62d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsUserManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsUserManagementService.java @@ -2,9 +2,9 @@ import java.util.Set; +import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.exception.VersionControlException; public interface VcsUserManagementService { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlServerHealthIndicator.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlServerHealthIndicator.java index 7695b98611f6..e5b90a0c1a13 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlServerHealthIndicator.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlServerHealthIndicator.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.connectors.vcs; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlService.java index d59a5ed3a63d..f0abaffbb132 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlService.java @@ -5,13 +5,13 @@ import jakarta.annotation.Nullable; +import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.domain.Commit; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.exception.VersionControlException; import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; public interface VersionControlService { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/TeamSearchUserDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/TeamSearchUserDTO.java index 3bf393f86fcb..005b19f73c64 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/TeamSearchUserDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/TeamSearchUserDTO.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.User; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/UserDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/UserDTO.java index e4cda4ef41ee..edd6941e3fb8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/UserDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/UserDTO.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.dto; -import static de.tum.cit.aet.artemis.config.Constants.USERNAME_MAX_LENGTH; -import static de.tum.cit.aet.artemis.config.Constants.USERNAME_MIN_LENGTH; +import static de.tum.cit.aet.artemis.core.config.Constants.USERNAME_MAX_LENGTH; +import static de.tum.cit.aet.artemis.core.config.Constants.USERNAME_MIN_LENGTH; import java.time.Instant; import java.time.ZonedDateTime; @@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Authority; import de.tum.cit.aet.artemis.domain.GuidedTourSetting; import de.tum.cit.aet.artemis.domain.Organization; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingExerciseDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingExerciseDTO.java index 17b17e62ec8a..d8ab88d96912 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingExerciseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingExerciseDTO.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.dto.athena; -import static de.tum.cit.aet.artemis.config.Constants.ATHENA_PROGRAMMING_EXERCISE_REPOSITORY_API_PATH; +import static de.tum.cit.aet.artemis.core.config.Constants.ATHENA_PROGRAMMING_EXERCISE_REPOSITORY_API_PATH; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingSubmissionDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingSubmissionDTO.java index 5434357b2057..cea173fcd746 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingSubmissionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingSubmissionDTO.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.dto.athena; -import static de.tum.cit.aet.artemis.config.Constants.ATHENA_PROGRAMMING_EXERCISE_REPOSITORY_API_PATH; +import static de.tum.cit.aet.artemis.core.config.Constants.ATHENA_PROGRAMMING_EXERCISE_REPOSITORY_API_PATH; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamAccessService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamAccessService.java index 961922e2a6ca..5ab34f4dc33b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamAccessService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamAccessService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.exam; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Optional; @@ -8,6 +8,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; @@ -18,7 +19,6 @@ import de.tum.cit.aet.artemis.repository.ExamRepository; import de.tum.cit.aet.artemis.repository.StudentExamRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDateService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDateService.java index 882858613170..24628fe8f308 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDateService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.exam; -import static de.tum.cit.aet.artemis.config.Constants.EXAM_START_WAIT_TIME_MINUTES; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.EXAM_START_WAIT_TIME_MINUTES; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Objects; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDeletionService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDeletionService.java index bdb048c0a651..0e7fda606d84 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDeletionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDeletionService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.exam; -import static de.tum.cit.aet.artemis.config.Constants.EXAM_EXERCISE_START_STATUS; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.EXAM_EXERCISE_START_STATUS; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.HashSet; import java.util.List; @@ -18,7 +18,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.GradingScale; import de.tum.cit.aet.artemis.domain.User; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamImportService.java index db8c5d350e0f..1bce354f7a07 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamImportService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.exam; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamLiveEventsService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamLiveEventsService.java index 11a7ac507616..023cd86ce247 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamLiveEventsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamLiveEventsService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.exam; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.scheduling.annotation.Async; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizService.java index 6d9ed42210c0..db45ae3fa627 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.exam; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Set; import java.util.stream.Collectors; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamRegistrationService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamRegistrationService.java index 48870b7d9007..6114fddbc09b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamRegistrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamRegistrationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.exam; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.HashMap; @@ -17,7 +17,8 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.exam.Exam; @@ -30,7 +31,6 @@ import de.tum.cit.aet.artemis.repository.StudentExamRepository; import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.user.UserService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamService.java index 592a1770479d..3455e71741cc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.exam; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; import static java.time.ZonedDateTime.now; @@ -39,7 +39,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.BonusStrategy; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -86,7 +87,6 @@ import de.tum.cit.aet.artemis.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.BonusService; import de.tum.cit.aet.artemis.service.CourseScoreCalculationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSessionService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSessionService.java index 228e681cfb6e..c4b28cc234e8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSessionService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.exam; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.security.SecureRandom; import java.util.Base64; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionService.java index 243ad378dd82..1e0e827b0915 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.exam; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Comparator; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamUserService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamUserService.java index 8d33c38239ce..e1ac0f42c846 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamUserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamUserService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.exam; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.awt.Rectangle; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessService.java index 445fbdd65a72..f5422fe780a5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.exam; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamService.java index c7ad2187ae07..2094cad20181 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.exam; -import static de.tum.cit.aet.artemis.config.Constants.EXAM_EXERCISE_START_STATUS; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.EXAM_EXERCISE_START_STATUS; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.util.TimeLogUtil.formatDurationFrom; import java.time.Instant; @@ -33,6 +33,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.FileUploadExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; @@ -65,7 +66,6 @@ import de.tum.cit.aet.artemis.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.service.SubmissionVersionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/CourseExamExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/CourseExamExportService.java index 4a32ec228a55..ab3923bde9eb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/CourseExamExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/CourseExamExportService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.export; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.FileWriter; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCommunicationDataService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCommunicationDataService.java index 64ceddefcec7..988aa2baa96c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCommunicationDataService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCommunicationDataService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.export; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.export.DataExportExerciseCreationService.CSV_FILE_EXTENSION; import static de.tum.cit.aet.artemis.service.export.DataExportUtil.createDirectoryIfNotExistent; import static de.tum.cit.aet.artemis.service.export.DataExportUtil.retrieveCourseDirPath; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCreationService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCreationService.java index 06f0bff4934c..76718a7bedee 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCreationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.export; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.export.DataExportExerciseCreationService.CSV_FILE_EXTENSION; import java.io.IOException; @@ -19,10 +19,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.exception.ArtemisMailException; import de.tum.cit.aet.artemis.domain.DataExport; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.DataExportState; -import de.tum.cit.aet.artemis.exception.ArtemisMailException; import de.tum.cit.aet.artemis.repository.DataExportRepository; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ResourceLoaderService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExamCreationService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExamCreationService.java index fb48d57a467b..78ee1c7ffd18 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExamCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExamCreationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.export; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.export.DataExportExerciseCreationService.CSV_FILE_EXTENSION; import static de.tum.cit.aet.artemis.service.export.DataExportUtil.createDirectoryIfNotExistent; import static de.tum.cit.aet.artemis.service.export.DataExportUtil.retrieveCourseDirPath; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExerciseCreationService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExerciseCreationService.java index 1e4c94e4eaf0..ef162b04f477 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExerciseCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExerciseCreationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.export; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.export.DataExportQuizExerciseCreationService.TXT_FILE_EXTENSION; import static de.tum.cit.aet.artemis.service.export.DataExportUtil.createDirectoryIfNotExistent; import static de.tum.cit.aet.artemis.service.export.DataExportUtil.retrieveCourseDirPath; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportQuizExerciseCreationService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportQuizExerciseCreationService.java index 605e04db385b..1856150f098a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportQuizExerciseCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportQuizExerciseCreationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.export; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportScienceEventService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportScienceEventService.java index 325bb135e12a..8d2a69a7b4c9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportScienceEventService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportScienceEventService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.export; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.export.DataExportExerciseCreationService.CSV_FILE_EXTENSION; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportService.java index 5ebb07218fcc..d943358c819d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.export; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/ExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/ExerciseWithSubmissionsExportService.java index ab76feb65edd..a1e7befede88 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/ExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/ExerciseWithSubmissionsExportService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.export; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadExerciseWithSubmissionsExportService.java index df00ebe5eb91..1a1765ed5583 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadExerciseWithSubmissionsExportService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.export; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.nio.file.Path; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadSubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadSubmissionExportService.java index 3892d50a9415..1722f6954535 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadSubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadSubmissionExportService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.export; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.File; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingExerciseWithSubmissionsExportService.java index 721e4bd1eb0d..4dc752d1d317 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingExerciseWithSubmissionsExportService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.export; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.nio.file.Path; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingSubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingSubmissionExportService.java index 888194f8efd1..5ec94d2ecec1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingSubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingSubmissionExportService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.export; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.BufferedWriter; import java.io.File; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/ProgrammingExerciseExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/ProgrammingExerciseExportService.java index 1d413f7fd57f..cc116f9f13a3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/ProgrammingExerciseExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/ProgrammingExerciseExportService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.export; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService.RepositoryCheckoutPath; import static de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsXmlFileUtils.getDocumentBuilderFactory; @@ -52,6 +52,7 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; +import de.tum.cit.aet.artemis.core.exception.GitException; import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.domain.Exercise; @@ -63,7 +64,6 @@ import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.exception.GitException; import de.tum.cit.aet.artemis.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/QuizExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/QuizExerciseWithSubmissionsExportService.java index af04fb4a23d1..721e77112828 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/QuizExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/QuizExerciseWithSubmissionsExportService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.export; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.IOException; import java.net.URI; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/SubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/SubmissionExportService.java index a66b69a94047..9128919349f9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/SubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/SubmissionExportService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.export; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.File; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/TextExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/TextExerciseWithSubmissionsExportService.java index 179e5cb92ac8..88a41f4d177c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/TextExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/TextExerciseWithSubmissionsExportService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.export; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.nio.file.Path; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/TextSubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/TextSubmissionExportService.java index 93d151c9d966..f07ddf87d785 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/TextSubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/TextSubmissionExportService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.export; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.BufferedWriter; import java.io.File; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleAspect.java b/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleAspect.java index fb1c36c11b2a..bf81fea9c587 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleAspect.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleAspect.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.feature; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Arrays; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleInfoContributor.java index 47940ea719fb..9c1a51613168 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleInfoContributor.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.feature; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.boot.actuate.info.Info; import org.springframework.boot.actuate.info.InfoContributor; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleService.java b/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleService.java index 2d6a527b37f8..f48c796df2f7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.feature; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Map; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/CodeHintService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/CodeHintService.java index a0bc22675c31..4aba3449ca68 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/CodeHintService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/CodeHintService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.hestia; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ExerciseHintService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ExerciseHintService.java index ed251566ef56..6beee6ab69dd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ExerciseHintService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ExerciseHintService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.hestia; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -18,6 +18,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; @@ -29,7 +30,6 @@ import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.repository.hestia.ExerciseHintActivationRepository; import de.tum.cit.aet.artemis.repository.hestia.ExerciseHintRepository; -import de.tum.cit.aet.artemis.security.Role; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java index 94e62fa774c1..cd11d2c64c78 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.hestia; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseTaskService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseTaskService.java index 356d8d5c7b41..31989cae9166 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseTaskService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseTaskService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.hestia; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/TestwiseCoverageService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/TestwiseCoverageService.java index f45fbbbf4ae4..6d418230df29 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/TestwiseCoverageService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/TestwiseCoverageService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.hestia; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Arrays; import java.util.Collections; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralTestCaseService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralTestCaseService.java index 23be162ab45d..62b6d6ffc117 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralTestCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralTestCaseService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.hestia.behavioral; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Arrays; import java.util.Collections; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralTestCaseService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralTestCaseService.java index b9b4f0986ebc..c0439f710422 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralTestCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralTestCaseService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.hestia.structural; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.IOException; import java.net.URISyntaxException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/icl/ArtemisGitServletService.java b/src/main/java/de/tum/cit/aet/artemis/service/icl/ArtemisGitServletService.java index d8b848d7f6a0..53c0b95c7f42 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/icl/ArtemisGitServletService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/icl/ArtemisGitServletService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.icl; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/icl/GitPublickeyAuthenticatorService.java b/src/main/java/de/tum/cit/aet/artemis/service/icl/GitPublickeyAuthenticatorService.java index daa27faaec9e..8d6e944334a2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/icl/GitPublickeyAuthenticatorService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/icl/GitPublickeyAuthenticatorService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.icl; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; import java.io.IOException; import java.security.GeneralSecurityException; @@ -16,8 +16,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.config.icl.ssh.HashUtils; -import de.tum.cit.aet.artemis.config.icl.ssh.SshConstants; +import de.tum.cit.aet.artemis.programming.icl.ssh.HashUtils; +import de.tum.cit.aet.artemis.programming.icl.ssh.SshConstants; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.connectors.localci.SharedQueueManagementService; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitCommandFactoryService.java b/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitCommandFactoryService.java index 34e0577fedf0..5ab405c64213 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitCommandFactoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitCommandFactoryService.java @@ -1,13 +1,13 @@ package de.tum.cit.aet.artemis.service.icl; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; import org.apache.sshd.git.pack.GitPackCommand; import org.apache.sshd.git.pack.GitPackCommandFactory; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.config.icl.ssh.SshGitCommand; +import de.tum.cit.aet.artemis.programming.icl.ssh.SshGitCommand; import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCServletService; @Profile(PROFILE_LOCALVC) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitLocationResolverService.java b/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitLocationResolverService.java index 03990d7734b3..20a169199d2b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitLocationResolverService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitLocationResolverService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.icl; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; import java.io.IOException; import java.net.URL; @@ -18,10 +18,10 @@ import org.springframework.security.access.AccessDeniedException; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.config.icl.ssh.SshConstants; +import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCForbiddenException; +import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.exception.localvc.LocalVCForbiddenException; -import de.tum.cit.aet.artemis.exception.localvc.LocalVCInternalException; +import de.tum.cit.aet.artemis.programming.icl.ssh.SshConstants; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCServletService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisDefaultTemplateService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisDefaultTemplateService.java index 83b1b4ecda18..11deb429d865 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisDefaultTemplateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisDefaultTemplateService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.iris; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisCourseChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisCourseChatSessionService.java index 6bebcb5ae7c7..562551b426e6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisCourseChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisCourseChatSessionService.java @@ -11,6 +11,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.competency.CompetencyJol; @@ -21,7 +22,6 @@ import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettingsType; import de.tum.cit.aet.artemis.repository.iris.IrisCourseChatSessionRepository; import de.tum.cit.aet.artemis.repository.iris.IrisSessionRepository; -import de.tum.cit.aet.artemis.security.Role; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisPipelineService; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisExerciseChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisExerciseChatSessionService.java index d04f5f75d3f4..6d2ad8ad8b3a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisExerciseChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisExerciseChatSessionService.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.Submission; @@ -21,7 +22,6 @@ import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.repository.iris.IrisSessionRepository; -import de.tum.cit.aet.artemis.security.Role; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisPipelineService; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisHestiaSessionService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisHestiaSessionService.java index 591f7f6f8529..cd03c4364607 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisHestiaSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisHestiaSessionService.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.hestia.CodeHint; @@ -16,7 +17,6 @@ import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettingsType; import de.tum.cit.aet.artemis.repository.iris.IrisHestiaSessionRepository; import de.tum.cit.aet.artemis.repository.iris.IrisSessionRepository; -import de.tum.cit.aet.artemis.security.Role; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisConnectorService; import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSettingsService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSettingsService.java index b80e3bc6a9bb..ad3e4869d69f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSettingsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSettingsService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.iris.settings; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import static de.tum.cit.aet.artemis.domain.iris.settings.IrisSettingsType.COURSE; import static de.tum.cit.aet.artemis.domain.iris.settings.IrisSettingsType.EXERCISE; import static de.tum.cit.aet.artemis.domain.iris.settings.IrisSettingsType.GLOBAL; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserDto.java b/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserDto.java index 827b91b99c66..39da561f42a8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserDto.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserDto.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.ldap; -import static de.tum.cit.aet.artemis.config.Constants.TUM_LDAP_MAIN_EMAIL; -import static de.tum.cit.aet.artemis.config.Constants.TUM_LDAP_MATRIKEL_NUMBER; +import static de.tum.cit.aet.artemis.core.config.Constants.TUM_LDAP_MAIN_EMAIL; +import static de.tum.cit.aet.artemis.core.config.Constants.TUM_LDAP_MATRIKEL_NUMBER; import javax.naming.Name; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserService.java b/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserService.java index 491afacfb69f..8a158c671176 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserService.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.service.ldap; -import static de.tum.cit.aet.artemis.config.Constants.TUM_LDAP_EMAILS; -import static de.tum.cit.aet.artemis.config.Constants.TUM_LDAP_MAIN_EMAIL; -import static de.tum.cit.aet.artemis.config.Constants.TUM_LDAP_MATRIKEL_NUMBER; +import static de.tum.cit.aet.artemis.core.config.Constants.TUM_LDAP_EMAILS; +import static de.tum.cit.aet.artemis.core.config.Constants.TUM_LDAP_MAIN_EMAIL; +import static de.tum.cit.aet.artemis.core.config.Constants.TUM_LDAP_MATRIKEL_NUMBER; import static org.springframework.ldap.query.LdapQueryBuilder.query; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNavigationService.java b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNavigationService.java index f5d7feceda08..289f00a267f0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNavigationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNavigationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.learningpath; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNgxService.java b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNgxService.java index e857a24f60aa..4f03de265f33 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNgxService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNgxService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.learningpath; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.HashMap; import java.util.HashSet; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathRecommendationService.java b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathRecommendationService.java index c7769ab4919e..6f419543775f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathRecommendationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathRecommendationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.learningpath; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.time.temporal.ChronoUnit; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathService.java b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathService.java index cfb59854b3e5..d414218b5310 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.learningpath; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Collections; import java.util.HashSet; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/LinkPreviewService.java b/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/LinkPreviewService.java index 8c95bfca38cf..df432161a5ef 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/LinkPreviewService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/LinkPreviewService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.linkpreview; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/listeners/ResultListener.java b/src/main/java/de/tum/cit/aet/artemis/service/listeners/ResultListener.java index 3527ad9b335c..c7d107533150 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/listeners/ResultListener.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/listeners/ResultListener.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.listeners; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import jakarta.persistence.PostPersist; import jakarta.persistence.PostUpdate; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageReceiveService.java b/src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageReceiveService.java index 92335abad655..1871525be143 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageReceiveService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageReceiveService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.messaging; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import java.util.Optional; @@ -14,6 +14,7 @@ import com.hazelcast.core.HazelcastInstance; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; @@ -22,7 +23,6 @@ import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.quiz.QuizScheduleService; import de.tum.cit.aet.artemis.service.scheduled.AthenaScheduleService; import de.tum.cit.aet.artemis.service.scheduled.ModelingExerciseScheduleService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/messaging/MainInstanceMessageSendService.java b/src/main/java/de/tum/cit/aet/artemis/service/messaging/MainInstanceMessageSendService.java index 8acf83d146a6..ed5610072c73 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/messaging/MainInstanceMessageSendService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/messaging/MainInstanceMessageSendService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.messaging; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/AnswerMessageService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/AnswerMessageService.java index 83a803954a33..55f024c26fe4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/AnswerMessageService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/AnswerMessageService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.metis; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Objects; @@ -10,6 +10,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.metis.AnswerPost; @@ -26,7 +27,6 @@ import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; import de.tum.cit.aet.artemis.repository.metis.PostRepository; import de.tum.cit.aet.artemis.repository.metis.conversation.ConversationRepository; -import de.tum.cit.aet.artemis.security.Role; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/ConversationMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/ConversationMessagingService.java index 0904c218a696..edec9735f231 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/ConversationMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/ConversationMessagingService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.metis; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Comparator; @@ -26,6 +26,8 @@ import com.google.common.collect.Lists; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.ConversationNotificationRecipientSummary; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; @@ -48,8 +50,6 @@ import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.metis.ConversationMessageRepository; import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/PostingService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/PostingService.java index e6524cf855d7..1f5c15b025d1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/PostingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/PostingService.java @@ -17,6 +17,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.ConversationNotificationRecipientSummary; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; @@ -34,7 +35,6 @@ import de.tum.cit.aet.artemis.repository.LectureRepository; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.cit.aet.artemis.security.Role; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.dto.UserRoleDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/ReactionService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/ReactionService.java index f9240f230fb4..fba8014d8eeb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/ReactionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/ReactionService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.metis; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ChannelService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ChannelService.java index 3abbf71cb091..f2fd73077a7f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ChannelService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ChannelService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.metis.conversation; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationDTOService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationDTOService.java index d44ba8da3f84..a0059f9c6a13 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationDTOService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationDTOService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.metis.conversation; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationService.java index 3c94910f9dd6..c29218b37229 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.metis.conversation; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.ArrayList; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/GroupChatService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/GroupChatService.java index 9093f7abd436..7868bb4458de 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/GroupChatService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/GroupChatService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.metis.conversation; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/OneToOneChatService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/OneToOneChatService.java index 9e88fa6fb009..93bf6d62f7a8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/OneToOneChatService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/OneToOneChatService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.metis.conversation; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ChannelAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ChannelAuthorizationService.java index e0d1a9dd3d95..fcc1e3a130b4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ChannelAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ChannelAuthorizationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.metis.conversation.auth; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.List; @@ -13,6 +13,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.metis.ConversationParticipantSettingsView; @@ -20,7 +21,6 @@ import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.cit.aet.artemis.security.Role; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ConversationAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ConversationAuthorizationService.java index d6bfbf6248cb..659192ec832a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ConversationAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ConversationAuthorizationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.metis.conversation.auth; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import jakarta.persistence.Persistence; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/GroupChatAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/GroupChatAuthorizationService.java index d6d778684f15..1dedaae4d287 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/GroupChatAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/GroupChatAuthorizationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.metis.conversation.auth; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.domain.metis.conversation.ConversationSettings.MAX_GROUP_CHATS_PER_USER_PER_COURSE; import jakarta.validation.constraints.NotNull; @@ -8,13 +8,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; import de.tum.cit.aet.artemis.repository.metis.conversation.GroupChatRepository; -import de.tum.cit.aet.artemis.security.Role; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/OneToOneChatAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/OneToOneChatAuthorizationService.java index d9780f861d26..6fbe10c73a88 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/OneToOneChatAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/OneToOneChatAuthorizationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.metis.conversation.auth; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.domain.metis.conversation.ConversationSettings.MAX_ONE_TO_ONE_CHATS_PER_USER_PER_COURSE; import jakarta.validation.constraints.NotNull; @@ -8,12 +8,12 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; import de.tum.cit.aet.artemis.repository.metis.conversation.OneToOneChatRepository; -import de.tum.cit.aet.artemis.security.Role; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/similarity/TitleJaccardSimilarityCompareStrategy.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/similarity/TitleJaccardSimilarityCompareStrategy.java index b3ae2e6da5e9..24a46d029b8e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/similarity/TitleJaccardSimilarityCompareStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/similarity/TitleJaccardSimilarityCompareStrategy.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.metis.similarity; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.apache.commons.text.similarity.JaccardSimilarity; import org.springframework.context.annotation.Primary; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metrics/LearningMetricsService.java b/src/main/java/de/tum/cit/aet/artemis/service/metrics/LearningMetricsService.java index d7910a5199fb..f9417defdbb6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metrics/LearningMetricsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metrics/LearningMetricsService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.metrics; -import static de.tum.cit.aet.artemis.config.Constants.MIN_SCORE_GREEN; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.MIN_SCORE_GREEN; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.util.TimeUtil.toRelativeTime; import static java.util.function.Function.identity; import static java.util.stream.Collectors.averagingDouble; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationService.java index b9e8864ca4eb..1236c9792cc0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.notifications; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_MESSAGE; import static de.tum.cit.aet.artemis.domain.notification.ConversationNotificationFactory.createConversationMessageNotification; import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_MESSAGE_CHANNEL_TEXT; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationService.java index 54a4e0ccad5c..4e3b6c50e1d8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.notifications; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel.EMAIL; import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel.PUSH; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationScheduleService.java index f99615161466..8ad78dbaeccf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationScheduleService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.notifications; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; @@ -8,8 +8,8 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationService.java index a13f1b8d7dcb..34b0c46139c1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.notifications; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.EDITOR; import static de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.INSTRUCTOR; import static de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.STUDENT; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailSendingService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailSendingService.java index ce1d2aa4c0f2..8dc03f8afe40 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailSendingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailSendingService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.notifications; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailService.java index ab41af662a19..7cf0acbc9877 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.notifications; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_SUBMISSION_ASSESSED; import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.extractNotificationUrl; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsService.java index 5423d68df82c..9e32d47252ce 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.notifications; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.ATTACHMENT_CHANGE; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_CHANNEL; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_GROUP_CHAT; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/SingleUserNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/SingleUserNotificationService.java index d7f3548e14ed..5a8138f834fb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/SingleUserNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/SingleUserNotificationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.notifications; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_REPLY_MESSAGE; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_USER_MENTIONED; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DATA_EXPORT_CREATED; @@ -47,6 +47,7 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.DataExport; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.FileUploadExercise; @@ -67,7 +68,6 @@ import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.metis.ConversationMessageRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationService.java index 743588abb107..208c4fce8141 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.notifications; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DELETED; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UPDATED; import static de.tum.cit.aet.artemis.domain.notification.TutorialGroupNotificationFactory.createTutorialGroupNotification; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/ApplePushNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/ApplePushNotificationService.java index b0a0ba204f3b..176fc88098e3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/ApplePushNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/ApplePushNotificationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.notifications.push_notifications; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/FirebasePushNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/FirebasePushNotificationService.java index 05545486955f..1be4228a4c46 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/FirebasePushNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/FirebasePushNotificationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.notifications.push_notifications; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/PushNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/PushNotificationService.java index f99dc78a16c3..515df79769e3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/PushNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/PushNotificationService.java @@ -37,7 +37,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; import de.tum.cit.aet.artemis.domain.notification.Notification; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlService.java index 9ea8f47548ed..db6412e59008 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.plagiarism; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import java.time.ZonedDateTime; import java.util.Set; @@ -13,6 +13,7 @@ import org.springframework.stereotype.Service; import de.jplag.exceptions.ExitException; +import de.tum.cit.aet.artemis.core.exception.ArtemisMailException; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.TextExercise; @@ -24,7 +25,6 @@ import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismResult; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmissionElement; -import de.tum.cit.aet.artemis.exception.ArtemisMailException; import de.tum.cit.aet.artemis.repository.ExerciseRepository; import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismComparisonRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ModelingPlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ModelingPlagiarismDetectionService.java index 7de4fdd78172..e9559d9b4b62 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ModelingPlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ModelingPlagiarismDetectionService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.plagiarism; import static com.google.gson.JsonParser.parseString; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.plagiarism.PlagiarismService.hasMinimumScore; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismAnswerPostService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismAnswerPostService.java index a5639a3ee6d3..0a7351dc6675 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismAnswerPostService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismAnswerPostService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.plagiarism; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Objects; @@ -8,6 +8,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.metis.AnswerPost; @@ -19,7 +20,6 @@ import de.tum.cit.aet.artemis.repository.metis.AnswerPostRepository; import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; import de.tum.cit.aet.artemis.repository.metis.PostRepository; -import de.tum.cit.aet.artemis.security.Role; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.metis.PostingService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismCaseService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismCaseService.java index 4bf8b92f3e88..1d7961a315bc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismCaseService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.plagiarism; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Collection; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionService.java index 6b6dd36ad2c1..cb10f1dc5f48 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.plagiarism; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.File; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismPostService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismPostService.java index 5770f0773da0..837cff38e4a7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismPostService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismPostService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.plagiarism; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.List; @@ -9,6 +9,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; @@ -21,7 +22,6 @@ import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; import de.tum.cit.aet.artemis.repository.metis.PostRepository; import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.cit.aet.artemis.security.Role; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.metis.PostingService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismService.java index ff838d90de93..9aeaecc62f32 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.plagiarism; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static java.util.function.Predicate.isEqual; import static java.util.function.Predicate.not; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismWebsocketService.java index adf7201fe69d..901f7f4855f0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismWebsocketService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.plagiarism; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.IOException; import java.util.HashMap; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java index 4471692a66f7..7b2cf9d2c21a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.plagiarism; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.plagiarism.PlagiarismService.filterParticipationMinimumScore; import java.io.File; @@ -37,13 +37,13 @@ import de.jplag.python3.PythonLanguage; import de.jplag.reporting.reportobject.ReportObjectFactory; import de.jplag.swift.SwiftLanguage; +import de.tum.cit.aet.artemis.core.exception.GitException; import de.tum.cit.aet.artemis.domain.PlagiarismCheckState; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Repository; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; -import de.tum.cit.aet.artemis.exception.GitException; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/TextPlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/TextPlagiarismDetectionService.java index d85434050163..9da18d058f2a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/TextPlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/TextPlagiarismDetectionService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.plagiarism; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.plagiarism.PlagiarismService.hasMinimumScore; import java.io.File; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/cache/PlagiarismCacheService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/cache/PlagiarismCacheService.java index 0edd9e57262d..43ccb42d0181 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/cache/PlagiarismCacheService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/cache/PlagiarismCacheService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.plagiarism.cache; -import static de.tum.cit.aet.artemis.config.Constants.HAZELCAST_ACTIVE_PLAGIARISM_CHECKS_PER_COURSE_CACHE; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.HAZELCAST_ACTIVE_PLAGIARISM_CHECKS_PER_COURSE_CACHE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/AuxiliaryRepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/AuxiliaryRepositoryService.java index 3a8c23f91f2b..734d9ce8ca0e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/AuxiliaryRepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/AuxiliaryRepositoryService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.programming; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/CommitHistoryService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/CommitHistoryService.java index 2128b138d991..293b6af1d85d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/CommitHistoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/CommitHistoryService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.programming; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/DefaultTemplateUpgradeService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/DefaultTemplateUpgradeService.java index 5d0beb2eb173..e97b26b7e434 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/DefaultTemplateUpgradeService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/DefaultTemplateUpgradeService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.programming; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/JavaTemplateUpgradeService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/JavaTemplateUpgradeService.java index e5e9c74b0f8c..780fd8815364 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/JavaTemplateUpgradeService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/JavaTemplateUpgradeService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.programming; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.FileInputStream; import java.io.FileOutputStream; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingAssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingAssessmentService.java index 5af1bd35c669..13cd55e9c004 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingAssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingAssessmentService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.programming; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseCodeReviewFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseCodeReviewFeedbackService.java index eec47af35150..d0e8f714b514 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseCodeReviewFeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseCodeReviewFeedbackService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.programming; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static java.time.ZonedDateTime.now; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationService.java index 4c2e886611f7..f0982aef0308 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.programming; -import static de.tum.cit.aet.artemis.config.Constants.FEEDBACK_DETAIL_TEXT_DATABASE_MAX_LENGTH; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.FEEDBACK_DETAIL_TEXT_DATABASE_MAX_LENGTH; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.Arrays; @@ -27,8 +27,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.config.Constants; -import de.tum.cit.aet.artemis.config.StaticCodeAnalysisConfigurer; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.config.StaticCodeAnalysisConfigurer; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseGradingService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseGradingService.java index cef7a2ed7fcc..220a6642f9c0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseGradingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseGradingService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.programming; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.config.Constants.TEST_CASES_DUPLICATE_NOTIFICATION; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.TEST_CASES_DUPLICATE_NOTIFICATION; import static de.tum.cit.aet.artemis.domain.ProgrammingSubmission.createFallbackSubmission; import java.time.ZonedDateTime; @@ -30,7 +30,9 @@ import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Feedback; @@ -52,8 +54,6 @@ import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPenaltyPolicy; import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; -import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; -import de.tum.cit.aet.artemis.exception.VersionControlException; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportBasicService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportBasicService.java index 8e50b8b0889c..7f7e8fa9ea29 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportBasicService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportBasicService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.programming; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportFromFileService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportFromFileService.java index 35e5f01d52cf..d6693c498ea0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportFromFileService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportFromFileService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.programming; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.export.ProgrammingExerciseExportService.BUILD_PLAN_FILE_NAME; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportService.java index 20e346900292..5a8712331ea3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportService.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.service.programming; -import static de.tum.cit.aet.artemis.config.Constants.ASSIGNMENT_REPO_NAME; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.config.Constants.TEST_REPO_NAME; +import static de.tum.cit.aet.artemis.core.config.Constants.ASSIGNMENT_REPO_NAME; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.TEST_REPO_NAME; import java.io.IOException; import java.util.HashMap; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseParticipationService.java index 69ea438a2622..b605b470de28 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseParticipationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.programming; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.FilenameFilter; import java.io.IOException; @@ -19,6 +19,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.FileSystemUtils; +import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Repository; @@ -34,7 +35,6 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.exception.VersionControlException; import de.tum.cit.aet.artemis.repository.ParticipationRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseRepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseRepositoryService.java index 3230e0e03b96..afc018822568 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseRepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseRepositoryService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.programming; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.config.Constants.SETUP_COMMIT_MESSAGE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.SETUP_COMMIT_MESSAGE; import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.isMavenProject; import java.io.FileNotFoundException; @@ -24,7 +24,7 @@ import org.springframework.core.io.Resource; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Repository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseService.java index 4a0565d17956..614dd9a5416a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.programming; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.SOLUTION; import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.TEMPLATE; import static de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository.ProgrammingExerciseFetchOptions.AuxiliaryRepositories; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseTestCaseService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseTestCaseService.java index 0022717b263b..7ed7f97b1c83 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseTestCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseTestCaseService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.programming; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.HashSet; import java.util.List; @@ -16,7 +16,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingMessagingService.java index b7b7f2a5e69c..e1529227dd5f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingMessagingService.java @@ -1,12 +1,12 @@ package de.tum.cit.aet.artemis.service.programming; -import static de.tum.cit.aet.artemis.config.Constants.BUILD_RUN_COMPLETE_FOR_PROGRAMMING_EXERCISE; -import static de.tum.cit.aet.artemis.config.Constants.BUILD_RUN_STARTED_FOR_PROGRAMMING_EXERCISE; -import static de.tum.cit.aet.artemis.config.Constants.EXERCISE_TOPIC_ROOT; -import static de.tum.cit.aet.artemis.config.Constants.NEW_SUBMISSION_TOPIC; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.config.Constants.PROGRAMMING_SUBMISSION_TOPIC; -import static de.tum.cit.aet.artemis.config.Constants.TEST_CASES_CHANGED_RUN_COMPLETED_NOTIFICATION; +import static de.tum.cit.aet.artemis.core.config.Constants.BUILD_RUN_COMPLETE_FOR_PROGRAMMING_EXERCISE; +import static de.tum.cit.aet.artemis.core.config.Constants.BUILD_RUN_STARTED_FOR_PROGRAMMING_EXERCISE; +import static de.tum.cit.aet.artemis.core.config.Constants.EXERCISE_TOPIC_ROOT; +import static de.tum.cit.aet.artemis.core.config.Constants.NEW_SUBMISSION_TOPIC; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROGRAMMING_SUBMISSION_TOPIC; +import static de.tum.cit.aet.artemis.core.config.Constants.TEST_CASES_CHANGED_RUN_COMPLETED_NOTIFICATION; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingSubmissionService.java index c361081fe910..2c7fcf33e80e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingSubmissionService.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.service.programming; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.config.Constants.PROGRAMMING_GRACE_PERIOD_SECONDS; -import static de.tum.cit.aet.artemis.config.Constants.SETUP_COMMIT_MESSAGE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROGRAMMING_GRACE_PERIOD_SECONDS; +import static de.tum.cit.aet.artemis.core.config.Constants.SETUP_COMMIT_MESSAGE; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -21,6 +21,9 @@ import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.core.exception.VersionControlException; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Commit; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; @@ -40,8 +43,6 @@ import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; -import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; -import de.tum.cit.aet.artemis.exception.VersionControlException; import de.tum.cit.aet.artemis.repository.ComplaintRepository; import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.repository.FeedbackRepository; @@ -54,7 +55,6 @@ import de.tum.cit.aet.artemis.repository.SubmissionPolicyRepository; import de.tum.cit.aet.artemis.repository.SubmissionRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.FeedbackService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingTriggerService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingTriggerService.java index e30688a8b0bb..235141c8b465 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingTriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingTriggerService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.programming; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.config.Constants.TRIGGER_INSTRUCTOR_BUILD; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.TRIGGER_INSTRUCTOR_BUILD; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -17,6 +17,8 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; @@ -29,14 +31,12 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.repository.ResultRepository; import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryAccessService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryAccessService.java index 32be58b3c052..2b0b6c4ed047 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryAccessService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryAccessService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.programming; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryParticipationService.java index b888b2c996e9..daff6a1f6bd9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryParticipationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.programming; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryService.java index 39c6687ebda3..af79b42a2896 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.programming; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/TemplateUpgradePolicyService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/TemplateUpgradePolicyService.java index f2c8a604f88d..3c242fb494d6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/TemplateUpgradePolicyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/TemplateUpgradePolicyService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.programming; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizBatchService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizBatchService.java index 62e6dd2c1a87..61e4b79e50d9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizBatchService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizBatchService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.quiz; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.security.SecureRandom; import java.time.ZonedDateTime; @@ -16,13 +16,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.exception.QuizJoinException; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; -import de.tum.cit.aet.artemis.exception.QuizJoinException; import de.tum.cit.aet.artemis.repository.ParticipationRepository; import de.tum.cit.aet.artemis.repository.QuizBatchRepository; import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseImportService.java index 5c894c2fa4a6..03d9ae87df3e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseImportService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.quiz; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.IOException; import java.net.URI; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseService.java index bf1439dcc0cd..42a7a4521889 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.quiz; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.IOException; import java.net.URI; @@ -31,7 +31,8 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; @@ -44,7 +45,6 @@ import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; -import de.tum.cit.aet.artemis.exception.FilePathParsingException; import de.tum.cit.aet.artemis.repository.DragAndDropMappingRepository; import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizMessagingService.java index 12e6f916a02e..6c985a1dba11 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizMessagingService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.quiz; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.domain.enumeration.QuizAction.START_BATCH; import jakarta.annotation.Nullable; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizPoolService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizPoolService.java index e5ce2f0caa4c..947c8e27faff 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizPoolService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizPoolService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.quiz; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.security.SecureRandom; import java.util.ArrayList; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizResultService.java index c7713225539e..24675a6bc4b7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizResultService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.quiz; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Comparator; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizScheduleService.java index 47c9815ede7d..84904c0b0ceb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizScheduleService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.quiz; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; -import static de.tum.cit.aet.artemis.config.StartupDelayConfig.QUIZ_EXERCISE_SCHEDULE_DELAY_SEC; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.core.config.StartupDelayConfig.QUIZ_EXERCISE_SCHEDULE_DELAY_SEC; import static de.tum.cit.aet.artemis.domain.enumeration.QuizAction.START_NOW; import java.time.Instant; @@ -18,13 +18,13 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.repository.QuizBatchRepository; import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.scheduled.ScheduleService; import de.tum.cit.aet.artemis.service.util.Tuple; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizService.java index cdee2903b25f..760c1edb7690 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.quiz; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizStatisticService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizStatisticService.java index aa6f94a77047..0aab6b9ceaed 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizStatisticService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizStatisticService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.quiz; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizSubmissionService.java index 041e48e224fe..5e69baebcccc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizSubmissionService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.quiz; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Optional; @@ -11,6 +11,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.exception.QuizSubmissionException; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; @@ -24,7 +25,6 @@ import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; -import de.tum.cit.aet.artemis.exception.QuizSubmissionException; import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.repository.ResultRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AthenaScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AthenaScheduleService.java index e7b3b3015f46..7bf2a361a3d4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AthenaScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AthenaScheduleService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.scheduled; -import static de.tum.cit.aet.artemis.config.StartupDelayConfig.ATHENA_SCHEDULE_DELAY_SEC; +import static de.tum.cit.aet.artemis.core.config.StartupDelayConfig.ATHENA_SCHEDULE_DELAY_SEC; import java.time.Instant; import java.time.ZonedDateTime; @@ -20,10 +20,10 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.ExerciseLifecycleService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.connectors.athena.AthenaSubmissionSendingService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AutomaticProgrammingExerciseCleanupService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AutomaticProgrammingExerciseCleanupService.java index 8dfa65de79db..2dfbfcf8cba2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AutomaticProgrammingExerciseCleanupService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AutomaticProgrammingExerciseCleanupService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.scheduled; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import static java.time.ZonedDateTime.now; import java.time.ZonedDateTime; @@ -19,12 +19,12 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.connectors.GitService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleService.java index f6a7a16736a7..3c3d1e8dd7e7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.scheduled; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import java.time.ZonedDateTime; import java.util.Collections; @@ -16,10 +16,10 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.DataExport; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.repository.DataExportRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.export.DataExportCreationService; import de.tum.cit.aet.artemis.service.export.DataExportService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ModelingExerciseScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ModelingExerciseScheduleService.java index 23ba99ef7312..c02bdf5618a7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ModelingExerciseScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ModelingExerciseScheduleService.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.service.scheduled; -import static de.tum.cit.aet.artemis.config.Constants.EXAM_END_WAIT_TIME_FOR_COMPASS_MINUTES; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; -import static de.tum.cit.aet.artemis.config.StartupDelayConfig.MODELING_EXERCISE_SCHEDULE_DELAY_SEC; +import static de.tum.cit.aet.artemis.core.config.Constants.EXAM_END_WAIT_TIME_FOR_COMPASS_MINUTES; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.core.config.StartupDelayConfig.MODELING_EXERCISE_SCHEDULE_DELAY_SEC; import static java.time.Instant.now; import java.time.Instant; @@ -24,11 +24,11 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.compass.CompassService; import de.tum.cit.aet.artemis.service.exam.ExamDateService; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/NotificationScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/NotificationScheduleService.java index 93df237a1e99..9fd7d8816bf8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/NotificationScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/NotificationScheduleService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.scheduled; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; -import static de.tum.cit.aet.artemis.config.StartupDelayConfig.NOTIFICATION_SCHEDULE_DELAY_SEC; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.core.config.StartupDelayConfig.NOTIFICATION_SCHEDULE_DELAY_SEC; import java.time.Instant; import java.time.ZonedDateTime; @@ -16,10 +16,10 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ParticipantScoreScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ParticipantScoreScheduleService.java index 1f8ad8edc295..098a11e65366 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ParticipantScoreScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ParticipantScoreScheduleService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.scheduled; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; -import static de.tum.cit.aet.artemis.config.StartupDelayConfig.PARTICIPATION_SCORES_SCHEDULE_DELAY_SEC; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.core.config.StartupDelayConfig.PARTICIPATION_SCORES_SCHEDULE_DELAY_SEC; import java.time.Instant; import java.time.ZonedDateTime; @@ -28,6 +28,7 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Team; @@ -44,7 +45,6 @@ import de.tum.cit.aet.artemis.repository.TeamRepository; import de.tum.cit.aet.artemis.repository.TeamScoreRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.service.util.RoundingUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ProgrammingExerciseScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ProgrammingExerciseScheduleService.java index 6753be623ff8..d99820e3932d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ProgrammingExerciseScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ProgrammingExerciseScheduleService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.scheduled; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; -import static de.tum.cit.aet.artemis.config.StartupDelayConfig.PROGRAMMING_EXERCISE_SCHEDULE_DELAY_SEC; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.core.config.StartupDelayConfig.PROGRAMMING_EXERCISE_SCHEDULE_DELAY_SEC; import java.time.Instant; import java.time.ZonedDateTime; @@ -34,7 +34,8 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; @@ -51,7 +52,6 @@ import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.repository.ResultRepository; import de.tum.cit.aet.artemis.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.service.exam.ExamDateService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupService.java index d5cf5bbe1100..0dd437ef4419 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.scheduled; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import java.util.Arrays; import java.util.Collection; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ScheduleService.java index e821bcdd5bc2..77afc69bf6dd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ScheduleService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.scheduled; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Objects; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/UserScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/UserScheduleService.java index a49f5a4aa9f0..d293ae7918b7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/UserScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/UserScheduleService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.scheduled; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import java.util.Map; import java.util.Optional; @@ -17,8 +17,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.exception.VersionControlException; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/WeeklyEmailSummaryScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/WeeklyEmailSummaryScheduleService.java index 98a78e5cae12..042087298e9d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/WeeklyEmailSummaryScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/WeeklyEmailSummaryScheduleService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.scheduled; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; -import static de.tum.cit.aet.artemis.config.StartupDelayConfig.EMAIL_SUMMARY_SCHEDULE_DELAY_SEC; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.core.config.StartupDelayConfig.EMAIL_SUMMARY_SCHEDULE_DELAY_SEC; import java.time.DayOfWeek; import java.time.Duration; @@ -19,7 +19,7 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.service.EmailSummaryService; import de.tum.cit.aet.artemis.service.ProfileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/science/ScienceEventService.java b/src/main/java/de/tum/cit/aet/artemis/service/science/ScienceEventService.java index 8741978b5cad..0e5c52bee539 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/science/ScienceEventService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/science/ScienceEventService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.science; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/telemetry/TelemetryService.java b/src/main/java/de/tum/cit/aet/artemis/service/telemetry/TelemetryService.java index e5461b557ac0..a4a502facf41 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/telemetry/TelemetryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/telemetry/TelemetryService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.telemetry; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/theia/TheiaInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/service/theia/TheiaInfoContributor.java index 486e6fe9f180..25f61abee9c6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/theia/TheiaInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/theia/TheiaInfoContributor.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.theia; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_THEIA; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_THEIA; import java.net.URL; @@ -10,7 +10,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; @Profile(PROFILE_THEIA) @Component diff --git a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupChannelManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupChannelManagementService.java index 35af67ff9149..bd3b83c8ed8b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupChannelManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupChannelManagementService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.tutorialgroups; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static jakarta.persistence.Persistence.getPersistenceUtil; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupFreePeriodService.java b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupFreePeriodService.java index 783ce76410e5..8302c5e6f0fa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupFreePeriodService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupFreePeriodService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.tutorialgroups; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupScheduleService.java index fb136becb284..134f2b8c9e34 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupScheduleService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.tutorialgroups; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.web.rest.util.DateUtil.getFirstDateOfWeekDay; import java.time.LocalDate; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupService.java b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupService.java index e80c25163423..b2fb522ce0f9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.tutorialgroups; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupResource.TutorialGroupImportErrors.MULTIPLE_REGISTRATIONS; import static jakarta.persistence.Persistence.getPersistenceUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupsConfigurationService.java b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupsConfigurationService.java index 946645322798..684aadf5bd36 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupsConfigurationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupsConfigurationService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.tutorialgroups; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/user/AuthorityService.java b/src/main/java/de/tum/cit/aet/artemis/service/user/AuthorityService.java index abc5b08760e3..8e013188a8fc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/user/AuthorityService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/user/AuthorityService.java @@ -1,11 +1,11 @@ package de.tum.cit.aet.artemis.service.user; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.security.Role.EDITOR; +import static de.tum.cit.aet.artemis.core.security.Role.INSTRUCTOR; +import static de.tum.cit.aet.artemis.core.security.Role.STUDENT; +import static de.tum.cit.aet.artemis.core.security.Role.TEACHING_ASSISTANT; import static de.tum.cit.aet.artemis.domain.Authority.ADMIN_AUTHORITY; -import static de.tum.cit.aet.artemis.security.Role.EDITOR; -import static de.tum.cit.aet.artemis.security.Role.INSTRUCTOR; -import static de.tum.cit.aet.artemis.security.Role.STUDENT; -import static de.tum.cit.aet.artemis.security.Role.TEACHING_ASSISTANT; import java.util.HashSet; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/user/PasswordService.java b/src/main/java/de/tum/cit/aet/artemis/service/user/PasswordService.java index ec9ba7c34238..e3b9c9a82af9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/user/PasswordService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/user/PasswordService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.user; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; @@ -8,7 +8,7 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.config.SecurityConfiguration; +import de.tum.cit.aet.artemis.core.config.SecurityConfiguration; /** * This service is a simple delegate to break the circular structure we would get when defining diff --git a/src/main/java/de/tum/cit/aet/artemis/service/user/UserCreationService.java b/src/main/java/de/tum/cit/aet/artemis/service/user/UserCreationService.java index 9de3ff8826b1..f2f9eee789ec 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/user/UserCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/user/UserCreationService.java @@ -1,10 +1,10 @@ package de.tum.cit.aet.artemis.service.user; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.security.Role.EDITOR; -import static de.tum.cit.aet.artemis.security.Role.INSTRUCTOR; -import static de.tum.cit.aet.artemis.security.Role.STUDENT; -import static de.tum.cit.aet.artemis.security.Role.TEACHING_ASSISTANT; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.security.Role.EDITOR; +import static de.tum.cit.aet.artemis.core.security.Role.INSTRUCTOR; +import static de.tum.cit.aet.artemis.core.security.Role.STUDENT; +import static de.tum.cit.aet.artemis.core.security.Role.TEACHING_ASSISTANT; import java.time.Instant; import java.util.HashSet; @@ -23,7 +23,8 @@ import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Authority; import de.tum.cit.aet.artemis.domain.Organization; import de.tum.cit.aet.artemis.domain.User; @@ -31,7 +32,6 @@ import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.repository.OrganizationRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/user/UserManagementInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/service/user/UserManagementInfoContributor.java index 2cb6a1eb9fef..169b1082f29c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/user/UserManagementInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/user/UserManagementInfoContributor.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.user; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; import java.util.regex.Pattern; @@ -11,7 +11,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; @Profile(PROFILE_CORE) @Component diff --git a/src/main/java/de/tum/cit/aet/artemis/service/user/UserService.java b/src/main/java/de/tum/cit/aet/artemis/service/user/UserService.java index e2132c4543cc..dcc1960223e5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/user/UserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/user/UserService.java @@ -1,16 +1,16 @@ package de.tum.cit.aet.artemis.service.user; -import static de.tum.cit.aet.artemis.config.Constants.PASSWORD_MAX_LENGTH; -import static de.tum.cit.aet.artemis.config.Constants.PASSWORD_MIN_LENGTH; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.config.Constants.USERNAME_MAX_LENGTH; -import static de.tum.cit.aet.artemis.config.Constants.USERNAME_MIN_LENGTH; -import static de.tum.cit.aet.artemis.config.Constants.USER_EMAIL_DOMAIN_AFTER_SOFT_DELETE; -import static de.tum.cit.aet.artemis.config.Constants.USER_FIRST_NAME_AFTER_SOFT_DELETE; -import static de.tum.cit.aet.artemis.config.Constants.USER_LAST_NAME_AFTER_SOFT_DELETE; +import static de.tum.cit.aet.artemis.core.config.Constants.PASSWORD_MAX_LENGTH; +import static de.tum.cit.aet.artemis.core.config.Constants.PASSWORD_MIN_LENGTH; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.USERNAME_MAX_LENGTH; +import static de.tum.cit.aet.artemis.core.config.Constants.USERNAME_MIN_LENGTH; +import static de.tum.cit.aet.artemis.core.config.Constants.USER_EMAIL_DOMAIN_AFTER_SOFT_DELETE; +import static de.tum.cit.aet.artemis.core.config.Constants.USER_FIRST_NAME_AFTER_SOFT_DELETE; +import static de.tum.cit.aet.artemis.core.config.Constants.USER_LAST_NAME_AFTER_SOFT_DELETE; +import static de.tum.cit.aet.artemis.core.security.Role.ADMIN; +import static de.tum.cit.aet.artemis.core.security.Role.STUDENT; import static de.tum.cit.aet.artemis.domain.Authority.ADMIN_AUTHORITY; -import static de.tum.cit.aet.artemis.security.Role.ADMIN; -import static de.tum.cit.aet.artemis.security.Role.STUDENT; import static org.apache.commons.lang3.StringUtils.lowerCase; import java.net.URI; @@ -38,18 +38,18 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; +import de.tum.cit.aet.artemis.core.exception.AccountRegistrationBlockedException; +import de.tum.cit.aet.artemis.core.exception.UsernameAlreadyUsedException; +import de.tum.cit.aet.artemis.core.exception.VersionControlException; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Authority; import de.tum.cit.aet.artemis.domain.GuidedTourSetting; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.participation.ParticipationVCSAccessToken; -import de.tum.cit.aet.artemis.exception.AccountRegistrationBlockedException; -import de.tum.cit.aet.artemis.exception.UsernameAlreadyUsedException; -import de.tum.cit.aet.artemis.exception.VersionControlException; import de.tum.cit.aet.artemis.repository.AuthorityRepository; import de.tum.cit.aet.artemis.repository.GuidedTourSettingsRepository; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.science.ScienceEventRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ParticipationVcsAccessTokenService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AbstractSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AbstractSubmissionResource.java index a04717b746c8..bab42098bbc8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AbstractSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AbstractSubmissionResource.java @@ -4,6 +4,7 @@ import org.springframework.http.ResponseEntity; +import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.User; @@ -11,7 +12,6 @@ import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.repository.SubmissionRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.SubmissionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AccountResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AccountResource.java index a8b379e42857..4eecf36d5a65 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AccountResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AccountResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.IOException; import java.net.URI; @@ -31,10 +31,10 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import de.tum.cit.aet.artemis.config.icl.ssh.HashUtils; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.programming.icl.ssh.HashUtils; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.AccountService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AeolusTemplateResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AeolusTemplateResource.java index 34766d155468..c0bf7bce70a2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AeolusTemplateResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AeolusTemplateResource.java @@ -18,9 +18,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.service.connectors.BuildScriptProviderService; import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AndroidAppSiteAssociationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AndroidAppSiteAssociationResource.java index 1b81240f7890..6f2a9a598ef9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AndroidAppSiteAssociationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AndroidAppSiteAssociationResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.cit.aet.artemis.security.annotations.ManualConfig; +import de.tum.cit.aet.artemis.core.security.annotations.ManualConfig; /** * REST controller for the android assetlink.json diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonConversionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonConversionResource.java index 9e0097beceef..34fde3a6dfd0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonConversionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonConversionResource.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.connectors.apollon.ApollonConversionService; import de.tum.cit.aet.artemis.service.connectors.apollon.dto.ApollonModelDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonDiagramResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonDiagramResource.java index 5308ac25b19e..c3d531a73bc2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonDiagramResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonDiagramResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -20,14 +20,14 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.modeling.ApollonDiagram; import de.tum.cit.aet.artemis.repository.ApollonDiagramRepository; import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AppleAppSiteAssociationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AppleAppSiteAssociationResource.java index 105557ffa1d8..666f8875dfac 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AppleAppSiteAssociationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AppleAppSiteAssociationResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.cit.aet.artemis.security.annotations.ManualConfig; +import de.tum.cit.aet.artemis.core.security.annotations.ManualConfig; /** * REST controller for the apple-app-site-association json diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AssessmentResource.java index e226c1dd0fc7..2f5acc8068db 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AssessmentResource.java @@ -7,6 +7,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.util.StringUtils; +import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Feedback; @@ -21,7 +22,6 @@ import de.tum.cit.aet.artemis.repository.ResultRepository; import de.tum.cit.aet.artemis.repository.SubmissionRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; import de.tum.cit.aet.artemis.service.AssessmentService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AthenaResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AthenaResource.java index 60167a846dae..ec03a1cf21ba 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AthenaResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AthenaResource.java @@ -17,12 +17,17 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.exception.NetworkingException; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.core.security.annotations.ManualConfig; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.exception.NetworkingException; import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.repository.ModelingSubmissionRepository; @@ -30,11 +35,6 @@ import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; -import de.tum.cit.aet.artemis.security.annotations.ManualConfig; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.connectors.athena.AthenaFeedbackSuggestionsService; import de.tum.cit.aet.artemis.service.connectors.athena.AthenaModuleService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AttachmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AttachmentResource.java index c924b9f2a247..b1236c99fe86 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AttachmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AttachmentResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.FilePathService.actualPathForPublicPath; import java.net.URI; @@ -26,16 +26,16 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.Attachment; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; import de.tum.cit.aet.artemis.repository.AttachmentRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/BonusResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/BonusResource.java index fa3ea4f4531b..8a3faca1b6ba 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/BonusResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/BonusResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -21,6 +21,11 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.ManualConfig; import de.tum.cit.aet.artemis.domain.Bonus; import de.tum.cit.aet.artemis.domain.BonusStrategy; import de.tum.cit.aet.artemis.domain.Course; @@ -28,11 +33,6 @@ import de.tum.cit.aet.artemis.repository.BonusRepository; import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.repository.GradingScaleRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.ManualConfig; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.BonusService; import de.tum.cit.aet.artemis.service.CourseScoreCalculationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResource.java index 81ce7a110a9b..d0ba8726db4b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -21,6 +21,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.Complaint; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -43,10 +47,6 @@ import de.tum.cit.aet.artemis.repository.ExerciseRepository; import de.tum.cit.aet.artemis.repository.ResultRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ComplaintService; import de.tum.cit.aet.artemis.service.dto.ComplaintRequestDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResponseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResponseResource.java index 3696381d23c2..1c843a31f086 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResponseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResponseResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; @@ -17,12 +17,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.Complaint; import de.tum.cit.aet.artemis.domain.ComplaintResponse; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.repository.ComplaintRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.ComplaintResponseService; import de.tum.cit.aet.artemis.service.dto.ComplaintAction; import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ConsistencyCheckResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ConsistencyCheckResource.java index 319b34e4c757..d5fff21edb74 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ConsistencyCheckResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ConsistencyCheckResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; @@ -13,10 +13,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ConsistencyCheckService; import de.tum.cit.aet.artemis.service.dto.ConsistencyErrorDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java index bb68a0eecb4e..71584c58bbfc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static java.time.ZonedDateTime.now; import java.io.File; @@ -56,7 +56,12 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.GradingScale; @@ -74,11 +79,6 @@ import de.tum.cit.aet.artemis.repository.TeamRepository; import de.tum.cit.aet.artemis.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AssessmentDashboardService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ComplaintService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/CustomMetricsExtension.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/CustomMetricsExtension.java index 4f09fd3c3531..b14351457a1e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/CustomMetricsExtension.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/CustomMetricsExtension.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java index 973bba9d430c..1557cee2a4bf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.File; import java.nio.file.Path; @@ -23,11 +23,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.DataExport; import de.tum.cit.aet.artemis.domain.enumeration.DataExportState; import de.tum.cit.aet.artemis.repository.DataExportRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.export.DataExportService; import de.tum.cit.aet.artemis.web.rest.dto.DataExportDTO; import de.tum.cit.aet.artemis.web.rest.dto.RequestDataExportDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamLockResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamLockResource.java index 59eea8c4588b..7ccc4648e565 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamLockResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamLockResource.java @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.service.exam.ExamAccessService; import de.tum.cit.aet.artemis.service.exam.ExamService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java index 8d393a626776..9e242fb39aa3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.util.TimeLogUtil.formatDurationFrom; import static java.time.ZonedDateTime.now; @@ -50,7 +50,12 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; @@ -69,11 +74,6 @@ import de.tum.cit.aet.artemis.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AssessmentDashboardService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.SubmissionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java index f55372963f3f..7270c05aebc7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.nio.file.Path; @@ -19,12 +19,12 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.exam.ExamUser; import de.tum.cit.aet.artemis.repository.ExamUserRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.exam.ExamAccessService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java index 5b1285f4595d..cceb2d59ff64 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; @@ -21,6 +21,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.ExampleSubmission; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.TextExercise; @@ -29,10 +33,6 @@ import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.repository.ExerciseRepository; import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExampleSubmissionService; import de.tum.cit.aet.artemis.service.TextBlockService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java index a77997d2cbe0..5a5e526e5b37 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.IOException; import java.net.URI; @@ -24,7 +24,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.exam.Exam; @@ -32,9 +35,6 @@ import de.tum.cit.aet.artemis.repository.ExamRepository; import de.tum.cit.aet.artemis.repository.ExerciseGroupRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.service.ExerciseDeletionService; import de.tum.cit.aet.artemis.service.exam.ExamAccessService; import de.tum.cit.aet.artemis.service.exam.ExamImportService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java index cb304a3f1ad3..8dd1854dff53 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Collections; @@ -21,6 +21,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.ExampleSubmission; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.GradingCriterion; @@ -40,10 +44,6 @@ import de.tum.cit.aet.artemis.repository.ParticipationRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDeletionService; import de.tum.cit.aet.artemis.service.ExerciseService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseScoresChartResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseScoresChartResource.java index 490cedf1d9ba..f71f5d77899a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseScoresChartResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseScoresChartResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Set; @@ -15,13 +15,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.ExerciseScoresChartService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java index ff029d76c272..2435a8004123 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.IOException; import java.net.FileNameMap; @@ -39,6 +39,12 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; import de.tum.cit.aet.artemis.domain.Attachment; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.FileUploadExercise; @@ -64,12 +70,6 @@ import de.tum.cit.aet.artemis.repository.QuizQuestionRepository; import de.tum.cit.aet.artemis.repository.SlideRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java index 53ff7ed29498..474a11eed7cc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -17,6 +17,9 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.FileUploadExercise; import de.tum.cit.aet.artemis.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.domain.Result; @@ -30,9 +33,6 @@ import de.tum.cit.aet.artemis.repository.ResultRepository; import de.tum.cit.aet.artemis.repository.SubmissionRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AssessmentService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java index 608f23acbf94..217b22909b52 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.FILE_ENDING_PATTERN; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.FILE_ENDING_PATTERN; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.File; import java.net.URI; @@ -26,6 +26,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.FileUploadExercise; @@ -38,10 +42,6 @@ import de.tum.cit.aet.artemis.repository.ParticipationRepository; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.ExerciseDeletionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java index b8038d53c875..9338da7a3fc5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.IOException; import java.util.Collections; @@ -26,7 +26,11 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.server.ResponseStatusException; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.exception.EmptyFileException; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.FileUploadExercise; import de.tum.cit.aet.artemis.domain.FileUploadSubmission; @@ -35,7 +39,6 @@ import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.exception.EmptyFileException; import de.tum.cit.aet.artemis.repository.ExerciseRepository; import de.tum.cit.aet.artemis.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.repository.FileUploadSubmissionRepository; @@ -43,9 +46,6 @@ import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.repository.SubmissionRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.FileUploadSubmissionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/GitDiffReportParserService.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/GitDiffReportParserService.java index 1b8303946d04..7d524bab96de 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/GitDiffReportParserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/GitDiffReportParserService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/GradeStepResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/GradeStepResource.java index 314a16d95614..a91eaa24540a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/GradeStepResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/GradeStepResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; import java.util.Set; @@ -15,6 +15,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.GradeStep; import de.tum.cit.aet.artemis.domain.GradingScale; @@ -28,9 +31,6 @@ import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.dto.GradeDTO; import de.tum.cit.aet.artemis.web.rest.dto.GradeStepsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/GradingScaleResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/GradingScaleResource.java index 99cfaf50648e..b89e7bfc3729 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/GradingScaleResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/GradingScaleResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -23,6 +23,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.GradingScale; import de.tum.cit.aet.artemis.domain.exam.Exam; @@ -30,8 +32,6 @@ import de.tum.cit.aet.artemis.repository.ExamRepository; import de.tum.cit.aet.artemis.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.GradingScaleService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/GuidedTourSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/GuidedTourSettingsResource.java index 2bb17b1be00b..81196a4e561d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/GuidedTourSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/GuidedTourSettingsResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Set; @@ -16,9 +16,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.GuidedTourSetting; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.user.UserService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java index fd1efe6573d4..cacbc9f158a3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -24,15 +24,15 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.competency.LearningPath; import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.repository.LearningPathRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.LearningObjectService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java index d0b85ca60f66..406f1a6a0c03 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -26,6 +26,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Lecture; @@ -38,10 +42,6 @@ import de.tum.cit.aet.artemis.repository.LectureRepository; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.service.LectureImportService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java index f2fa5da94814..0d13afd1c2d4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -12,11 +12,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.LongFeedbackText; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.participation.Participation; import de.tum.cit.aet.artemis.repository.LongFeedbackTextRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java index 4bd5606b581c..09003ca33bbb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java @@ -25,12 +25,12 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.nimbusds.jwt.SignedJWT; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.connectors.lti.LtiDeepLinkingService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/MetricsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/MetricsResource.java index 34c2d0c7cee1..984de8174ef1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/MetricsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/MetricsResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; import de.tum.cit.aet.artemis.service.metrics.LearningMetricsService; import de.tum.cit.aet.artemis.web.rest.dto.metrics.StudentMetricsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java index a4781821fa2b..303dd35283ee 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; @@ -20,6 +20,9 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; @@ -34,9 +37,6 @@ import de.tum.cit.aet.artemis.repository.ResultRepository; import de.tum.cit.aet.artemis.repository.SubmissionRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AssessmentService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java index 8c79a169058b..4d56bd93b9a9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.web.rest.plagiarism.PlagiarismResultResponseBuilder.buildPlagiarismResultResponse; import java.io.File; @@ -27,6 +27,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.GradingCriterion; @@ -41,10 +45,6 @@ import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismResultRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.ExerciseDeletionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java index 49f3dcdfe90e..7465ec90432c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.List; @@ -26,6 +26,9 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.GradingCriterion; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; @@ -40,9 +43,6 @@ import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.repository.SubmissionRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ModelingSubmissionService; import de.tum.cit.aet.artemis.service.ResultService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationResource.java index 0ab06b1e5c8b..83c67f74ed87 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.MESSAGE_REPLY_IN_CONVERSATION_TITLE; import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_MESSAGE_TITLE; @@ -21,12 +21,12 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.notification.Notification; import de.tum.cit.aet.artemis.repository.NotificationRepository; import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel; import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService; import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java index aa4b238f6f80..8c21fe357c09 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Arrays; import java.util.List; @@ -20,11 +20,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.NotificationSetting; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/OrganizationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/OrganizationResource.java index 9aeec987b4c4..afeaff4ae33c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/OrganizationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/OrganizationResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Set; @@ -14,9 +14,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.Organization; import de.tum.cit.aet.artemis.repository.OrganizationRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; /** * REST controller for managing the Organization entities diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java index af5f3528dcb7..37d6bf76c901 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; @@ -13,12 +13,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipantScoreService; import de.tum.cit.aet.artemis.web.rest.dto.score.ScoreDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java index 10812bf4873e..daba16ac2987 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static java.time.ZonedDateTime.now; import java.net.URI; @@ -41,8 +41,13 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ResponseStatusException; -import de.tum.cit.aet.artemis.config.Constants; -import de.tum.cit.aet.artemis.config.GuidedTourConfiguration; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.config.GuidedTourConfiguration; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.GradingScale; @@ -75,11 +80,6 @@ import de.tum.cit.aet.artemis.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.repository.TeamRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.GradingScaleService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/PlantUmlResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/PlantUmlResource.java index e586689a455f..00221a647098 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/PlantUmlResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/PlantUmlResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.util.TimeLogUtil.formatDurationFrom; import java.io.IOException; @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.PlantUmlService; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java index c4c9f81033f9..5c3c19b8e6fd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.beans.PropertyEditorSupport; import java.io.IOException; @@ -38,7 +38,17 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; +import de.tum.cit.aet.artemis.core.exception.QuizJoinException; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastTutorInCourse; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastInstructorInExercise; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.QuizAction; @@ -48,21 +58,11 @@ import de.tum.cit.aet.artemis.domain.quiz.DragItem; import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.exception.FilePathParsingException; -import de.tum.cit.aet.artemis.exception.QuizJoinException; import de.tum.cit.aet.artemis.repository.QuizBatchRepository; import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastTutorInCourse; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastInstructorInExercise; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.ExerciseDeletionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java index c4ccd27433ac..fac8acebd167 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Optional; @@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; @@ -28,7 +29,6 @@ import de.tum.cit.aet.artemis.repository.ResultRepository; import de.tum.cit.aet.artemis.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.quiz.QuizBatchService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java index e4f7c1e53b63..c046731cd3fe 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -14,11 +14,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.quiz.QuizPool; import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.exam.ExamAccessService; import de.tum.cit.aet.artemis.service.quiz.QuizPoolService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java index ebe940af0cb8..6ba77c8919db 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; @@ -20,6 +20,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.exception.QuizSubmissionException; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; @@ -29,13 +33,9 @@ import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; -import de.tum.cit.aet.artemis.exception.QuizSubmissionException; import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.exam.ExamSubmissionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java index 2eec8aa53e8f..db87046fb016 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -19,6 +19,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Rating; import de.tum.cit.aet.artemis.domain.Result; @@ -27,9 +30,6 @@ import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.repository.ResultRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.RatingService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java index 1ead2b7a2b69..0c4e77d72995 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -25,6 +25,11 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Feedback; @@ -41,11 +46,6 @@ import de.tum.cit.aet.artemis.repository.ResultRepository; import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java index 119d544ca292..ed5c45594eef 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Objects; import java.util.Set; @@ -17,13 +17,13 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisCategory; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.StaticCodeAnalysisCategoryRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/StatisticsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/StatisticsResource.java index 14e5b0057a70..15b132b82944 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/StatisticsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/StatisticsResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; @@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.enumeration.GraphType; @@ -18,8 +20,6 @@ import de.tum.cit.aet.artemis.domain.enumeration.StatisticsView; import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.StatisticsService; import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementStatisticsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java index bf65da6b38b9..400cccb427be 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.EXAM_START_WAIT_TIME_MINUTES; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.EXAM_START_WAIT_TIME_MINUTES; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.util.TimeLogUtil.formatDurationFrom; import static java.time.ZonedDateTime.now; @@ -35,7 +35,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; @@ -52,8 +54,6 @@ import de.tum.cit.aet.artemis.repository.SubmissionPolicyRepository; import de.tum.cit.aet.artemis.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.exam.ExamAccessService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java index eaa2e4ca1429..3d5ebbf53710 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -22,13 +22,13 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.service.SubmissionPolicyService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java index 4f9462f9027b..05f11855bf57 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Collections; import java.util.List; @@ -17,6 +17,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; @@ -31,10 +35,6 @@ import de.tum.cit.aet.artemis.repository.SubmissionRepository; import de.tum.cit.aet.artemis.repository.SubmissionVersionRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.service.ResultService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/SystemNotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/SystemNotificationResource.java index ae72b73c1fb1..93c725086146 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/SystemNotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/SystemNotificationResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Optional; @@ -19,10 +19,10 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.notification.SystemNotification; import de.tum.cit.aet.artemis.repository.SystemNotificationRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.PaginationUtil; import tech.jhipster.web.util.ResponseUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java index 22099aa1a85b..9c7683723adb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.config.Constants.SHORT_NAME_PATTERN; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.SHORT_NAME_PATTERN; import static de.tum.cit.aet.artemis.web.rest.util.StringUtil.stripIllegalCharacters; import java.net.URI; @@ -34,7 +34,12 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ResponseStatusException; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; @@ -48,11 +53,6 @@ import de.tum.cit.aet.artemis.repository.TeamRepository; import de.tum.cit.aet.artemis.repository.TeamScoreRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.SubmissionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentEventResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentEventResource.java index d536f92dffec..f812e12799e2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentEventResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentEventResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -18,6 +18,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.TextSubmission; @@ -27,9 +30,6 @@ import de.tum.cit.aet.artemis.repository.TextAssessmentEventRepository; import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java index 4a2bdfc982ea..b408f6897801 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static java.util.stream.Collectors.toSet; import java.util.Collections; @@ -29,6 +29,9 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.ExampleSubmission; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Feedback; @@ -51,9 +54,6 @@ import de.tum.cit.aet.artemis.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.service.TextAssessmentService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java index b7dc70f9a322..56bfb61fecd3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.web.rest.plagiarism.PlagiarismResultResponseBuilder.buildPlagiarismResultResponse; import java.io.File; @@ -29,6 +29,11 @@ import org.springframework.web.bind.annotation.RestController; import de.jplag.exceptions.ExitException; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ExampleSubmission; import de.tum.cit.aet.artemis.domain.Exercise; @@ -55,11 +60,6 @@ import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismResultRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.ExerciseDateService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java index ed30b460b8c0..9a175743450f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Optional; @@ -22,6 +22,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.GradingCriterion; import de.tum.cit.aet.artemis.domain.Submission; @@ -35,9 +38,6 @@ import de.tum.cit.aet.artemis.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.service.TextAssessmentService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorEffortResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorEffortResource.java index 1e2fb8342958..b65d4570c764 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorEffortResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorEffortResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; @@ -13,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; @@ -20,8 +22,6 @@ import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.repository.ExerciseRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.TutorEffortService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java index b1c82c62f801..f75c2cc24cbf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -17,7 +17,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.cit.aet.artemis.config.GuidedTourConfiguration; +import de.tum.cit.aet.artemis.core.config.GuidedTourConfiguration; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.ExampleSubmission; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; @@ -25,8 +27,6 @@ import de.tum.cit.aet.artemis.repository.ExerciseRepository; import de.tum.cit.aet.artemis.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.TutorParticipationService; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/UserResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/UserResource.java index 5a1475cb9cbe..37f694f84136 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/UserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/UserResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.List; @@ -23,10 +23,10 @@ import org.springframework.web.server.ResponseStatusException; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.connectors.lti.LtiService; import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.service.dto.UserInitializationDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminBuildJobQueueResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminBuildJobQueueResource.java index b97b2017c50f..53861506f637 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminBuildJobQueueResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminBuildJobQueueResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALCI; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; import java.time.ZonedDateTime; import java.util.List; @@ -20,9 +20,9 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.domain.BuildJob; import de.tum.cit.aet.artemis.repository.BuildJobRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.service.connectors.localci.SharedQueueManagementService; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminCourseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminCourseResource.java index ca38ba85b1e2..4c645c433e6b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminCourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminCourseResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -28,14 +28,14 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.DefaultChannelType; import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminDataExportResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminDataExportResource.java index f5f3f52ced30..299c71ecde4d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminDataExportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminDataExportResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.http.ResponseEntity; @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.service.export.DataExportService; import de.tum.cit.aet.artemis.web.rest.dto.RequestDataExportDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminExamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminExamResource.java index e3bae4962bee..f9e2b2f6658c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminExamResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; @@ -12,9 +12,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; /** * REST controller for administrating Exam. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminExerciseResource.java index c86b465dd031..7a2ab5934acb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminExerciseResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Set; @@ -12,9 +12,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; /** * REST controller for administrating Exercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminImprintResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminImprintResource.java index d38f3e0e8410..0d5db2eb3a25 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminImprintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminImprintResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import jakarta.ws.rs.BadRequestException; @@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.service.LegalDocumentService; import de.tum.cit.aet.artemis.web.rest.dto.ImprintDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminLtiConfigurationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminLtiConfigurationResource.java index 7d51179190fc..39acbd0cd3a6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminLtiConfigurationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminLtiConfigurationResource.java @@ -18,10 +18,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; -import de.tum.cit.aet.artemis.security.OAuth2JWKSService; -import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.connectors.lti.LtiDynamicRegistrationService; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminModelingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminModelingExerciseResource.java index d68d7c679c80..007f1598b440 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminModelingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminModelingExerciseResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -14,9 +14,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.repository.ModelClusterRepository; import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.service.ModelingExerciseService; import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminOrganizationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminOrganizationResource.java index 1bc9030c3c04..b7dbf48886ad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminOrganizationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminOrganizationResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.List; @@ -21,12 +21,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.domain.Organization; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.repository.OrganizationRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.service.OrganizationService; import de.tum.cit.aet.artemis.web.rest.dto.OrganizationCountDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminPrivacyStatementResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminPrivacyStatementResource.java index 1b037c59f3e9..0a500b4c308f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminPrivacyStatementResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminPrivacyStatementResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import jakarta.ws.rs.BadRequestException; @@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.service.LegalDocumentService; import de.tum.cit.aet.artemis.web.rest.dto.PrivacyStatementDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminStandardizedCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminStandardizedCompetencyResource.java index 1a1d7d89c858..996ebb0f3508 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminStandardizedCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminStandardizedCompetencyResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -22,8 +22,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; -import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.service.competency.KnowledgeAreaService; import de.tum.cit.aet.artemis.service.competency.StandardizedCompetencyService; import de.tum.cit.aet.artemis.service.feature.Feature; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminStatisticsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminStatisticsResource.java index 99899111d5b6..db780494bc4c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminStatisticsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminStatisticsResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; @@ -13,10 +13,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.domain.enumeration.GraphType; import de.tum.cit.aet.artemis.domain.enumeration.SpanType; import de.tum.cit.aet.artemis.domain.enumeration.StatisticsView; -import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.service.StatisticsService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminSystemNotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminSystemNotificationResource.java index dcef5961aac1..cc1e0ba5ccfc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminSystemNotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminSystemNotificationResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -18,10 +18,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.domain.notification.Notification; import de.tum.cit.aet.artemis.domain.notification.SystemNotification; import de.tum.cit.aet.artemis.repository.SystemNotificationRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.service.SystemNotificationService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminTextAssessmentEventResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminTextAssessmentEventResource.java index 76f76afbb73a..a6b941596704 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminTextAssessmentEventResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminTextAssessmentEventResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; @@ -11,9 +11,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.domain.analytics.TextAssessmentEvent; import de.tum.cit.aet.artemis.repository.TextAssessmentEventRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; /** * REST controller for administrating TextAssessmentEventResource. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminUserResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminUserResource.java index cd490d0516f8..f360ca694260 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminUserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminUserResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -29,11 +29,11 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.repository.AuthorityRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.service.ldap.LdapUserService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AuditResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AuditResource.java index 385a1b1244f0..892ed77cd502 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AuditResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AuditResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static tech.jhipster.web.util.PaginationUtil.generatePaginationHttpHeaders; import java.time.Instant; @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; -import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.service.AuditEventService; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.ResponseUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/FeatureToggleResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/FeatureToggleResource.java index e79c591ec400..fdba3e847ccc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/FeatureToggleResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/FeatureToggleResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Map; @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.service.feature.Feature; import de.tum.cit.aet.artemis.service.feature.FeatureToggleService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/LogResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/LogResource.java index b48407683fbb..f4cf8aaadd80 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/LogResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/LogResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.admin; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; @@ -16,7 +16,7 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; -import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.web.rest.vm.LoggerVM; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/iris/AdminIrisSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/iris/AdminIrisSettingsResource.java index 35f3f9e6ba16..6a443d0f5d21 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/iris/AdminIrisSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/iris/AdminIrisSettingsResource.java @@ -7,8 +7,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.domain.iris.settings.IrisSettings; -import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java index 22ee45836ba9..e87b49232e38 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.competency; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -25,6 +25,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.competency.Competency; @@ -33,10 +37,6 @@ import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.LectureUnitService; import de.tum.cit.aet.artemis.service.competency.CompetencyService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java index 69994ddc2732..e0443fc1cb57 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.competency; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -26,6 +26,12 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; @@ -35,12 +41,6 @@ import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.competency.CompetencyJolService; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java index 9b7729ddb2c2..eb70e25c4df2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.competency; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -25,6 +25,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; @@ -33,10 +37,6 @@ import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.repository.PrerequisiteRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.LectureUnitService; import de.tum.cit.aet.artemis.service.competency.CourseCompetencyService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/StandardizedCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/StandardizedCompetencyResource.java index d223c17222b3..39126085f6b1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/StandardizedCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/StandardizedCompetencyResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.competency; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; @@ -13,12 +13,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.domain.competency.KnowledgeArea; import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; import de.tum.cit.aet.artemis.repository.SourceRepository; import de.tum.cit.aet.artemis.repository.competency.KnowledgeAreaRepository; import de.tum.cit.aet.artemis.repository.competency.StandardizedCompetencyRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.service.competency.StandardizedCompetencyService; import de.tum.cit.aet.artemis.service.feature.Feature; import de.tum.cit.aet.artemis.service.feature.FeatureToggle; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ExceptionTranslator.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ExceptionTranslator.java index 826188b04917..37d3ca7db3e0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ExceptionTranslator.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ExceptionTranslator.java @@ -33,6 +33,7 @@ import org.zalando.problem.spring.web.advice.security.SecurityAdviceTrait; import org.zalando.problem.violations.ConstraintViolationProblem; +import de.tum.cit.aet.artemis.core.exception.UsernameAlreadyUsedException; import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabException; import tech.jhipster.web.util.HeaderUtil; @@ -102,7 +103,7 @@ public ResponseEntity handleEmailAlreadyUsedException(EmailAlreadyUsedE } @ExceptionHandler - public ResponseEntity handleUsernameAlreadyUsedException(de.tum.cit.aet.artemis.exception.UsernameAlreadyUsedException ex, NativeWebRequest request) { + public ResponseEntity handleUsernameAlreadyUsedException(UsernameAlreadyUsedException ex, NativeWebRequest request) { LoginAlreadyUsedException problem = new LoginAlreadyUsedException(); return create(problem, request, HeaderUtil.createFailureAlert(applicationName, true, problem.getEntityName(), problem.getErrorKey(), problem.getMessage())); } diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CodeHintResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CodeHintResource.java index c9eb2442d7bf..8a638a0ad4e7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CodeHintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CodeHintResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.hestia; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Objects; @@ -19,13 +19,13 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettingsType; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.hestia.CodeHintRepository; import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; import de.tum.cit.aet.artemis.service.hestia.CodeHintService; import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CoverageReportResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CoverageReportResource.java index ef6efa32dade..f284bcf1331a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CoverageReportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CoverageReportResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.hestia; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; import de.tum.cit.aet.artemis.domain.hestia.CoverageReport; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; import de.tum.cit.aet.artemis.service.hestia.TestwiseCoverageService; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ExerciseHintResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ExerciseHintResource.java index a4ff566f39fd..7d974840e042 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ExerciseHintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ExerciseHintResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.hestia; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -20,6 +20,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.hestia.CodeHint; @@ -28,10 +32,6 @@ import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.hestia.ExerciseHintRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; import de.tum.cit.aet.artemis.service.hestia.CodeHintService; import de.tum.cit.aet.artemis.service.hestia.ExerciseHintService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java index 75d20e0b0c61..f18627a917f8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.hestia; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.IOException; @@ -15,6 +15,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; @@ -23,10 +27,6 @@ import de.tum.cit.aet.artemis.repository.ParticipationRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseGitDiffReportService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java index de92d3b00732..6c6d53a0af7c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.hestia; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -21,6 +21,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.domain.hestia.CodeHint; @@ -29,10 +33,6 @@ import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.repository.hestia.CodeHintRepository; import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralSolutionEntryGenerationException; import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralTestCaseService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java index 32fb96aece8b..f11868bc93f1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.hestia; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Set; @@ -13,11 +13,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisCourseChatSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisCourseChatSessionResource.java index 10911ab67409..f8b63800f7f0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisCourseChatSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisCourseChatSessionResource.java @@ -12,12 +12,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; import de.tum.cit.aet.artemis.domain.iris.session.IrisCourseChatSession; import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettingsType; import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.iris.IrisCourseChatSessionRepository; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisHealthIndicator; import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; import de.tum.cit.aet.artemis.service.iris.IrisSessionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisExerciseChatSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisExerciseChatSessionResource.java index c2879d1bb963..8de3e3bf51b0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisExerciseChatSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisExerciseChatSessionResource.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.iris.session.IrisExerciseChatSession; @@ -20,7 +21,6 @@ import de.tum.cit.aet.artemis.repository.ExerciseRepository; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.iris.IrisExerciseChatSessionRepository; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisHealthIndicator; import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; import de.tum.cit.aet.artemis.service.iris.IrisSessionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisMessageResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisMessageResource.java index 0038959d0127..f08eb114b6e5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisMessageResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisMessageResource.java @@ -17,13 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; import de.tum.cit.aet.artemis.domain.iris.message.IrisMessageSender; import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.iris.IrisMessageRepository; import de.tum.cit.aet.artemis.repository.iris.IrisSessionRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.iris.IrisMessageService; import de.tum.cit.aet.artemis.service.iris.IrisSessionService; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisModelsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisModelsResource.java index 4795e2f31857..889c894025c0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisModelsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisModelsResource.java @@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisConnectorException; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisConnectorService; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisModelDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisResource.java index 795f74b28c11..bfa3fb716995 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisResource.java @@ -7,8 +7,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisHealthIndicator; import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisSettingsResource.java index 24d27ed1e909..ba24f225db66 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisSettingsResource.java @@ -9,16 +9,16 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.iris.settings.IrisCourseSettings; import de.tum.cit.aet.artemis.domain.iris.settings.IrisExerciseSettings; import de.tum.cit.aet.artemis.domain.iris.settings.IrisSettings; import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedSettingsDTO; import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java index 89d5962ac7ca..e9f191c9aa50 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.lecture; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.IOException; import java.net.URI; @@ -29,13 +29,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.domain.Attachment; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; import de.tum.cit.aet.artemis.repository.AttachmentUnitRepository; import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.service.AttachmentUnitService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/ExerciseUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/ExerciseUnitResource.java index 6e95ab809a7e..941918b2e32b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/ExerciseUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/ExerciseUnitResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.lecture; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -19,12 +19,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; import de.tum.cit.aet.artemis.repository.ExerciseUnitRepository; import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java index 5e8025ffb348..391fe3f6647b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.lecture; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Comparator; import java.util.List; @@ -22,16 +22,16 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; import de.tum.cit.aet.artemis.repository.LectureRepository; import de.tum.cit.aet.artemis.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.LectureUnitService; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java index 7c09bc4a7ea8..9cfda1e3279d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.lecture; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.IOException; import java.net.URI; @@ -28,12 +28,12 @@ import com.google.common.net.InternetDomainName; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.lecture.OnlineUnit; import de.tum.cit.aet.artemis.repository.LectureRepository; import de.tum.cit.aet.artemis.repository.OnlineUnitRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.LectureUnitService; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java index c7a3f6469136..1bc3e2ab786b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.lecture; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -18,12 +18,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.lecture.TextUnit; import de.tum.cit.aet.artemis.repository.LectureRepository; import de.tum.cit.aet.artemis.repository.TextUnitRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java index 21a75084a29b..cffa44355e88 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.lecture; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -20,12 +20,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.lecture.VideoUnit; import de.tum.cit.aet.artemis.repository.LectureRepository; import de.tum.cit.aet.artemis.repository.VideoUnitRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.LectureUnitService; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildJobQueueResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildJobQueueResource.java index 8e96112c9bf5..aafa3778afa7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildJobQueueResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildJobQueueResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.localci; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALCI; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; import java.time.ZonedDateTime; import java.util.List; @@ -20,12 +20,12 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.cit.aet.artemis.domain.BuildJob; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.repository.BuildJobRepository; import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.connectors.localci.SharedQueueManagementService; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildLogResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildLogResource.java index 3dbb33883d44..b1adabafbff5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildLogResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildLogResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.localci; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALCI; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.service.BuildLogEntryService; @Profile(PROFILE_LOCALCI) diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildPlanResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildPlanResource.java index aa2306b48a92..27d620bcb726 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildPlanResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildPlanResource.java @@ -11,12 +11,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.domain.BuildPlan; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.programming.ProgrammingTriggerService; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/AnswerMessageResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/AnswerMessageResource.java index 4952bbf59b74..174f2acf6f15 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/AnswerMessageResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/AnswerMessageResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.metis; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -18,8 +18,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.metis.AnswerPost; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.metis.AnswerMessageService; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java index 3972dfdb1cb9..9e212dfa39c1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.metis; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -28,13 +28,13 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; import de.tum.cit.aet.artemis.domain.metis.CreatedConversationMessage; import de.tum.cit.aet.artemis.domain.metis.Post; import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.metis.ConversationMessagingService; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ReactionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ReactionResource.java index d5f5034b6700..c9591eddc188 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ReactionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ReactionResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.metis; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -19,8 +19,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.metis.Reaction; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.metis.ReactionService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java index 61739df37771..e869301e7c72 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.metis.conversation; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.metis.conversation.ChannelService.CHANNEL_ENTITY_NAME; import java.net.URI; @@ -30,6 +30,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; @@ -38,8 +40,6 @@ import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationDTOService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java index 63a39f117801..4712c1421490 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.metis.conversation; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.List; @@ -25,13 +25,13 @@ import org.springframework.web.server.ResponseStatusException; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ConductAgreementService; import de.tum.cit.aet.artemis.service.dto.ResponsibleUserDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/GroupChatResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/GroupChatResource.java index 71dda7c0faa6..78278da2e4fb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/GroupChatResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/GroupChatResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.metis.conversation; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.domain.metis.conversation.ConversationSettings.MAX_GROUP_CHAT_PARTICIPANTS; import static de.tum.cit.aet.artemis.service.metis.conversation.GroupChatService.GROUP_CHAT_ENTITY_NAME; @@ -21,12 +21,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.metis.conversation.GroupChatRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationDTOService; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; import de.tum.cit.aet.artemis.service.metis.conversation.GroupChatService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/OneToOneChatResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/OneToOneChatResource.java index 6e385dbfdf44..f98fdabd16b6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/OneToOneChatResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/OneToOneChatResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.metis.conversation; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -18,10 +18,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationDTOService; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; import de.tum.cit.aet.artemis.service.metis.conversation.OneToOneChatService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ogparser/LinkPreviewResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ogparser/LinkPreviewResource.java index 6c9a9dcd79af..d5831746bce4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ogparser/LinkPreviewResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ogparser/LinkPreviewResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.ogparser; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.linkpreview.LinkPreviewService; import de.tum.cit.aet.artemis.web.rest.dto.LinkPreviewDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicAccountResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicAccountResource.java index c07e37c3721d..5e27278feb21 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicAccountResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicAccountResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.open; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -25,10 +25,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; -import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.service.AccountService; import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.service.notifications.MailService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicBuildPlanResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicBuildPlanResource.java index d84400654ae8..2dc6675a1af6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicBuildPlanResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicBuildPlanResource.java @@ -10,10 +10,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.domain.BuildPlan; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.repository.BuildPlanRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicImprintResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicImprintResource.java index 605d29bcfca6..74df1bd238da 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicImprintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicImprintResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.open; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import jakarta.ws.rs.BadRequestException; @@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.service.LegalDocumentService; import de.tum.cit.aet.artemis.web.rest.dto.ImprintDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicLtiResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicLtiResource.java index 35410e783660..f6cbbd658aae 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicLtiResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicLtiResource.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.web.rest.open; -import static de.tum.cit.aet.artemis.config.lti.CustomLti13Configurer.LTI13_DEEPLINK_REDIRECT_PATH; -import static de.tum.cit.aet.artemis.config.lti.CustomLti13Configurer.LTI13_LOGIN_REDIRECT_PROXY_PATH; +import static de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer.LTI13_DEEPLINK_REDIRECT_PATH; +import static de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer.LTI13_LOGIN_REDIRECT_PROXY_PATH; import java.io.IOException; import java.text.ParseException; @@ -23,7 +23,7 @@ import com.nimbusds.jwt.SignedJWT; -import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; /** * REST controller for receiving LTI requests. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicOAuth2JWKSResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicOAuth2JWKSResource.java index 721df2e75457..024540c8c5ce 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicOAuth2JWKSResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicOAuth2JWKSResource.java @@ -12,9 +12,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import de.tum.cit.aet.artemis.security.OAuth2JWKSService; -import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; -import de.tum.cit.aet.artemis.security.annotations.ManualConfig; +import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.core.security.annotations.ManualConfig; /** * REST controller to serve the public JWKSet related to all OAuth2 clients. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPrivacyStatementResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPrivacyStatementResource.java index 4e673d3c8c47..55e3e3be599a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPrivacyStatementResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPrivacyStatementResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.open; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import jakarta.ws.rs.BadRequestException; @@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.service.LegalDocumentService; import de.tum.cit.aet.artemis.web.rest.dto.PrivacyStatementDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicProgrammingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicProgrammingSubmissionResource.java index e6eb9a32cddc..6558f8cc82cb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicProgrammingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicProgrammingSubmissionResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.open; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; @@ -15,16 +15,16 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.core.exception.VersionControlException; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.domain.Commit; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.participation.Participation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; -import de.tum.cit.aet.artemis.exception.VersionControlException; import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; -import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.service.programming.ProgrammingMessagingService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPyrisStatusUpdateResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPyrisStatusUpdateResource.java index f5f4d2547473..c1515f772aa3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPyrisStatusUpdateResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPyrisStatusUpdateResource.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisJobService; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisStatusUpdateService; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicResultResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicResultResource.java index 82302e9d44bc..e805ed9cab1d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicResultResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.open; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; @@ -15,13 +15,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; -import de.tum.cit.aet.artemis.security.SecurityUtils; -import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.service.hestia.TestwiseCoverageService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicSystemNotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicSystemNotificationResource.java index 3a37c4614316..938ae49f05ea 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicSystemNotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicSystemNotificationResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.open; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.domain.notification.SystemNotification; -import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.service.SystemNotificationService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicTimeResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicTimeResource.java index 1bd9b8ee8587..ed7f8cc5937b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicTimeResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicTimeResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.open; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.Instant; @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicUserJwtResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicUserJwtResource.java index 1908e3a56087..f733a7263c06 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicUserJwtResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicUserJwtResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.open; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Optional; @@ -29,10 +29,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.cit.aet.artemis.security.SecurityUtils; -import de.tum.cit.aet.artemis.security.UserNotActivatedException; -import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; -import de.tum.cit.aet.artemis.security.jwt.JWTCookieService; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.security.UserNotActivatedException; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.core.security.jwt.JWTCookieService; import de.tum.cit.aet.artemis.service.connectors.SAML2Service; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.vm.LoginVM; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismAnswerPostResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismAnswerPostResource.java index 402bb01daeb6..481f7afe4069 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismAnswerPostResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismAnswerPostResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.plagiarism; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -18,8 +18,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.metis.AnswerPost; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismAnswerPostService; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java index 33de91425fad..632e3ea5de3e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.plagiarism; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Map; @@ -20,6 +20,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; @@ -27,9 +30,6 @@ import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismCaseService; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismPostResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismPostResource.java index 7f06f87943f9..39e68de5f103 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismPostResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismPostResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.plagiarism; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.net.URI; import java.net.URISyntaxException; @@ -27,9 +27,9 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismPostService; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java index 78b6dd6aba22..663280d4330e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.plagiarism; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Objects; @@ -17,6 +17,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; @@ -27,10 +31,6 @@ import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismResultRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismService; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismComparisonStatusDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilder.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilder.java index 1af2eaad608b..81249ea04dbb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilder.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilder.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.plagiarism; -import static de.tum.cit.aet.artemis.config.Constants.SYSTEM_ACCOUNT; +import static de.tum.cit.aet.artemis.core.config.Constants.SYSTEM_ACCOUNT; import java.util.Objects; import java.util.stream.DoubleStream; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java index e54304601629..0981890591e2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.programming; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Comparator; @@ -19,6 +19,8 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.Result; @@ -32,8 +34,6 @@ import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.repository.SubmissionRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.exam.ExamService; import de.tum.cit.aet.artemis.service.programming.ProgrammingAssessmentService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java index e047696cb0a2..86ab7723720c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.programming; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.util.TimeLogUtil.formatDurationFrom; import java.io.File; @@ -40,6 +40,11 @@ import com.fasterxml.jackson.core.JsonProcessingException; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; @@ -53,11 +58,6 @@ import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ConsistencyCheckService; import de.tum.cit.aet.artemis.service.CourseService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java index 64e5ba9f1bd7..0943bd30bd5e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.programming; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; @@ -14,6 +14,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Result; @@ -21,9 +24,6 @@ import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ResultRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseGradingService; import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseGradingStatisticsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseLockResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseLockResource.java index 7bf777079444..a6bbd5127759 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseLockResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseLockResource.java @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastInstructorInExercise; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastInstructorInExercise; import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; // only available for external version control services diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java index 0cde504eaa8a..6cab80b38c5b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.programming; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.io.IOException; import java.time.ZonedDateTime; @@ -20,6 +20,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.Result; @@ -34,10 +38,6 @@ import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.repository.ResultRepository; import de.tum.cit.aet.artemis.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.service.ResultService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java index 4ec351c0b2b4..595bfa97e5d8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.programming; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.web.rest.plagiarism.PlagiarismResultResponseBuilder.buildPlagiarismResultResponse; import java.io.FileInputStream; @@ -20,12 +20,12 @@ import org.springframework.web.bind.annotation.RestController; import de.jplag.exceptions.ExitException; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismResultRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.feature.Feature; import de.tum.cit.aet.artemis.service.feature.FeatureToggle; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java index af76d8a63924..748a3abcef5d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.web.rest.programming; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_THEIA; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_THEIA; import java.io.IOException; import java.net.URI; @@ -38,6 +38,12 @@ import com.fasterxml.jackson.core.JsonProcessingException; +import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.GradingCriterion; @@ -48,7 +54,6 @@ import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; @@ -59,11 +64,6 @@ import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.ExerciseDeletionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java index a2d0bbf4eb57..8e1f81f09d39 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.programming; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; import java.util.Set; @@ -16,15 +16,15 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseService; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseTestCaseService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java index 68888a203241..7e59511a3eb3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.programming; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Collections; @@ -21,6 +21,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.GradingCriterion; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; @@ -40,10 +44,6 @@ import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.repository.SubmissionRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationResource.java index 1be1e0acf13a..df63a0df145b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.push_notification; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; @@ -24,14 +24,14 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.jwt.TokenProvider; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfiguration; import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfigurationId; import de.tum.cit.aet.artemis.repository.PushNotificationDeviceConfigurationRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.jwt.TokenProvider; import io.jsonwebtoken.ExpiredJwtException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java index 31ae2f16eca5..4d162801b823 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.ArrayList; import java.util.List; @@ -30,6 +30,8 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ResponseStatusException; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.BuildLogEntry; import de.tum.cit.aet.artemis.domain.FileType; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; @@ -45,8 +47,6 @@ import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.repository.SubmissionPolicyRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryResource.java index e817d01a9e4e..f658e0652fb7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryResource.java @@ -27,12 +27,12 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.server.ResponseStatusException; +import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.domain.File; import de.tum.cit.aet.artemis.domain.FileType; import de.tum.cit.aet.artemis.domain.Repository; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/TestRepositoryResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/TestRepositoryResource.java index 4c23ee712333..9052ae3a593d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/TestRepositoryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/TestRepositoryResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.repository; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.security.Principal; import java.util.List; @@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ResponseStatusException; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.FileType; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Repository; @@ -34,7 +35,6 @@ import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.connectors.GitService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceResource.java index c762eab43c3e..213c8a435c22 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.science; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.feature.Feature; import de.tum.cit.aet.artemis.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.service.science.ScienceEventService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceSettingsResource.java index e6a2298f9f97..c5ebe3d917ba 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceSettingsResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.science; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Arrays; import java.util.List; @@ -20,11 +20,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.science.ScienceSetting; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.science.ScienceSettingRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/settings/ide/IdeSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/settings/ide/IdeSettingsResource.java index b758081e8d15..33c64060d00f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/settings/ide/IdeSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/settings/ide/IdeSettingsResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.settings.ide; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.Arrays; import java.util.List; @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.settings.ide.Ide; @@ -24,7 +25,6 @@ import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.settings.IdeRepository; import de.tum.cit.aet.artemis.repository.settings.UserIdeMappingRepository; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.web.rest.dto.settings.ide.IdeDTO; import de.tum.cit.aet.artemis.web.rest.dto.settings.ide.IdeMappingDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/theia/TheiaConfigurationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/theia/TheiaConfigurationResource.java index d8847920d42b..4a983823b61e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/theia/TheiaConfigurationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/theia/TheiaConfigurationResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.theia; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_THEIA; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_THEIA; import java.util.Map; @@ -11,9 +11,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.cit.aet.artemis.config.TheiaConfiguration; +import de.tum.cit.aet.artemis.core.config.TheiaConfiguration; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; @Profile(PROFILE_THEIA) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java index ff8cf30626aa..836c5363bbdc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.tutorialgroups; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.web.rest.util.DateUtil.interpretInTimeZone; import java.net.URI; @@ -23,12 +23,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupFreePeriodRepository; import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupsConfigurationRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.feature.Feature; import de.tum.cit.aet.artemis.service.feature.FeatureToggle; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java index 324a4b6dfa49..9b1bb085f91f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.tutorialgroups; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.web.rest.util.DateUtil.isIso8601DateString; import static de.tum.cit.aet.artemis.web.rest.util.DateUtil.isIso8601TimeString; @@ -42,7 +42,12 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; @@ -53,11 +58,6 @@ import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupNotificationRepository; import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRepository; import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupsConfigurationRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.feature.Feature; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java index 9766cdcad6e3..987c391c01dc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.tutorialgroups; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupScheduleService.updateTutorialGroupSession; import static de.tum.cit.aet.artemis.web.rest.util.DateUtil.interpretInTimeZone; @@ -36,6 +36,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; @@ -45,9 +48,6 @@ import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupScheduleRepository; import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupSessionRepository; import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupsConfigurationRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.feature.Feature; import de.tum.cit.aet.artemis.service.feature.FeatureToggle; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java index 60acad1c1294..f4b405958f89 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.tutorialgroups; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.web.rest.util.DateUtil.isIso8601DateString; import java.net.URI; @@ -23,12 +23,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupsConfigurationRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.feature.Feature; import de.tum.cit.aet.artemis.service.feature.FeatureToggle; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/LoginVM.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/LoginVM.java index 3e2c17d5db62..d63c92c89e5f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/LoginVM.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/LoginVM.java @@ -1,9 +1,9 @@ package de.tum.cit.aet.artemis.web.rest.vm; -import static de.tum.cit.aet.artemis.config.Constants.PASSWORD_MAX_LENGTH; -import static de.tum.cit.aet.artemis.config.Constants.PASSWORD_MIN_LENGTH; -import static de.tum.cit.aet.artemis.config.Constants.USERNAME_MAX_LENGTH; -import static de.tum.cit.aet.artemis.config.Constants.USERNAME_MIN_LENGTH; +import static de.tum.cit.aet.artemis.core.config.Constants.PASSWORD_MAX_LENGTH; +import static de.tum.cit.aet.artemis.core.config.Constants.PASSWORD_MIN_LENGTH; +import static de.tum.cit.aet.artemis.core.config.Constants.USERNAME_MAX_LENGTH; +import static de.tum.cit.aet.artemis.core.config.Constants.USERNAME_MIN_LENGTH; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/ManagedUserVM.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/ManagedUserVM.java index 9a2cf755d961..392e5f0d359f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/ManagedUserVM.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/ManagedUserVM.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.dto.UserDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java index f976764dc574..af43161bb126 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.web.websocket; -import static de.tum.cit.aet.artemis.config.Constants.EXERCISE_TOPIC_ROOT; -import static de.tum.cit.aet.artemis.config.Constants.NEW_RESULT_TOPIC; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.EXERCISE_TOPIC_ROOT; +import static de.tum.cit.aet.artemis.core.config.Constants.NEW_RESULT_TOPIC; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/localci/LocalCIWebsocketMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/localci/LocalCIWebsocketMessagingService.java index f7e08b27c090..0f89c2b20740 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/localci/LocalCIWebsocketMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/localci/LocalCIWebsocketMessagingService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.websocket.localci; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALCI; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; import java.util.List; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/ParticipationTeamWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/ParticipationTeamWebsocketService.java index 30185a632114..68cbaf299dc7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/ParticipationTeamWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/ParticipationTeamWebsocketService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.websocket.team; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.security.Principal; import java.time.Instant; @@ -32,6 +32,7 @@ import com.hazelcast.core.HazelcastInstance; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.TextExercise; @@ -43,7 +44,6 @@ import de.tum.cit.aet.artemis.repository.ExerciseRepository; import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.ModelingSubmissionService; import de.tum.cit.aet.artemis.service.TextSubmissionService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/TeamWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/TeamWebsocketService.java index 6756af3f548a..b02527a24fca 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/TeamWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/TeamWebsocketService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.websocket.team; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.HashSet; import java.util.List; diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java index 61b37887d30d..f7721fe50c17 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.doNothing; @@ -29,6 +29,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import de.tum.cit.aet.artemis.connector.GitlabRequestMockProvider; +import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Team; @@ -38,7 +39,6 @@ import de.tum.cit.aet.artemis.domain.participation.AbstractBaseProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabService; import de.tum.cit.aet.artemis.service.connectors.gitlabci.GitLabCIService; import de.tum.cit.aet.artemis.service.connectors.gitlabci.GitLabCITriggerService; diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java index b2547cac989c..4bbf3276428c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_THEIA; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_THEIA; import static tech.jhipster.config.JHipsterConstants.SPRING_PROFILE_TEST; import java.util.Set; @@ -17,6 +17,7 @@ import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.TestPropertySource; +import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Team; @@ -26,7 +27,6 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; -import de.tum.cit.aet.artemis.security.OAuth2JWKSService; import de.tum.cit.aet.artemis.service.exam.ExamLiveEventsService; import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java index 0f172e460742..fbc4d83c5227 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java @@ -1,9 +1,9 @@ package de.tum.cit.aet.artemis; -import static de.tum.cit.aet.artemis.config.Constants.ASSIGNMENT_REPO_NAME; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; -import static de.tum.cit.aet.artemis.config.Constants.TEST_REPO_NAME; +import static de.tum.cit.aet.artemis.core.config.Constants.ASSIGNMENT_REPO_NAME; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.core.config.Constants.TEST_REPO_NAME; import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.SOLUTION; import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.TEMPLATE; import static de.tum.cit.aet.artemis.util.TestConstants.COMMIT_HASH_OBJECT_ID; diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java index 80d660ef18c1..913d87b81573 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_SCHEDULING; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import static tech.jhipster.config.JHipsterConstants.SPRING_PROFILE_TEST; import java.io.IOException; diff --git a/src/test/java/de/tum/cit/aet/artemis/ClientForwardTest.java b/src/test/java/de/tum/cit/aet/artemis/ClientForwardTest.java index a1ea849bf6ed..5e9bee240698 100644 --- a/src/test/java/de/tum/cit/aet/artemis/ClientForwardTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/ClientForwardTest.java @@ -13,10 +13,10 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.test.web.servlet.ResultActions; -import de.tum.cit.aet.artemis.config.SecurityConfiguration; -import de.tum.cit.aet.artemis.security.jwt.JWTCookieService; -import de.tum.cit.aet.artemis.security.jwt.JWTFilter; -import de.tum.cit.aet.artemis.web.filter.SpaWebFilter; +import de.tum.cit.aet.artemis.core.config.SecurityConfiguration; +import de.tum.cit.aet.artemis.core.security.jwt.JWTCookieService; +import de.tum.cit.aet.artemis.core.security.jwt.JWTFilter; +import de.tum.cit.aet.artemis.core.web.filter.SpaWebFilter; /** * Test class for the ClientForwardController REST controller. diff --git a/src/test/java/de/tum/cit/aet/artemis/ContentVersionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/ContentVersionIntegrationTest.java index 9ad7bee430cd..dc84771ef5f5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/ContentVersionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/ContentVersionIntegrationTest.java @@ -11,7 +11,7 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import de.tum.cit.aet.artemis.web.filter.ApiVersionFilter; +import de.tum.cit.aet.artemis.core.web.filter.ApiVersionFilter; class ContentVersionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/InetSocketAddressValidatorTest.java b/src/test/java/de/tum/cit/aet/artemis/InetSocketAddressValidatorTest.java index c08f81e9c2aa..848076e8b45e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/InetSocketAddressValidatorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/InetSocketAddressValidatorTest.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.validation.InetSocketAddressValidator; +import de.tum.cit.aet.artemis.core.validation.InetSocketAddressValidator; class InetSocketAddressValidatorTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/LongFeedbackResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/LongFeedbackResourceIntegrationTest.java index a8009fad85d8..9781f1fc0900 100644 --- a/src/test/java/de/tum/cit/aet/artemis/LongFeedbackResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/LongFeedbackResourceIntegrationTest.java @@ -8,7 +8,7 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/LtiDeepLinkingIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/LtiDeepLinkingIntegrationTest.java index 2ef779f6fdcf..a8e57fd1274b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/LtiDeepLinkingIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/LtiDeepLinkingIntegrationTest.java @@ -28,10 +28,10 @@ import com.nimbusds.jose.jwk.JWK; import com.nimbusds.jose.jwk.RSAKey; -import de.tum.cit.aet.artemis.config.lti.CustomLti13Configurer; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.lti.Claims; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer; import io.jsonwebtoken.Jwts; class LtiDeepLinkingIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java index 2df5eb9b2252..b0eee3340045 100644 --- a/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java @@ -72,8 +72,8 @@ import de.tum.cit.aet.artemis.AbstractArtemisIntegrationTest; import de.tum.cit.aet.artemis.authorization.AuthorizationTestService; -import de.tum.cit.aet.artemis.config.ApplicationConfiguration; -import de.tum.cit.aet.artemis.config.ConditionalMetricsExclusionConfiguration; +import de.tum.cit.aet.artemis.core.config.ApplicationConfiguration; +import de.tum.cit.aet.artemis.core.config.ConditionalMetricsExclusionConfiguration; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.web.rest.repository.RepositoryResource; diff --git a/src/test/java/de/tum/cit/aet/artemis/architecture/EnforceRoleInResourceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/architecture/EnforceRoleInResourceArchitectureTest.java index 312b525d7c22..b2bee939a393 100644 --- a/src/test/java/de/tum/cit/aet/artemis/architecture/EnforceRoleInResourceArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/architecture/EnforceRoleInResourceArchitectureTest.java @@ -9,8 +9,8 @@ import com.tngtech.archunit.lang.ArchCondition; import com.tngtech.archunit.lang.ConditionEvents; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceRoleInCourse; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceRoleInExercise; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceRoleInCourse; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceRoleInExercise; /** * This class contains architecture tests for endpoints with EnforceRoleInResource annotations. diff --git a/src/test/java/de/tum/cit/aet/artemis/architecture/ServiceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/architecture/ServiceArchitectureTest.java index c9d9e421bfa2..d59685d928aa 100644 --- a/src/test/java/de/tum/cit/aet/artemis/architecture/ServiceArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/architecture/ServiceArchitectureTest.java @@ -18,11 +18,11 @@ import com.tngtech.archunit.lang.ArchRule; import com.tngtech.archunit.lang.ConditionEvents; -import de.tum.cit.aet.artemis.config.migration.MigrationService; -import de.tum.cit.aet.artemis.management.SecurityMetersService; -import de.tum.cit.aet.artemis.security.DomainUserDetailsService; -import de.tum.cit.aet.artemis.security.OAuth2JWKSService; -import de.tum.cit.aet.artemis.security.jwt.JWTCookieService; +import de.tum.cit.aet.artemis.core.config.migration.MigrationService; +import de.tum.cit.aet.artemis.core.management.SecurityMetersService; +import de.tum.cit.aet.artemis.core.security.DomainUserDetailsService; +import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; +import de.tum.cit.aet.artemis.core.security.jwt.JWTCookieService; import de.tum.cit.aet.artemis.web.rest.GitDiffReportParserService; import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; import de.tum.cit.aet.artemis.web.websocket.localci.LocalCIWebsocketMessagingService; diff --git a/src/test/java/de/tum/cit/aet/artemis/aspects/resources/EnforceRoleInCourseResource.java b/src/test/java/de/tum/cit/aet/artemis/aspects/resources/EnforceRoleInCourseResource.java index b00df4ff619e..34d58898e448 100644 --- a/src/test/java/de/tum/cit/aet/artemis/aspects/resources/EnforceRoleInCourseResource.java +++ b/src/test/java/de/tum/cit/aet/artemis/aspects/resources/EnforceRoleInCourseResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.aspects.resources; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.http.ResponseEntity; @@ -9,12 +9,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastTutorInCourse; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInCourse.EnforceRoleInCourse; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastTutorInCourse; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceRoleInCourse; @Profile(PROFILE_CORE) @RestController diff --git a/src/test/java/de/tum/cit/aet/artemis/aspects/resources/EnforceRoleInExerciseResource.java b/src/test/java/de/tum/cit/aet/artemis/aspects/resources/EnforceRoleInExerciseResource.java index 3c81e8c22bbe..3be7fab107a5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/aspects/resources/EnforceRoleInExerciseResource.java +++ b/src/test/java/de/tum/cit/aet/artemis/aspects/resources/EnforceRoleInExerciseResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.aspects.resources; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.http.ResponseEntity; @@ -9,12 +9,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastInstructorInExercise; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; -import de.tum.cit.aet.artemis.security.annotations.enforceRoleInExercise.EnforceRoleInExercise; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastInstructorInExercise; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceRoleInExercise; @Profile(PROFILE_CORE) @RestController diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintResponseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintResponseIntegrationTest.java index cad08d00e226..70984ec2f252 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintResponseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintResponseIntegrationTest.java @@ -15,7 +15,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Complaint; import de.tum.cit.aet.artemis.domain.ComplaintResponse; import de.tum.cit.aet.artemis.domain.Course; diff --git a/src/test/java/de/tum/cit/aet/artemis/authentication/InternalAuthenticationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/InternalAuthenticationIntegrationTest.java index 95cf5f15fd0e..c2c9420397fe 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authentication/InternalAuthenticationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/InternalAuthenticationIntegrationTest.java @@ -28,6 +28,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.connector.GitlabRequestMockProvider; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.domain.Authority; import de.tum.cit.aet.artemis.domain.Course; @@ -36,8 +38,6 @@ import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.repository.AuthorityRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.security.Role; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.user.PasswordService; import de.tum.cit.aet.artemis.tutorialgroups.TutorialGroupUtilService; import de.tum.cit.aet.artemis.web.rest.vm.LoginVM; diff --git a/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java index 8d1e4bdd987e..0a3f27cf389d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java @@ -21,6 +21,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Authority; import de.tum.cit.aet.artemis.domain.Course; @@ -30,7 +31,6 @@ import de.tum.cit.aet.artemis.repository.AuthorityRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; import de.tum.cit.aet.artemis.web.rest.vm.LoginVM; diff --git a/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationArchitectureTest.java index f09d65c6ca5f..45f373667797 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationArchitectureTest.java @@ -11,13 +11,13 @@ import com.tngtech.archunit.lang.ArchRule; import de.tum.cit.aet.artemis.architecture.AbstractArchitectureTest; -import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; -import de.tum.cit.aet.artemis.security.annotations.ManualConfig; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.core.security.annotations.ManualConfig; class AuthorizationArchitectureTest extends AbstractArchitectureTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationTestService.java b/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationTestService.java index d3decec5e3b7..d30d8649c258 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationTestService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.authorization; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.assertj.core.api.Fail.fail; import java.lang.annotation.Annotation; @@ -20,13 +20,13 @@ import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.mvc.method.RequestMappingInfo; -import de.tum.cit.aet.artemis.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.security.annotations.EnforceNothing; -import de.tum.cit.aet.artemis.security.annotations.ManualConfig; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.core.security.annotations.ManualConfig; /** * This service is used to check if the authorization annotations are used correctly. diff --git a/src/test/java/de/tum/cit/aet/artemis/config/MetricsBeanTest.java b/src/test/java/de/tum/cit/aet/artemis/config/MetricsBeanTest.java index 8a5e2398ed5d..1e8419251717 100644 --- a/src/test/java/de/tum/cit/aet/artemis/config/MetricsBeanTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/config/MetricsBeanTest.java @@ -13,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.config.MetricsBean; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.TextExercise; @@ -32,7 +34,6 @@ import de.tum.cit.aet.artemis.repository.ExerciseRepository; import de.tum.cit.aet.artemis.repository.SubmissionRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.user.UserUtilService; import io.micrometer.core.instrument.MeterRegistry; diff --git a/src/test/java/de/tum/cit/aet/artemis/config/ProgrammingLanguageConfigurationTest.java b/src/test/java/de/tum/cit/aet/artemis/config/ProgrammingLanguageConfigurationTest.java index 610cfe5d1c5d..39c9180fc46f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/config/ProgrammingLanguageConfigurationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/config/ProgrammingLanguageConfigurationTest.java @@ -13,6 +13,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import de.tum.cit.aet.artemis.core.config.ProgrammingLanguageConfiguration; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; diff --git a/src/test/java/de/tum/cit/aet/artemis/config/TheiaConfigurationTest.java b/src/test/java/de/tum/cit/aet/artemis/config/TheiaConfigurationTest.java index 2dfced061a4a..8c604e042655 100644 --- a/src/test/java/de/tum/cit/aet/artemis/config/TheiaConfigurationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/config/TheiaConfigurationTest.java @@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.config.TheiaConfiguration; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; class TheiaConfigurationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/config/TopicSubscriptionInterceptorTest.java b/src/test/java/de/tum/cit/aet/artemis/config/TopicSubscriptionInterceptorTest.java index f0f438349a26..5627fc3d2e6f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/config/TopicSubscriptionInterceptorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/config/TopicSubscriptionInterceptorTest.java @@ -15,7 +15,7 @@ import org.springframework.messaging.simp.stomp.StompHeaderAccessor; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.config.websocket.WebsocketConfiguration; +import de.tum.cit.aet.artemis.core.config.websocket.WebsocketConfiguration; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusServiceTest.java index 297899d89e64..1c6ca80a2de0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusServiceTest.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.connectors; -import static de.tum.cit.aet.artemis.config.Constants.ASSIGNMENT_REPO_NAME; -import static de.tum.cit.aet.artemis.config.Constants.SOLUTION_REPO_NAME; -import static de.tum.cit.aet.artemis.config.Constants.TEST_REPO_NAME; +import static de.tum.cit.aet.artemis.core.config.Constants.ASSIGNMENT_REPO_NAME; +import static de.tum.cit.aet.artemis.core.config.Constants.SOLUTION_REPO_NAME; +import static de.tum.cit.aet.artemis.core.config.Constants.TEST_REPO_NAME; import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java index 7738ecb31169..2a4462623001 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java @@ -43,6 +43,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; +import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProvider; +import de.tum.cit.aet.artemis.core.security.lti.Lti13TokenRetriever; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Feedback; @@ -61,8 +63,6 @@ import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.repository.ResultRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.ArtemisAuthenticationProvider; -import de.tum.cit.aet.artemis.security.lti.Lti13TokenRetriever; import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; import de.tum.cit.aet.artemis.service.connectors.lti.Lti13Service; import de.tum.cit.aet.artemis.service.connectors.lti.LtiService; diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java index e7a61a010bf8..96d6c490f835 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java @@ -19,12 +19,12 @@ import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; +import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.domain.lti.Lti13ClientRegistration; import de.tum.cit.aet.artemis.domain.lti.Lti13PlatformConfiguration; import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; -import de.tum.cit.aet.artemis.security.OAuth2JWKSService; import de.tum.cit.aet.artemis.service.connectors.lti.LtiDynamicRegistrationService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiServiceTest.java index 3b86d9866650..2f6ee71e5fc5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiServiceTest.java @@ -28,15 +28,15 @@ import org.springframework.web.util.UriComponents; import org.springframework.web.util.UriComponentsBuilder; +import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProvider; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.security.jwt.JWTCookieService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.ArtemisAuthenticationProvider; -import de.tum.cit.aet.artemis.security.SecurityUtils; -import de.tum.cit.aet.artemis.security.jwt.JWTCookieService; import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; import de.tum.cit.aet.artemis.service.connectors.lti.LtiService; import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; diff --git a/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java b/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java index 5c8326034d70..b7f3f0dc34bf 100644 --- a/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.course; -import static de.tum.cit.aet.artemis.config.Constants.ARTEMIS_GROUP_DEFAULT_PREFIX; +import static de.tum.cit.aet.artemis.core.config.Constants.ARTEMIS_GROUP_DEFAULT_PREFIX; import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -63,7 +63,8 @@ import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.competency.PrerequisiteUtilService; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Complaint; import de.tum.cit.aet.artemis.domain.ComplaintResponse; import de.tum.cit.aet.artemis.domain.Course; @@ -137,7 +138,6 @@ import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; import de.tum.cit.aet.artemis.repository.metis.conversation.ConversationRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/FeedbackTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/FeedbackTest.java index b077061bd247..9a11c6873b62 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/FeedbackTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/FeedbackTest.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; class FeedbackTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/notification/GroupNotificationFactoryTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/notification/GroupNotificationFactoryTest.java index e951bd2bc3f5..53d881a4b364 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/notification/GroupNotificationFactoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/notification/GroupNotificationFactoryTest.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.domain.notification; -import static de.tum.cit.aet.artemis.config.Constants.TEST_CASES_DUPLICATE_NOTIFICATION; +import static de.tum.cit.aet.artemis.core.config.Constants.TEST_CASES_DUPLICATE_NOTIFICATION; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority.HIGH; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority.MEDIUM; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.ATTACHMENT_CHANGE; diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderSignatureTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderSignatureTest.java index bb7560d399ce..6c8de6835ab7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderSignatureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderSignatureTest.java @@ -16,6 +16,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.config.Constants; import io.github.classgraph.AnnotationEnumValue; import io.github.classgraph.ClassGraph; @@ -29,7 +30,7 @@ class NotificationPlaceholderSignatureTest extends AbstractSpringIntegrationInde * You must now do the following: * 1. Check if you really need to change these placeholders. If not, revert your changes. * 2. Write a database migration for the old placeholder JSON strings, such that they match your new signature. - * 3. Increment the {{@link de.tum.cit.aet.artemis.config.Constants#PUSH_NOTIFICATION_VERSION}}. This ensures that old versions of the native apps discard your new + * 3. Increment the {{@link Constants#PUSH_NOTIFICATION_VERSION}}. This ensures that old versions of the native apps discard your new * notifications. * 4. Update both the Android and iOS app. Only merge this server PR after they have been updated and released to the stores. Otherwise, notifications no longer work for * end users. diff --git a/src/test/java/de/tum/cit/aet/artemis/entitylistener/ResultListenerIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/entitylistener/ResultListenerIntegrationTest.java index 33d93d4da522..19365c79ef57 100644 --- a/src/test/java/de/tum/cit/aet/artemis/entitylistener/ResultListenerIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/entitylistener/ResultListenerIntegrationTest.java @@ -20,6 +20,7 @@ import org.springframework.test.util.ReflectionTestUtils; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Result; @@ -36,7 +37,6 @@ import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.repository.StudentScoreRepository; import de.tum.cit.aet.artemis.repository.TeamRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.team.TeamUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExerciseGroupIntegrationJenkinsGitlabTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExerciseGroupIntegrationJenkinsGitlabTest.java index 4d865d8946a4..bdba1551916a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExerciseGroupIntegrationJenkinsGitlabTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExerciseGroupIntegrationJenkinsGitlabTest.java @@ -20,6 +20,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -35,7 +36,6 @@ import de.tum.cit.aet.artemis.repository.ExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.repository.TextExerciseRepository; -import de.tum.cit.aet.artemis.security.Role; import de.tum.cit.aet.artemis.user.UserUtilService; class ExerciseGroupIntegrationJenkinsGitlabTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java index 2b3d9a2d3908..5419efba0b8c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java @@ -61,6 +61,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.assessment.GradingScaleUtilService; import de.tum.cit.aet.artemis.bonus.BonusFactory; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.BonusStrategy; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -120,7 +121,6 @@ import de.tum.cit.aet.artemis.repository.SubmissionRepository; import de.tum.cit.aet.artemis.repository.SubmissionVersionRepository; import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.exam.ExamQuizService; import de.tum.cit.aet.artemis.service.exam.StudentExamService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java index dbba27dcb882..85f50279f5b2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java @@ -24,7 +24,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Complaint; import de.tum.cit.aet.artemis.domain.ComplaintResponse; import de.tum.cit.aet.artemis.domain.Course; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java index c59488c1a269..4a417fa666cb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java @@ -28,7 +28,7 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.FileUploadExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java index bb617186b954..64d5072efb37 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java @@ -27,7 +27,7 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Complaint; import de.tum.cit.aet.artemis.domain.ComplaintResponse; import de.tum.cit.aet.artemis.domain.Course; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java index cfdfcd4b1732..254280c78ed0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java @@ -21,7 +21,7 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.SubmissionVersion; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/GitServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/GitServiceTest.java index 5b15671fac32..46deb6102cfc 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/GitServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/GitServiceTest.java @@ -34,10 +34,10 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.exception.GitException; import de.tum.cit.aet.artemis.domain.File; import de.tum.cit.aet.artemis.domain.FileType; import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.exception.GitException; import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.util.GitUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/GitlabServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/GitlabServiceTest.java index 26e6379bd46a..2db9a4d4284d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/GitlabServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/GitlabServiceTest.java @@ -29,11 +29,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.domain.Commit; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.exception.VersionControlException; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java index 03c55831380e..70b2fa87cda2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java @@ -27,7 +27,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.AssessmentNote; import de.tum.cit.aet.artemis.domain.Complaint; import de.tum.cit.aet.artemis.domain.ComplaintResponse; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseFactory.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseFactory.java index 8a4c8a7c0e8f..f11c5cea6dfb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseFactory.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Set; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java index bdcdc630d85b..e6395e5fbe8e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.cit.aet.artemis.config.Constants.TEST_CASES_DUPLICATE_NOTIFICATION; +import static de.tum.cit.aet.artemis.core.config.Constants.TEST_CASES_DUPLICATE_NOTIFICATION; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.timeout; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java index 5e54ee627a17..d8084ebf1dff 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java @@ -64,7 +64,7 @@ import com.fasterxml.jackson.core.type.TypeReference; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.domain.Course; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java index 81dbe75c8007..e6c28846bc40 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.cit.aet.artemis.config.Constants.LOCALCI_RESULTS_DIRECTORY; -import static de.tum.cit.aet.artemis.config.Constants.LOCALCI_WORKING_DIRECTORY; +import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_RESULTS_DIRECTORY; +import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_WORKING_DIRECTORY; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultJenkinsIntegrationTest.java index d8ea91587f5c..2f7297127d80 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultJenkinsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultJenkinsIntegrationTest.java @@ -20,7 +20,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.CommitDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java index 8b31af0095d9..969f6fae1b0e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.cit.aet.artemis.config.Constants.NEW_RESULT_TOPIC; +import static de.tum.cit.aet.artemis.core.config.Constants.NEW_RESULT_TOPIC; import static java.util.Comparator.comparing; import static java.util.Comparator.naturalOrder; import static java.util.Comparator.nullsFirst; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java index b564e9c07260..dd4e24e565db 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java @@ -29,7 +29,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationGitlabCIGitlabSamlTest; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java index 14a76a683b4a..39e20d118b4d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java @@ -22,6 +22,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; @@ -31,7 +32,6 @@ import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseFeedbackCreationService; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseTestCaseService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java index df26a3b0e490..0ec672867281 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java @@ -70,7 +70,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.config.StaticCodeAnalysisConfigurer; +import de.tum.cit.aet.artemis.core.config.StaticCodeAnalysisConfigurer; +import de.tum.cit.aet.artemis.core.exception.GitException; +import de.tum.cit.aet.artemis.core.exception.VersionControlException; +import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Authority; import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; @@ -104,8 +107,6 @@ import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.cit.aet.artemis.exam.ExamFactory; import de.tum.cit.aet.artemis.exam.ExamUtilService; -import de.tum.cit.aet.artemis.exception.GitException; -import de.tum.cit.aet.artemis.exception.VersionControlException; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.repository.AuxiliaryRepositoryRepository; @@ -128,7 +129,6 @@ import de.tum.cit.aet.artemis.repository.TeamRepository; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; -import de.tum.cit.aet.artemis.security.Role; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.UriService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java index 4fe13cb3dbca..3cd20704661d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java @@ -27,6 +27,7 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.BuildLogEntry; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; @@ -39,7 +40,6 @@ import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.CommitDTO; import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestCaseDTO; import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestCaseDetailMessageDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java index 6858465f38b5..fb32fc1a145c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.cit.aet.artemis.config.Constants.NEW_SUBMISSION_TOPIC; -import static de.tum.cit.aet.artemis.config.Constants.SETUP_COMMIT_MESSAGE; +import static de.tum.cit.aet.artemis.core.config.Constants.NEW_SUBMISSION_TOPIC; +import static de.tum.cit.aet.artemis.core.config.Constants.SETUP_COMMIT_MESSAGE; import static de.tum.cit.aet.artemis.util.TestConstants.COMMIT_HASH_OBJECT_ID; import static de.tum.cit.aet.artemis.util.TestResourceUtils.HalfSecond; import static org.assertj.core.api.Assertions.assertThat; @@ -35,7 +35,8 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.domain.Commit; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.GradingCriterion; @@ -52,7 +53,6 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java index 0b784661e58c..2146f703d16d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java @@ -24,7 +24,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.cit.aet.artemis.config.StaticCodeAnalysisConfigurer; +import de.tum.cit.aet.artemis.core.config.StaticCodeAnalysisConfigurer; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Feedback; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java index 133d7abef89d..a89ff207b1bd 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java @@ -42,6 +42,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.TeamAssignmentConfig; @@ -79,7 +80,6 @@ import de.tum.cit.aet.artemis.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.repository.TeamRepository; import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.service.quiz.QuizExerciseService; import de.tum.cit.aet.artemis.util.ExerciseIntegrationTestService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java index 62e43a24ee25..4d4ad2161dae 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java @@ -34,7 +34,7 @@ import org.springframework.web.multipart.MultipartFile; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitIntegrationTest.java index 7f4c4d8c3ce4..5b1b41dc4e24 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitIntegrationTest.java @@ -37,6 +37,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Attachment; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.competency.Competency; @@ -47,7 +48,6 @@ import de.tum.cit.aet.artemis.repository.AttachmentUnitRepository; import de.tum.cit.aet.artemis.repository.LectureRepository; import de.tum.cit.aet.artemis.repository.SlideRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; class AttachmentUnitIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentConfigurationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentConfigurationTest.java index aeaeb207d314..8c34bc4e980b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentConfigurationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentConfigurationTest.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.config.icl.BuildAgentConfiguration; +import de.tum.cit.aet.artemis.programming.icl.BuildAgentConfiguration; class BuildAgentConfigurationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentDockerServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentDockerServiceTest.java index 65f878d3e62e..247874115364 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentDockerServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentDockerServiceTest.java @@ -29,9 +29,9 @@ import com.hazelcast.map.IMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.core.exception.LocalCIException; import de.tum.cit.aet.artemis.domain.BuildJob; import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; -import de.tum.cit.aet.artemis.exception.LocalCIException; import de.tum.cit.aet.artemis.service.connectors.localci.buildagent.BuildAgentDockerService; import de.tum.cit.aet.artemis.service.connectors.localci.buildagent.BuildLogsMap; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildConfig; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java index 99cdb09c12fc..960a4a6e0a87 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.localvcci; -import static de.tum.cit.aet.artemis.config.Constants.LOCALCI_RESULTS_DIRECTORY; -import static de.tum.cit.aet.artemis.config.Constants.LOCALCI_WORKING_DIRECTORY; +import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_RESULTS_DIRECTORY; +import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_WORKING_DIRECTORY; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.awaitility.Awaitility.await; @@ -50,6 +50,7 @@ import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.Frame; +import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.domain.BuildJob; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.Result; @@ -58,7 +59,6 @@ import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.exception.VersionControlException; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.service.ParticipationVcsAccessTokenService; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResultServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResultServiceTest.java index 98109bbcefb8..b79ff4523bc8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResultServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResultServiceTest.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.cit.aet.artemis.exception.LocalCIException; +import de.tum.cit.aet.artemis.core.exception.LocalCIException; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.service.connectors.localci.LocalCIResultService; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCInfoContributorTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCInfoContributorTest.java index c67f9533c9be..1689331b3476 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCInfoContributorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCInfoContributorTest.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.localvcci; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_BUILDAGENT; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIIntegrationTest.java index f263bad8825e..bed3714e9870 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIIntegrationTest.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.localvcci; -import static de.tum.cit.aet.artemis.config.Constants.LOCALCI_RESULTS_DIRECTORY; -import static de.tum.cit.aet.artemis.config.Constants.LOCALCI_WORKING_DIRECTORY; +import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_RESULTS_DIRECTORY; +import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_WORKING_DIRECTORY; import static de.tum.cit.aet.artemis.service.connectors.localci.LocalCITriggerService.PRIORITY_EXAM_CONDUCTION; import static de.tum.cit.aet.artemis.service.connectors.localci.LocalCITriggerService.PRIORITY_NORMAL; import static de.tum.cit.aet.artemis.service.connectors.localci.LocalCITriggerService.PRIORITY_OPTIONAL_EXERCISE; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCSshIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCSshIntegrationTest.java index 0c535ef2b890..6fdd3ca56492 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCSshIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCSshIntegrationTest.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.localvcci; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -27,9 +27,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.config.icl.ssh.HashUtils; -import de.tum.cit.aet.artemis.config.icl.ssh.SshGitCommand; import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.programming.icl.ssh.HashUtils; +import de.tum.cit.aet.artemis.programming.icl.ssh.SshGitCommand; import de.tum.cit.aet.artemis.service.icl.SshGitCommandFactoryService; @Profile(PROFILE_LOCALVC) diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/MultipleHostKeyProviderTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/MultipleHostKeyProviderTest.java index 53d561ecd819..b277a9acecee 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/MultipleHostKeyProviderTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/MultipleHostKeyProviderTest.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.localvcci; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; import static org.assertj.core.api.Assertions.assertThat; import java.nio.file.Path; @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Profile; -import de.tum.cit.aet.artemis.config.icl.ssh.MultipleHostKeyProvider; +import de.tum.cit.aet.artemis.programming.icl.ssh.MultipleHostKeyProvider; @Profile(PROFILE_LOCALVC) class MultipleHostKeyProviderTest extends LocalVCIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/TestBuildAgentConfiguration.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/TestBuildAgentConfiguration.java index 51f197dbae5b..759ce305cba8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/TestBuildAgentConfiguration.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/TestBuildAgentConfiguration.java @@ -36,7 +36,7 @@ import com.github.dockerjava.api.model.Container; import com.github.dockerjava.api.model.Image; -import de.tum.cit.aet.artemis.config.icl.BuildAgentConfiguration; +import de.tum.cit.aet.artemis.programming.icl.BuildAgentConfiguration; import de.tum.cit.aet.artemis.service.connectors.localci.buildagent.BuildAgentDockerService; import de.tum.cit.aet.artemis.util.FixMissingServletPathProcessor; diff --git a/src/test/java/de/tum/cit/aet/artemis/management/SecurityMetersServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/management/SecurityMetersServiceTest.java index 15f343a37500..7c12149cce8a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/management/SecurityMetersServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/management/SecurityMetersServiceTest.java @@ -7,6 +7,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import de.tum.cit.aet.artemis.core.management.SecurityMetersService; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/MessageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/MessageIntegrationTest.java index 1c7896bd6bfc..a214776250c3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/MessageIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/MessageIntegrationTest.java @@ -45,6 +45,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; @@ -64,7 +65,6 @@ import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; import de.tum.cit.aet.artemis.repository.metis.conversation.ConversationNotificationRepository; import de.tum.cit.aet.artemis.repository.metis.conversation.OneToOneChatRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/ReactionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/ReactionIntegrationTest.java index aba8a201f752..1e4cba4aba78 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/ReactionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/ReactionIntegrationTest.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.metis; -import static de.tum.cit.aet.artemis.config.Constants.VOTE_EMOJI_ID; +import static de.tum.cit.aet.artemis.core.config.Constants.VOTE_EMOJI_ID; import static org.assertj.core.api.Assertions.assertThat; import java.util.Collection; diff --git a/src/test/java/de/tum/cit/aet/artemis/migration/MigrationIntegrityTest.java b/src/test/java/de/tum/cit/aet/artemis/migration/MigrationIntegrityTest.java index 7dacb1edb2cf..12b424e384f4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/migration/MigrationIntegrityTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/migration/MigrationIntegrityTest.java @@ -8,9 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.config.migration.MigrationEntry; -import de.tum.cit.aet.artemis.config.migration.MigrationRegistry; -import de.tum.cit.aet.artemis.config.migration.MigrationService; +import de.tum.cit.aet.artemis.core.config.migration.MigrationEntry; +import de.tum.cit.aet.artemis.core.config.migration.MigrationRegistry; +import de.tum.cit.aet.artemis.core.config.migration.MigrationService; class MigrationIntegrityTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/migration/MigrationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/migration/MigrationServiceTest.java index 8067ec64d2d3..5bf1c861c9a0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/migration/MigrationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/migration/MigrationServiceTest.java @@ -23,10 +23,10 @@ import org.springframework.core.env.Profiles; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.config.migration.MigrationEntry; -import de.tum.cit.aet.artemis.config.migration.MigrationIntegrityException; -import de.tum.cit.aet.artemis.config.migration.MigrationRegistry; -import de.tum.cit.aet.artemis.config.migration.MigrationService; +import de.tum.cit.aet.artemis.core.config.migration.MigrationEntry; +import de.tum.cit.aet.artemis.core.config.migration.MigrationIntegrityException; +import de.tum.cit.aet.artemis.core.config.migration.MigrationRegistry; +import de.tum.cit.aet.artemis.core.config.migration.MigrationService; import de.tum.cit.aet.artemis.domain.MigrationChangelog; import de.tum.cit.aet.artemis.migration.entries.TestChangeEntry20211214_231800; import de.tum.cit.aet.artemis.migration.entries.TestChangeEntry20211215_231800; diff --git a/src/test/java/de/tum/cit/aet/artemis/migration/entries/TestChangeEntry20211214_231800.java b/src/test/java/de/tum/cit/aet/artemis/migration/entries/TestChangeEntry20211214_231800.java index 4289dbed76eb..0f9ab6a3e2ef 100644 --- a/src/test/java/de/tum/cit/aet/artemis/migration/entries/TestChangeEntry20211214_231800.java +++ b/src/test/java/de/tum/cit/aet/artemis/migration/entries/TestChangeEntry20211214_231800.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.migration.entries; -import de.tum.cit.aet.artemis.config.migration.MigrationEntry; +import de.tum.cit.aet.artemis.core.config.migration.MigrationEntry; public class TestChangeEntry20211214_231800 extends MigrationEntry { diff --git a/src/test/java/de/tum/cit/aet/artemis/migration/entries/TestChangeEntry20211215_231800.java b/src/test/java/de/tum/cit/aet/artemis/migration/entries/TestChangeEntry20211215_231800.java index f2e09df3a247..86e875fc0a48 100644 --- a/src/test/java/de/tum/cit/aet/artemis/migration/entries/TestChangeEntry20211215_231800.java +++ b/src/test/java/de/tum/cit/aet/artemis/migration/entries/TestChangeEntry20211215_231800.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.migration.entries; -import de.tum.cit.aet.artemis.config.migration.MigrationEntry; +import de.tum.cit.aet.artemis.core.config.migration.MigrationEntry; public class TestChangeEntry20211215_231800 extends MigrationEntry { diff --git a/src/test/java/de/tum/cit/aet/artemis/migration/entries/TestChangeEntry20211216_231800.java b/src/test/java/de/tum/cit/aet/artemis/migration/entries/TestChangeEntry20211216_231800.java index cf2067dc01f0..69c3071a7a96 100644 --- a/src/test/java/de/tum/cit/aet/artemis/migration/entries/TestChangeEntry20211216_231800.java +++ b/src/test/java/de/tum/cit/aet/artemis/migration/entries/TestChangeEntry20211216_231800.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.migration.entries; -import de.tum.cit.aet.artemis.config.migration.MigrationEntry; +import de.tum.cit.aet.artemis.core.config.migration.MigrationEntry; public class TestChangeEntry20211216_231800 extends MigrationEntry { diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsServiceTest.java index df975e30c041..274c1899aa59 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsServiceTest.java @@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.NotificationSetting; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; @@ -31,7 +32,6 @@ import de.tum.cit.aet.artemis.domain.notification.Notification; import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel; import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/SingleUserNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/SingleUserNotificationServiceTest.java index cf70a560d36f..235d7e0f9f9f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/SingleUserNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/SingleUserNotificationServiceTest.java @@ -66,6 +66,7 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.DataExport; @@ -101,7 +102,6 @@ import de.tum.cit.aet.artemis.repository.NotificationRepository; import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationFactory.java b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationFactory.java index 033457ff0e92..97b7cfdcdf89 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationFactory.java @@ -9,7 +9,7 @@ import jakarta.validation.constraints.NotNull; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.ExampleSubmission; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Feedback; diff --git a/src/test/java/de/tum/cit/aet/artemis/repository/StatisticsRepositoryTest.java b/src/test/java/de/tum/cit/aet/artemis/repository/StatisticsRepositoryTest.java index 1ae396bc1051..c6288c2cda3c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repository/StatisticsRepositoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/repository/StatisticsRepositoryTest.java @@ -16,12 +16,12 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.PersistentAuditEvent; import de.tum.cit.aet.artemis.domain.enumeration.GraphType; import de.tum.cit.aet.artemis.domain.enumeration.SpanType; import de.tum.cit.aet.artemis.domain.enumeration.StatisticsView; import de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.user.UserUtilService; class StatisticsRepositoryTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java b/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java index f395ed691d1e..0a00cbaea928 100644 --- a/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java @@ -44,12 +44,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import de.tum.cit.aet.artemis.config.lti.CustomLti13Configurer; +import de.tum.cit.aet.artemis.core.exception.LtiEmailAlreadyInUseException; +import de.tum.cit.aet.artemis.core.web.filter.Lti13LaunchFilter; import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; -import de.tum.cit.aet.artemis.exception.LtiEmailAlreadyInUseException; +import de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer; import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.service.connectors.lti.Lti13Service; -import de.tum.cit.aet.artemis.web.filter.Lti13LaunchFilter; import uk.ac.ox.ctl.lti13.lti.Claims; import uk.ac.ox.ctl.lti13.security.oauth2.client.lti.authentication.OidcAuthenticationToken; import uk.ac.ox.ctl.lti13.security.oauth2.client.lti.web.OAuth2LoginAuthenticationFilter; diff --git a/src/test/java/de/tum/cit/aet/artemis/security/OAuth2JWKSServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/security/OAuth2JWKSServiceTest.java index 85b0efc99bcc..4834226eb5b0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/security/OAuth2JWKSServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/security/OAuth2JWKSServiceTest.java @@ -17,6 +17,7 @@ import com.nimbusds.jose.jwk.JWK; +import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; class OAuth2JWKSServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/security/SecurityUtilsUnitTest.java b/src/test/java/de/tum/cit/aet/artemis/security/SecurityUtilsUnitTest.java index 5c9f247b51dd..0eaa3688a2f5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/security/SecurityUtilsUnitTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/security/SecurityUtilsUnitTest.java @@ -15,6 +15,9 @@ import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolder; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; + /** * Test class for the {@link SecurityUtils} utility class. */ diff --git a/src/test/java/de/tum/cit/aet/artemis/security/jwt/JWTFilterTest.java b/src/test/java/de/tum/cit/aet/artemis/security/jwt/JWTFilterTest.java index 1276fc1c375f..7a8affac1840 100644 --- a/src/test/java/de/tum/cit/aet/artemis/security/jwt/JWTFilterTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/security/jwt/JWTFilterTest.java @@ -17,8 +17,10 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.test.util.ReflectionTestUtils; -import de.tum.cit.aet.artemis.management.SecurityMetersService; -import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.core.management.SecurityMetersService; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.jwt.JWTFilter; +import de.tum.cit.aet.artemis.core.security.jwt.TokenProvider; import io.jsonwebtoken.io.Decoders; import io.jsonwebtoken.security.Keys; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; diff --git a/src/test/java/de/tum/cit/aet/artemis/security/jwt/TokenProviderSecurityMetersTest.java b/src/test/java/de/tum/cit/aet/artemis/security/jwt/TokenProviderSecurityMetersTest.java index 55b2976ccddc..d4e405ddb07b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/security/jwt/TokenProviderSecurityMetersTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/security/jwt/TokenProviderSecurityMetersTest.java @@ -17,8 +17,9 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.test.util.ReflectionTestUtils; -import de.tum.cit.aet.artemis.management.SecurityMetersService; -import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.core.management.SecurityMetersService; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.jwt.TokenProvider; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.io.Decoders; import io.jsonwebtoken.security.Keys; diff --git a/src/test/java/de/tum/cit/aet/artemis/security/jwt/TokenProviderTest.java b/src/test/java/de/tum/cit/aet/artemis/security/jwt/TokenProviderTest.java index 57bccb1e7206..4f7dd1278831 100644 --- a/src/test/java/de/tum/cit/aet/artemis/security/jwt/TokenProviderTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/security/jwt/TokenProviderTest.java @@ -18,8 +18,9 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.test.util.ReflectionTestUtils; -import de.tum.cit.aet.artemis.management.SecurityMetersService; -import de.tum.cit.aet.artemis.security.Role; +import de.tum.cit.aet.artemis.core.management.SecurityMetersService; +import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.jwt.TokenProvider; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.io.Decoders; import io.jsonwebtoken.security.Keys; diff --git a/src/test/java/de/tum/cit/aet/artemis/security/lti/Lti13TokenRetrieverTest.java b/src/test/java/de/tum/cit/aet/artemis/security/lti/Lti13TokenRetrieverTest.java index a08eebc05981..744f8eef7ead 100644 --- a/src/test/java/de/tum/cit/aet/artemis/security/lti/Lti13TokenRetrieverTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/security/lti/Lti13TokenRetrieverTest.java @@ -47,8 +47,9 @@ import com.nimbusds.jwt.JWTClaimsSet; import com.nimbusds.jwt.SignedJWT; +import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; +import de.tum.cit.aet.artemis.core.security.lti.Lti13TokenRetriever; import de.tum.cit.aet.artemis.domain.lti.Scopes; -import de.tum.cit.aet.artemis.security.OAuth2JWKSService; class Lti13TokenRetrieverTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java index 58aae6d40b90..ef6f718a4165 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java @@ -21,6 +21,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.TextSubmission; @@ -31,7 +32,6 @@ import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.repository.SubmissionRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ExerciseDateServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ExerciseDateServiceTest.java index 20a9eedfd093..e8d50e6fe5ff 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ExerciseDateServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ExerciseDateServiceTest.java @@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; import de.tum.cit.aet.artemis.domain.exam.Exam; @@ -29,7 +30,6 @@ import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.repository.ParticipationRepository; import de.tum.cit.aet.artemis.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.user.UserUtilService; class ExerciseDateServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/FeedbackServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/FeedbackServiceTest.java index c232d74d77fc..166f5c64a33e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/FeedbackServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/FeedbackServiceTest.java @@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.LongFeedbackText; import de.tum.cit.aet.artemis.repository.FeedbackRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/FilePathServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/FilePathServiceTest.java index 3a41b65768dd..de54e4ea74aa 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/FilePathServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/FilePathServiceTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.exception.FilePathParsingException; +import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; class FilePathServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java index 8336d743904a..d0cd0c7fa6ec 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java @@ -28,6 +28,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationGitlabCIGitlabSamlTest; +import de.tum.cit.aet.artemis.core.exception.GitLabCIException; import de.tum.cit.aet.artemis.domain.BuildLogEntry; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; @@ -36,7 +37,6 @@ import de.tum.cit.aet.artemis.domain.participation.Participation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.exception.GitLabCIException; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java index 863640645ad0..0621ebada4a7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java @@ -17,6 +17,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.GradingScaleUtilService; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.GradeStep; @@ -26,7 +27,6 @@ import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.repository.ExamRepository; import de.tum.cit.aet.artemis.repository.GradingScaleRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsJobServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsJobServiceTest.java index 1a50bbe38933..208766999bb3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsJobServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsJobServiceTest.java @@ -28,7 +28,7 @@ import com.offbytwo.jenkins.model.FolderJob; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.cit.aet.artemis.exception.JenkinsException; +import de.tum.cit.aet.artemis.core.exception.JenkinsException; import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsXmlFileUtils; import de.tum.cit.aet.artemis.service.connectors.jenkins.jobs.JenkinsJobService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsServiceTest.java index 0a476474b8de..6ea84a0d5f84 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsServiceTest.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.config.Constants.ASSIGNMENT_REPO_NAME; +import static de.tum.cit.aet.artemis.core.config.Constants.ASSIGNMENT_REPO_NAME; import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.SOLUTION; import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.TEMPLATE; import static org.assertj.core.api.Assertions.assertThat; @@ -32,12 +32,12 @@ import com.offbytwo.jenkins.model.JobWithDetails; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.core.exception.JenkinsException; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.BuildPlan; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.exception.JenkinsException; import de.tum.cit.aet.artemis.exercise.programming.ContinuousIntegrationTestService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java index 8e6eaa178c95..8f6d2e6d2378 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java @@ -23,6 +23,7 @@ import de.tum.cit.aet.artemis.competency.CompetencyProgressUtilService; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.competency.LearningPathUtilService; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; @@ -40,7 +41,6 @@ import de.tum.cit.aet.artemis.repository.CompetencyRepository; import de.tum.cit.aet.artemis.repository.ExerciseRepository; import de.tum.cit.aet.artemis.repository.LectureUnitRepository; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.service.learningpath.LearningPathNgxService; import de.tum.cit.aet.artemis.service.learningpath.LearningPathRecommendationService; import de.tum.cit.aet.artemis.service.learningpath.LearningPathService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleServiceTest.java index 937a78fd24ba..f41dd8142dbf 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleServiceTest.java @@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.enumeration.ParticipationLifecycle; @@ -20,7 +21,6 @@ import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.security.SecurityUtils; import de.tum.cit.aet.artemis.user.UserUtilService; class ParticipationLifecycleServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/UriServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/UriServiceTest.java index 1d5d24c075a0..df3e0c26c5d0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/UriServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/UriServiceTest.java @@ -9,11 +9,11 @@ import org.junit.jupiter.api.Test; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.exception.VersionControlException; class UriServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java index 4eb6efca97e4..77ff6403d49f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java @@ -14,12 +14,12 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractAthenaTest; +import de.tum.cit.aet.artemis.core.exception.NetworkingException; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.exception.NetworkingException; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.service.dto.athena.ProgrammingFeedbackDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java index de28a5397680..f46041d14f72 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java @@ -32,12 +32,12 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.core.security.lti.Lti13TokenRetriever; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.security.lti.Lti13TokenRetriever; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import uk.ac.ox.ctl.lti13.lti.Claims; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java index 357d58a438c6..c79446f0e5de 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java @@ -15,6 +15,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; @@ -27,7 +28,6 @@ import de.tum.cit.aet.artemis.repository.ExamUserRepository; import de.tum.cit.aet.artemis.repository.StudentExamRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java index b3e242f81e0f..6256bf9882e3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java @@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/team/TeamFactory.java b/src/test/java/de/tum/cit/aet/artemis/team/TeamFactory.java index 79531404b40d..6b2f6c3d9981 100644 --- a/src/test/java/de/tum/cit/aet/artemis/team/TeamFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/team/TeamFactory.java @@ -4,11 +4,11 @@ import java.util.List; import java.util.Set; +import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Authority; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.security.Role; import de.tum.cit.aet.artemis.user.UserFactory; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/team/TeamUtilService.java b/src/test/java/de/tum/cit/aet/artemis/team/TeamUtilService.java index 175c742766fb..44395e183a03 100644 --- a/src/test/java/de/tum/cit/aet/artemis/team/TeamUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/team/TeamUtilService.java @@ -9,13 +9,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Authority; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.repository.TeamRepository; import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.security.Role; import de.tum.cit.aet.artemis.user.UserUtilService; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java index 3cd3b092ac60..13ad88e02ebe 100644 --- a/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java @@ -36,8 +36,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; -import de.tum.cit.aet.artemis.config.Constants; import de.tum.cit.aet.artemis.connector.AthenaRequestMockProvider; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Complaint; import de.tum.cit.aet.artemis.domain.ComplaintResponse; import de.tum.cit.aet.artemis.domain.Course; diff --git a/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java index 7b9bb40e9632..77637f536020 100644 --- a/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java @@ -19,7 +19,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.SubmissionVersion; import de.tum.cit.aet.artemis.domain.Team; diff --git a/src/test/java/de/tum/cit/aet/artemis/theia/TheiaInfoContributorTest.java b/src/test/java/de/tum/cit/aet/artemis/theia/TheiaInfoContributorTest.java index 547c22b342d2..2b97b257262b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/theia/TheiaInfoContributorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/theia/TheiaInfoContributorTest.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.theia; -import static de.tum.cit.aet.artemis.config.Constants.PROFILE_THEIA; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_THEIA; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; @@ -8,7 +8,7 @@ import org.springframework.boot.actuate.info.Info; import org.springframework.context.annotation.Profile; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.service.theia.TheiaInfoContributor; @Profile(PROFILE_THEIA) diff --git a/src/test/java/de/tum/cit/aet/artemis/uri/RepositoryUriTest.java b/src/test/java/de/tum/cit/aet/artemis/uri/RepositoryUriTest.java index d60e6c7c4c58..822a4f3586a6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/uri/RepositoryUriTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/uri/RepositoryUriTest.java @@ -15,8 +15,8 @@ import org.junit.jupiter.api.Test; +import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.exception.localvc.LocalVCInternalException; import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; class RepositoryUriTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java index bfbd86b7435b..b8fe46b7b040 100644 --- a/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java @@ -14,7 +14,7 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.AccountService; import de.tum.cit.aet.artemis.service.dto.PasswordChangeDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java b/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java index f8d6d3916f14..360743bc9f4c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java @@ -27,7 +27,8 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.springframework.util.LinkedMultiValueMap; -import de.tum.cit.aet.artemis.config.Constants; +import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Authority; import de.tum.cit.aet.artemis.domain.Course; @@ -45,7 +46,6 @@ import de.tum.cit.aet.artemis.repository.SubmissionRepository; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.science.ScienceEventRepository; -import de.tum.cit.aet.artemis.security.Role; import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; import de.tum.cit.aet.artemis.service.connectors.lti.LtiService; import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; diff --git a/src/test/java/de/tum/cit/aet/artemis/user/UserUtilService.java b/src/test/java/de/tum/cit/aet/artemis/user/UserUtilService.java index d67449b16a35..e0f1ee036768 100644 --- a/src/test/java/de/tum/cit/aet/artemis/user/UserUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/UserUtilService.java @@ -20,12 +20,12 @@ import org.springframework.security.test.context.TestSecurityContextHolder; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Authority; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.repository.AuthorityRepository; import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.UserTestRepository; -import de.tum.cit.aet.artemis.security.Role; import de.tum.cit.aet.artemis.service.user.PasswordService; /** From 20964e4fe8f0201ebb260e79981f9214587d7ff3 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Wed, 11 Sep 2024 15:12:10 +0200 Subject: [PATCH 04/43] move repository files into modules --- .../repository/BonusRepository.java | 4 +- .../repository/ComplaintRepository.java | 4 +- .../ComplaintResponseRepository.java | 4 +- .../ExampleSubmissionRepository.java | 4 +- .../repository/FeedbackRepository.java | 4 +- .../repository/GradeStepRepository.java | 4 +- .../GradingCriterionRepository.java | 4 +- .../GradingInstructionRepository.java | 4 +- .../repository/GradingScaleRepository.java | 4 +- .../LongFeedbackTextRepository.java | 4 +- .../ParticipantScoreRepository.java | 4 +- .../repository/RatingRepository.java | 4 +- .../repository/ResultRepository.java | 4 +- .../repository/StudentScoreRepository.java | 4 +- .../repository/TeamScoreRepository.java | 4 +- .../TextAssessmentEventRepository.java | 4 +- .../repository/TextBlockRepository.java | 4 +- .../TutorParticipationRepository.java | 4 +- .../CompetencyMetricsRepository.java | 4 +- .../CompetencyProgressRepository.java | 4 +- .../CompetencyRelationRepository.java | 4 +- .../repository/CompetencyRepository.java | 4 +- .../CourseCompetencyRepository.java | 4 +- .../repository/LearningPathRepository.java | 4 +- .../repository/PrerequisiteRepository.java | 4 +- .../repository/SourceRepository.java | 4 +- .../competency/CompetencyJolRepository.java | 4 +- .../competency/KnowledgeAreaRepository.java | 4 +- .../StandardizedCompetencyRepository.java | 4 +- .../science/ScienceEventRepository.java | 4 +- .../science/ScienceSettingRepository.java | 4 +- .../repository}/AnswerPostRepository.java | 4 +- .../ConductAgreementRepository.java | 4 +- .../ConversationMessageRepository.java | 20 ++++---- .../ConversationParticipantRepository.java | 4 +- .../repository}/CustomPostRepository.java | 2 +- .../repository}/CustomPostRepositoryImpl.java | 2 +- .../GroupNotificationRepository.java | 4 +- .../repository}/MessageSpecs.java | 2 +- .../repository/NotificationRepository.java | 4 +- .../NotificationSettingRepository.java | 4 +- .../repository}/PostRepository.java | 4 +- ...ficationDeviceConfigurationRepository.java | 4 +- .../repository}/ReactionRepository.java | 4 +- .../SingleUserNotificationRepository.java | 4 +- .../SystemNotificationRepository.java | 4 +- .../conversation/ChannelRepository.java | 4 +- .../ConversationNotificationRepository.java | 4 +- .../conversation/ConversationRepository.java | 4 +- .../conversation/GroupChatRepository.java | 4 +- .../conversation/OneToOneChatRepository.java | 4 +- .../core/config/DatabaseConfiguration.java | 4 +- .../aet/artemis/core/config/MetricsBean.java | 12 ++--- .../config/migration/MigrationService.java | 2 +- .../MigrationEntry20240614_140000.java | 4 +- .../websocket/WebsocketConfiguration.java | 6 +-- .../repository/AuthorityRepository.java | 4 +- .../repository/CourseRepository.java | 4 +- .../CustomAuditEventRepository.java | 2 +- .../repository/DataExportRepository.java | 4 +- .../GuidedTourSettingsRepository.java | 4 +- .../repository/LdapUserRepository.java | 2 +- .../repository/MigrationChangeRepository.java | 4 +- .../repository/OrganizationRepository.java | 4 +- .../PersistenceAuditEventRepository.java | 4 +- .../repository/StatisticsRepository.java | 4 +- .../{ => core}/repository/UserRepository.java | 20 ++++---- .../specs => core/repository}/UserSpecs.java | 2 +- .../repository/base/ArtemisJpaRepository.java | 2 +- .../base/DynamicSpecificationRepository.java | 2 +- .../repository/base/FetchOptions.java | 2 +- .../repository/base/RepositoryImpl.java | 2 +- .../ArtemisAuthenticationProviderImpl.java | 2 +- ...ArtemisInternalAuthenticationProvider.java | 2 +- .../security/DomainUserDetailsService.java | 2 +- .../admin/AdminBuildJobQueueResource.java | 4 +- .../web}/admin/AdminCourseResource.java | 6 +-- .../web}/admin/AdminDataExportResource.java | 2 +- .../web}/admin/AdminExamResource.java | 4 +- .../web}/admin/AdminExerciseResource.java | 4 +- .../web}/admin/AdminImprintResource.java | 2 +- .../admin/AdminLtiConfigurationResource.java | 4 +- .../admin/AdminModelingExerciseResource.java | 6 +-- .../web}/admin/AdminOrganizationResource.java | 8 ++-- .../admin/AdminPrivacyStatementResource.java | 2 +- .../AdminStandardizedCompetencyResource.java | 2 +- .../web}/admin/AdminStatisticsResource.java | 2 +- .../AdminSystemNotificationResource.java | 4 +- .../AdminTextAssessmentEventResource.java | 4 +- .../web}/admin/AdminUserResource.java | 6 +-- .../web}/admin/AuditResource.java | 2 +- .../web}/admin/FeatureToggleResource.java | 2 +- .../rest => core/web}/admin/LogResource.java | 2 +- .../admin/iris/AdminIrisSettingsResource.java | 2 +- .../cit/aet/artemis/domain/BonusStrategy.java | 2 +- .../aet/artemis/domain/IBonusStrategy.java | 2 +- .../de/tum/cit/aet/artemis/domain/User.java | 3 +- .../domain/modeling/SimilarElementCount.java | 2 +- .../repository/ExamLiveEventRepository.java | 4 +- .../{ => exam}/repository/ExamRepository.java | 4 +- .../repository/ExamSessionRepository.java | 4 +- .../repository/ExamUserRepository.java | 4 +- .../repository/ExerciseGroupRepository.java | 4 +- .../repository/StudentExamRepository.java | 4 +- .../ExerciseMetricsRepository.java | 4 +- .../repository/ExerciseRepository.java | 4 +- .../repository/ParticipationRepository.java | 4 +- .../StudentParticipationRepository.java | 4 +- .../repository/SubmissionRepository.java | 4 +- .../SubmissionVersionRepository.java | 4 +- .../repository/TeamRepository.java | 4 +- .../FileUploadExerciseRepository.java | 4 +- .../FileUploadSubmissionRepository.java | 4 +- .../IrisCourseChatSessionRepository.java | 4 +- .../IrisExerciseChatSessionRepository.java | 4 +- .../IrisHestiaSessionRepository.java | 4 +- .../repository}/IrisMessageRepository.java | 4 +- .../repository}/IrisSessionRepository.java | 4 +- .../repository}/IrisSettingsRepository.java | 4 +- .../IrisSubSettingsRepository.java | 4 +- .../repository}/IrisTemplateRepository.java | 4 +- .../repository/AttachmentRepository.java | 4 +- .../repository/AttachmentUnitRepository.java | 4 +- .../repository/ExerciseUnitRepository.java | 4 +- .../repository/LectureRepository.java | 4 +- .../LectureUnitCompletionRepository.java | 4 +- .../LectureUnitMetricsRepository.java | 4 +- .../repository/LectureUnitRepository.java | 4 +- .../repository/OnlineUnitRepository.java | 4 +- .../repository/SlideRepository.java | 4 +- .../repository/TextUnitRepository.java | 4 +- .../repository/VideoUnitRepository.java | 4 +- .../Lti13ResourceLaunchRepository.java | 4 +- .../LtiPlatformConfigurationRepository.java | 4 +- .../OnlineCourseConfigurationRepository.java | 4 +- .../repository/ApollonDiagramRepository.java | 4 +- .../repository/ModelClusterRepository.java | 4 +- .../repository/ModelElementRepository.java | 4 +- .../ModelingExerciseRepository.java | 4 +- .../ModelingSubmissionRepository.java | 4 +- .../repository}/PlagiarismCaseRepository.java | 4 +- .../PlagiarismComparisonRepository.java | 4 +- .../PlagiarismResultRepository.java | 4 +- .../PlagiarismSubmissionRepository.java | 4 +- .../AuxiliaryRepositoryRepository.java | 4 +- .../repository/BuildJobRepository.java | 4 +- .../repository/BuildLogEntryRepository.java | 4 +- .../BuildLogStatisticsEntryRepository.java | 4 +- .../repository/BuildPlanRepository.java | 4 +- ...ParticipationVCSAccessTokenRepository.java | 4 +- ...grammingExerciseBuildConfigRepository.java | 4 +- .../ProgrammingExerciseRepository.java | 8 ++-- ...xerciseStudentParticipationRepository.java | 4 +- ...ProgrammingExerciseTestCaseRepository.java | 4 +- .../ProgrammingSubmissionRepository.java | 4 +- ...ammingExerciseParticipationRepository.java | 8 ++-- .../StaticCodeAnalysisCategoryRepository.java | 4 +- .../SubmissionPolicyRepository.java | 4 +- ...ammingExerciseParticipationRepository.java | 8 ++-- .../repository/hestia/CodeHintRepository.java | 4 +- .../hestia/CoverageFileReportRepository.java | 4 +- .../hestia/CoverageReportRepository.java | 4 +- .../ExerciseHintActivationRepository.java | 4 +- .../hestia/ExerciseHintRepository.java | 4 +- ...ammingExerciseGitDiffReportRepository.java | 4 +- ...ammingExerciseSolutionEntryRepository.java | 4 +- .../ProgrammingExerciseTaskRepository.java | 4 +- ...TestwiseCoverageReportEntryRepository.java | 4 +- .../repository/settings/IdeRepository.java | 4 +- .../settings/UserIdeMappingRepository.java | 4 +- .../DragAndDropMappingRepository.java | 4 +- .../repository/DragItemRepository.java | 4 +- .../repository/QuizBatchRepository.java | 4 +- .../repository/QuizExerciseRepository.java | 4 +- .../repository/QuizGroupRepository.java | 4 +- .../QuizPointStatisticRepository.java | 4 +- .../repository/QuizPoolRepository.java | 4 +- .../repository/QuizQuestionRepository.java | 4 +- .../QuizQuestionStatisticRepository.java | 4 +- .../repository/QuizSubmissionRepository.java | 4 +- .../ShortAnswerMappingRepository.java | 4 +- .../repository/SubmittedAnswerRepository.java | 4 +- .../aet/artemis/repository/package-info.java | 4 -- .../service/AssessmentDashboardService.java | 8 ++-- .../artemis/service/AssessmentService.java | 12 ++--- .../service/AttachmentUnitService.java | 8 ++-- .../artemis/service/AuditEventService.java | 2 +- .../service/AuthorizationCheckService.java | 6 +-- .../cit/aet/artemis/service/BonusService.java | 4 +- .../artemis/service/BuildLogEntryService.java | 4 +- .../service/ComplaintResponseService.java | 6 +-- .../aet/artemis/service/ComplaintService.java | 12 ++--- .../service/ConductAgreementService.java | 2 +- .../service/ConsistencyCheckService.java | 2 +- .../CourseScoreCalculationService.java | 6 +-- .../aet/artemis/service/CourseService.java | 48 +++++++++---------- .../artemis/service/EmailSummaryService.java | 4 +- .../service/ExampleSubmissionService.java | 12 ++--- .../artemis/service/ExerciseDateService.java | 4 +- .../service/ExerciseDeletionService.java | 12 ++--- .../service/ExerciseImportService.java | 6 +-- .../service/ExerciseScoresChartService.java | 6 +-- .../aet/artemis/service/ExerciseService.java | 28 +++++------ .../service/ExerciseSpecificationService.java | 3 +- .../aet/artemis/service/FeedbackService.java | 2 +- .../FileUploadExerciseImportService.java | 8 ++-- .../service/FileUploadExerciseService.java | 2 +- .../service/FileUploadSubmissionService.java | 18 +++---- .../artemis/service/GradingScaleService.java | 2 +- .../service/LearningObjectService.java | 8 ++-- .../artemis/service/LectureImportService.java | 8 ++-- .../aet/artemis/service/LectureService.java | 4 +- .../service/LectureUnitProcessingService.java | 2 +- .../artemis/service/LectureUnitService.java | 12 ++--- .../ModelingExerciseImportService.java | 8 ++-- .../service/ModelingExerciseService.java | 6 +-- .../service/ModelingSubmissionService.java | 20 ++++---- .../OnlineCourseConfigurationService.java | 2 +- .../artemis/service/OrganizationService.java | 6 +-- .../service/ParticipantScoreService.java | 10 ++-- ...articipationAuthorizationCheckService.java | 6 +-- .../artemis/service/ParticipationService.java | 22 ++++----- .../ParticipationVcsAccessTokenService.java | 4 +- .../PresentationPointsCalculationService.java | 2 +- .../aet/artemis/service/RatingService.java | 4 +- .../aet/artemis/service/ResultService.java | 30 ++++++------ .../artemis/service/SlideSplitterService.java | 2 +- .../service/StaticCodeAnalysisService.java | 2 +- .../artemis/service/StatisticsService.java | 16 +++---- .../service/SubmissionPolicyService.java | 8 ++-- .../artemis/service/SubmissionService.java | 16 +++---- .../service/SubmissionVersionService.java | 4 +- .../service/SystemNotificationService.java | 2 +- .../cit/aet/artemis/service/TeamService.java | 6 +-- .../service/TextAssessmentService.java | 14 +++--- .../aet/artemis/service/TextBlockService.java | 2 +- .../service/TextExerciseFeedbackService.java | 2 +- .../service/TextExerciseImportService.java | 14 +++--- .../artemis/service/TextExerciseService.java | 2 +- .../service/TextSubmissionService.java | 18 +++---- .../artemis/service/TutorEffortService.java | 2 +- .../service/TutorLeaderboardService.java | 6 +-- .../service/TutorParticipationService.java | 4 +- .../service/compass/CompassService.java | 8 ++-- .../competency/CompetencyJolService.java | 8 ++-- .../competency/CompetencyProgressService.java | 8 ++-- .../competency/CompetencyRelationService.java | 4 +- .../service/competency/CompetencyService.java | 12 ++--- .../competency/CourseCompetencyService.java | 10 ++-- .../competency/KnowledgeAreaService.java | 2 +- .../competency/PrerequisiteService.java | 12 ++--- .../StandardizedCompetencyService.java | 6 +-- .../service/connectors/SAML2Service.java | 2 +- .../athena/AthenaDTOConverterService.java | 8 ++-- .../athena/AthenaModuleService.java | 2 +- .../athena/AthenaRepositoryExportService.java | 6 +-- .../AthenaSubmissionSendingService.java | 2 +- .../ci/AbstractBuildPlanCreator.java | 4 +- ...actContinuousIntegrationResultService.java | 6 +-- ...bPersonalAccessTokenManagementService.java | 2 +- .../connectors/gitlab/GitLabService.java | 10 ++-- .../gitlab/GitLabUserManagementService.java | 4 +- .../gitlabci/GitLabCIBuildPlanService.java | 4 +- .../gitlabci/GitLabCIResultService.java | 10 ++-- .../connectors/gitlabci/GitLabCIService.java | 4 +- .../gitlabci/GitLabCITriggerService.java | 2 +- .../jenkins/JenkinsResultService.java | 10 ++-- .../connectors/jenkins/JenkinsService.java | 2 +- .../jenkins/JenkinsUserManagementService.java | 4 +- .../build_plan/JenkinsBuildPlanService.java | 8 ++-- .../JenkinsPipelineScriptCreator.java | 4 +- .../ldap/LdapAuthenticationProvider.java | 2 +- .../LocalCIResultProcessingService.java | 6 +-- .../localci/LocalCIResultService.java | 6 +-- .../connectors/localci/LocalCIService.java | 2 +- .../localci/LocalCITriggerService.java | 6 +-- .../localci/SharedQueueManagementService.java | 2 +- .../connectors/localvc/LocalVCService.java | 8 ++-- .../localvc/LocalVCServletService.java | 6 +-- .../service/connectors/lti/Lti13Service.java | 12 ++--- .../connectors/lti/LtiDeepLinkingService.java | 2 +- .../lti/LtiDynamicRegistrationService.java | 2 +- .../service/connectors/lti/LtiService.java | 2 +- .../pyris/PyrisPipelineService.java | 4 +- .../connectors/pyris/PyrisWebhookService.java | 2 +- .../vcs/AbstractVersionControlService.java | 8 ++-- .../vcs/VcsTokenRenewalService.java | 2 +- .../service/exam/ExamAccessService.java | 8 ++-- .../artemis/service/exam/ExamDateService.java | 4 +- .../service/exam/ExamDeletionService.java | 16 +++---- .../service/exam/ExamImportService.java | 20 ++++---- .../service/exam/ExamLiveEventsService.java | 6 +-- .../artemis/service/exam/ExamQuizService.java | 12 ++--- .../service/exam/ExamRegistrationService.java | 12 ++--- .../aet/artemis/service/exam/ExamService.java | 28 +++++------ .../service/exam/ExamSessionService.java | 4 +- .../service/exam/ExamSubmissionService.java | 4 +- .../artemis/service/exam/ExamUserService.java | 4 +- .../exam/StudentExamAccessService.java | 8 ++-- .../service/exam/StudentExamService.java | 18 +++---- .../export/CourseExamExportService.java | 2 +- .../DataExportCommunicationDataService.java | 6 +-- .../export/DataExportCreationService.java | 2 +- .../export/DataExportExamCreationService.java | 4 +- .../DataExportExerciseCreationService.java | 6 +-- ...DataExportQuizExerciseCreationService.java | 6 +-- .../export/DataExportScienceEventService.java | 2 +- .../service/export/DataExportService.java | 4 +- .../FileUploadSubmissionExportService.java | 2 +- .../ModelingSubmissionExportService.java | 2 +- .../ProgrammingExerciseExportService.java | 8 ++-- ...zExerciseWithSubmissionsExportService.java | 2 +- .../export/SubmissionExportService.java | 2 +- .../export/TextSubmissionExportService.java | 2 +- .../service/hestia/CodeHintService.java | 6 +-- .../service/hestia/ExerciseHintService.java | 6 +-- ...ogrammingExerciseGitDiffReportService.java | 10 ++-- .../ProgrammingExerciseTaskService.java | 6 +-- .../hestia/TestwiseCoverageService.java | 8 ++-- .../behavioral/BehavioralTestCaseService.java | 6 +-- .../structural/StructuralTestCaseService.java | 6 +-- .../icl/GitPublickeyAuthenticatorService.java | 2 +- .../icl/SshGitLocationResolverService.java | 2 +- .../service/iris/IrisMessageService.java | 2 +- .../service/iris/IrisRateLimitService.java | 2 +- .../service/iris/IrisSessionService.java | 2 +- .../AbstractIrisChatSessionService.java | 2 +- .../session/IrisCourseChatSessionService.java | 4 +- .../IrisExerciseChatSessionService.java | 8 ++-- .../session/IrisHestiaSessionService.java | 4 +- .../iris/settings/IrisSettingsService.java | 2 +- .../artemis/service/ldap/LdapUserService.java | 2 +- .../learningpath/LearningPathNgxService.java | 2 +- .../LearningPathRecommendationService.java | 6 +-- .../learningpath/LearningPathService.java | 16 +++---- .../InstanceMessageReceiveService.java | 8 ++-- .../service/metis/AnswerMessageService.java | 18 +++---- .../metis/ConversationMessagingService.java | 14 +++--- .../artemis/service/metis/PostingService.java | 10 ++-- .../service/metis/ReactionService.java | 10 ++-- .../metis/conversation/ChannelService.java | 6 +-- .../conversation/ConversationDTOService.java | 8 ++-- .../conversation/ConversationService.java | 16 +++---- .../metis/conversation/GroupChatService.java | 6 +-- .../conversation/OneToOneChatService.java | 6 +-- .../auth/ChannelAuthorizationService.java | 6 +-- .../ConversationAuthorizationService.java | 4 +- .../auth/GroupChatAuthorizationService.java | 6 +-- .../OneToOneChatAuthorizationService.java | 6 +-- .../metrics/LearningMetricsService.java | 6 +-- .../ConversationNotificationService.java | 4 +- .../GroupNotificationService.java | 4 +- .../NotificationSettingsService.java | 2 +- .../SingleUserNotificationService.java | 8 ++-- .../TutorialGroupNotificationService.java | 4 +- .../ApplePushNotificationService.java | 2 +- .../FirebasePushNotificationService.java | 2 +- .../PushNotificationService.java | 2 +- .../ContinuousPlagiarismControlService.java | 8 ++-- .../PlagiarismAnswerPostService.java | 14 +++--- .../plagiarism/PlagiarismCaseService.java | 8 ++-- .../PlagiarismDetectionService.java | 2 +- .../plagiarism/PlagiarismPostService.java | 14 +++--- .../service/plagiarism/PlagiarismService.java | 6 +-- ...ProgrammingPlagiarismDetectionService.java | 4 +- .../AuxiliaryRepositoryService.java | 2 +- .../JavaTemplateUpgradeService.java | 2 +- .../ProgrammingAssessmentService.java | 14 +++--- ...mingExerciseCodeReviewFeedbackService.java | 4 +- ...ammingExerciseFeedbackCreationService.java | 6 +-- .../ProgrammingExerciseGradingService.java | 16 +++---- ...ProgrammingExerciseImportBasicService.java | 18 +++---- ...grammingExerciseImportFromFileService.java | 2 +- .../ProgrammingExerciseImportService.java | 6 +-- ...ogrammingExerciseParticipationService.java | 12 ++--- .../ProgrammingExerciseService.java | 32 ++++++------- .../ProgrammingExerciseTestCaseService.java | 4 +- .../ProgrammingMessagingService.java | 2 +- .../ProgrammingSubmissionService.java | 24 +++++----- .../ProgrammingTriggerService.java | 12 ++--- .../RepositoryParticipationService.java | 4 +- .../service/quiz/QuizBatchService.java | 6 +-- .../quiz/QuizExerciseImportService.java | 6 +-- .../service/quiz/QuizExerciseService.java | 10 ++-- .../artemis/service/quiz/QuizPoolService.java | 10 ++-- .../service/quiz/QuizResultService.java | 10 ++-- .../service/quiz/QuizScheduleService.java | 4 +- .../aet/artemis/service/quiz/QuizService.java | 4 +- .../service/quiz/QuizStatisticService.java | 10 ++-- .../service/quiz/QuizSubmissionService.java | 8 ++-- .../scheduled/AthenaScheduleService.java | 2 +- ...aticProgrammingExerciseCleanupService.java | 4 +- .../scheduled/DataExportScheduleService.java | 2 +- .../ModelingExerciseScheduleService.java | 2 +- .../NotificationScheduleService.java | 2 +- .../ParticipantScoreScheduleService.java | 14 +++--- .../ProgrammingExerciseScheduleService.java | 14 +++--- ...tionDeviceConfigurationCleanupService.java | 2 +- .../scheduled/UserScheduleService.java | 2 +- .../service/science/ScienceEventService.java | 2 +- .../service/team/TeamImportStrategy.java | 2 +- .../team/strategies/CreateOnlyStrategy.java | 2 +- .../strategies/PurgeExistingStrategy.java | 2 +- ...TutorialGroupChannelManagementService.java | 6 +-- .../TutorialGroupFreePeriodService.java | 4 +- .../TutorialGroupScheduleService.java | 4 +- .../tutorialgroups/TutorialGroupService.java | 8 ++-- .../TutorialGroupsConfigurationService.java | 6 +-- .../service/user/AuthorityService.java | 2 +- .../service/user/UserCreationService.java | 8 ++-- .../aet/artemis/service/user/UserService.java | 8 ++-- .../repository/TextExerciseRepository.java | 4 +- .../repository/TextSubmissionRepository.java | 4 +- .../TutorialGroupFreePeriodRepository.java | 4 +- .../TutorialGroupNotificationRepository.java | 4 +- .../TutorialGroupRegistrationRepository.java | 4 +- .../repository}/TutorialGroupRepository.java | 4 +- .../TutorialGroupScheduleRepository.java | 4 +- .../TutorialGroupSessionRepository.java | 4 +- ...TutorialGroupsConfigurationRepository.java | 4 +- .../web/rest/AbstractSubmissionResource.java | 8 ++-- .../aet/artemis/web/rest/AccountResource.java | 2 +- .../web/rest/ApollonDiagramResource.java | 4 +- .../artemis/web/rest/AssessmentResource.java | 10 ++-- .../aet/artemis/web/rest/AthenaResource.java | 14 +++--- .../artemis/web/rest/AttachmentResource.java | 4 +- .../aet/artemis/web/rest/BonusResource.java | 6 +-- .../artemis/web/rest/ComplaintResource.java | 10 ++-- .../web/rest/ComplaintResponseResource.java | 4 +- .../web/rest/ConsistencyCheckResource.java | 2 +- .../aet/artemis/web/rest/CourseResource.java | 14 +++--- .../artemis/web/rest/DataExportResource.java | 4 +- .../aet/artemis/web/rest/ExamResource.java | 14 +++--- .../artemis/web/rest/ExamUserResource.java | 4 +- .../web/rest/ExampleSubmissionResource.java | 6 +-- .../web/rest/ExerciseGroupResource.java | 6 +-- .../artemis/web/rest/ExerciseResource.java | 12 ++--- .../web/rest/ExerciseScoresChartResource.java | 4 +- .../aet/artemis/web/rest/FileResource.java | 20 ++++---- .../rest/FileUploadAssessmentResource.java | 14 +++--- .../web/rest/FileUploadExerciseResource.java | 12 ++--- .../rest/FileUploadSubmissionResource.java | 14 +++--- .../artemis/web/rest/GradeStepResource.java | 14 +++--- .../web/rest/GradingScaleResource.java | 8 ++-- .../web/rest/LearningPathResource.java | 6 +-- .../aet/artemis/web/rest/LectureResource.java | 8 ++-- .../web/rest/LongFeedbackTextResource.java | 2 +- .../cit/aet/artemis/web/rest/LtiResource.java | 4 +- .../aet/artemis/web/rest/MetricsResource.java | 2 +- .../web/rest/ModelingAssessmentResource.java | 14 +++--- .../web/rest/ModelingExerciseResource.java | 14 +++--- .../web/rest/ModelingSubmissionResource.java | 14 +++--- .../web/rest/NotificationResource.java | 6 +-- .../rest/NotificationSettingsResource.java | 4 +- .../web/rest/OrganizationResource.java | 2 +- .../web/rest/ParticipantScoreResource.java | 4 +- .../web/rest/ParticipationResource.java | 22 ++++----- .../web/rest/QuizExerciseResource.java | 10 ++-- .../web/rest/QuizParticipationResource.java | 10 ++-- .../artemis/web/rest/QuizPoolResource.java | 2 +- .../web/rest/QuizSubmissionResource.java | 6 +-- .../aet/artemis/web/rest/RatingResource.java | 6 +-- .../aet/artemis/web/rest/ResultResource.java | 10 ++-- .../web/rest/StaticCodeAnalysisResource.java | 4 +- .../artemis/web/rest/StatisticsResource.java | 4 +- .../artemis/web/rest/StudentExamResource.java | 14 +++--- .../web/rest/SubmissionPolicyResource.java | 4 +- .../artemis/web/rest/SubmissionResource.java | 12 ++--- .../web/rest/SystemNotificationResource.java | 2 +- .../aet/artemis/web/rest/TeamResource.java | 12 ++--- .../web/rest/TextAssessmentEventResource.java | 8 ++-- .../web/rest/TextAssessmentResource.java | 18 +++---- .../web/rest/TextExerciseResource.java | 24 +++++----- .../web/rest/TextSubmissionResource.java | 14 +++--- .../artemis/web/rest/TutorEffortResource.java | 6 +-- .../web/rest/TutorParticipationResource.java | 6 +-- .../aet/artemis/web/rest/UserResource.java | 2 +- .../rest/competency/CompetencyResource.java | 8 ++-- .../competency/CourseCompetencyResource.java | 10 ++-- .../rest/competency/PrerequisiteResource.java | 8 ++-- .../StandardizedCompetencyResource.java | 6 +-- .../web/rest/hestia/CodeHintResource.java | 6 +-- .../web/rest/hestia/ExerciseHintResource.java | 8 ++-- ...grammingExerciseGitDiffReportResource.java | 6 +-- ...grammingExerciseSolutionEntryResource.java | 8 ++-- .../ProgrammingExerciseTaskResource.java | 2 +- .../iris/IrisCourseChatSessionResource.java | 6 +-- .../iris/IrisExerciseChatSessionResource.java | 6 +-- .../web/rest/iris/IrisMessageResource.java | 6 +-- .../artemis/web/rest/iris/IrisResource.java | 2 +- .../web/rest/iris/IrisSettingsResource.java | 6 +-- .../rest/lecture/AttachmentUnitResource.java | 4 +- .../rest/lecture/ExerciseUnitResource.java | 4 +- .../web/rest/lecture/LectureUnitResource.java | 6 +-- .../web/rest/lecture/OnlineUnitResource.java | 4 +- .../web/rest/lecture/TextUnitResource.java | 4 +- .../web/rest/lecture/VideoUnitResource.java | 4 +- .../rest/localci/BuildJobQueueResource.java | 4 +- .../web/rest/localci/BuildPlanResource.java | 4 +- .../metis/ConversationMessageResource.java | 4 +- .../metis/conversation/ChannelResource.java | 8 ++-- .../ConversationManagementResource.java | 2 +- .../conversation/ConversationResource.java | 4 +- .../metis/conversation/GroupChatResource.java | 6 +-- .../conversation/OneToOneChatResource.java | 4 +- .../web/rest/open/PublicAccountResource.java | 2 +- .../rest/open/PublicBuildPlanResource.java | 2 +- .../PublicProgrammingSubmissionResource.java | 2 +- .../plagiarism/PlagiarismCaseResource.java | 6 +-- .../rest/plagiarism/PlagiarismResource.java | 10 ++-- .../ProgrammingAssessmentResource.java | 14 +++--- ...ogrammingExerciseExportImportResource.java | 10 ++-- .../ProgrammingExerciseGradingResource.java | 6 +-- ...grammingExerciseParticipationResource.java | 10 ++-- ...ProgrammingExercisePlagiarismResource.java | 4 +- .../ProgrammingExerciseResource.java | 20 ++++---- .../ProgrammingExerciseTestCaseResource.java | 6 +-- .../ProgrammingSubmissionResource.java | 14 +++--- .../PushNotificationResource.java | 4 +- ...grammingExerciseParticipationResource.java | 10 ++-- .../rest/repository/RepositoryResource.java | 4 +- .../repository/TestRepositoryResource.java | 4 +- .../rest/science/ScienceSettingsResource.java | 4 +- .../settings/ide/IdeSettingsResource.java | 6 +-- .../TutorialGroupFreePeriodResource.java | 4 +- .../tutorialgroups/TutorialGroupResource.java | 10 ++-- .../TutorialGroupSessionResource.java | 10 ++-- .../TutorialGroupsConfigurationResource.java | 4 +- .../web/websocket/ResultWebsocketService.java | 2 +- .../ParticipationTeamWebsocketService.java | 6 +-- .../AbstractArtemisIntegrationTest.java | 8 ++-- ...tractSpringIntegrationIndependentTest.java | 2 +- ...ctSpringIntegrationLocalCILocalVCTest.java | 12 ++--- .../aet/artemis/BuildPlanIntegrationTest.java | 6 +-- .../cit/aet/artemis/FileIntegrationTest.java | 8 ++-- .../aet/artemis/LtiQuizIntegrationTest.java | 4 +- .../ManagementResourceIntegrationTest.java | 4 +- .../aet/artemis/MetricsIntegrationTest.java | 2 +- .../artemis/OAuth2JWKSIntegrationTest.java | 2 +- .../artemis/StatisticsIntegrationTest.java | 12 ++--- .../aet/artemis/StudentScoreUtilService.java | 2 +- .../RepositoryArchitectureTest.java | 4 +- .../AssessmentComplaintIntegrationTest.java | 8 ++-- ...ssessmentTeamComplaintIntegrationTest.java | 4 +- .../ComplaintResponseIntegrationTest.java | 6 +-- .../assessment/ComplaintUtilService.java | 8 ++-- .../ExampleSubmissionIntegrationTest.java | 4 +- .../ExerciseScoresChartIntegrationTest.java | 4 +- .../assessment/GradeStepIntegrationTest.java | 6 +-- .../GradingScaleIntegrationTest.java | 4 +- .../assessment/GradingScaleUtilService.java | 2 +- .../ParticipantScoreIntegrationTest.java | 10 ++-- .../ResultServiceIntegrationTest.java | 24 +++++----- .../TutorEffortIntegrationTest.java | 6 +-- .../TutorParticipationIntegrationTest.java | 6 +-- ...rParticipationResourceIntegrationTest.java | 4 +- ...InternalAuthenticationIntegrationTest.java | 4 +- .../LdapAuthenticationIntegrationTest.java | 6 +-- .../UserJenkinsGitlabIntegrationTest.java | 2 +- .../artemis/bonus/BonusIntegrationTest.java | 6 +-- ...CompetencyPrerequisiteIntegrationTest.java | 16 +++---- .../CompetencyJolIntegrationTest.java | 2 +- .../CompetencyProgressUtilService.java | 2 +- .../competency/CompetencyUtilService.java | 10 ++-- .../CourseCompetencyIntegrationTest.java | 20 ++++---- .../LearningPathIntegrationTest.java | 12 ++--- .../competency/LearningPathUtilService.java | 8 ++-- .../competency/PrerequisiteUtilService.java | 2 +- ...StandardizedCompetencyIntegrationTest.java | 8 ++-- .../StandardizedCompetencyUtilService.java | 4 +- .../aet/artemis/config/MetricsBeanTest.java | 10 ++-- .../connector/GitlabRequestMockProvider.java | 4 +- .../connector/JenkinsRequestMockProvider.java | 2 +- .../artemis/connectors/Lti13ServiceTest.java | 12 ++--- .../LtiDynamicRegistrationServiceTest.java | 2 +- .../artemis/connectors/LtiServiceTest.java | 2 +- .../aet/artemis/course/CourseTestService.java | 44 ++++++++--------- .../aet/artemis/course/CourseUtilService.java | 34 ++++++------- .../DataExportResourceIntegrationTest.java | 2 +- .../cit/aet/artemis/domain/ResultTest.java | 2 +- .../ResultListenerIntegrationTest.java | 8 ++-- .../aet/artemis/exam/ExamIntegrationTest.java | 18 +++---- .../ExamParticipationIntegrationTest.java | 24 +++++----- .../exam/ExamRegistrationIntegrationTest.java | 6 +-- .../exam/ExamSessionIntegrationTest.java | 4 +- .../cit/aet/artemis/exam/ExamStartTest.java | 8 ++-- .../artemis/exam/ExamUserIntegrationTest.java | 4 +- .../cit/aet/artemis/exam/ExamUtilService.java | 24 +++++----- ...ciseGroupIntegrationJenkinsGitlabTest.java | 8 ++-- .../exam/ProgrammingExamIntegrationTest.java | 8 ++-- .../exam/StudentExamIntegrationTest.java | 22 ++++----- .../artemis/exam/TestExamIntegrationTest.java | 6 +-- .../AthenaExerciseIntegrationTest.java | 4 +- .../AthenaResourceIntegrationTest.java | 14 +++--- .../exercise/ExerciseIntegrationTest.java | 6 +-- .../artemis/exercise/ExerciseUtilService.java | 16 +++---- .../FileUploadAssessmentIntegrationTest.java | 10 ++-- .../FileUploadExerciseIntegrationTest.java | 10 ++-- .../FileUploadExerciseUtilService.java | 12 ++--- .../FileUploadSubmissionIntegrationTest.java | 4 +- ...ApollonDiagramResourceIntegrationTest.java | 2 +- .../ModelingAssessmentIntegrationTest.java | 18 +++---- .../ModelingExerciseIntegrationTest.java | 16 +++---- .../modeling/ModelingExerciseUtilService.java | 16 +++---- .../ModelingSubmissionIntegrationTest.java | 20 ++++---- .../AuxiliaryRepositoryServiceTest.java | 4 +- .../CourseGitlabJenkinsIntegrationTest.java | 2 +- .../programming/GitlabServiceTest.java | 4 +- .../ProgrammingAssessmentIntegrationTest.java | 12 ++--- .../ProgrammingExerciseBuildPlanTest.java | 2 +- ...ProgrammingExerciseGitIntegrationTest.java | 2 +- ...ProgrammingExerciseGradingServiceTest.java | 16 +++---- ...rammingExerciseIntegrationTestService.java | 16 +++---- ...gExerciseParticipationIntegrationTest.java | 8 ++-- ...grammingExerciseRepositoryServiceTest.java | 2 +- .../ProgrammingExerciseResultTestService.java | 16 +++---- ...rogrammingExerciseScheduleServiceTest.java | 10 ++-- ...rammingExerciseServiceIntegrationTest.java | 2 +- .../ProgrammingExerciseServiceTest.java | 2 +- .../programming/ProgrammingExerciseTest.java | 8 ++-- ...rogrammingExerciseTestCaseServiceTest.java | 4 +- .../ProgrammingExerciseTestService.java | 34 ++++++------- .../ProgrammingExerciseUtilService.java | 36 +++++++------- ...AndResultGitlabJenkinsIntegrationTest.java | 6 +-- ...issionAndResultIntegrationTestService.java | 2 +- .../ProgrammingSubmissionIntegrationTest.java | 6 +-- .../RepositoryIntegrationTest.java | 16 +++---- ...seParticipationJenkinsIntegrationTest.java | 2 +- .../StaticCodeAnalysisIntegrationTest.java | 4 +- .../SubmissionPolicyIntegrationTest.java | 2 +- ...TestRepositoryResourceIntegrationTest.java | 4 +- .../quiz/QuizExerciseIntegrationTest.java | 12 ++--- .../quiz/QuizExerciseUtilService.java | 22 ++++----- .../quiz/QuizSubmissionIntegrationTest.java | 8 ++-- .../text/TextExerciseUtilService.java | 24 +++++----- .../hestia/CodeHintIntegrationTest.java | 6 +-- .../artemis/hestia/CodeHintServiceTest.java | 8 ++-- .../hestia/ExerciseHintIntegrationTest.java | 8 ++-- .../hestia/ExerciseHintServiceTest.java | 14 +++--- .../artemis/hestia/HestiaDatabaseTest.java | 10 ++-- ...mmingExerciseGitDiffReportServiceTest.java | 2 +- ...gExerciseSolutionEntryIntegrationTest.java | 8 ++-- ...rogrammingExerciseTaskIntegrationTest.java | 8 ++-- .../ProgrammingExerciseTaskServiceTest.java | 8 ++-- .../hestia/StructuralTestCaseServiceTest.java | 2 +- .../TestwiseCoverageIntegrationTest.java | 10 ++-- .../TestwiseCoverageReportServiceTest.java | 8 ++-- .../BehavioralTestCaseServiceTest.java | 12 ++--- .../iris/AbstractIrisIntegrationTest.java | 6 +-- .../iris/IrisChatMessageIntegrationTest.java | 4 +- ...risExerciseChatSessionIntegrationTest.java | 2 +- .../iris/PyrisLectureIngestionTest.java | 4 +- .../settings/IrisSettingsIntegrationTest.java | 4 +- .../AttachmentResourceIntegrationTest.java | 4 +- .../AttachmentUnitIntegrationTest.java | 8 ++-- .../AttachmentUnitsIntegrationTest.java | 4 +- .../lecture/ExerciseUnitIntegrationTest.java | 10 ++-- .../lecture/LectureIntegrationTest.java | 10 ++-- .../lecture/LectureUnitIntegrationTest.java | 6 +-- .../lecture/LectureUnitServiceTest.java | 2 +- .../artemis/lecture/LectureUtilService.java | 26 +++++----- .../lecture/OnlineUnitIntegrationTest.java | 4 +- .../lecture/TextUnitIntegrationTest.java | 4 +- .../lecture/VideoUnitIntegrationTest.java | 4 +- ...AbstractLocalCILocalVCIntegrationTest.java | 8 ++-- .../localvcci/LocalVCLocalCITestService.java | 6 +-- .../metis/AbstractConversationTest.java | 16 +++---- .../metis/AnswerMessageIntegrationTest.java | 4 +- .../artemis/metis/ChannelIntegrationTest.java | 4 +- .../artemis/metis/MessageIntegrationTest.java | 8 ++-- .../artemis/metis/PostingServiceUnitTest.java | 2 +- .../metis/ReactionIntegrationTest.java | 6 +-- .../migration/MigrationServiceTest.java | 2 +- .../GroupNotificationServiceTest.java | 10 ++-- .../NotificationResourceIntegrationTest.java | 4 +- .../NotificationScheduleServiceTest.java | 8 ++-- ...cationSettingsResourceIntegrationTest.java | 2 +- .../NotificationSettingsServiceTest.java | 2 +- .../PushNotificationResourceTest.java | 4 +- .../SingleUserNotificationServiceTest.java | 8 ++-- .../SystemNotificationIntegrationTest.java | 2 +- .../OrganizationIntegrationTest.java | 2 +- .../organization/OrganizationUtilService.java | 2 +- .../ParticipationIntegrationTest.java | 10 ++-- ...articipationSubmissionIntegrationTest.java | 2 +- .../ParticipationUtilService.java | 22 ++++----- .../SubmissionIntegrationTest.java | 4 +- ...ontinuousPlagiarismControlServiceTest.java | 8 ++-- .../PlagiarismAnswerPostIntegrationTest.java | 4 +- .../PlagiarismCaseIntegrationTest.java | 6 +-- .../PlagiarismDetectionConfigHelperTest.java | 2 +- .../PlagiarismDetectionServiceTest.java | 2 +- .../plagiarism/PlagiarismIntegrationTest.java | 8 ++-- .../PlagiarismPostIntegrationTest.java | 6 +-- .../plagiarism/PlagiarismUtilService.java | 8 ++-- .../artemis/post/ConversationUtilService.java | 20 ++++---- .../ParticipationTestRepository.java | 2 +- ...iseStudentParticipationTestRepository.java | 2 +- .../ProgrammingExerciseTestRepository.java | 2 +- .../ProgrammingSubmissionTestRepository.java | 2 +- .../repository/StatisticsRepositoryTest.java | 2 + .../repository/UserRepositoryTest.java | 1 + .../repository/UserTestRepository.java | 2 +- .../science/ScienceIntegrationTest.java | 2 +- .../ScienceSettingsIntegrationTest.java | 2 +- .../artemis/science/ScienceUtilService.java | 2 +- .../security/Lti13LaunchFilterTest.java | 2 +- .../service/AssessmentServiceTest.java | 6 +-- .../AuthorizationCheckServiceTest.java | 4 +- .../service/ComplaintResponseServiceTest.java | 6 +-- .../service/ConsistencyCheckTestService.java | 4 +- .../CourseScoreCalculationServiceTest.java | 8 ++-- .../artemis/service/CourseServiceTest.java | 8 ++-- .../DataExportCreationServiceTest.java | 12 ++--- .../service/EmailSummaryServiceTest.java | 4 +- .../service/ExerciseDateServiceTest.java | 8 ++-- .../artemis/service/FeedbackServiceTest.java | 4 +- .../artemis/service/GitlabCIServiceTest.java | 10 ++-- .../service/GradingScaleServiceTest.java | 4 +- .../artemis/service/JenkinsServiceTest.java | 6 +-- .../service/LearningPathServiceTest.java | 6 +-- .../service/LectureImportServiceTest.java | 2 +- .../artemis/service/LectureServiceTest.java | 2 +- .../OnlineCourseConfigurationServiceTest.java | 2 +- ...cipationAuthorizationCheckServiceTest.java | 4 +- .../service/ParticipationServiceTest.java | 8 ++-- ...sentationPointsCalculationServiceTest.java | 4 +- .../service/RepositoryAccessServiceTest.java | 4 +- .../artemis/service/ResultServiceTest.java | 6 +-- .../service/SubmissionServiceTest.java | 8 ++-- .../service/TeamWebsocketServiceTest.java | 6 +-- .../TitleCacheEvictionServiceTest.java | 12 ++--- .../AthenaFeedbackSendingServiceTest.java | 8 ++-- .../AthenaRepositoryExportServiceTest.java | 2 +- .../AthenaSubmissionSelectionServiceTest.java | 4 +- .../AthenaSubmissionSendingServiceTest.java | 4 +- ...sonalAccessTokenManagementServiceTest.java | 2 +- .../JenkinsPipelineScriptCreatorTest.java | 6 +-- .../lti/LtiDeepLinkingServiceTest.java | 2 +- .../vcs/VcsTokenRenewalServiceTest.java | 2 +- .../service/exam/ExamAccessServiceTest.java | 8 ++-- .../service/exam/ExamQuizServiceTest.java | 12 ++--- .../artemis/service/exam/ExamServiceTest.java | 6 +-- .../exam/ExamSubmissionServiceTest.java | 6 +-- .../exam/StudentExamAccessServiceTest.java | 2 +- .../export/CourseExamExportServiceTest.java | 6 +-- .../ConversationNotificationServiceTest.java | 12 ++--- .../TutorialGroupNotificationServiceTest.java | 10 ++-- ...leFirebasePushNotificationServiceTest.java | 2 +- ...ngExerciseFeedbackCreationServiceTest.java | 6 +-- .../DataExportScheduleServiceTest.java | 2 +- ...DeviceConfigurationCleanupServiceTest.java | 2 +- .../ide/IdePreferencesIntegrationTest.java | 4 +- .../team/TeamImportIntegrationTest.java | 2 +- .../aet/artemis/team/TeamIntegrationTest.java | 2 +- .../cit/aet/artemis/team/TeamUtilService.java | 4 +- .../text/AssessmentEventIntegrationTest.java | 6 +-- .../text/TextAssessmentIntegrationTest.java | 18 +++---- .../text/TextExerciseIntegrationTest.java | 18 +++---- .../text/TextSubmissionIntegrationTest.java | 14 +++--- .../AbstractTutorialGroupIntegrationTest.java | 22 ++++----- .../TutorialGroupIntegrationTest.java | 3 +- .../TutorialGroupUtilService.java | 12 ++--- .../cit/aet/artemis/user/UserTestService.java | 14 +++--- .../cit/aet/artemis/user/UserUtilService.java | 4 +- .../artemis/util/HestiaUtilTestService.java | 10 ++-- 766 files changed, 2466 insertions(+), 2466 deletions(-) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/repository/BonusRepository.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/repository/ComplaintRepository.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/repository/ComplaintResponseRepository.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/repository/ExampleSubmissionRepository.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/repository/FeedbackRepository.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/repository/GradeStepRepository.java (76%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/repository/GradingCriterionRepository.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/repository/GradingInstructionRepository.java (78%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/repository/GradingScaleRepository.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/repository/LongFeedbackTextRepository.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/repository/ParticipantScoreRepository.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/repository/RatingRepository.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/repository/ResultRepository.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/repository/StudentScoreRepository.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/repository/TeamScoreRepository.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/repository/TextAssessmentEventRepository.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/repository/TextBlockRepository.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/repository/TutorParticipationRepository.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{repository/metrics => atlas/repository}/CompetencyMetricsRepository.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/repository/CompetencyProgressRepository.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/repository/CompetencyRelationRepository.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/repository/CompetencyRepository.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/repository/CourseCompetencyRepository.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/repository/LearningPathRepository.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/repository/PrerequisiteRepository.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/repository/SourceRepository.java (77%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/repository/competency/CompetencyJolRepository.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/repository/competency/KnowledgeAreaRepository.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/repository/competency/StandardizedCompetencyRepository.java (78%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/repository/science/ScienceEventRepository.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/repository/science/ScienceSettingRepository.java (79%) rename src/main/java/de/tum/cit/aet/artemis/{repository/metis => communication/repository}/AnswerPostRepository.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/repository/ConductAgreementRepository.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{repository/metis => communication/repository}/ConversationMessageRepository.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{repository/metis => communication/repository}/ConversationParticipantRepository.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{repository/metis => communication/repository}/CustomPostRepository.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{repository/metis => communication/repository}/CustomPostRepositoryImpl.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/repository/GroupNotificationRepository.java (80%) rename src/main/java/de/tum/cit/aet/artemis/{repository/specs => communication/repository}/MessageSpecs.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/repository/NotificationRepository.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/repository/NotificationSettingRepository.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{repository/metis => communication/repository}/PostRepository.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/repository/PushNotificationDeviceConfigurationRepository.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{repository/metis => communication/repository}/ReactionRepository.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/repository/SingleUserNotificationRepository.java (78%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/repository/SystemNotificationRepository.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{repository/metis => communication/repository}/conversation/ChannelRepository.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{repository/metis => communication/repository}/conversation/ConversationNotificationRepository.java (74%) rename src/main/java/de/tum/cit/aet/artemis/{repository/metis => communication/repository}/conversation/ConversationRepository.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{repository/metis => communication/repository}/conversation/GroupChatRepository.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{repository/metis => communication/repository}/conversation/OneToOneChatRepository.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/repository/AuthorityRepository.java (77%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/repository/CourseRepository.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/repository/CustomAuditEventRepository.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/repository/DataExportRepository.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/repository/GuidedTourSettingsRepository.java (78%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/repository/LdapUserRepository.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/repository/MigrationChangeRepository.java (57%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/repository/OrganizationRepository.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/repository/PersistenceAuditEventRepository.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/repository/StatisticsRepository.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/repository/UserRepository.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{repository/specs => core/repository}/UserSpecs.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/repository/base/ArtemisJpaRepository.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/repository/base/DynamicSpecificationRepository.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/repository/base/FetchOptions.java (71%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/repository/base/RepositoryImpl.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/admin/AdminBuildJobQueueResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/admin/AdminCourseResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/admin/AdminDataExportResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/admin/AdminExamResource.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/admin/AdminExerciseResource.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/admin/AdminImprintResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/admin/AdminLtiConfigurationResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/admin/AdminModelingExerciseResource.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/admin/AdminOrganizationResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/admin/AdminPrivacyStatementResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/admin/AdminStandardizedCompetencyResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/admin/AdminStatisticsResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/admin/AdminSystemNotificationResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/admin/AdminTextAssessmentEventResource.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/admin/AdminUserResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/admin/AuditResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/admin/FeatureToggleResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/admin/LogResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/admin/iris/AdminIrisSettingsResource.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => exam}/repository/ExamLiveEventRepository.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => exam}/repository/ExamRepository.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => exam}/repository/ExamSessionRepository.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => exam}/repository/ExamUserRepository.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => exam}/repository/ExerciseGroupRepository.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => exam}/repository/StudentExamRepository.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{repository/metrics => exercise/repository}/ExerciseMetricsRepository.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/repository/ExerciseRepository.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/repository/ParticipationRepository.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/repository/StudentParticipationRepository.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/repository/SubmissionRepository.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/repository/SubmissionVersionRepository.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/repository/TeamRepository.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => fileupload}/repository/FileUploadExerciseRepository.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => fileupload}/repository/FileUploadSubmissionRepository.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{repository/iris => iris/repository}/IrisCourseChatSessionRepository.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{repository/iris => iris/repository}/IrisExerciseChatSessionRepository.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{repository/iris => iris/repository}/IrisHestiaSessionRepository.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{repository/iris => iris/repository}/IrisMessageRepository.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{repository/iris => iris/repository}/IrisSessionRepository.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{repository/iris => iris/repository}/IrisSettingsRepository.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{repository/iris => iris/repository}/IrisSubSettingsRepository.java (66%) rename src/main/java/de/tum/cit/aet/artemis/{repository/iris => iris/repository}/IrisTemplateRepository.java (63%) rename src/main/java/de/tum/cit/aet/artemis/{ => lecture}/repository/AttachmentRepository.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{ => lecture}/repository/AttachmentUnitRepository.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => lecture}/repository/ExerciseUnitRepository.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{ => lecture}/repository/LectureRepository.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => lecture}/repository/LectureUnitCompletionRepository.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{repository/metrics => lecture/repository}/LectureUnitMetricsRepository.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => lecture}/repository/LectureUnitRepository.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => lecture}/repository/OnlineUnitRepository.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{ => lecture}/repository/SlideRepository.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{ => lecture}/repository/TextUnitRepository.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{ => lecture}/repository/VideoUnitRepository.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{ => lti}/repository/Lti13ResourceLaunchRepository.java (84%) rename src/main/java/de/tum/cit/aet/artemis/{ => lti}/repository/LtiPlatformConfigurationRepository.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => lti}/repository/OnlineCourseConfigurationRepository.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/repository/ApollonDiagramRepository.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/repository/ModelClusterRepository.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/repository/ModelElementRepository.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/repository/ModelingExerciseRepository.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/repository/ModelingSubmissionRepository.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{repository/plagiarism => plagiarism/repository}/PlagiarismCaseRepository.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{repository/plagiarism => plagiarism/repository}/PlagiarismComparisonRepository.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{repository/plagiarism => plagiarism/repository}/PlagiarismResultRepository.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{repository/plagiarism => plagiarism/repository}/PlagiarismSubmissionRepository.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/repository/AuxiliaryRepositoryRepository.java (80%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/repository/BuildJobRepository.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/repository/BuildLogEntryRepository.java (84%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/repository/BuildLogStatisticsEntryRepository.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/repository/BuildPlanRepository.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/repository/ParticipationVCSAccessTokenRepository.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/repository/ProgrammingExerciseBuildConfigRepository.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/repository/ProgrammingExerciseRepository.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/repository/ProgrammingExerciseStudentParticipationRepository.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/repository/ProgrammingExerciseTestCaseRepository.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/repository/ProgrammingSubmissionRepository.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/repository/SolutionProgrammingExerciseParticipationRepository.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/repository/StaticCodeAnalysisCategoryRepository.java (81%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/repository/SubmissionPolicyRepository.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/repository/TemplateProgrammingExerciseParticipationRepository.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/repository/hestia/CodeHintRepository.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/repository/hestia/CoverageFileReportRepository.java (74%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/repository/hestia/CoverageReportRepository.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/repository/hestia/ExerciseHintActivationRepository.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/repository/hestia/ExerciseHintRepository.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/repository/hestia/ProgrammingExerciseGitDiffReportRepository.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/repository/hestia/ProgrammingExerciseSolutionEntryRepository.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/repository/hestia/ProgrammingExerciseTaskRepository.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/repository/hestia/TestwiseCoverageReportEntryRepository.java (78%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/repository/settings/IdeRepository.java (77%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/repository/settings/UserIdeMappingRepository.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{ => quiz}/repository/DragAndDropMappingRepository.java (79%) rename src/main/java/de/tum/cit/aet/artemis/{ => quiz}/repository/DragItemRepository.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{ => quiz}/repository/QuizBatchRepository.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => quiz}/repository/QuizExerciseRepository.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => quiz}/repository/QuizGroupRepository.java (78%) rename src/main/java/de/tum/cit/aet/artemis/{ => quiz}/repository/QuizPointStatisticRepository.java (79%) rename src/main/java/de/tum/cit/aet/artemis/{ => quiz}/repository/QuizPoolRepository.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{ => quiz}/repository/QuizQuestionRepository.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{ => quiz}/repository/QuizQuestionStatisticRepository.java (79%) rename src/main/java/de/tum/cit/aet/artemis/{ => quiz}/repository/QuizSubmissionRepository.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => quiz}/repository/ShortAnswerMappingRepository.java (79%) rename src/main/java/de/tum/cit/aet/artemis/{ => quiz}/repository/SubmittedAnswerRepository.java (94%) delete mode 100644 src/main/java/de/tum/cit/aet/artemis/repository/package-info.java rename src/main/java/de/tum/cit/aet/artemis/{ => text}/repository/TextExerciseRepository.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => text}/repository/TextSubmissionRepository.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{repository/tutorialgroups => tutorialgroup/repository}/TutorialGroupFreePeriodRepository.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{repository/tutorialgroups => tutorialgroup/repository}/TutorialGroupNotificationRepository.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{repository/tutorialgroups => tutorialgroup/repository}/TutorialGroupRegistrationRepository.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{repository/tutorialgroups => tutorialgroup/repository}/TutorialGroupRepository.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{repository/tutorialgroups => tutorialgroup/repository}/TutorialGroupScheduleRepository.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{repository/tutorialgroups => tutorialgroup/repository}/TutorialGroupSessionRepository.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{repository/tutorialgroups => tutorialgroup/repository}/TutorialGroupsConfigurationRepository.java (92%) diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/BonusRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/BonusRepository.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/repository/BonusRepository.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/repository/BonusRepository.java index 9f6a3addc312..5c3e76dab87a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/BonusRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/BonusRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.assessment.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Bonus; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Bonus entity diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ComplaintRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintRepository.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/repository/ComplaintRepository.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintRepository.java index fca454dfe66f..26035bd92aff 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ComplaintRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.assessment.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -15,6 +15,7 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Complaint; import de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseMapEntry; import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; @@ -22,7 +23,6 @@ import de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardComplaintResponses; import de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardComplaints; import de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardMoreFeedbackRequests; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Complaint entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ComplaintResponseRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintResponseRepository.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/repository/ComplaintResponseRepository.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintResponseRepository.java index 9db01bf4d7e5..480cbf14919c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ComplaintResponseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintResponseRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.assessment.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -13,10 +13,10 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.ComplaintResponse; import de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseMapEntry; import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the ComplaintResponse entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ExampleSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ExampleSubmissionRepository.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/repository/ExampleSubmissionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/repository/ExampleSubmissionRepository.java index 447761da7de5..baf0b2d43e5a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ExampleSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ExampleSubmissionRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.assessment.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -13,10 +13,10 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.ExampleSubmission; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the ExampleSubmission entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/FeedbackRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/FeedbackRepository.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/repository/FeedbackRepository.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/repository/FeedbackRepository.java index 5f36f5c084cb..c7c71b5874e7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/FeedbackRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/FeedbackRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.assessment.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -12,12 +12,12 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.GradingCriterion; import de.tum.cit.aet.artemis.domain.GradingInstruction; import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Feedback entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/GradeStepRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradeStepRepository.java similarity index 76% rename from src/main/java/de/tum/cit/aet/artemis/repository/GradeStepRepository.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradeStepRepository.java index 06152d75babe..751c4809ae33 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/GradeStepRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradeStepRepository.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.assessment.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.GradeStep; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA Repository for the GradeStep entity diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/GradingCriterionRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingCriterionRepository.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/repository/GradingCriterionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingCriterionRepository.java index 7ef46b2a7282..586e4a5fa718 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/GradingCriterionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingCriterionRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.assessment.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the GradingCriteria entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/GradingInstructionRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingInstructionRepository.java similarity index 78% rename from src/main/java/de/tum/cit/aet/artemis/repository/GradingInstructionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingInstructionRepository.java index 66b1ccab3066..b2ea1b872ab1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/GradingInstructionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingInstructionRepository.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.assessment.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.GradingInstruction; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the GradingInstruction entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/GradingScaleRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingScaleRepository.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/repository/GradingScaleRepository.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingScaleRepository.java index c15a412b93a4..c30edc4b2f04 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/GradingScaleRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingScaleRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.assessment.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -19,9 +19,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.GradeStep; import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/LongFeedbackTextRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/LongFeedbackTextRepository.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/repository/LongFeedbackTextRepository.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/repository/LongFeedbackTextRepository.java index 8d59ebfbd792..72a2fd31c3d6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/LongFeedbackTextRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/LongFeedbackTextRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.assessment.repository; import java.util.List; import java.util.Optional; @@ -6,8 +6,8 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.LongFeedbackText; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; public interface LongFeedbackTextRepository extends ArtemisJpaRepository { diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ParticipantScoreRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/repository/ParticipantScoreRepository.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java index 4396cc667aa7..8ff4428c7314 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ParticipantScoreRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.assessment.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -20,11 +20,11 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.domain.scores.ParticipantScore; import de.tum.cit.aet.artemis.domain.statistics.ScoreDistribution; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementOverviewExerciseStatisticsDTO; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseScoresAggregatedInformation; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/RatingRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/RatingRepository.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/repository/RatingRepository.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/repository/RatingRepository.java index 698910dcc80c..2dd300a4ea71 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/RatingRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/RatingRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.assessment.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -12,9 +12,9 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Rating; import de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseRatingCount; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Rating entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ResultRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/repository/ResultRepository.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java index 97379c39f9f3..0f570fd49ba9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ResultRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.assessment.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static java.util.Arrays.asList; @@ -21,6 +21,7 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.domain.ExampleSubmission; @@ -34,7 +35,6 @@ import de.tum.cit.aet.artemis.domain.assessment.dashboard.ResultCount; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardAssessments; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.service.util.RoundingUtil; import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; import de.tum.cit.aet.artemis.web.rest.dto.ResultWithPointsPerGradingCriterionDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/StudentScoreRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/StudentScoreRepository.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/repository/StudentScoreRepository.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/repository/StudentScoreRepository.java index 41d18ce87439..8c00edd12cc2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/StudentScoreRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/StudentScoreRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.assessment.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -15,10 +15,10 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.scores.StudentScore; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.dto.score.StudentScoreSum; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/TeamScoreRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TeamScoreRepository.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/repository/TeamScoreRepository.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/repository/TeamScoreRepository.java index ef3a6c3aef00..d4c8a46d1ad2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/TeamScoreRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TeamScoreRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.assessment.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -15,11 +15,11 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.scores.TeamScore; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.dto.score.TeamScoreSum; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/TextAssessmentEventRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TextAssessmentEventRepository.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/repository/TextAssessmentEventRepository.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/repository/TextAssessmentEventRepository.java index 37b9c714263b..835b3bb3184f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/TextAssessmentEventRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TextAssessmentEventRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.assessment.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static java.util.stream.Collectors.toMap; @@ -11,8 +11,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.analytics.TextAssessmentEvent; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the TextAssessmentEvent entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/TextBlockRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TextBlockRepository.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/repository/TextBlockRepository.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/repository/TextBlockRepository.java index cd6e1d520601..d514e757c7b9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/TextBlockRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TextBlockRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.assessment.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -9,8 +9,8 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.TextBlock; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the TextBlock entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/TutorParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TutorParticipationRepository.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/repository/TutorParticipationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/repository/TutorParticipationRepository.java index d7117894cd2a..c8119c304be1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/TutorParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TutorParticipationRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.assessment.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -11,11 +11,11 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the TutorParticipation entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metrics/CompetencyMetricsRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyMetricsRepository.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/repository/metrics/CompetencyMetricsRepository.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyMetricsRepository.java index 89abf7b52ebf..919059b8e5bc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metrics/CompetencyMetricsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyMetricsRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.metrics; +package de.tum.cit.aet.artemis.atlas.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.competency.Competency; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO; import de.tum.cit.aet.artemis.web.rest.dto.metrics.CompetencyInformationDTO; import de.tum.cit.aet.artemis.web.rest.dto.metrics.CompetencyProgressDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/CompetencyProgressRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyProgressRepository.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/repository/CompetencyProgressRepository.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyProgressRepository.java index 53f4f029ad29..d3f0ea99c847 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/CompetencyProgressRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyProgressRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.atlas.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -14,10 +14,10 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/CompetencyRelationRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyRelationRepository.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/repository/CompetencyRelationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyRelationRepository.java index 5a3ecb62a034..9cfa787d35d7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/CompetencyRelationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyRelationRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.atlas.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -11,9 +11,9 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.competency.CompetencyRelation; import de.tum.cit.aet.artemis.domain.competency.RelationType; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Competency Relation entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/CompetencyRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyRepository.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/repository/CompetencyRepository.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyRepository.java index 5eff52100384..619ad4abe767 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/CompetencyRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.atlas.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -12,9 +12,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.competency.Competency; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Competency entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/CourseCompetencyRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CourseCompetencyRepository.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/repository/CourseCompetencyRepository.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/repository/CourseCompetencyRepository.java index 2454f353a58a..c5e0d179e2c3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/CourseCompetencyRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CourseCompetencyRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.atlas.repository; import java.util.List; import java.util.Optional; @@ -10,12 +10,12 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.LearningObject; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.dto.metrics.CompetencyExerciseMasteryCalculationDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/LearningPathRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/LearningPathRepository.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/repository/LearningPathRepository.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/repository/LearningPathRepository.java index f061fe73837a..e33df99f848a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/LearningPathRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/LearningPathRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.atlas.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -13,8 +13,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.competency.LearningPath; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/PrerequisiteRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/PrerequisiteRepository.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/repository/PrerequisiteRepository.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/repository/PrerequisiteRepository.java index 46b8185109ef..aaa7e5f753a3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/PrerequisiteRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/PrerequisiteRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.atlas.repository; import java.util.List; import java.util.Optional; @@ -7,9 +7,9 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.competency.Prerequisite; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the {@link Prerequisite} entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/SourceRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/SourceRepository.java similarity index 77% rename from src/main/java/de/tum/cit/aet/artemis/repository/SourceRepository.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/repository/SourceRepository.java index fb88fab7c385..8a8634880e9a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/SourceRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/SourceRepository.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.atlas.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.competency.Source; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the {@link Source} entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/competency/CompetencyJolRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/CompetencyJolRepository.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/repository/competency/CompetencyJolRepository.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/CompetencyJolRepository.java index 5402d1ef17ad..d4d40165f635 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/competency/CompetencyJolRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/CompetencyJolRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.competency; +package de.tum.cit.aet.artemis.atlas.repository.competency; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -10,8 +10,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.competency.CompetencyJol; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/competency/KnowledgeAreaRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/KnowledgeAreaRepository.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/repository/competency/KnowledgeAreaRepository.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/KnowledgeAreaRepository.java index 8797e93e4ca7..4eac74aa27f1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/competency/KnowledgeAreaRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/KnowledgeAreaRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.competency; +package de.tum.cit.aet.artemis.atlas.repository.competency; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -14,8 +14,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.competency.KnowledgeArea; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/competency/StandardizedCompetencyRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/StandardizedCompetencyRepository.java similarity index 78% rename from src/main/java/de/tum/cit/aet/artemis/repository/competency/StandardizedCompetencyRepository.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/StandardizedCompetencyRepository.java index f3cd7b594135..1fdb76d24ab7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/competency/StandardizedCompetencyRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/StandardizedCompetencyRepository.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.repository.competency; +package de.tum.cit.aet.artemis.atlas.repository.competency; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the {@link StandardizedCompetency} entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/science/ScienceEventRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/science/ScienceEventRepository.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/repository/science/ScienceEventRepository.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/repository/science/ScienceEventRepository.java index 8fdbfb28b9ea..cfbb99092845 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/science/ScienceEventRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/science/ScienceEventRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.science; +package de.tum.cit.aet.artemis.atlas.repository.science; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -11,9 +11,9 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.science.ScienceEvent; import de.tum.cit.aet.artemis.domain.science.ScienceEventType; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the ScienceEvent entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/science/ScienceSettingRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/science/ScienceSettingRepository.java similarity index 79% rename from src/main/java/de/tum/cit/aet/artemis/repository/science/ScienceSettingRepository.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/repository/science/ScienceSettingRepository.java index c26133adbf82..57af211187b6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/science/ScienceSettingRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/science/ScienceSettingRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.science; +package de.tum.cit.aet.artemis.atlas.repository.science; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -7,8 +7,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.science.ScienceSetting; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the ScienceSetting entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metis/AnswerPostRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/AnswerPostRepository.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/repository/metis/AnswerPostRepository.java rename to src/main/java/de/tum/cit/aet/artemis/communication/repository/AnswerPostRepository.java index a8e7207085e5..052af555db31 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metis/AnswerPostRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/AnswerPostRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.metis; +package de.tum.cit.aet.artemis.communication.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -9,8 +9,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.metis.AnswerPost; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the AnswerPost entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ConductAgreementRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConductAgreementRepository.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/repository/ConductAgreementRepository.java rename to src/main/java/de/tum/cit/aet/artemis/communication/repository/ConductAgreementRepository.java index 7b20d28dc914..14358a141f96 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ConductAgreementRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConductAgreementRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.communication.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -9,9 +9,9 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.ConductAgreement; import de.tum.cit.aet.artemis.domain.ConductAgreementId; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the Code of Conduct Agreement entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metis/ConversationMessageRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/repository/metis/ConversationMessageRepository.java rename to src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java index 169a23c894e7..49be6049c3a2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metis/ConversationMessageRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java @@ -1,14 +1,14 @@ -package de.tum.cit.aet.artemis.repository.metis; +package de.tum.cit.aet.artemis.communication.repository; +import static de.tum.cit.aet.artemis.communication.repository.MessageSpecs.getAnsweredOrReactedSpecification; +import static de.tum.cit.aet.artemis.communication.repository.MessageSpecs.getConversationSpecification; +import static de.tum.cit.aet.artemis.communication.repository.MessageSpecs.getConversationsSpecification; +import static de.tum.cit.aet.artemis.communication.repository.MessageSpecs.getCourseWideChannelsSpecification; +import static de.tum.cit.aet.artemis.communication.repository.MessageSpecs.getOwnSpecification; +import static de.tum.cit.aet.artemis.communication.repository.MessageSpecs.getSearchTextSpecification; +import static de.tum.cit.aet.artemis.communication.repository.MessageSpecs.getSortSpecification; +import static de.tum.cit.aet.artemis.communication.repository.MessageSpecs.getUnresolvedSpecification; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.repository.specs.MessageSpecs.getAnsweredOrReactedSpecification; -import static de.tum.cit.aet.artemis.repository.specs.MessageSpecs.getConversationSpecification; -import static de.tum.cit.aet.artemis.repository.specs.MessageSpecs.getConversationsSpecification; -import static de.tum.cit.aet.artemis.repository.specs.MessageSpecs.getCourseWideChannelsSpecification; -import static de.tum.cit.aet.artemis.repository.specs.MessageSpecs.getOwnSpecification; -import static de.tum.cit.aet.artemis.repository.specs.MessageSpecs.getSearchTextSpecification; -import static de.tum.cit.aet.artemis.repository.specs.MessageSpecs.getSortSpecification; -import static de.tum.cit.aet.artemis.repository.specs.MessageSpecs.getUnresolvedSpecification; import java.util.List; import java.util.Map; @@ -26,9 +26,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metis/ConversationParticipantRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationParticipantRepository.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/repository/metis/ConversationParticipantRepository.java rename to src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationParticipantRepository.java index 88dba06a1fff..2b33de98a5f9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metis/ConversationParticipantRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationParticipantRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.metis; +package de.tum.cit.aet.artemis.communication.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -14,8 +14,8 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the ConversationParticipant entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metis/CustomPostRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/CustomPostRepository.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/repository/metis/CustomPostRepository.java rename to src/main/java/de/tum/cit/aet/artemis/communication/repository/CustomPostRepository.java index 72087e56a3ad..b7b065f1157c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metis/CustomPostRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/CustomPostRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.metis; +package de.tum.cit.aet.artemis.communication.repository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metis/CustomPostRepositoryImpl.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/CustomPostRepositoryImpl.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/repository/metis/CustomPostRepositoryImpl.java rename to src/main/java/de/tum/cit/aet/artemis/communication/repository/CustomPostRepositoryImpl.java index ab162958e9a3..22eeed4a7ae5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metis/CustomPostRepositoryImpl.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/CustomPostRepositoryImpl.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.metis; +package de.tum.cit.aet.artemis.communication.repository; import java.util.Collections; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/GroupNotificationRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/GroupNotificationRepository.java similarity index 80% rename from src/main/java/de/tum/cit/aet/artemis/repository/GroupNotificationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/communication/repository/GroupNotificationRepository.java index 8c0b9d936b79..5ea23f8d9727 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/GroupNotificationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/GroupNotificationRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.communication.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -7,8 +7,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.notification.GroupNotification; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the Notification entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/specs/MessageSpecs.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/MessageSpecs.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/repository/specs/MessageSpecs.java rename to src/main/java/de/tum/cit/aet/artemis/communication/repository/MessageSpecs.java index a02341b4afab..3342d2555f5f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/specs/MessageSpecs.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/MessageSpecs.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.specs; +package de.tum.cit.aet.artemis.communication.repository; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/NotificationRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/NotificationRepository.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/repository/NotificationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/communication/repository/NotificationRepository.java index 0967f115d59b..78562d02f6bc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/NotificationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/NotificationRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.communication.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -14,8 +14,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.notification.Notification; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the Notification entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/NotificationSettingRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/NotificationSettingRepository.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/repository/NotificationSettingRepository.java rename to src/main/java/de/tum/cit/aet/artemis/communication/repository/NotificationSettingRepository.java index 647fa6c9d980..d443a7ed20e6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/NotificationSettingRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/NotificationSettingRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.communication.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -11,9 +11,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.NotificationSetting; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the NotificationSetting entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metis/PostRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/PostRepository.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/repository/metis/PostRepository.java rename to src/main/java/de/tum/cit/aet/artemis/communication/repository/PostRepository.java index 4d79e147c680..c8bbafed86ab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metis/PostRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/PostRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.metis; +package de.tum.cit.aet.artemis.communication.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -12,8 +12,8 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/PushNotificationDeviceConfigurationRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/PushNotificationDeviceConfigurationRepository.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/repository/PushNotificationDeviceConfigurationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/communication/repository/PushNotificationDeviceConfigurationRepository.java index dc367e027cb0..c72f7d2b41ee 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/PushNotificationDeviceConfigurationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/PushNotificationDeviceConfigurationRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.communication.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -12,11 +12,11 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfiguration; import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfigurationId; import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceType; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * The Repository used for PushNotificationDeviceConfiguration diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metis/ReactionRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ReactionRepository.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/repository/metis/ReactionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/communication/repository/ReactionRepository.java index 0e056117a36f..8380a998cb0e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metis/ReactionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ReactionRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.metis; +package de.tum.cit.aet.artemis.communication.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -7,8 +7,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.metis.Reaction; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the Reaction entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/SingleUserNotificationRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/SingleUserNotificationRepository.java similarity index 78% rename from src/main/java/de/tum/cit/aet/artemis/repository/SingleUserNotificationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/communication/repository/SingleUserNotificationRepository.java index b3983e488aa1..4a1dbe85da1d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/SingleUserNotificationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/SingleUserNotificationRepository.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.communication.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.notification.SingleUserNotification; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the Notification entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/SystemNotificationRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/SystemNotificationRepository.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/repository/SystemNotificationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/communication/repository/SystemNotificationRepository.java index d55a42c708ef..b68ecb81fd95 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/SystemNotificationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/SystemNotificationRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.communication.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -10,8 +10,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.notification.SystemNotification; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the Notification entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ChannelRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/ChannelRepository.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ChannelRepository.java rename to src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/ChannelRepository.java index 7182b36c4548..e91d20da911b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ChannelRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/ChannelRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.metis.conversation; +package de.tum.cit.aet.artemis.communication.repository.conversation; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -10,8 +10,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ConversationNotificationRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/ConversationNotificationRepository.java similarity index 74% rename from src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ConversationNotificationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/ConversationNotificationRepository.java index b190c17af4cf..97a1da954bf1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ConversationNotificationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/ConversationNotificationRepository.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.repository.metis.conversation; +package de.tum.cit.aet.artemis.communication.repository.conversation; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.notification.ConversationNotification; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ConversationRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/ConversationRepository.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ConversationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/ConversationRepository.java index 6d014c7a18d4..6ce205db14f3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/ConversationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/ConversationRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.metis.conversation; +package de.tum.cit.aet.artemis.communication.repository.conversation; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -14,10 +14,10 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; import de.tum.cit.aet.artemis.domain.metis.conversation.GeneralConversationInfo; import de.tum.cit.aet.artemis.domain.metis.conversation.UserConversationInfo; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/GroupChatRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/GroupChatRepository.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/GroupChatRepository.java rename to src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/GroupChatRepository.java index 8b0693fb5dc1..69a0f210c95a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/GroupChatRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/GroupChatRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.metis.conversation; +package de.tum.cit.aet.artemis.communication.repository.conversation; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/OneToOneChatRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/OneToOneChatRepository.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/OneToOneChatRepository.java rename to src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/OneToOneChatRepository.java index eee37c2e4231..870484d10d59 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metis/conversation/OneToOneChatRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/OneToOneChatRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.metis.conversation; +package de.tum.cit.aet.artemis.communication.repository.conversation; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -10,8 +10,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.metis.conversation.OneToOneChat; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/DatabaseConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/DatabaseConfiguration.java index 6cb91a10e5f6..a9edea6fbad1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/DatabaseConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/DatabaseConfiguration.java @@ -8,11 +8,11 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.transaction.annotation.EnableTransactionManagement; -import de.tum.cit.aet.artemis.repository.base.RepositoryImpl; +import de.tum.cit.aet.artemis.core.repository.base.RepositoryImpl; @Profile(PROFILE_CORE) @Configuration -@EnableJpaRepositories(basePackages = "de.tum.cit.aet.artemis.repository", repositoryBaseClass = RepositoryImpl.class) +@EnableJpaRepositories(basePackages = "de.tum.cit.aet.artemis.*.repository", repositoryBaseClass = RepositoryImpl.class) @EnableJpaAuditing(auditorAwareRef = "springSecurityAuditorAware") @EnableTransactionManagement public class DatabaseConfiguration { diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java b/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java index e85e4a6e3db8..b8bb8c163911 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java @@ -34,17 +34,17 @@ import com.zaxxer.hikari.HikariDataSource; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.StatisticsRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.domain.metrics.ExerciseTypeMetricsEntry; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.StatisticsRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.connectors.localci.SharedQueueManagementService; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/migration/MigrationService.java b/src/main/java/de/tum/cit/aet/artemis/core/config/migration/MigrationService.java index 57cce77480c2..48a8371b4914 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/migration/MigrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/migration/MigrationService.java @@ -26,8 +26,8 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; +import de.tum.cit.aet.artemis.core.repository.MigrationChangeRepository; import de.tum.cit.aet.artemis.domain.MigrationChangelog; -import de.tum.cit.aet.artemis.repository.MigrationChangeRepository; /** * This service contains utility functionality that verifies a changelog to prevent corruption and executes a given changelog. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/migration/entries/MigrationEntry20240614_140000.java b/src/main/java/de/tum/cit/aet/artemis/core/config/migration/entries/MigrationEntry20240614_140000.java index c91fc5d3483e..6877bf432a4b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/migration/entries/MigrationEntry20240614_140000.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/migration/entries/MigrationEntry20240614_140000.java @@ -6,11 +6,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.core.config.migration.MigrationEntry; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.competency.Competency; -import de.tum.cit.aet.artemis.repository.CompetencyRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; public class MigrationEntry20240614_140000 extends MigrationEntry { diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java index 3b19c1d4b45b..a7af8a0541b8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java @@ -63,9 +63,9 @@ import de.tum.cit.aet.artemis.core.validation.InetSocketAddressValidator; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/AuthorityRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/AuthorityRepository.java similarity index 77% rename from src/main/java/de/tum/cit/aet/artemis/repository/AuthorityRepository.java rename to src/main/java/de/tum/cit/aet/artemis/core/repository/AuthorityRepository.java index 91ab18e4efb1..e17b5960d706 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/AuthorityRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/AuthorityRepository.java @@ -1,9 +1,9 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.core.repository; import java.util.List; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Authority; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Authority entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/CourseRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/CourseRepository.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/repository/CourseRepository.java rename to src/main/java/de/tum/cit/aet/artemis/core/repository/CourseRepository.java index b6ddaa608921..46eb7381042c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/CourseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/CourseRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.core.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.AUTOMATIC; @@ -21,6 +21,7 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.FileUploadExercise; @@ -31,7 +32,6 @@ import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; import de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/CustomAuditEventRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/CustomAuditEventRepository.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/repository/CustomAuditEventRepository.java rename to src/main/java/de/tum/cit/aet/artemis/core/repository/CustomAuditEventRepository.java index 37d06c5ac1ef..2d1b6e753471 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/CustomAuditEventRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/CustomAuditEventRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.core.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/DataExportRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/DataExportRepository.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/repository/DataExportRepository.java rename to src/main/java/de/tum/cit/aet/artemis/core/repository/DataExportRepository.java index 9086e5a49497..4a1cdbe7f13a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/DataExportRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/DataExportRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.core.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -11,8 +11,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.DataExport; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for a data export entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/GuidedTourSettingsRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/GuidedTourSettingsRepository.java similarity index 78% rename from src/main/java/de/tum/cit/aet/artemis/repository/GuidedTourSettingsRepository.java rename to src/main/java/de/tum/cit/aet/artemis/core/repository/GuidedTourSettingsRepository.java index 4c631e82f5d3..94b4e9ff3f3f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/GuidedTourSettingsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/GuidedTourSettingsRepository.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.core.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.GuidedTourSetting; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the GuidedTourSetting entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/LdapUserRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/LdapUserRepository.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/repository/LdapUserRepository.java rename to src/main/java/de/tum/cit/aet/artemis/core/repository/LdapUserRepository.java index 7fec30e60ddd..11cca2f537cf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/LdapUserRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/LdapUserRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.core.repository; import org.springframework.context.annotation.Profile; import org.springframework.data.ldap.repository.LdapRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/MigrationChangeRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/MigrationChangeRepository.java similarity index 57% rename from src/main/java/de/tum/cit/aet/artemis/repository/MigrationChangeRepository.java rename to src/main/java/de/tum/cit/aet/artemis/core/repository/MigrationChangeRepository.java index b5307d212d24..1e0c48226e5c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/MigrationChangeRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/MigrationChangeRepository.java @@ -1,7 +1,7 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.core.repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.MigrationChangelog; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; public interface MigrationChangeRepository extends ArtemisJpaRepository { } diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/OrganizationRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/OrganizationRepository.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/repository/OrganizationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/core/repository/OrganizationRepository.java index 9c7d22255ed4..31dcd43c7d21 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/OrganizationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/OrganizationRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.core.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -16,8 +16,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Organization; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/PersistenceAuditEventRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/PersistenceAuditEventRepository.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/repository/PersistenceAuditEventRepository.java rename to src/main/java/de/tum/cit/aet/artemis/core/repository/PersistenceAuditEventRepository.java index 2c4b4c488f84..36b7d8a8c8a5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/PersistenceAuditEventRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/PersistenceAuditEventRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.core.repository; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -16,8 +16,8 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.PersistentAuditEvent; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the PersistentAuditEvent entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/StatisticsRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/StatisticsRepository.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/repository/StatisticsRepository.java rename to src/main/java/de/tum/cit/aet/artemis/core/repository/StatisticsRepository.java index 37a81e5b9b31..4dec0ce370fb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/StatisticsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/StatisticsRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.core.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -25,6 +25,7 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.GraphType; @@ -32,7 +33,6 @@ import de.tum.cit.aet.artemis.domain.enumeration.StatisticsView; import de.tum.cit.aet.artemis.domain.statistics.CourseStatisticsAverageScore; import de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the statistics pages diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/UserRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/repository/UserRepository.java rename to src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java index 58b93a372d4c..3148aad3e4da 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/UserRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java @@ -1,14 +1,14 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.core.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.repository.specs.UserSpecs.distinct; -import static de.tum.cit.aet.artemis.repository.specs.UserSpecs.getActivatedOrDeactivatedSpecification; -import static de.tum.cit.aet.artemis.repository.specs.UserSpecs.getAllUsersWithoutUserGroups; -import static de.tum.cit.aet.artemis.repository.specs.UserSpecs.getAuthoritySpecification; -import static de.tum.cit.aet.artemis.repository.specs.UserSpecs.getInternalOrExternalSpecification; -import static de.tum.cit.aet.artemis.repository.specs.UserSpecs.getSearchTermSpecification; -import static de.tum.cit.aet.artemis.repository.specs.UserSpecs.getWithOrWithoutRegistrationNumberSpecification; -import static de.tum.cit.aet.artemis.repository.specs.UserSpecs.notSoftDeleted; +import static de.tum.cit.aet.artemis.core.repository.UserSpecs.distinct; +import static de.tum.cit.aet.artemis.core.repository.UserSpecs.getActivatedOrDeactivatedSpecification; +import static de.tum.cit.aet.artemis.core.repository.UserSpecs.getAllUsersWithoutUserGroups; +import static de.tum.cit.aet.artemis.core.repository.UserSpecs.getAuthoritySpecification; +import static de.tum.cit.aet.artemis.core.repository.UserSpecs.getInternalOrExternalSpecification; +import static de.tum.cit.aet.artemis.core.repository.UserSpecs.getSearchTermSpecification; +import static de.tum.cit.aet.artemis.core.repository.UserSpecs.getWithOrWithoutRegistrationNumberSpecification; +import static de.tum.cit.aet.artemis.core.repository.UserSpecs.notSoftDeleted; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.time.ZonedDateTime; @@ -38,6 +38,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.ConversationNotificationRecipientSummary; @@ -46,7 +47,6 @@ import de.tum.cit.aet.artemis.domain.Organization; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.service.dto.UserRoleDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.UserPageableSearchDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/specs/UserSpecs.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/UserSpecs.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/repository/specs/UserSpecs.java rename to src/main/java/de/tum/cit/aet/artemis/core/repository/UserSpecs.java index f22c2e3f84f7..ad5fd8c789af 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/specs/UserSpecs.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/UserSpecs.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.specs; +package de.tum.cit.aet.artemis.core.repository; import java.util.Arrays; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/base/ArtemisJpaRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/base/ArtemisJpaRepository.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/repository/base/ArtemisJpaRepository.java rename to src/main/java/de/tum/cit/aet/artemis/core/repository/base/ArtemisJpaRepository.java index 2eae628853e6..273a17651855 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/base/ArtemisJpaRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/base/ArtemisJpaRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.base; +package de.tum.cit.aet.artemis.core.repository.base; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/base/DynamicSpecificationRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/base/DynamicSpecificationRepository.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/repository/base/DynamicSpecificationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/core/repository/base/DynamicSpecificationRepository.java index 192a05f24962..483b2a13e1ef 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/base/DynamicSpecificationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/base/DynamicSpecificationRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.base; +package de.tum.cit.aet.artemis.core.repository.base; import java.util.Collection; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/base/FetchOptions.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/base/FetchOptions.java similarity index 71% rename from src/main/java/de/tum/cit/aet/artemis/repository/base/FetchOptions.java rename to src/main/java/de/tum/cit/aet/artemis/core/repository/base/FetchOptions.java index a44383e76bdb..95223d1a8631 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/base/FetchOptions.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/base/FetchOptions.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.base; +package de.tum.cit.aet.artemis.core.repository.base; /** * Interface for fetch options used in dynamic fetching queries. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/base/RepositoryImpl.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/base/RepositoryImpl.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/repository/base/RepositoryImpl.java rename to src/main/java/de/tum/cit/aet/artemis/core/repository/base/RepositoryImpl.java index c51592c5ccba..2dd7531a3964 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/base/RepositoryImpl.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/base/RepositoryImpl.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.base; +package de.tum.cit.aet.artemis.core.repository.base; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/security/ArtemisAuthenticationProviderImpl.java b/src/main/java/de/tum/cit/aet/artemis/core/security/ArtemisAuthenticationProviderImpl.java index 1067173a316d..ea999d1f63f9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/security/ArtemisAuthenticationProviderImpl.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/security/ArtemisAuthenticationProviderImpl.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.core.security; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.service.user.PasswordService; import de.tum.cit.aet.artemis.service.user.UserCreationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/security/ArtemisInternalAuthenticationProvider.java b/src/main/java/de/tum/cit/aet/artemis/core/security/ArtemisInternalAuthenticationProvider.java index b4f5becf1659..60b50e50b88b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/security/ArtemisInternalAuthenticationProvider.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/security/ArtemisInternalAuthenticationProvider.java @@ -12,7 +12,7 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.stereotype.Component; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.service.user.PasswordService; import de.tum.cit.aet.artemis.service.user.UserCreationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/security/DomainUserDetailsService.java b/src/main/java/de/tum/cit/aet/artemis/core/security/DomainUserDetailsService.java index dd168d5a3323..5a2f3a3cb5d7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/security/DomainUserDetailsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/security/DomainUserDetailsService.java @@ -12,8 +12,8 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.UserRepository; /** * Authenticate a user from the database. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminBuildJobQueueResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminBuildJobQueueResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java index 53861506f637..c874636802a8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminBuildJobQueueResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.core.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; @@ -22,7 +22,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.domain.BuildJob; -import de.tum.cit.aet.artemis.repository.BuildJobRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; import de.tum.cit.aet.artemis.service.connectors.localci.SharedQueueManagementService; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminCourseResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminCourseResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java index 4c645c433e6b..c8c6683d4ea7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminCourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.core.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -29,13 +29,13 @@ import org.springframework.web.multipart.MultipartFile; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.DefaultChannelType; import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminDataExportResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminDataExportResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminDataExportResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminDataExportResource.java index 299c71ecde4d..e6f27faa0629 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminDataExportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminDataExportResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.core.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminExamResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminExamResource.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminExamResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminExamResource.java index f9e2b2f6658c..14fc5ef7dc11 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminExamResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.core.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -14,7 +14,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; /** * REST controller for administrating Exam. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminExerciseResource.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminExerciseResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminExerciseResource.java index 7a2ab5934acb..4a89bf59497a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminExerciseResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.core.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -14,7 +14,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; /** * REST controller for administrating Exercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminImprintResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminImprintResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminImprintResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminImprintResource.java index 0d5db2eb3a25..76fe1d167b20 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminImprintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminImprintResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.core.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminLtiConfigurationResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminLtiConfigurationResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java index 39acbd0cd3a6..ec5707bf121c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminLtiConfigurationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.core.web.admin; import java.util.UUID; @@ -21,7 +21,7 @@ import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; -import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; +import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.connectors.lti.LtiDynamicRegistrationService; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminModelingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminModelingExerciseResource.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminModelingExerciseResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminModelingExerciseResource.java index 007f1598b440..ee9def6c05a8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminModelingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminModelingExerciseResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.core.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -15,8 +15,8 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.repository.ModelClusterRepository; -import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelClusterRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.service.ModelingExerciseService; import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminOrganizationResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminOrganizationResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminOrganizationResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminOrganizationResource.java index b7dbf48886ad..2eef77c243fc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminOrganizationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminOrganizationResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.core.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -21,12 +21,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.OrganizationRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.domain.Organization; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.OrganizationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.OrganizationService; import de.tum.cit.aet.artemis.web.rest.dto.OrganizationCountDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminPrivacyStatementResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminPrivacyStatementResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminPrivacyStatementResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminPrivacyStatementResource.java index 0a500b4c308f..101c2ef7e3a9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminPrivacyStatementResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminPrivacyStatementResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.core.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminStandardizedCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStandardizedCompetencyResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminStandardizedCompetencyResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStandardizedCompetencyResource.java index 996ebb0f3508..7963ead826b6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminStandardizedCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStandardizedCompetencyResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.core.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminStatisticsResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStatisticsResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminStatisticsResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStatisticsResource.java index db780494bc4c..91bc2f52f95d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminStatisticsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStatisticsResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.core.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminSystemNotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminSystemNotificationResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminSystemNotificationResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminSystemNotificationResource.java index cc1e0ba5ccfc..ab0a30e51be2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminSystemNotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminSystemNotificationResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.core.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -18,10 +18,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.communication.repository.SystemNotificationRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.domain.notification.Notification; import de.tum.cit.aet.artemis.domain.notification.SystemNotification; -import de.tum.cit.aet.artemis.repository.SystemNotificationRepository; import de.tum.cit.aet.artemis.service.SystemNotificationService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminTextAssessmentEventResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminTextAssessmentEventResource.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminTextAssessmentEventResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminTextAssessmentEventResource.java index a6b941596704..c6ce98429959 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminTextAssessmentEventResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminTextAssessmentEventResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.core.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -11,9 +11,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.repository.TextAssessmentEventRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.domain.analytics.TextAssessmentEvent; -import de.tum.cit.aet.artemis.repository.TextAssessmentEventRepository; /** * REST controller for administrating TextAssessmentEventResource. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminUserResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminUserResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java index f360ca694260..11baf627fbf8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AdminUserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.core.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -30,10 +30,10 @@ import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.repository.AuthorityRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.AuthorityRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.service.ldap.LdapUserService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AuditResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AuditResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AuditResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/admin/AuditResource.java index 892ed77cd502..cf9c625b9822 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/AuditResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AuditResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.core.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static tech.jhipster.web.util.PaginationUtil.generatePaginationHttpHeaders; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/FeatureToggleResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/FeatureToggleResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/admin/FeatureToggleResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/admin/FeatureToggleResource.java index fdba3e847ccc..d26566e0ac0d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/FeatureToggleResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/FeatureToggleResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.core.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/LogResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/LogResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/admin/LogResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/admin/LogResource.java index f4cf8aaadd80..f9dbb07458da 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/LogResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/LogResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.admin; +package de.tum.cit.aet.artemis.core.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/iris/AdminIrisSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/iris/AdminIrisSettingsResource.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/admin/iris/AdminIrisSettingsResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/admin/iris/AdminIrisSettingsResource.java index 6a443d0f5d21..8ad018d8ba80 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/admin/iris/AdminIrisSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/iris/AdminIrisSettingsResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.admin.iris; +package de.tum.cit.aet.artemis.core.web.admin.iris; import org.springframework.context.annotation.Profile; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/BonusStrategy.java b/src/main/java/de/tum/cit/aet/artemis/domain/BonusStrategy.java index 7b0b88eb4894..7178041ee768 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/BonusStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/BonusStrategy.java @@ -5,7 +5,7 @@ import org.apache.commons.lang3.NotImplementedException; -import de.tum.cit.aet.artemis.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/IBonusStrategy.java b/src/main/java/de/tum/cit/aet/artemis/domain/IBonusStrategy.java index 22da0d2b4e85..2abd4d69ca42 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/IBonusStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/IBonusStrategy.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.domain; -import de.tum.cit.aet.artemis.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; public interface IBonusStrategy { diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/User.java b/src/main/java/de/tum/cit/aet/artemis/domain/User.java index 08cf44e9eb15..030141aaf14a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/User.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/User.java @@ -39,6 +39,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; import de.tum.cit.aet.artemis.domain.competency.LearningPath; import de.tum.cit.aet.artemis.domain.exam.ExamUser; @@ -146,7 +147,7 @@ public class User extends AbstractAuditingEntity implements Participant { * This is used for checking if a access token needs to be renewed. * * @see de.tum.cit.aet.artemis.service.connectors.vcs.VcsTokenRenewalService - * @see de.tum.cit.aet.artemis.repository.UserRepository#getUsersWithAccessTokenExpirationDateBefore + * @see UserRepository#getUsersWithAccessTokenExpirationDateBefore */ @Nullable @JsonIgnore diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/modeling/SimilarElementCount.java b/src/main/java/de/tum/cit/aet/artemis/domain/modeling/SimilarElementCount.java index 9753e67d3e13..5c86adfe5306 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/modeling/SimilarElementCount.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/modeling/SimilarElementCount.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.domain.modeling; -import de.tum.cit.aet.artemis.repository.ModelElementRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelElementRepository; public class SimilarElementCount implements ModelElementRepository.ModelElementCount { diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ExamLiveEventRepository.java b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamLiveEventRepository.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/repository/ExamLiveEventRepository.java rename to src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamLiveEventRepository.java index 30c7b3087e88..3b262d82c5f7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ExamLiveEventRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamLiveEventRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.exam.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -10,8 +10,8 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.exam.event.ExamLiveEvent; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the ExamLiveEvent entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ExamRepository.java b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamRepository.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/repository/ExamRepository.java rename to src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamRepository.java index 401c7650933e..124360ff90a7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ExamRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.exam.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -23,10 +23,10 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.dto.CourseContentCount; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ExamSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamSessionRepository.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/repository/ExamSessionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamSessionRepository.java index fda3a2b8b269..45a2621d0cd9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ExamSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamSessionRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.exam.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.exam.ExamSession; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the ExamSession entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ExamUserRepository.java b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamUserRepository.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/repository/ExamUserRepository.java rename to src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamUserRepository.java index fa565815c63a..b54b837fd5bb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ExamUserRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamUserRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.exam.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -13,8 +13,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.exam.ExamUser; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.dto.ExamUserAttendanceCheckDTO; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ExerciseGroupRepository.java b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExerciseGroupRepository.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/repository/ExerciseGroupRepository.java rename to src/main/java/de/tum/cit/aet/artemis/exam/repository/ExerciseGroupRepository.java index 7808fbb320eb..c758051d03ae 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ExerciseGroupRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExerciseGroupRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.exam.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -14,8 +14,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the ExerciseGroup entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/StudentExamRepository.java b/src/main/java/de/tum/cit/aet/artemis/exam/repository/StudentExamRepository.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/repository/StudentExamRepository.java rename to src/main/java/de/tum/cit/aet/artemis/exam/repository/StudentExamRepository.java index 7863e4264ef9..2b63ce4ab052 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/StudentExamRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/repository/StudentExamRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.exam.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -21,6 +21,7 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.exam.Exam; @@ -28,7 +29,6 @@ import de.tum.cit.aet.artemis.domain.exam.StudentExam; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.service.exam.ExamQuizQuestionsGenerator; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metrics/ExerciseMetricsRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseMetricsRepository.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/repository/metrics/ExerciseMetricsRepository.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseMetricsRepository.java index 2faa89b566df..f05b8cc72ba5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metrics/ExerciseMetricsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseMetricsRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.metrics; +package de.tum.cit.aet.artemis.exercise.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -11,8 +11,8 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.dto.metrics.ExerciseInformationDTO; import de.tum.cit.aet.artemis.web.rest.dto.metrics.MapEntryLongLong; import de.tum.cit.aet.artemis.web.rest.dto.metrics.ResourceTimestampDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/repository/ExerciseRepository.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java index f3272ef1ef9d..979a7bf8cb2f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.exercise.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -21,9 +21,9 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.metrics.ExerciseTypeMetricsEntry; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ParticipationRepository.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/repository/ParticipationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/repository/ParticipationRepository.java index 829e603071e1..3e00302c15a9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ParticipationRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.exercise.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -16,9 +16,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/StudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/repository/StudentParticipationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java index 41d3dcc220a0..a3a1e6f84d7e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/StudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.exercise.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static java.util.stream.Collectors.toMap; @@ -27,6 +27,7 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; @@ -38,7 +39,6 @@ import de.tum.cit.aet.artemis.domain.participation.IdToPresentationScoreSum; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.domain.quiz.QuizSubmittedAnswerCount; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.dto.feedback.FeedbackDetailDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/SubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/repository/SubmissionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java index 9e557237cf0b..d65f47b79e90 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/SubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.exercise.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -15,6 +15,7 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.FileUploadExercise; import de.tum.cit.aet.artemis.domain.FileUploadSubmission; @@ -31,7 +32,6 @@ import de.tum.cit.aet.artemis.domain.participation.Participation; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/SubmissionVersionRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionVersionRepository.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/repository/SubmissionVersionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionVersionRepository.java index 2249ab47099c..623816bfbb0a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/SubmissionVersionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionVersionRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.exercise.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -10,8 +10,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.SubmissionVersion; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the SubmissionVersion entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/TeamRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/TeamRepository.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/repository/TeamRepository.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/repository/TeamRepository.java index a355b63651c8..578ad3bea73a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/TeamRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/TeamRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.exercise.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -16,10 +16,10 @@ import org.springframework.data.util.Pair; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; import de.tum.cit.aet.artemis.web.rest.errors.StudentsAlreadyAssignedException; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/FileUploadExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/repository/FileUploadExerciseRepository.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/repository/FileUploadExerciseRepository.java rename to src/main/java/de/tum/cit/aet/artemis/fileupload/repository/FileUploadExerciseRepository.java index c24f90cca778..1b0503e2411c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/FileUploadExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/repository/FileUploadExerciseRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.fileupload.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -15,8 +15,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the FileUploadExercise entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/FileUploadSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/repository/FileUploadSubmissionRepository.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/repository/FileUploadSubmissionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/fileupload/repository/FileUploadSubmissionRepository.java index 4bcac3b2162a..7c2021428090 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/FileUploadSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/repository/FileUploadSubmissionRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.fileupload.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -13,8 +13,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the FileUploadSubmission entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisCourseChatSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisCourseChatSessionRepository.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisCourseChatSessionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisCourseChatSessionRepository.java index d7a37fc17827..dafe1f0e082c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisCourseChatSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisCourseChatSessionRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.iris; +package de.tum.cit.aet.artemis.iris.repository; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -12,9 +12,9 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.domain.iris.session.IrisCourseChatSession; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisExerciseChatSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisExerciseChatSessionRepository.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisExerciseChatSessionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisExerciseChatSessionRepository.java index bc0d9c2dd0d6..9d867bdaa6e4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisExerciseChatSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisExerciseChatSessionRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.iris; +package de.tum.cit.aet.artemis.iris.repository; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -12,9 +12,9 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.domain.iris.session.IrisExerciseChatSession; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisHestiaSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisHestiaSessionRepository.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisHestiaSessionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisHestiaSessionRepository.java index 797df73078fc..4c15480ebd54 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisHestiaSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisHestiaSessionRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.iris; +package de.tum.cit.aet.artemis.iris.repository; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -6,8 +6,8 @@ import org.springframework.data.jpa.repository.EntityGraph; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.iris.session.IrisHestiaSession; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Repository interface for managing {@link IrisHestiaSession} entities. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisMessageRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisMessageRepository.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisMessageRepository.java rename to src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisMessageRepository.java index e1f371fcf755..ce1a0694079c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisMessageRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisMessageRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.iris; +package de.tum.cit.aet.artemis.iris.repository; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -12,9 +12,9 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; import de.tum.cit.aet.artemis.domain.iris.message.IrisMessageSender; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the IrisMessage entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSessionRepository.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisSessionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSessionRepository.java index 67f4fa062e20..d9b64f097158 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSessionRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.iris; +package de.tum.cit.aet.artemis.iris.repository; import java.util.Optional; @@ -7,8 +7,8 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisSettingsRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSettingsRepository.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisSettingsRepository.java rename to src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSettingsRepository.java index 8192920e430b..ee1838de7492 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisSettingsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSettingsRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.iris; +package de.tum.cit.aet.artemis.iris.repository; import java.util.Comparator; import java.util.Optional; @@ -7,11 +7,11 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.iris.settings.IrisCourseSettings; import de.tum.cit.aet.artemis.domain.iris.settings.IrisExerciseSettings; import de.tum.cit.aet.artemis.domain.iris.settings.IrisGlobalSettings; import de.tum.cit.aet.artemis.domain.iris.settings.IrisSettings; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the IrisSettings entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisSubSettingsRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSubSettingsRepository.java similarity index 66% rename from src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisSubSettingsRepository.java rename to src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSubSettingsRepository.java index 545710f96468..2f05a3fca4c6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisSubSettingsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSubSettingsRepository.java @@ -1,7 +1,7 @@ -package de.tum.cit.aet.artemis.repository.iris; +package de.tum.cit.aet.artemis.iris.repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettings; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the IrisSubSettings entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisTemplateRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisTemplateRepository.java similarity index 63% rename from src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisTemplateRepository.java rename to src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisTemplateRepository.java index 292b3530c66a..5e2090c6ed1f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/iris/IrisTemplateRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisTemplateRepository.java @@ -1,7 +1,7 @@ -package de.tum.cit.aet.artemis.repository.iris; +package de.tum.cit.aet.artemis.iris.repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.iris.IrisTemplate; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the IrisTemplate entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/AttachmentRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentRepository.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/repository/AttachmentRepository.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentRepository.java index 46b70d51c869..1d60345c4da0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/AttachmentRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.lecture.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Attachment; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the Attachment entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/AttachmentUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentUnitRepository.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/repository/AttachmentUnitRepository.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentUnitRepository.java index 9bb67031b9d5..a5616eaf0f50 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/AttachmentUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentUnitRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.lecture.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -11,9 +11,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ExerciseUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/ExerciseUnitRepository.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/repository/ExerciseUnitRepository.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/repository/ExerciseUnitRepository.java index 4cb064e242ad..420a805851be 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ExerciseUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/ExerciseUnitRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.lecture.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Exercise Unit entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/LectureRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureRepository.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/repository/LectureRepository.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureRepository.java index a733ad1aaaf9..6fb174f9ac9b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/LectureRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.lecture.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -16,8 +16,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.dto.CourseContentCount; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/LectureUnitCompletionRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitCompletionRepository.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/repository/LectureUnitCompletionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitCompletionRepository.java index 353e51264d15..2a35491e41fd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/LectureUnitCompletionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitCompletionRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.lecture.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -11,10 +11,10 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; import de.tum.cit.aet.artemis.domain.lecture.LectureUnitCompletion; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/metrics/LectureUnitMetricsRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitMetricsRepository.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/repository/metrics/LectureUnitMetricsRepository.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitMetricsRepository.java index 77c741ffdcdd..5d53a9da3ec2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/metrics/LectureUnitMetricsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitMetricsRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.metrics; +package de.tum.cit.aet.artemis.lecture.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.dto.metrics.LectureUnitInformationDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/LectureUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitRepository.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/repository/LectureUnitRepository.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitRepository.java index c4bf95a505d9..48c10587344b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/LectureUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.lecture.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -10,8 +10,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Lecture Unit entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/OnlineUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/OnlineUnitRepository.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/repository/OnlineUnitRepository.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/repository/OnlineUnitRepository.java index aca3cabd38e5..d99b4a000440 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/OnlineUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/OnlineUnitRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.lecture.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -11,8 +11,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.lecture.OnlineUnit; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Online Unit entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/SlideRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/SlideRepository.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/repository/SlideRepository.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/repository/SlideRepository.java index 23e84249a3ce..595c5623a4c3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/SlideRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/SlideRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.lecture.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -7,8 +7,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.lecture.Slide; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Attachment Unit entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/TextUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/TextUnitRepository.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/repository/TextUnitRepository.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/repository/TextUnitRepository.java index 8462947e37c8..ad51afd5486e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/TextUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/TextUnitRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.lecture.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.lecture.TextUnit; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Text Unit entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/VideoUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/VideoUnitRepository.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/repository/VideoUnitRepository.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/repository/VideoUnitRepository.java index 91a93f7401da..1d19cfc2ce1f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/VideoUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/VideoUnitRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.lecture.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -11,8 +11,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.lecture.VideoUnit; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Video Unit entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/Lti13ResourceLaunchRepository.java b/src/main/java/de/tum/cit/aet/artemis/lti/repository/Lti13ResourceLaunchRepository.java similarity index 84% rename from src/main/java/de/tum/cit/aet/artemis/repository/Lti13ResourceLaunchRepository.java rename to src/main/java/de/tum/cit/aet/artemis/lti/repository/Lti13ResourceLaunchRepository.java index 6a60e7b7da30..a9a8b8b0ca98 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/Lti13ResourceLaunchRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/repository/Lti13ResourceLaunchRepository.java @@ -1,14 +1,14 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.lti.repository; import java.util.Collection; import java.util.Optional; import jakarta.validation.constraints.NotNull; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.lti.LtiResourceLaunch; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; public interface Lti13ResourceLaunchRepository extends ArtemisJpaRepository { diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/LtiPlatformConfigurationRepository.java b/src/main/java/de/tum/cit/aet/artemis/lti/repository/LtiPlatformConfigurationRepository.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/repository/LtiPlatformConfigurationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/lti/repository/LtiPlatformConfigurationRepository.java index ed455a471d54..cf7b2ebcfe54 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/LtiPlatformConfigurationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/repository/LtiPlatformConfigurationRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.lti.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -11,8 +11,8 @@ import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/OnlineCourseConfigurationRepository.java b/src/main/java/de/tum/cit/aet/artemis/lti/repository/OnlineCourseConfigurationRepository.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/repository/OnlineCourseConfigurationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/lti/repository/OnlineCourseConfigurationRepository.java index 3066174493fc..d7cb48835395 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/OnlineCourseConfigurationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/repository/OnlineCourseConfigurationRepository.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.lti.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the OnlineCourseConfiguration entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ApollonDiagramRepository.java b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ApollonDiagramRepository.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/repository/ApollonDiagramRepository.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/repository/ApollonDiagramRepository.java index 1b7108782e6a..dbdc54df91db 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ApollonDiagramRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ApollonDiagramRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.modeling.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -10,8 +10,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.modeling.ApollonDiagram; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the ApollonDiagram entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ModelClusterRepository.java b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelClusterRepository.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/repository/ModelClusterRepository.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelClusterRepository.java index ec5fa383b567..4d583cb8f531 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ModelClusterRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelClusterRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.modeling.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.modeling.ModelCluster; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the ModelCluster entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ModelElementRepository.java b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelElementRepository.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/repository/ModelElementRepository.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelElementRepository.java index 8be8d8220b7d..f56881641c8a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ModelElementRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelElementRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.modeling.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.modeling.ModelElement; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the ModelElement entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ModelingExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelingExerciseRepository.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/repository/ModelingExerciseRepository.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelingExerciseRepository.java index 0e692ad54abb..ee2b45de6e8e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ModelingExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelingExerciseRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.modeling.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -16,8 +16,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the ModelingExercise entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ModelingSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelingSubmissionRepository.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/repository/ModelingSubmissionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelingSubmissionRepository.java index 072fd7e359a8..112ffcc7bad7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ModelingSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelingSubmissionRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.modeling.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -12,8 +12,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the ModelingSubmission entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismCaseRepository.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismCaseRepository.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismCaseRepository.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismCaseRepository.java index 03b03d35f43f..266f0a28d106 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismCaseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismCaseRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -11,8 +11,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the PlagiarismCase entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismComparisonRepository.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismComparisonRepository.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismComparisonRepository.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismComparisonRepository.java index 2af663c6f5d0..0f46b461048d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismComparisonRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismComparisonRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -14,9 +14,9 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the PlagiarismComparison entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismResultRepository.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismResultRepository.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismResultRepository.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismResultRepository.java index 8029f6403eba..56a76f3eeb12 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismResultRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismResultRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -13,8 +13,8 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismResult; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the PlagiarismResult entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismSubmissionRepository.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismSubmissionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismSubmissionRepository.java index 8dee59501d11..b205de23f418 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/plagiarism/PlagiarismSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismSubmissionRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -9,9 +9,9 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the PlagiarismCase entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/AuxiliaryRepositoryRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/AuxiliaryRepositoryRepository.java similarity index 80% rename from src/main/java/de/tum/cit/aet/artemis/repository/AuxiliaryRepositoryRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/repository/AuxiliaryRepositoryRepository.java index 7670388680e4..b49aed5e6518 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/AuxiliaryRepositoryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/AuxiliaryRepositoryRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.programming.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -7,8 +7,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the AuxiliaryRepository entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/BuildJobRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/repository/BuildJobRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java index 340e77efdfc7..21472d73aef8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/BuildJobRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.programming.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -19,10 +19,10 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.BuildJob; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.service.connectors.localci.dto.DockerImageBuild; import de.tum.cit.aet.artemis.service.connectors.localci.dto.ResultBuildJob; import de.tum.cit.aet.artemis.service.dto.BuildJobResultCountDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/BuildLogEntryRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogEntryRepository.java similarity index 84% rename from src/main/java/de/tum/cit/aet/artemis/repository/BuildLogEntryRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogEntryRepository.java index 7f8439e7e81a..fec6645bb8a1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/BuildLogEntryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogEntryRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.programming.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -7,8 +7,8 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the BuildLogEntry entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/BuildLogStatisticsEntryRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogStatisticsEntryRepository.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/repository/BuildLogStatisticsEntryRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogStatisticsEntryRepository.java index 7d6cc30e6ca0..3a928211eed3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/BuildLogStatisticsEntryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogStatisticsEntryRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.programming.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.domain.statistics.BuildLogStatisticsEntry.BuildJobPartDuration; @@ -10,10 +10,10 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.statistics.BuildLogStatisticsEntry; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.dto.BuildLogStatisticsDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/BuildPlanRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildPlanRepository.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/repository/BuildPlanRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildPlanRepository.java index a7436075585e..aaec68045c22 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/BuildPlanRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildPlanRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.programming.repository; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -8,9 +8,9 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.BuildPlan; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; public interface BuildPlanRepository extends ArtemisJpaRepository { diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ParticipationVCSAccessTokenRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ParticipationVCSAccessTokenRepository.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/repository/ParticipationVCSAccessTokenRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/repository/ParticipationVCSAccessTokenRepository.java index 5d7aa3993fd7..747187b6151b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ParticipationVCSAccessTokenRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ParticipationVCSAccessTokenRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.programming.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -11,8 +11,8 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.participation.ParticipationVCSAccessToken; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseBuildConfigRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseBuildConfigRepository.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseBuildConfigRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseBuildConfigRepository.java index 0a224b9d643a..4e2744de64b5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseBuildConfigRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseBuildConfigRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.programming.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -8,9 +8,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java index 61b9b4d41c23..9a85f8e24d6c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java @@ -1,9 +1,9 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.programming.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.config.Constants.SHORT_NAME_PATTERN; import static de.tum.cit.aet.artemis.core.config.Constants.TITLE_NAME_PATTERN; -import static de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository.ProgrammingExerciseFetchOptions; +import static de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository.ProgrammingExerciseFetchOptions; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.time.ZonedDateTime; @@ -22,6 +22,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.DynamicSpecificationRepository; +import de.tum.cit.aet.artemis.core.repository.base.FetchOptions; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise_; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; @@ -31,8 +33,6 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.repository.base.DynamicSpecificationRepository; -import de.tum.cit.aet.artemis.repository.base.FetchOptions; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseStudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseStudentParticipationRepository.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseStudentParticipationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseStudentParticipationRepository.java index 7e49bdef56e1..edeba1cfd57a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseStudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseStudentParticipationRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.programming.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -16,8 +16,8 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the Participation entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseTestCaseRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseTestCaseRepository.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseTestCaseRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseTestCaseRepository.java index 30e8de4ab874..d01dd24e6c31 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseTestCaseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseTestCaseRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.programming.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -10,8 +10,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the ProgrammingExerciseTestCase entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingSubmissionRepository.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingSubmissionRepository.java index e8cf3154ec30..91ce974ff318 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingSubmissionRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.programming.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -17,8 +17,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.service.dto.ProgrammingSubmissionIdAndSubmissionDateDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/SolutionProgrammingExerciseParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/SolutionProgrammingExerciseParticipationRepository.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/repository/SolutionProgrammingExerciseParticipationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/repository/SolutionProgrammingExerciseParticipationRepository.java index c61eb5ee0195..f008bc10fc9b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/SolutionProgrammingExerciseParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/SolutionProgrammingExerciseParticipationRepository.java @@ -1,7 +1,7 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.programming.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository.SolutionParticipationFetchOptions; +import static de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository.SolutionParticipationFetchOptions; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.Collection; @@ -16,13 +16,13 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.DynamicSpecificationRepository; +import de.tum.cit.aet.artemis.core.repository.base.FetchOptions; import de.tum.cit.aet.artemis.domain.DomainObject_; import de.tum.cit.aet.artemis.domain.Submission_; import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation_; import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation_; -import de.tum.cit.aet.artemis.repository.base.DynamicSpecificationRepository; -import de.tum.cit.aet.artemis.repository.base.FetchOptions; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/StaticCodeAnalysisCategoryRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/StaticCodeAnalysisCategoryRepository.java similarity index 81% rename from src/main/java/de/tum/cit/aet/artemis/repository/StaticCodeAnalysisCategoryRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/repository/StaticCodeAnalysisCategoryRepository.java index 4a484153e595..89fecc6582f6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/StaticCodeAnalysisCategoryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/StaticCodeAnalysisCategoryRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.programming.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -7,8 +7,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisCategory; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the StaticCodeAnalysisCategory entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/SubmissionPolicyRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/SubmissionPolicyRepository.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/repository/SubmissionPolicyRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/repository/SubmissionPolicyRepository.java index 18708c53e6d3..2fc810af4129 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/SubmissionPolicyRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/SubmissionPolicyRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.programming.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -10,8 +10,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the SubmissionPolicy entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/TemplateProgrammingExerciseParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/TemplateProgrammingExerciseParticipationRepository.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/repository/TemplateProgrammingExerciseParticipationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/repository/TemplateProgrammingExerciseParticipationRepository.java index 9b22faed0a9a..d3a72c08de50 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/TemplateProgrammingExerciseParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/TemplateProgrammingExerciseParticipationRepository.java @@ -1,7 +1,7 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.programming.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository.TemplateParticipationFetchOptions; +import static de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository.TemplateParticipationFetchOptions; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.Collection; @@ -16,12 +16,12 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.DynamicSpecificationRepository; +import de.tum.cit.aet.artemis.core.repository.base.FetchOptions; import de.tum.cit.aet.artemis.domain.DomainObject_; import de.tum.cit.aet.artemis.domain.Submission_; import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation_; -import de.tum.cit.aet.artemis.repository.base.DynamicSpecificationRepository; -import de.tum.cit.aet.artemis.repository.base.FetchOptions; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/CodeHintRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CodeHintRepository.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/repository/hestia/CodeHintRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CodeHintRepository.java index 7f78460a8161..f2a23860e87f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/CodeHintRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CodeHintRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.hestia; +package de.tum.cit.aet.artemis.programming.repository.hestia; import java.util.Optional; import java.util.Set; @@ -8,8 +8,8 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.hestia.CodeHint; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/CoverageFileReportRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageFileReportRepository.java similarity index 74% rename from src/main/java/de/tum/cit/aet/artemis/repository/hestia/CoverageFileReportRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageFileReportRepository.java index 34b6fa81ed11..dd0962a999be 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/CoverageFileReportRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageFileReportRepository.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.repository.hestia; +package de.tum.cit.aet.artemis.programming.repository.hestia; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.hestia.CoverageFileReport; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/CoverageReportRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageReportRepository.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/repository/hestia/CoverageReportRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageReportRepository.java index 09fbaa65d0de..c1e0eced467c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/CoverageReportRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageReportRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.hestia; +package de.tum.cit.aet.artemis.programming.repository.hestia; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -16,9 +16,9 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.domain.hestia.CoverageReport; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.service.dto.CoverageReportAndSubmissionDateDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ExerciseHintActivationRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ExerciseHintActivationRepository.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/repository/hestia/ExerciseHintActivationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ExerciseHintActivationRepository.java index 11e16b8a72cf..88b9200d2b58 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ExerciseHintActivationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ExerciseHintActivationRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.hestia; +package de.tum.cit.aet.artemis.programming.repository.hestia; import java.util.Optional; import java.util.Set; @@ -6,8 +6,8 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.hestia.ExerciseHintActivation; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; public interface ExerciseHintActivationRepository extends ArtemisJpaRepository { diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ExerciseHintRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ExerciseHintRepository.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/repository/hestia/ExerciseHintRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ExerciseHintRepository.java index d8939ac88708..0f3b1ff2216b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ExerciseHintRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ExerciseHintRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.hestia; +package de.tum.cit.aet.artemis.programming.repository.hestia; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -12,8 +12,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.hestia.ExerciseHint; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ProgrammingExerciseGitDiffReportRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseGitDiffReportRepository.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/repository/hestia/ProgrammingExerciseGitDiffReportRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseGitDiffReportRepository.java index da5a713363bd..11bd7378366b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ProgrammingExerciseGitDiffReportRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseGitDiffReportRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.hestia; +package de.tum.cit.aet.artemis.programming.repository.hestia; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -9,8 +9,8 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the ProgrammingExerciseGitDiffReport entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ProgrammingExerciseSolutionEntryRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseSolutionEntryRepository.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/repository/hestia/ProgrammingExerciseSolutionEntryRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseSolutionEntryRepository.java index 35af03ba7004..dbd879a4ae96 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ProgrammingExerciseSolutionEntryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseSolutionEntryRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.hestia; +package de.tum.cit.aet.artemis.programming.repository.hestia; import java.util.Optional; import java.util.Set; @@ -8,8 +8,8 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ProgrammingExerciseTaskRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseTaskRepository.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/repository/hestia/ProgrammingExerciseTaskRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseTaskRepository.java index 7194a9709815..3abf53e82bb6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/ProgrammingExerciseTaskRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseTaskRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.hestia; +package de.tum.cit.aet.artemis.programming.repository.hestia; import java.util.Optional; import java.util.Set; @@ -8,8 +8,8 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/TestwiseCoverageReportEntryRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/TestwiseCoverageReportEntryRepository.java similarity index 78% rename from src/main/java/de/tum/cit/aet/artemis/repository/hestia/TestwiseCoverageReportEntryRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/TestwiseCoverageReportEntryRepository.java index dfec328ab9a2..5773ac4365d3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/hestia/TestwiseCoverageReportEntryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/TestwiseCoverageReportEntryRepository.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.repository.hestia; +package de.tum.cit.aet.artemis.programming.repository.hestia; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.hestia.TestwiseCoverageReportEntry; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the TestwiseCoverageReportEntry entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/settings/IdeRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/settings/IdeRepository.java similarity index 77% rename from src/main/java/de/tum/cit/aet/artemis/repository/settings/IdeRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/repository/settings/IdeRepository.java index 4ec7e987d38d..1c8b253e403d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/settings/IdeRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/settings/IdeRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.settings; +package de.tum.cit.aet.artemis.programming.repository.settings; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -7,8 +7,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.settings.ide.Ide; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the Ide entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/settings/UserIdeMappingRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/settings/UserIdeMappingRepository.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/repository/settings/UserIdeMappingRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/repository/settings/UserIdeMappingRepository.java index bcb77645300e..44fb094dc242 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/settings/UserIdeMappingRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/settings/UserIdeMappingRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.settings; +package de.tum.cit.aet.artemis.programming.repository.settings; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -7,9 +7,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.settings.ide.Ide; import de.tum.cit.aet.artemis.domain.settings.ide.UserIdeMapping; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the UserIdeMapping entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/DragAndDropMappingRepository.java b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/DragAndDropMappingRepository.java similarity index 79% rename from src/main/java/de/tum/cit/aet/artemis/repository/DragAndDropMappingRepository.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/repository/DragAndDropMappingRepository.java index cf3220d25ed1..8922297b86b8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/DragAndDropMappingRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/DragAndDropMappingRepository.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.quiz.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.quiz.DragAndDropMapping; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the DragAndDropMapping entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/DragItemRepository.java b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/DragItemRepository.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/repository/DragItemRepository.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/repository/DragItemRepository.java index d7092d7d9f56..5e1bb527d967 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/DragItemRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/DragItemRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.quiz.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -8,8 +8,8 @@ import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.quiz.DragItem; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the DragItem entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/QuizBatchRepository.java b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizBatchRepository.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/repository/QuizBatchRepository.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizBatchRepository.java index 9f439ef24540..6e3d6c64e7c4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/QuizBatchRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizBatchRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.quiz.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -10,9 +10,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the QuizBatch entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/QuizExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizExerciseRepository.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/repository/QuizExerciseRepository.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizExerciseRepository.java index da730c022015..cf2422cfbd25 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/QuizExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizExerciseRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.quiz.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -17,8 +17,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the QuizExercise entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/QuizGroupRepository.java b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizGroupRepository.java similarity index 78% rename from src/main/java/de/tum/cit/aet/artemis/repository/QuizGroupRepository.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizGroupRepository.java index e6319b3070d5..c8a1c6d7cc21 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/QuizGroupRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizGroupRepository.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.quiz.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.quiz.QuizGroup; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the QuizGroup entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/QuizPointStatisticRepository.java b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizPointStatisticRepository.java similarity index 79% rename from src/main/java/de/tum/cit/aet/artemis/repository/QuizPointStatisticRepository.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizPointStatisticRepository.java index 03aa1f2e7302..0b0e6976b609 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/QuizPointStatisticRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizPointStatisticRepository.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.quiz.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.quiz.QuizPointStatistic; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the QuizPointStatistic entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/QuizPoolRepository.java b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizPoolRepository.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/repository/QuizPoolRepository.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizPoolRepository.java index fcb7be634379..771b27ec6002 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/QuizPoolRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizPoolRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.quiz.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.quiz.QuizPool; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the QuizPool entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/QuizQuestionRepository.java b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizQuestionRepository.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/repository/QuizQuestionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizQuestionRepository.java index cddddbd3e0ad..8535f634c5c9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/QuizQuestionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizQuestionRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.quiz.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -10,9 +10,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the QuizQuestion entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/QuizQuestionStatisticRepository.java b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizQuestionStatisticRepository.java similarity index 79% rename from src/main/java/de/tum/cit/aet/artemis/repository/QuizQuestionStatisticRepository.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizQuestionStatisticRepository.java index 75e340badaf0..e4bdb1082f66 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/QuizQuestionStatisticRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizQuestionStatisticRepository.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.quiz.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.quiz.QuizQuestionStatistic; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the QuizQuestionStatistic entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/QuizSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizSubmissionRepository.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/repository/QuizSubmissionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizSubmissionRepository.java index 6e847cbefa6e..ecd482940269 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/QuizSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizSubmissionRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.quiz.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -12,8 +12,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the QuizSubmission entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/ShortAnswerMappingRepository.java b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/ShortAnswerMappingRepository.java similarity index 79% rename from src/main/java/de/tum/cit/aet/artemis/repository/ShortAnswerMappingRepository.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/repository/ShortAnswerMappingRepository.java index bff9f95ddccc..51fe4ebe440c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/ShortAnswerMappingRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/ShortAnswerMappingRepository.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.quiz.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerMapping; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the ShortAnswerMapping entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/SubmittedAnswerRepository.java b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/SubmittedAnswerRepository.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/repository/SubmittedAnswerRepository.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/repository/SubmittedAnswerRepository.java index 6aefdb80b5c3..54e48ce278e4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/SubmittedAnswerRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/SubmittedAnswerRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.quiz.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -8,11 +8,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the SubmittedAnswer entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/package-info.java b/src/main/java/de/tum/cit/aet/artemis/repository/package-info.java deleted file mode 100644 index 56c09d869077..000000000000 --- a/src/main/java/de/tum/cit/aet/artemis/repository/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Spring Data JPA repositories. - */ -package de.tum.cit.aet.artemis.repository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AssessmentDashboardService.java b/src/main/java/de/tum/cit/aet/artemis/service/AssessmentDashboardService.java index 8ddcfb6fd377..fa3eb386f31a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AssessmentDashboardService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AssessmentDashboardService.java @@ -13,16 +13,16 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.domain.ExampleSubmission; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseMapEntry; import de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus; import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; -import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/service/AssessmentService.java index 0f73a8ca50db..16e425e8702e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AssessmentService.java @@ -9,6 +9,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.AssessmentNote; import de.tum.cit.aet.artemis.domain.ComplaintResponse; import de.tum.cit.aet.artemis.domain.Exercise; @@ -20,12 +24,8 @@ import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.service.connectors.lti.LtiNewResultService; import de.tum.cit.aet.artemis.service.exam.ExamDateService; import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java b/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java index c3e5d8acd469..a3c84aa7022e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java @@ -20,10 +20,10 @@ import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; import de.tum.cit.aet.artemis.domain.lecture.Slide; -import de.tum.cit.aet.artemis.repository.AttachmentRepository; -import de.tum.cit.aet.artemis.repository.AttachmentUnitRepository; -import de.tum.cit.aet.artemis.repository.SlideRepository; -import de.tum.cit.aet.artemis.repository.iris.IrisSettingsRepository; +import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; +import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; +import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.SlideRepository; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisWebhookService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AuditEventService.java b/src/main/java/de/tum/cit/aet/artemis/service/AuditEventService.java index 546d8854c8a6..edb312e3ffad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AuditEventService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AuditEventService.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.config.audit.AuditEventConverter; -import de.tum.cit.aet.artemis.repository.PersistenceAuditEventRepository; +import de.tum.cit.aet.artemis.core.repository.PersistenceAuditEventRepository; /** * Service for managing audit events. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AuthorizationCheckService.java b/src/main/java/de/tum/cit/aet/artemis/service/AuthorizationCheckService.java index 99a2936082a8..d0b42fcbb591 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AuthorizationCheckService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AuthorizationCheckService.java @@ -19,6 +19,8 @@ import com.google.errorprone.annotations.CheckReturnValue; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Authority; @@ -32,9 +34,7 @@ import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.service.exam.ExamDateService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/BonusService.java b/src/main/java/de/tum/cit/aet/artemis/service/BonusService.java index cdbc39b57f93..a85efad02113 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/BonusService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/BonusService.java @@ -5,13 +5,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.BonusRepository; +import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.domain.Bonus; import de.tum.cit.aet.artemis.domain.GradeStep; import de.tum.cit.aet.artemis.domain.GradeType; import de.tum.cit.aet.artemis.domain.GradingScale; import de.tum.cit.aet.artemis.domain.IBonusStrategy; -import de.tum.cit.aet.artemis.repository.BonusRepository; -import de.tum.cit.aet.artemis.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/BuildLogEntryService.java b/src/main/java/de/tum/cit/aet/artemis/service/BuildLogEntryService.java index 2313735479fa..9dd2211b2b01 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/BuildLogEntryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/BuildLogEntryService.java @@ -26,8 +26,8 @@ import de.tum.cit.aet.artemis.domain.BuildLogEntry; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.repository.BuildLogEntryRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildLogEntryRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ComplaintResponseService.java b/src/main/java/de/tum/cit/aet/artemis/service/ComplaintResponseService.java index 9a24ec688b88..24a31d0c906e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ComplaintResponseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ComplaintResponseService.java @@ -9,6 +9,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Complaint; import de.tum.cit.aet.artemis.domain.ComplaintResponse; import de.tum.cit.aet.artemis.domain.Course; @@ -17,9 +20,6 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.ComplaintResponseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ComplaintService.java b/src/main/java/de/tum/cit/aet/artemis/service/ComplaintService.java index 1dcdc1e00487..bcb04930aa67 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ComplaintService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ComplaintService.java @@ -15,6 +15,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Complaint; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.DomainObject; @@ -28,12 +32,8 @@ import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.domain.participation.Participant; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.ComplaintResponseRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.service.dto.ComplaintRequestDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ConductAgreementService.java b/src/main/java/de/tum/cit/aet/artemis/service/ConductAgreementService.java index f4b3ce53007d..11bcea3b7d8c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ConductAgreementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ConductAgreementService.java @@ -5,10 +5,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.repository.ConductAgreementRepository; import de.tum.cit.aet.artemis.domain.ConductAgreement; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.ConductAgreementRepository; /** * Service Implementation for managing a user's agreement to a course's code of conduct. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ConsistencyCheckService.java b/src/main/java/de/tum/cit/aet/artemis/service/ConsistencyCheckService.java index 8fc9ee642a9e..307bcac6029d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ConsistencyCheckService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ConsistencyCheckService.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.service.dto.ConsistencyErrorDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationService.java b/src/main/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationService.java index 61c7d7df8995..2e13e845f2e8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationService.java @@ -36,9 +36,9 @@ import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.service.dto.MaxAndReachablePoints; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismCaseService.PlagiarismMapping; import de.tum.cit.aet.artemis.web.rest.dto.BonusSourceResultDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java b/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java index c45fffcaf0dc..6bac9b7c96e8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java @@ -43,7 +43,21 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; +import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.assessment.repository.RatingRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; +import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; +import de.tum.cit.aet.artemis.communication.repository.GroupNotificationRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.StatisticsRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Course; @@ -60,30 +74,14 @@ import de.tum.cit.aet.artemis.domain.notification.GroupNotification; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; import de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry; -import de.tum.cit.aet.artemis.repository.CompetencyRelationRepository; -import de.tum.cit.aet.artemis.repository.CompetencyRepository; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.ComplaintResponseRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExerciseGroupRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.GradingScaleRepository; -import de.tum.cit.aet.artemis.repository.GroupNotificationRepository; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.ParticipantScoreRepository; -import de.tum.cit.aet.artemis.repository.PrerequisiteRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.RatingRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StatisticsRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ConversationRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupNotificationRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.exam.ExamDeletionService; import de.tum.cit.aet.artemis.service.export.CourseExamExportService; @@ -93,6 +91,8 @@ import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupChannelManagementService; import de.tum.cit.aet.artemis.service.user.UserService; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupNotificationRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; import de.tum.cit.aet.artemis.web.rest.dto.CourseContentCount; import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementDetailViewDTO; import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/EmailSummaryService.java b/src/main/java/de/tum/cit/aet/artemis/service/EmailSummaryService.java index 93a80c5ded42..9eb6de21dcd9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/EmailSummaryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/EmailSummaryService.java @@ -12,12 +12,12 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.notifications.MailService; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExampleSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExampleSubmissionService.java index 4ce2d83ddc57..00c8fc516d07 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExampleSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExampleSubmissionService.java @@ -10,6 +10,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.domain.ExampleSubmission; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.GradingInstruction; @@ -18,12 +21,9 @@ import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; -import de.tum.cit.aet.artemis.repository.TutorParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDateService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDateService.java index a3a45b3abd96..1be625d6ecb0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDateService.java @@ -13,8 +13,8 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.participation.ParticipationInterface; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.service.exam.ExamDateService; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDeletionService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDeletionService.java index f492249a703c..d76eb16b56c9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDeletionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDeletionService.java @@ -13,6 +13,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.TextExercise; @@ -23,12 +25,10 @@ import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.ExerciseUnitRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.repository.TutorParticipationRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.lecture.repository.ExerciseUnitRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseImportService.java index 4a3e5a5631e9..41fcc4f2f18f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseImportService.java @@ -7,6 +7,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.GradingInstruction; @@ -14,9 +16,7 @@ import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismDetectionConfig; -import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; public abstract class ExerciseImportService { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseScoresChartService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseScoresChartService.java index 62b377bb53b0..c200d01d3dea 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseScoresChartService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseScoresChartService.java @@ -11,15 +11,15 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; +import de.tum.cit.aet.artemis.assessment.repository.TeamScoreRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; import de.tum.cit.aet.artemis.domain.scores.ParticipantScore; import de.tum.cit.aet.artemis.domain.scores.StudentScore; import de.tum.cit.aet.artemis.domain.scores.TeamScore; -import de.tum.cit.aet.artemis.repository.ParticipantScoreRepository; -import de.tum.cit.aet.artemis.repository.StudentScoreRepository; -import de.tum.cit.aet.artemis.repository.TeamScoreRepository; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseScoresAggregatedInformation; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseScoresDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseService.java index aec718eb25f7..a1543f3ea869 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseService.java @@ -27,7 +27,15 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; +import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ExampleSubmission; import de.tum.cit.aet.artemis.domain.Exercise; @@ -46,20 +54,12 @@ import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.domain.scores.ParticipantScore; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.ComplaintResponseRepository; -import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.repository.Lti13ResourceLaunchRepository; -import de.tum.cit.aet.artemis.repository.ParticipantScoreRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.lti.repository.Lti13ResourceLaunchRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.exam.ExamLiveEventsService; import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.service.quiz.QuizBatchService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseSpecificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseSpecificationService.java index f3883698c508..ebf0499eb5f0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseSpecificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseSpecificationService.java @@ -23,6 +23,7 @@ import de.tum.cit.aet.artemis.domain.exam.Exam_; import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup_; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; @Profile(PROFILE_CORE) @@ -106,7 +107,7 @@ else if (isCourseFilter) { * Creates a {@link Specification} to filter for programming exercises with the given programming language and SCA enabled. * * @param programmingLanguage the language to filter for - * @return a Specification that can get passed to the @{@link de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository} + * @return a Specification that can get passed to the @{@link ProgrammingExerciseRepository} * @see de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseService#getAllWithSCAOnPageWithSize(SearchTermPageableSearchDTO, boolean, boolean, ProgrammingLanguage, * User) */ diff --git a/src/main/java/de/tum/cit/aet/artemis/service/FeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/service/FeedbackService.java index ce4f9e9ddcf5..42f850e24d93 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/FeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/FeedbackService.java @@ -9,9 +9,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.LongFeedbackTextRepository; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.LongFeedbackText; -import de.tum.cit.aet.artemis.repository.LongFeedbackTextRepository; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseImportService.java index a5602fd3dcc9..c7b6c4529b13 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseImportService.java @@ -12,11 +12,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; -import de.tum.cit.aet.artemis.repository.FileUploadExerciseRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseService.java index 0f53d1ebd0d1..d6e545cb4ca7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseService.java @@ -11,7 +11,7 @@ import de.tum.cit.aet.artemis.domain.FileUploadExercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.FileUploadExerciseRepository; +import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.web.rest.util.PageUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadSubmissionService.java index 71384028b9ae..56122f249859 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadSubmissionService.java @@ -19,7 +19,12 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.server.ResponseStatusException; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.exception.EmptyFileException; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.FileUploadExercise; import de.tum.cit.aet.artemis.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.domain.Submission; @@ -27,15 +32,10 @@ import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.repository.FileUploadSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.fileupload.repository.FileUploadSubmissionRepository; import de.tum.cit.aet.artemis.service.connectors.athena.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.service.exam.ExamDateService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/GradingScaleService.java b/src/main/java/de/tum/cit/aet/artemis/service/GradingScaleService.java index a74cfa74c93c..df84da111862 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/GradingScaleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/GradingScaleService.java @@ -12,10 +12,10 @@ import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.domain.GradeStep; import de.tum.cit.aet.artemis.domain.GradingScale; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java b/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java index 3acbe24ac656..524dbed2ea25 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java @@ -17,10 +17,10 @@ import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; import de.tum.cit.aet.artemis.domain.lecture.LectureUnitCompletion; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.LectureUnitCompletionRepository; -import de.tum.cit.aet.artemis.repository.LectureUnitRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationObjectDTO.LearningObjectType; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LectureImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/LectureImportService.java index 3c4625cfb68d..a3adbe7f72e2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LectureImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LectureImportService.java @@ -25,10 +25,10 @@ import de.tum.cit.aet.artemis.domain.lecture.OnlineUnit; import de.tum.cit.aet.artemis.domain.lecture.TextUnit; import de.tum.cit.aet.artemis.domain.lecture.VideoUnit; -import de.tum.cit.aet.artemis.repository.AttachmentRepository; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.LectureUnitRepository; -import de.tum.cit.aet.artemis.repository.iris.IrisSettingsRepository; +import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; +import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisWebhookService; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LectureService.java b/src/main/java/de/tum/cit/aet/artemis/service/LectureService.java index 70d42b3ffded..c4a131514cb7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LectureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LectureService.java @@ -13,6 +13,7 @@ import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.domain.Attachment; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Lecture; @@ -21,8 +22,7 @@ import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisWebhookService; import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitProcessingService.java index 88734d00aafe..e78b55c2e58f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitProcessingService.java @@ -32,7 +32,7 @@ import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; -import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.web.rest.dto.LectureUnitInformationDTO; import de.tum.cit.aet.artemis.web.rest.dto.LectureUnitSplitDTO; import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitService.java b/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitService.java index bff100d88cdf..de6edd9acdfb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitService.java @@ -21,6 +21,7 @@ import org.springframework.dao.DataIntegrityViolationException; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.User; @@ -30,12 +31,11 @@ import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; import de.tum.cit.aet.artemis.domain.lecture.LectureUnitCompletion; import de.tum.cit.aet.artemis.domain.lecture.Slide; -import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.LectureUnitCompletionRepository; -import de.tum.cit.aet.artemis.repository.LectureUnitRepository; -import de.tum.cit.aet.artemis.repository.SlideRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.SlideRepository; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisWebhookService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseImportService.java index d2302f8af727..e28bdb7b278b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseImportService.java @@ -15,6 +15,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.domain.ExampleSubmission; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.GradingInstruction; @@ -22,10 +24,8 @@ import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseService.java index 8d770775ba0b..18484617c2c3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseService.java @@ -13,9 +13,9 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.modeling.ModelCluster; import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.repository.ModelClusterRepository; -import de.tum.cit.aet.artemis.repository.ModelElementRepository; -import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelClusterRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelElementRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ModelingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/ModelingSubmissionService.java index 885ac2c2f1fb..6eff6e0e5793 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ModelingSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ModelingSubmissionService.java @@ -17,6 +17,11 @@ import org.springframework.stereotype.Service; import org.springframework.web.server.ResponseStatusException; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; @@ -26,16 +31,11 @@ import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; import de.tum.cit.aet.artemis.domain.modeling.SimilarElementCount; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.repository.ModelElementRepository; -import de.tum.cit.aet.artemis.repository.ModelingSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelElementRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; import de.tum.cit.aet.artemis.service.compass.CompassService; import de.tum.cit.aet.artemis.service.connectors.athena.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.service.exam.ExamDateService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationService.java b/src/main/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationService.java index 73f7f3687a6f..9cda45dd1027 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationService.java @@ -21,7 +21,7 @@ import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer; -import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; +import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/OrganizationService.java b/src/main/java/de/tum/cit/aet/artemis/service/OrganizationService.java index 575e743348d4..8ff8591b3263 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/OrganizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/OrganizationService.java @@ -7,10 +7,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.OrganizationRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Organization; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.OrganizationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; /** * Service implementation for managing Organization entities diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipantScoreService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipantScoreService.java index 0a0da3260f31..fa38c2087839 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipantScoreService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipantScoreService.java @@ -18,6 +18,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; +import de.tum.cit.aet.artemis.assessment.repository.TeamScoreRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.GradingScale; @@ -27,11 +31,7 @@ import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; import de.tum.cit.aet.artemis.domain.scores.ParticipantScore; -import de.tum.cit.aet.artemis.repository.ParticipantScoreRepository; -import de.tum.cit.aet.artemis.repository.StudentScoreRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; -import de.tum.cit.aet.artemis.repository.TeamScoreRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.web.rest.dto.score.ScoreDTO; import de.tum.cit.aet.artemis.web.rest.dto.score.StudentScoreSum; import de.tum.cit.aet.artemis.web.rest.dto.score.TeamScoreSum; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java index a5adc49e6325..1b6d02427cde 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java @@ -9,6 +9,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Team; @@ -17,9 +18,8 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java index 053ffac9fa2b..587b0f2f065a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java @@ -18,6 +18,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; +import de.tum.cit.aet.artemis.assessment.repository.TeamScoreRepository; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.domain.Exercise; @@ -37,17 +40,14 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.repository.BuildLogStatisticsEntryRepository; -import de.tum.cit.aet.artemis.repository.ParticipantScoreRepository; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.StudentScoreRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; -import de.tum.cit.aet.artemis.repository.TeamScoreRepository; -import de.tum.cit.aet.artemis.repository.hestia.CoverageReportRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageReportRepository; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationVcsAccessTokenService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationVcsAccessTokenService.java index f5f09ea282c3..29f8416ab84b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationVcsAccessTokenService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationVcsAccessTokenService.java @@ -10,8 +10,8 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.participation.ParticipationVCSAccessToken; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ParticipationVCSAccessTokenRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ParticipationVCSAccessTokenRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCPersonalAccessTokenManagementService; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationService.java b/src/main/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationService.java index 0435648222b7..dadf65d405b4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationService.java @@ -10,7 +10,7 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; /** * Service for calculating the presentation points for a course or student. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/RatingService.java b/src/main/java/de/tum/cit/aet/artemis/service/RatingService.java index 86a8241d9862..ef520943ea06 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/RatingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/RatingService.java @@ -8,11 +8,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.RatingRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.domain.Rating; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseRatingCount; -import de.tum.cit.aet.artemis.repository.RatingRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; /** * Service Implementation for managing {@link de.tum.cit.aet.artemis.domain.Rating}. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/ResultService.java index 9142a2b45dba..7c17b398754b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ResultService.java @@ -23,6 +23,14 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.assessment.repository.LongFeedbackTextRepository; +import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.assessment.repository.RatingRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -40,21 +48,13 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.BuildJobRepository; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.ComplaintResponseRepository; -import de.tum.cit.aet.artemis.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.repository.LongFeedbackTextRepository; -import de.tum.cit.aet.artemis.repository.ParticipantScoreRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.RatingRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.service.connectors.localci.dto.ResultBuildJob; import de.tum.cit.aet.artemis.service.connectors.lti.LtiNewResultService; import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SlideSplitterService.java b/src/main/java/de/tum/cit/aet/artemis/service/SlideSplitterService.java index 4deb12121b5b..317bb2479daa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SlideSplitterService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SlideSplitterService.java @@ -25,7 +25,7 @@ import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; import de.tum.cit.aet.artemis.domain.lecture.Slide; -import de.tum.cit.aet.artemis.repository.SlideRepository; +import de.tum.cit.aet.artemis.lecture.repository.SlideRepository; import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/StaticCodeAnalysisService.java b/src/main/java/de/tum/cit/aet/artemis/service/StaticCodeAnalysisService.java index bf6dec5a9ef2..39e848727a79 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/StaticCodeAnalysisService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/StaticCodeAnalysisService.java @@ -18,7 +18,7 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisCategory; import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisDefaultCategory; -import de.tum.cit.aet.artemis.repository.StaticCodeAnalysisCategoryRepository; +import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; import de.tum.cit.aet.artemis.service.programming.ProgrammingTriggerService; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java b/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java index 1787023a1067..0704a7c037d3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java @@ -23,6 +23,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.StatisticsRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.GradingScale; @@ -33,14 +38,9 @@ import de.tum.cit.aet.artemis.domain.statistics.CourseStatisticsAverageScore; import de.tum.cit.aet.artemis.domain.statistics.ScoreDistribution; import de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.GradingScaleRepository; -import de.tum.cit.aet.artemis.repository.ParticipantScoreRepository; -import de.tum.cit.aet.artemis.repository.StatisticsRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementStatisticsDTO; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseManagementStatisticsDTO; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionPolicyService.java b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionPolicyService.java index dd2a4812b2b3..8d7394293a52 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionPolicyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionPolicyService.java @@ -18,10 +18,10 @@ import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPenaltyPolicy; import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; -import de.tum.cit.aet.artemis.repository.SubmissionPolicyRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.programming.repository.SubmissionPolicyRepository; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseParticipationService; import de.tum.cit.aet.artemis.web.rest.SubmissionPolicyResource; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java index e1fac41fd629..e75f1faa6cac 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java @@ -20,6 +20,11 @@ import org.springframework.data.domain.PageImpl; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.AssessmentNote; import de.tum.cit.aet.artemis.domain.Complaint; import de.tum.cit.aet.artemis.domain.Exercise; @@ -37,14 +42,9 @@ import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; import de.tum.cit.aet.artemis.domain.participation.Participation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.service.connectors.athena.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.service.exam.ExamDateService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionVersionService.java b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionVersionService.java index 2526042dff94..cff1dfaa00c6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionVersionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionVersionService.java @@ -10,14 +10,14 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.SubmissionVersion; import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; -import de.tum.cit.aet.artemis.repository.SubmissionVersionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionVersionRepository; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SystemNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/SystemNotificationService.java index 2c50a2a114ec..931626ae9e37 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SystemNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SystemNotificationService.java @@ -8,9 +8,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.repository.SystemNotificationRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.notification.SystemNotification; -import de.tum.cit.aet.artemis.repository.SystemNotificationRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TeamService.java b/src/main/java/de/tum/cit/aet/artemis/service/TeamService.java index e2b9558a2d76..bf556bcc37c5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TeamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TeamService.java @@ -16,14 +16,14 @@ import org.springframework.data.util.Pair; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.TeamImportStrategyType; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlRepositoryPermission; import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.service.dto.TeamSearchUserDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextAssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextAssessmentService.java index cd90851fcfc8..d9b30e792ca2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextAssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextAssessmentService.java @@ -11,17 +11,17 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.service.connectors.lti.LtiNewResultService; import de.tum.cit.aet.artemis.service.exam.ExamDateService; import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextBlockService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextBlockService.java index 5ee1f1a1bc27..f417fcc86cd9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextBlockService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextBlockService.java @@ -12,9 +12,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.TextBlockRepository; import de.tum.cit.aet.artemis.domain.TextBlock; import de.tum.cit.aet.artemis.domain.TextSubmission; -import de.tum.cit.aet.artemis.repository.TextBlockRepository; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseFeedbackService.java index 40e1538d750c..71c7c79cbbab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseFeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseFeedbackService.java @@ -12,6 +12,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.TextExercise; @@ -20,7 +21,6 @@ import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.participation.Participation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ResultRepository; import de.tum.cit.aet.artemis.service.connectors.athena.AthenaFeedbackSuggestionsService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseImportService.java index c3a9cfa4713e..87552775d94c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseImportService.java @@ -18,6 +18,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.repository.TextBlockRepository; import de.tum.cit.aet.artemis.domain.ExampleSubmission; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Feedback; @@ -28,15 +32,11 @@ import de.tum.cit.aet.artemis.domain.TextBlockType; import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.TextSubmission; -import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; -import de.tum.cit.aet.artemis.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.TextBlockRepository; -import de.tum.cit.aet.artemis.repository.TextExerciseRepository; -import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseService.java index 125a7fd86c52..822d09a44f41 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseService.java @@ -11,8 +11,8 @@ import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.web.rest.util.PageUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextSubmissionService.java index 0750dd2e1356..ecf5e7fd5d3c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextSubmissionService.java @@ -13,23 +13,23 @@ import org.springframework.stereotype.Service; import org.springframework.web.server.ResponseStatusException; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.service.connectors.athena.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.service.exam.ExamDateService; +import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TutorEffortService.java b/src/main/java/de/tum/cit/aet/artemis/service/TutorEffortService.java index a6e7a9b19dd8..87cfaa5ccf08 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TutorEffortService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TutorEffortService.java @@ -13,9 +13,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.TextAssessmentEventRepository; import de.tum.cit.aet.artemis.domain.analytics.TextAssessmentEvent; import de.tum.cit.aet.artemis.domain.statistics.tutor.effort.TutorEffort; -import de.tum.cit.aet.artemis.repository.TextAssessmentEventRepository; /** * Contains business logic needed to calculate tutor efforts. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TutorLeaderboardService.java b/src/main/java/de/tum/cit/aet/artemis/service/TutorLeaderboardService.java index 9dc0167b2825..b85cf1591bcc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TutorLeaderboardService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TutorLeaderboardService.java @@ -12,6 +12,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; @@ -21,9 +24,6 @@ import de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardComplaintResponses; import de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardComplaints; import de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardMoreFeedbackRequests; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.web.rest.dto.TutorLeaderboardDTO; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TutorParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/service/TutorParticipationService.java index 8d7f7183fe16..9aef14ef6b9e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TutorParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TutorParticipationService.java @@ -24,13 +24,13 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.domain.ExampleSubmission; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; -import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; -import de.tum.cit.aet.artemis.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/CompassService.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/CompassService.java index 26ff294753e9..0c52339ca3d5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/CompassService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/CompassService.java @@ -13,6 +13,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; @@ -21,10 +22,9 @@ import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.repository.ModelClusterRepository; -import de.tum.cit.aet.artemis.repository.ModelElementRepository; -import de.tum.cit.aet.artemis.repository.ModelingSubmissionRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelClusterRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelElementRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; import de.tum.cit.aet.artemis.service.compass.controller.FeedbackSelector; import de.tum.cit.aet.artemis.service.compass.controller.ModelClusterFactory; import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyJolService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyJolService.java index d23076cacf36..b46baeb80a53 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyJolService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyJolService.java @@ -14,12 +14,12 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; +import de.tum.cit.aet.artemis.atlas.repository.competency.CompetencyJolRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.competency.CompetencyJol; import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; -import de.tum.cit.aet.artemis.repository.CompetencyProgressRepository; -import de.tum.cit.aet.artemis.repository.CompetencyRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.competency.CompetencyJolRepository; import de.tum.cit.aet.artemis.service.iris.session.IrisCourseChatSessionService; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolPairDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyProgressService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyProgressService.java index 1914df822661..db9948573b2c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyProgressService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyProgressService.java @@ -19,6 +19,9 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; +import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -31,10 +34,7 @@ import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; import de.tum.cit.aet.artemis.domain.participation.Participant; -import de.tum.cit.aet.artemis.repository.CompetencyProgressRepository; -import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; -import de.tum.cit.aet.artemis.repository.LectureUnitCompletionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.service.ParticipantScoreService; import de.tum.cit.aet.artemis.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.service.util.RoundingUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyRelationService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyRelationService.java index a971fd1c102d..a2eb1f34db07 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyRelationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyRelationService.java @@ -12,12 +12,12 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; +import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.competency.CompetencyRelation; import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.domain.competency.RelationType; -import de.tum.cit.aet.artemis.repository.CompetencyRelationRepository; -import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; /** * Service for managing CompetencyRelations. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyService.java index f17ab580dc63..25695e012afd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyService.java @@ -11,15 +11,15 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; +import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.competency.Competency; import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.repository.CompetencyProgressRepository; -import de.tum.cit.aet.artemis.repository.CompetencyRelationRepository; -import de.tum.cit.aet.artemis.repository.CompetencyRepository; -import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; -import de.tum.cit.aet.artemis.repository.LectureUnitCompletionRepository; -import de.tum.cit.aet.artemis.repository.competency.StandardizedCompetencyRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.service.LectureUnitService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/CourseCompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/CourseCompetencyService.java index 04a9eeabb8a5..fe4f7969b390 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/CourseCompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/CourseCompetencyService.java @@ -19,6 +19,10 @@ import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; +import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; @@ -27,11 +31,7 @@ import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.domain.competency.Prerequisite; import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; -import de.tum.cit.aet.artemis.repository.CompetencyProgressRepository; -import de.tum.cit.aet.artemis.repository.CompetencyRelationRepository; -import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; -import de.tum.cit.aet.artemis.repository.LectureUnitCompletionRepository; -import de.tum.cit.aet.artemis.repository.competency.StandardizedCompetencyRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.service.LectureUnitService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/KnowledgeAreaService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/KnowledgeAreaService.java index ce0b9b94fb56..f1e0a168ff5e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/KnowledgeAreaService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/KnowledgeAreaService.java @@ -7,8 +7,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.repository.competency.KnowledgeAreaRepository; import de.tum.cit.aet.artemis.domain.competency.KnowledgeArea; -import de.tum.cit.aet.artemis.repository.competency.KnowledgeAreaRepository; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaRequestDTO; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/PrerequisiteService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/PrerequisiteService.java index 1cb8e4a25a12..dd8e7f99e0c5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/PrerequisiteService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/PrerequisiteService.java @@ -11,15 +11,15 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; +import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; +import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.domain.competency.Prerequisite; -import de.tum.cit.aet.artemis.repository.CompetencyProgressRepository; -import de.tum.cit.aet.artemis.repository.CompetencyRelationRepository; -import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; -import de.tum.cit.aet.artemis.repository.LectureUnitCompletionRepository; -import de.tum.cit.aet.artemis.repository.PrerequisiteRepository; -import de.tum.cit.aet.artemis.repository.competency.StandardizedCompetencyRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.service.LectureUnitService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/StandardizedCompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/StandardizedCompetencyService.java index 84aea2944f6b..baff6ffdea7c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/StandardizedCompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/StandardizedCompetencyService.java @@ -20,12 +20,12 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.atlas.repository.SourceRepository; +import de.tum.cit.aet.artemis.atlas.repository.competency.KnowledgeAreaRepository; +import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; import de.tum.cit.aet.artemis.domain.competency.KnowledgeArea; import de.tum.cit.aet.artemis.domain.competency.Source; import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; -import de.tum.cit.aet.artemis.repository.SourceRepository; -import de.tum.cit.aet.artemis.repository.competency.KnowledgeAreaRepository; -import de.tum.cit.aet.artemis.repository.competency.StandardizedCompetencyRepository; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.SourceDTO; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO.KnowledgeAreaForCatalogDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/SAML2Service.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/SAML2Service.java index dca6750c4018..9a79275f533a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/SAML2Service.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/SAML2Service.java @@ -22,11 +22,11 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.config.SAML2Properties; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.UserNotActivatedException; import de.tum.cit.aet.artemis.domain.Authority; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.notifications.MailService; import de.tum.cit.aet.artemis.service.user.UserCreationService; import de.tum.cit.aet.artemis.service.user.UserService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaDTOConverterService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaDTOConverterService.java index b9707b9ad32f..1c2a030bc157 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaDTOConverterService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaDTOConverterService.java @@ -6,6 +6,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.assessment.repository.TextBlockRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; @@ -14,10 +16,7 @@ import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.TextBlockRepository; -import de.tum.cit.aet.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.dto.athena.ExerciseBaseDTO; import de.tum.cit.aet.artemis.service.dto.athena.FeedbackBaseDTO; import de.tum.cit.aet.artemis.service.dto.athena.ModelingExerciseDTO; @@ -30,6 +29,7 @@ import de.tum.cit.aet.artemis.service.dto.athena.TextExerciseDTO; import de.tum.cit.aet.artemis.service.dto.athena.TextFeedbackDTO; import de.tum.cit.aet.artemis.service.dto.athena.TextSubmissionDTO; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; /** * Service to convert exercises, submissions and feedback to DTOs for Athena. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaModuleService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaModuleService.java index 03af74304857..a4a9c29fed9e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaModuleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaModuleService.java @@ -24,7 +24,7 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportService.java index 0c3ab1f3d851..33f0fc6d927f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportService.java @@ -15,9 +15,9 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.export.ProgrammingExerciseExportService; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryExportOptionsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingService.java index ea240624d06d..ea10c80d6982 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingService.java @@ -20,7 +20,7 @@ import de.tum.cit.aet.artemis.core.exception.NetworkingException; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.service.dto.athena.ExerciseBaseDTO; import de.tum.cit.aet.artemis.service.dto.athena.SubmissionBaseDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractBuildPlanCreator.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractBuildPlanCreator.java index 9cb8ca95205d..44e20b803477 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractBuildPlanCreator.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractBuildPlanCreator.java @@ -6,8 +6,8 @@ import org.springframework.beans.factory.annotation.Value; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.repository.BuildPlanRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; public abstract class AbstractBuildPlanCreator { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractContinuousIntegrationResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractContinuousIntegrationResultService.java index 6d555f1ebde9..54341b277bbf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractContinuousIntegrationResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractContinuousIntegrationResultService.java @@ -11,9 +11,9 @@ import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.participation.Participation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.repository.BuildLogStatisticsEntryRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; import de.tum.cit.aet.artemis.service.dto.BuildJobDTOInterface; import de.tum.cit.aet.artemis.service.hestia.TestwiseCoverageService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java index 683cebe148c7..faef9d4cfdd1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java @@ -23,8 +23,8 @@ import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.connectors.gitlab.dto.GitLabPersonalAccessTokenListResponseDTO; import de.tum.cit.aet.artemis.service.connectors.vcs.VcsTokenManagementService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabService.java index 07536fa84eee..b79c06be2e43 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabService.java @@ -46,6 +46,7 @@ import com.fasterxml.jackson.databind.JsonNode; import de.tum.cit.aet.artemis.core.exception.VersionControlException; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Commit; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; @@ -53,11 +54,10 @@ import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.service.UriService; import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; import de.tum.cit.aet.artemis.service.connectors.GitService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabUserManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabUserManagementService.java index 0c047295e314..b2877caf911b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabUserManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabUserManagementService.java @@ -20,11 +20,11 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.exception.VersionControlException; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.connectors.vcs.VcsTokenManagementService; import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java index b005d8b4fb53..32a47fa64af9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java @@ -14,8 +14,8 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.repository.BuildPlanRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.ResourceLoaderService; import de.tum.cit.aet.artemis.service.connectors.ci.AbstractBuildPlanCreator; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIResultService.java index d805b91cc075..3c18d434e845 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIResultService.java @@ -8,16 +8,16 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.domain.BuildLogEntry; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; import de.tum.cit.aet.artemis.domain.statistics.BuildLogStatisticsEntry; -import de.tum.cit.aet.artemis.repository.BuildLogStatisticsEntryRepository; -import de.tum.cit.aet.artemis.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.service.connectors.ci.AbstractContinuousIntegrationResultService; import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestResultsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIService.java index 595b0b7c060e..761713e7a12c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIService.java @@ -33,8 +33,8 @@ import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.repository.BuildPlanRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.UriService; import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; import de.tum.cit.aet.artemis.service.connectors.ci.AbstractContinuousIntegrationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCITriggerService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCITriggerService.java index 8048f1b9f0bf..d29707fa5a3e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCITriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCITriggerService.java @@ -11,7 +11,7 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.UriService; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsResultService.java index bfd26478d16c..a38a2bcf7f16 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsResultService.java @@ -10,15 +10,15 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.domain.BuildLogEntry; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; -import de.tum.cit.aet.artemis.repository.BuildLogStatisticsEntryRepository; -import de.tum.cit.aet.artemis.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.service.connectors.ci.AbstractContinuousIntegrationResultService; import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestResultsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsService.java index 8132c34f5270..a98f4dadb55d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsService.java @@ -27,7 +27,7 @@ import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsUserManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsUserManagementService.java index b011e40cd589..9df2be0c997d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsUserManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsUserManagementService.java @@ -29,11 +29,11 @@ import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.JenkinsException; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; import de.tum.cit.aet.artemis.service.connectors.jenkins.dto.JenkinsUserDTO; import de.tum.cit.aet.artemis.service.connectors.jenkins.jobs.JenkinsJobPermission; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java index a891f2d2367b..98b8536ed722 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java @@ -37,6 +37,7 @@ import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationBuildPlanException; import de.tum.cit.aet.artemis.core.exception.JenkinsException; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; @@ -47,10 +48,9 @@ import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.repository.BuildPlanRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusBuildPlanService; import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusRepository; import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java index 4c75be83478f..a1bda8f721b5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java @@ -21,8 +21,8 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; -import de.tum.cit.aet.artemis.repository.BuildPlanRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.ResourceLoaderService; import de.tum.cit.aet.artemis.service.connectors.ci.AbstractBuildPlanCreator; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ldap/LdapAuthenticationProvider.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ldap/LdapAuthenticationProvider.java index 312814400e67..8e1073573131 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ldap/LdapAuthenticationProvider.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ldap/LdapAuthenticationProvider.java @@ -18,11 +18,11 @@ import org.springframework.security.ldap.SpringSecurityLdapTemplate; import org.springframework.stereotype.Component; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProvider; import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProviderImpl; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; import de.tum.cit.aet.artemis.service.ldap.LdapUserService; import de.tum.cit.aet.artemis.service.user.AuthorityService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultProcessingService.java index 296b0caf221f..3eba5b81f008 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultProcessingService.java @@ -31,9 +31,9 @@ import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; import de.tum.cit.aet.artemis.domain.participation.Participation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.repository.BuildJobRepository; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultService.java index dce2db8b42fc..e1219313f93c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultService.java @@ -12,9 +12,9 @@ import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; -import de.tum.cit.aet.artemis.repository.BuildLogStatisticsEntryRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.service.connectors.ci.AbstractContinuousIntegrationResultService; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildResult; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIService.java index d5f09c365f0b..6d8205561ff6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIService.java @@ -22,7 +22,7 @@ import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.connectors.BuildScriptProviderService; import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCITriggerService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCITriggerService.java index a4063f919729..b9ef8044c67e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCITriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCITriggerService.java @@ -34,9 +34,9 @@ import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.AuxiliaryRepositoryRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusResult; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/SharedQueueManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/SharedQueueManagementService.java index 4c7832c63881..8dd8de95e79a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/SharedQueueManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/SharedQueueManagementService.java @@ -32,7 +32,7 @@ import de.tum.cit.aet.artemis.domain.BuildJob; import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; -import de.tum.cit.aet.artemis.repository.BuildJobRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCService.java index 2f95a7f86aac..143ed97bb498 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCService.java @@ -37,10 +37,10 @@ import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.service.UriService; import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; import de.tum.cit.aet.artemis.service.connectors.GitService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCServletService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCServletService.java index 8277bb862ddf..0a7c51e83741 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCServletService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCServletService.java @@ -42,6 +42,7 @@ import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCAuthException; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCForbiddenException; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Commit; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; @@ -51,9 +52,8 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.repository.ParticipationVCSAccessTokenRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.programming.repository.ParticipationVCSAccessTokenRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; import de.tum.cit.aet.artemis.service.programming.AuxiliaryRepositoryService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/Lti13Service.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/Lti13Service.java index c49178bb7b0d..29f84934f708 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/Lti13Service.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/Lti13Service.java @@ -31,6 +31,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProvider; import de.tum.cit.aet.artemis.core.security.lti.Lti13TokenRetriever; import de.tum.cit.aet.artemis.domain.Course; @@ -46,12 +49,9 @@ import de.tum.cit.aet.artemis.domain.lti.LtiResourceLaunch; import de.tum.cit.aet.artemis.domain.lti.Scopes; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.Lti13ResourceLaunchRepository; -import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.lti.repository.Lti13ResourceLaunchRepository; +import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingService.java index c7f3ceb12c58..abf184a94960 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingService.java @@ -17,7 +17,7 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; import de.tum.cit.aet.artemis.domain.lti.Lti13DeepLinkingResponse; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDynamicRegistrationService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDynamicRegistrationService.java index 114851a5afb8..f07fdcafaac5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDynamicRegistrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDynamicRegistrationService.java @@ -19,7 +19,7 @@ import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.domain.lti.Lti13ClientRegistration; import de.tum.cit.aet.artemis.domain.lti.Lti13PlatformConfiguration; -import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; +import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiService.java index c28cb0391f62..13ed9bc5d475 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiService.java @@ -26,6 +26,7 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.exception.LtiEmailAlreadyInUseException; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProvider; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.SecurityUtils; @@ -33,7 +34,6 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; import de.tum.cit.aet.artemis.service.user.UserCreationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisPipelineService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisPipelineService.java index 59be037b3858..74741c8e8a2d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisPipelineService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisPipelineService.java @@ -15,6 +15,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; @@ -22,8 +23,7 @@ import de.tum.cit.aet.artemis.domain.iris.session.IrisCourseChatSession; import de.tum.cit.aet.artemis.domain.iris.session.IrisExerciseChatSession; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionDTO; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.course.PyrisCourseChatPipelineExecutionDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisWebhookService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisWebhookService.java index 3ec572056c08..e9ebb64b622e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisWebhookService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisWebhookService.java @@ -18,7 +18,7 @@ import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; import de.tum.cit.aet.artemis.domain.iris.settings.IrisCourseSettings; import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; -import de.tum.cit.aet.artemis.repository.iris.IrisSettingsRepository; +import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureUnitWebhookDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/AbstractVersionControlService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/AbstractVersionControlService.java index 602d794a88e5..7e26cf89f78d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/AbstractVersionControlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/AbstractVersionControlService.java @@ -19,10 +19,10 @@ import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.service.UriService; import de.tum.cit.aet.artemis.service.connectors.GitService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalService.java index cb868430cea1..7d179acfc7d7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalService.java @@ -14,8 +14,8 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamAccessService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamAccessService.java index 5ab34f4dc33b..65c96f355899 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamAccessService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamAccessService.java @@ -8,6 +8,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -15,10 +17,8 @@ import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDateService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDateService.java index 24628fe8f308..f65b8bcfb3cf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDateService.java @@ -18,8 +18,8 @@ import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.domain.exam.StudentExam; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDeletionService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDeletionService.java index 0e7fda606d84..86bafa7408ee 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDeletionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDeletionService.java @@ -18,7 +18,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.GradingScale; import de.tum.cit.aet.artemis.domain.User; @@ -27,14 +30,11 @@ import de.tum.cit.aet.artemis.domain.exam.StudentExam; import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; import de.tum.cit.aet.artemis.domain.quiz.QuizPool; -import de.tum.cit.aet.artemis.repository.ExamLiveEventRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.GradingScaleRepository; -import de.tum.cit.aet.artemis.repository.QuizPoolRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamLiveEventRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizPoolRepository; import de.tum.cit.aet.artemis.service.ExerciseDeletionService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamImportService.java index 1bce354f7a07..81ca4001d2d9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamImportService.java @@ -12,6 +12,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.domain.BaseExercise; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -24,16 +26,13 @@ import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExerciseGroupRepository; -import de.tum.cit.aet.artemis.repository.FileUploadExerciseRepository; -import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; -import de.tum.cit.aet.artemis.repository.TextExerciseRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; +import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.service.FileUploadExerciseImportService; import de.tum.cit.aet.artemis.service.ModelingExerciseImportService; import de.tum.cit.aet.artemis.service.TextExerciseImportService; @@ -41,6 +40,7 @@ import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseImportService; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseService; import de.tum.cit.aet.artemis.service.quiz.QuizExerciseImportService; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.web.rest.errors.ExamConfigurationException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamLiveEventsService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamLiveEventsService.java index 023cd86ce247..cea416cbd3cb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamLiveEventsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamLiveEventsService.java @@ -6,6 +6,7 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.exam.Exam; @@ -15,9 +16,8 @@ import de.tum.cit.aet.artemis.domain.exam.event.ExamWideAnnouncementEvent; import de.tum.cit.aet.artemis.domain.exam.event.ProblemStatementUpdateEvent; import de.tum.cit.aet.artemis.domain.exam.event.WorkingTimeUpdateEvent; -import de.tum.cit.aet.artemis.repository.ExamLiveEventRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamLiveEventRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizService.java index db45ae3fa627..09d47b786afa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizService.java @@ -10,17 +10,17 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.exam.StudentExam; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; -import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; -import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.SubmittedAnswerRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; +import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.service.quiz.QuizStatisticService; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamRegistrationService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamRegistrationService.java index 6114fddbc09b..87e6509fa27a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamRegistrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamRegistrationService.java @@ -18,6 +18,8 @@ import org.springframework.util.StringUtils; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; @@ -25,12 +27,10 @@ import de.tum.cit.aet.artemis.domain.exam.ExamUser; import de.tum.cit.aet.artemis.domain.exam.StudentExam; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExamUserRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.user.UserService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamService.java index 3455e71741cc..03347252c32c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamService.java @@ -39,7 +39,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; +import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.BonusStrategy; import de.tum.cit.aet.artemis.domain.Course; @@ -73,20 +79,14 @@ import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; import de.tum.cit.aet.artemis.domain.quiz.QuizSubmittedAnswerCount; import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.ComplaintResponseRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.GradingScaleRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.SubmittedAnswerRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.BonusService; import de.tum.cit.aet.artemis.service.CourseScoreCalculationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSessionService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSessionService.java index c4b28cc234e8..48282bae7e2e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSessionService.java @@ -23,8 +23,8 @@ import de.tum.cit.aet.artemis.domain.exam.SuspiciousExamSessions; import de.tum.cit.aet.artemis.domain.exam.SuspiciousSessionReason; import de.tum.cit.aet.artemis.domain.exam.SuspiciousSessionsAnalysisOptions; -import de.tum.cit.aet.artemis.repository.ExamSessionRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamSessionRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.web.rest.dto.CourseWithIdDTO; import de.tum.cit.aet.artemis.web.rest.dto.ExamSessionDTO; import de.tum.cit.aet.artemis.web.rest.dto.ExamWithIdAndCourseDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionService.java index 1e0e827b0915..16e2f063fb54 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionService.java @@ -19,8 +19,8 @@ import de.tum.cit.aet.artemis.domain.exam.StudentExam; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamUserService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamUserService.java index e1ac0f42c846..919f57730956 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamUserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamUserService.java @@ -24,10 +24,10 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.exam.ExamUser; -import de.tum.cit.aet.artemis.repository.ExamUserRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.web.rest.dto.ExamUsersNotFoundDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessService.java index f5422fe780a5..0366656400ef 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessService.java @@ -7,14 +7,14 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamService.java index 2094cad20181..6d9fb023deda 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamService.java @@ -33,6 +33,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.FileUploadExercise; @@ -57,15 +58,13 @@ import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; import de.tum.cit.aet.artemis.domain.quiz.compare.DnDMapping; import de.tum.cit.aet.artemis.domain.quiz.compare.SAMapping; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ModelingSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmittedAnswerRepository; -import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; +import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.service.SubmissionVersionService; @@ -74,6 +73,7 @@ import de.tum.cit.aet.artemis.service.programming.ProgrammingTriggerService; import de.tum.cit.aet.artemis.service.quiz.QuizPoolService; import de.tum.cit.aet.artemis.service.util.ExamExerciseStartPreparationStatus; +import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/CourseExamExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/CourseExamExportService.java index ab3923bde9eb..4617908b1df2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/CourseExamExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/CourseExamExportService.java @@ -39,7 +39,7 @@ import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.ZipFileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCommunicationDataService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCommunicationDataService.java index 988aa2baa96c..aca3509902f3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCommunicationDataService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCommunicationDataService.java @@ -17,13 +17,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; +import de.tum.cit.aet.artemis.communication.repository.PostRepository; +import de.tum.cit.aet.artemis.communication.repository.ReactionRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.metis.AnswerPost; import de.tum.cit.aet.artemis.domain.metis.Post; import de.tum.cit.aet.artemis.domain.metis.Reaction; -import de.tum.cit.aet.artemis.repository.metis.AnswerPostRepository; -import de.tum.cit.aet.artemis.repository.metis.PostRepository; -import de.tum.cit.aet.artemis.repository.metis.ReactionRepository; /** * A service to create the communication data export for users diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCreationService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCreationService.java index 76718a7bedee..8c0eb91e878c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCreationService.java @@ -20,10 +20,10 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.exception.ArtemisMailException; +import de.tum.cit.aet.artemis.core.repository.DataExportRepository; import de.tum.cit.aet.artemis.domain.DataExport; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.DataExportState; -import de.tum.cit.aet.artemis.repository.DataExportRepository; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ResourceLoaderService; import de.tum.cit.aet.artemis.service.ZipFileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExamCreationService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExamCreationService.java index 78ee1c7ffd18..7b65f4c87371 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExamCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExamCreationService.java @@ -20,12 +20,12 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.GradingScale; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.repository.GradingScaleRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.service.exam.ExamService; import de.tum.cit.aet.artemis.web.rest.dto.ExamScoresDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExerciseCreationService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExerciseCreationService.java index ef162b04f477..c2f1a9380d43 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExerciseCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExerciseCreationService.java @@ -26,6 +26,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.domain.Complaint; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.FileUploadSubmission; @@ -42,9 +43,8 @@ import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportQuizExerciseCreationService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportQuizExerciseCreationService.java index 1856150f098a..a3d9b92663b3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportQuizExerciseCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportQuizExerciseCreationService.java @@ -31,9 +31,9 @@ import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedText; -import de.tum.cit.aet.artemis.repository.QuizQuestionRepository; -import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizQuestionRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.service.DragAndDropQuizAnswerConversionService; import de.tum.cit.aet.artemis.service.archival.ArchivalReportEntry; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportScienceEventService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportScienceEventService.java index 8d2a69a7b4c9..e1d314c2718e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportScienceEventService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportScienceEventService.java @@ -13,8 +13,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.repository.science.ScienceEventRepository; import de.tum.cit.aet.artemis.domain.science.ScienceEvent; -import de.tum.cit.aet.artemis.repository.science.ScienceEventRepository; /** * A Service to create the science event export data for users. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportService.java index d943358c819d..1c70fa0c8404 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportService.java @@ -18,11 +18,11 @@ import org.springframework.core.io.Resource; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.repository.DataExportRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.DataExport; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.DataExportState; -import de.tum.cit.aet.artemis.repository.DataExportRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.web.rest.dto.DataExportDTO; import de.tum.cit.aet.artemis.web.rest.dto.RequestDataExportDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadSubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadSubmissionExportService.java index 1722f6954535..d033c016b1eb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadSubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadSubmissionExportService.java @@ -17,7 +17,7 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ZipFileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingSubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingSubmissionExportService.java index 5ec94d2ecec1..14812bef4019 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingSubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingSubmissionExportService.java @@ -14,7 +14,7 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ZipFileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/ProgrammingExerciseExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/ProgrammingExerciseExportService.java index cc116f9f13a3..bcfe7a105a03 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/ProgrammingExerciseExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/ProgrammingExerciseExportService.java @@ -64,10 +64,10 @@ import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.AuxiliaryRepositoryRepository; -import de.tum.cit.aet.artemis.repository.BuildPlanRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ZipFileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/QuizExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/QuizExerciseWithSubmissionsExportService.java index 721e77112828..c37362bdb9c5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/QuizExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/QuizExerciseWithSubmissionsExportService.java @@ -17,7 +17,7 @@ import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.archival.ArchivalReportEntry; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/SubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/SubmissionExportService.java index 9128919349f9..095630c04f98 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/SubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/SubmissionExportService.java @@ -29,7 +29,7 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ZipFileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/TextSubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/TextSubmissionExportService.java index f07ddf87d785..2762c19244ce 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/TextSubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/TextSubmissionExportService.java @@ -14,7 +14,7 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.TextSubmission; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ZipFileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/CodeHintService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/CodeHintService.java index 4aba3449ca68..0c2ed2a6962b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/CodeHintService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/CodeHintService.java @@ -17,9 +17,9 @@ import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.domain.iris.session.IrisHestiaSession; -import de.tum.cit.aet.artemis.repository.hestia.CodeHintRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.CodeHintRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.service.iris.session.IrisHestiaSessionService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ExerciseHintService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ExerciseHintService.java index 6beee6ab69dd..24e11e4390b7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ExerciseHintService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ExerciseHintService.java @@ -27,9 +27,9 @@ import de.tum.cit.aet.artemis.domain.hestia.ExerciseHint; import de.tum.cit.aet.artemis.domain.hestia.ExerciseHintActivation; import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.hestia.ExerciseHintActivationRepository; -import de.tum.cit.aet.artemis.repository.hestia.ExerciseHintRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintActivationRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java index cd11d2c64c78..58c5277b0f1a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java @@ -30,11 +30,11 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; -import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseGitDiffReportRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseGitDiffReportRepository; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.web.rest.GitDiffReportParserService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseTaskService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseTaskService.java index 31989cae9166..ee677af7c133 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseTaskService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseTaskService.java @@ -22,9 +22,9 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.repository.hestia.ExerciseHintRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/TestwiseCoverageService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/TestwiseCoverageService.java index 6d418230df29..00b4549cb913 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/TestwiseCoverageService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/TestwiseCoverageService.java @@ -26,10 +26,10 @@ import de.tum.cit.aet.artemis.domain.hestia.CoverageReport; import de.tum.cit.aet.artemis.domain.hestia.TestwiseCoverageReportEntry; import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.repository.hestia.CoverageFileReportRepository; -import de.tum.cit.aet.artemis.repository.hestia.CoverageReportRepository; -import de.tum.cit.aet.artemis.repository.hestia.TestwiseCoverageReportEntryRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageFileReportRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageReportRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.TestwiseCoverageReportEntryRepository; import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestwiseCoverageReportDTO; import de.tum.cit.aet.artemis.service.programming.RepositoryService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralTestCaseService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralTestCaseService.java index 62b6d6ffc117..e08afcd4b34b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralTestCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralTestCaseService.java @@ -16,9 +16,9 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseGitDiffReportService; import de.tum.cit.aet.artemis.service.hestia.TestwiseCoverageService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralTestCaseService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralTestCaseService.java index c0439f710422..f4399f678e8c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralTestCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralTestCaseService.java @@ -33,9 +33,9 @@ import de.tum.cit.aet.artemis.domain.Repository; import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTestCaseType; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; import de.tum.cit.aet.artemis.service.connectors.GitService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/icl/GitPublickeyAuthenticatorService.java b/src/main/java/de/tum/cit/aet/artemis/service/icl/GitPublickeyAuthenticatorService.java index 8d6e944334a2..6534fe2103a8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/icl/GitPublickeyAuthenticatorService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/icl/GitPublickeyAuthenticatorService.java @@ -16,9 +16,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.programming.icl.ssh.HashUtils; import de.tum.cit.aet.artemis.programming.icl.ssh.SshConstants; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.connectors.localci.SharedQueueManagementService; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitLocationResolverService.java b/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitLocationResolverService.java index 20a169199d2b..f820457bf931 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitLocationResolverService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitLocationResolverService.java @@ -22,7 +22,7 @@ import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.icl.ssh.SshConstants; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCServletService; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisMessageService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisMessageService.java index f18883a1a0da..86b14a8653bd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisMessageService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisMessageService.java @@ -11,7 +11,7 @@ import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; import de.tum.cit.aet.artemis.domain.iris.message.IrisMessageSender; import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; -import de.tum.cit.aet.artemis.repository.iris.IrisSessionRepository; +import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; /** * Service for managing Iris messages. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisRateLimitService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisRateLimitService.java index 74097355b18a..b6908eadce85 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisRateLimitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisRateLimitService.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.iris.IrisMessageRepository; +import de.tum.cit.aet.artemis.iris.repository.IrisMessageRepository; import de.tum.cit.aet.artemis.service.iris.exception.IrisRateLimitExceededException; import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisSessionService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisSessionService.java index f62d6f5faac5..d1689246e70b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisSessionService.java @@ -6,13 +6,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; import de.tum.cit.aet.artemis.domain.iris.session.IrisCourseChatSession; import de.tum.cit.aet.artemis.domain.iris.session.IrisExerciseChatSession; import de.tum.cit.aet.artemis.domain.iris.session.IrisHestiaSession; import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.iris.session.IrisChatBasedFeatureInterface; import de.tum.cit.aet.artemis.service.iris.session.IrisCourseChatSessionService; import de.tum.cit.aet.artemis.service.iris.session.IrisExerciseChatSessionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/AbstractIrisChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/AbstractIrisChatSessionService.java index dacf9623bd54..4f0416bc901d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/AbstractIrisChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/AbstractIrisChatSessionService.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.domain.iris.session.IrisChatSession; -import de.tum.cit.aet.artemis.repository.iris.IrisSessionRepository; +import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; public abstract class AbstractIrisChatSessionService implements IrisChatBasedFeatureInterface, IrisRateLimitedFeatureInterface { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisCourseChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisCourseChatSessionService.java index 562551b426e6..f92a0f05efa5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisCourseChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisCourseChatSessionService.java @@ -20,8 +20,8 @@ import de.tum.cit.aet.artemis.domain.iris.message.IrisTextMessageContent; import de.tum.cit.aet.artemis.domain.iris.session.IrisCourseChatSession; import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettingsType; -import de.tum.cit.aet.artemis.repository.iris.IrisCourseChatSessionRepository; -import de.tum.cit.aet.artemis.repository.iris.IrisSessionRepository; +import de.tum.cit.aet.artemis.iris.repository.IrisCourseChatSessionRepository; +import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisPipelineService; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisExerciseChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisExerciseChatSessionService.java index 6d2ad8ad8b3a..39c2210eec10 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisExerciseChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisExerciseChatSessionService.java @@ -18,10 +18,10 @@ import de.tum.cit.aet.artemis.domain.iris.message.IrisTextMessageContent; import de.tum.cit.aet.artemis.domain.iris.session.IrisExerciseChatSession; import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettingsType; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; -import de.tum.cit.aet.artemis.repository.iris.IrisSessionRepository; +import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisPipelineService; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisHestiaSessionService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisHestiaSessionService.java index cd03c4364607..352b5b1e83ac 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisHestiaSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisHestiaSessionService.java @@ -15,8 +15,8 @@ import de.tum.cit.aet.artemis.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.domain.iris.session.IrisHestiaSession; import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettingsType; -import de.tum.cit.aet.artemis.repository.iris.IrisHestiaSessionRepository; -import de.tum.cit.aet.artemis.repository.iris.IrisSessionRepository; +import de.tum.cit.aet.artemis.iris.repository.IrisHestiaSessionRepository; +import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisConnectorService; import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSettingsService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSettingsService.java index ad3e4869d69f..6ea4dce19517 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSettingsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSettingsService.java @@ -30,7 +30,7 @@ import de.tum.cit.aet.artemis.domain.iris.settings.IrisSettings; import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettings; import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettingsType; -import de.tum.cit.aet.artemis.repository.iris.IrisSettingsRepository; +import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.iris.IrisDefaultTemplateService; import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedSettingsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserService.java b/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserService.java index 8a158c671176..335dfb7e0d2b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserService.java @@ -18,8 +18,8 @@ import org.springframework.ldap.query.SearchScope; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.repository.LdapUserRepository; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.LdapUserRepository; @Service @Profile("ldap | ldap-only") diff --git a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNgxService.java b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNgxService.java index 4f03de265f33..3a527310fab0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNgxService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNgxService.java @@ -17,6 +17,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.LearningObject; import de.tum.cit.aet.artemis.domain.User; @@ -25,7 +26,6 @@ import de.tum.cit.aet.artemis.domain.competency.LearningPath; import de.tum.cit.aet.artemis.domain.competency.RelationType; import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.web.rest.dto.competency.NgxLearningPathDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathRecommendationService.java b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathRecommendationService.java index 6f419543775f..743234e4de6c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathRecommendationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathRecommendationService.java @@ -22,6 +22,9 @@ import com.google.common.util.concurrent.AtomicDouble; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; +import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.LearningObject; import de.tum.cit.aet.artemis.domain.Lecture; @@ -33,9 +36,6 @@ import de.tum.cit.aet.artemis.domain.competency.RelationType; import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.repository.CompetencyProgressRepository; -import de.tum.cit.aet.artemis.repository.CompetencyRelationRepository; -import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.service.LearningObjectService; import de.tum.cit.aet.artemis.service.ParticipantScoreService; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathService.java b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathService.java index d414218b5310..8b299811d0c4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathService.java @@ -18,6 +18,12 @@ import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; +import de.tum.cit.aet.artemis.atlas.repository.LearningPathRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; @@ -29,14 +35,8 @@ import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; import de.tum.cit.aet.artemis.domain.lecture.LectureUnitCompletion; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.CompetencyProgressRepository; -import de.tum.cit.aet.artemis.repository.CompetencyRelationRepository; -import de.tum.cit.aet.artemis.repository.CompetencyRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.LearningPathRepository; -import de.tum.cit.aet.artemis.repository.LectureUnitCompletionRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyGraphEdgeDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageReceiveService.java b/src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageReceiveService.java index 1871525be143..11b87f3e9385 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageReceiveService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageReceiveService.java @@ -14,15 +14,15 @@ import com.hazelcast.core.HazelcastInstance; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.quiz.QuizScheduleService; import de.tum.cit.aet.artemis.service.scheduled.AthenaScheduleService; import de.tum.cit.aet.artemis.service.scheduled.ModelingExerciseScheduleService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/AnswerMessageService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/AnswerMessageService.java index 55f024c26fe4..0543825ea87e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/AnswerMessageService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/AnswerMessageService.java @@ -10,6 +10,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; +import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; +import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.communication.repository.PostRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; @@ -18,15 +25,8 @@ import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; import de.tum.cit.aet.artemis.domain.notification.SingleUserNotification; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.AnswerPostRepository; -import de.tum.cit.aet.artemis.repository.metis.ConversationMessageRepository; -import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.cit.aet.artemis.repository.metis.PostRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ConversationRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/ConversationMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/ConversationMessagingService.java index edec9735f231..6f81103e3e1c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/ConversationMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/ConversationMessagingService.java @@ -26,6 +26,11 @@ import com.google.common.collect.Lists; +import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; +import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.communication.repository.SingleUserNotificationRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.ConversationNotificationRecipientSummary; @@ -43,13 +48,8 @@ import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; import de.tum.cit.aet.artemis.domain.notification.SingleUserNotification; import de.tum.cit.aet.artemis.domain.notification.SingleUserNotificationFactory; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.SingleUserNotificationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.ConversationMessageRepository; -import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/PostingService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/PostingService.java index 1f5c15b025d1..1d5e6e09f050 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/PostingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/PostingService.java @@ -17,6 +17,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.ConversationNotificationRecipientSummary; import de.tum.cit.aet.artemis.domain.Course; @@ -30,11 +33,8 @@ import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; import de.tum.cit.aet.artemis.domain.notification.ConversationNotification; import de.tum.cit.aet.artemis.domain.notification.Notification; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.dto.UserRoleDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/ReactionService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/ReactionService.java index fba8014d8eeb..ad7c08090170 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/ReactionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/ReactionService.java @@ -7,17 +7,17 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; +import de.tum.cit.aet.artemis.communication.repository.PostRepository; +import de.tum.cit.aet.artemis.communication.repository.ReactionRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.metis.AnswerPost; import de.tum.cit.aet.artemis.domain.metis.Post; import de.tum.cit.aet.artemis.domain.metis.Posting; import de.tum.cit.aet.artemis.domain.metis.Reaction; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.AnswerPostRepository; -import de.tum.cit.aet.artemis.repository.metis.PostRepository; -import de.tum.cit.aet.artemis.repository.metis.ReactionRepository; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismAnswerPostService; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismPostService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ChannelService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ChannelService.java index f2fd73077a7f..97d711c3c548 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ChannelService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ChannelService.java @@ -16,6 +16,9 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; +import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Lecture; @@ -23,9 +26,6 @@ import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; import de.tum.cit.aet.artemis.service.metis.conversation.errors.ChannelNameDuplicateException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationDTOService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationDTOService.java index a0059f9c6a13..ca0d8b0fdffe 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationDTOService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationDTOService.java @@ -12,6 +12,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; @@ -21,12 +24,9 @@ import de.tum.cit.aet.artemis.domain.metis.conversation.ConversationSummary; import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; import de.tum.cit.aet.artemis.domain.metis.conversation.OneToOneChat; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRepository; import de.tum.cit.aet.artemis.service.dto.UserPublicInfoDTO; import de.tum.cit.aet.artemis.service.metis.conversation.auth.ChannelAuthorizationService; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ConversationDTO; import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ConversationUserDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationService.java index c29218b37229..82945c0a86d3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationService.java @@ -20,6 +20,14 @@ import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestBody; +import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.communication.repository.PostRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.GroupChatRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.OneToOneChatRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; @@ -29,14 +37,6 @@ import de.tum.cit.aet.artemis.domain.metis.conversation.GeneralConversationInfo; import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; import de.tum.cit.aet.artemis.domain.metis.conversation.UserConversationInfo; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.cit.aet.artemis.repository.metis.PostRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ConversationRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.GroupChatRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.OneToOneChatRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/GroupChatService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/GroupChatService.java index 7868bb4458de..7dc44cc127b1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/GroupChatService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/GroupChatService.java @@ -9,13 +9,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.GroupChatRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.GroupChatRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.GroupChatDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/OneToOneChatService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/OneToOneChatService.java index 93bf6d62f7a8..86290440e53d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/OneToOneChatService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/OneToOneChatService.java @@ -7,13 +7,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.OneToOneChatRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; import de.tum.cit.aet.artemis.domain.metis.conversation.OneToOneChat; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.OneToOneChatRepository; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ChannelAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ChannelAuthorizationService.java index fcc1e3a130b4..9d8dd276fe45 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ChannelAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ChannelAuthorizationService.java @@ -13,14 +13,14 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.metis.ConversationParticipantSettingsView; import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ConversationAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ConversationAuthorizationService.java index 659192ec832a..fd6171137957 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ConversationAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ConversationAuthorizationService.java @@ -7,9 +7,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/GroupChatAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/GroupChatAuthorizationService.java index 1dedaae4d287..48d8516eed9e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/GroupChatAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/GroupChatAuthorizationService.java @@ -8,13 +8,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.GroupChatRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.GroupChatRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/OneToOneChatAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/OneToOneChatAuthorizationService.java index 6fbe10c73a88..cdc3c243e8a5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/OneToOneChatAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/OneToOneChatAuthorizationService.java @@ -8,12 +8,12 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.OneToOneChatRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.OneToOneChatRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metrics/LearningMetricsService.java b/src/main/java/de/tum/cit/aet/artemis/service/metrics/LearningMetricsService.java index f9417defdbb6..27602983ea45 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metrics/LearningMetricsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metrics/LearningMetricsService.java @@ -18,9 +18,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.repository.metrics.CompetencyMetricsRepository; -import de.tum.cit.aet.artemis.repository.metrics.ExerciseMetricsRepository; -import de.tum.cit.aet.artemis.repository.metrics.LectureUnitMetricsRepository; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyMetricsRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseMetricsRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitMetricsRepository; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO; import de.tum.cit.aet.artemis.web.rest.dto.metrics.CompetencyInformationDTO; import de.tum.cit.aet.artemis.web.rest.dto.metrics.CompetencyProgressDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationService.java index 1236c9792cc0..4eff24783bbb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationService.java @@ -13,6 +13,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.repository.SingleUserNotificationRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationNotificationRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; @@ -24,8 +26,6 @@ import de.tum.cit.aet.artemis.domain.notification.NotificationPlaceholderCreator; import de.tum.cit.aet.artemis.domain.notification.SingleUserNotification; import de.tum.cit.aet.artemis.domain.notification.SingleUserNotificationFactory; -import de.tum.cit.aet.artemis.repository.SingleUserNotificationRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ConversationNotificationRepository; /** * Service for sending notifications about new messages in conversations. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationService.java index 34b0c46139c1..96db7240d911 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationService.java @@ -31,6 +31,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.repository.GroupNotificationRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Attachment; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -44,8 +46,6 @@ import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; import de.tum.cit.aet.artemis.domain.notification.NotificationTarget; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.repository.GroupNotificationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsService.java index 9e32d47252ce..cd0063520583 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsService.java @@ -54,13 +54,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.domain.NotificationSetting; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; import de.tum.cit.aet.artemis.domain.notification.Notification; import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; -import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/SingleUserNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/SingleUserNotificationService.java index 5a8138f834fb..535891ba8b7b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/SingleUserNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/SingleUserNotificationService.java @@ -47,6 +47,9 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; +import de.tum.cit.aet.artemis.communication.repository.SingleUserNotificationRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.DataExport; import de.tum.cit.aet.artemis.domain.Exercise; @@ -64,10 +67,7 @@ import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.cit.aet.artemis.repository.SingleUserNotificationRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.ConversationMessageRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationService.java index 208c4fce8141..3bbb3e1fde2f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationService.java @@ -18,9 +18,9 @@ import de.tum.cit.aet.artemis.domain.notification.TutorialGroupNotification; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupRegistration; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupNotificationRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRegistrationRepository; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupNotificationRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRegistrationRepository; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/ApplePushNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/ApplePushNotificationService.java index 176fc88098e3..52938e7b6389 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/ApplePushNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/ApplePushNotificationService.java @@ -13,8 +13,8 @@ import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; +import de.tum.cit.aet.artemis.communication.repository.PushNotificationDeviceConfigurationRepository; import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceType; -import de.tum.cit.aet.artemis.repository.PushNotificationDeviceConfigurationRepository; /** * Handles the sending of iOS Notifications to the Relay Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/FirebasePushNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/FirebasePushNotificationService.java index 1be4228a4c46..f45dba746d78 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/FirebasePushNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/FirebasePushNotificationService.java @@ -17,8 +17,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.google.common.collect.Lists; +import de.tum.cit.aet.artemis.communication.repository.PushNotificationDeviceConfigurationRepository; import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceType; -import de.tum.cit.aet.artemis.repository.PushNotificationDeviceConfigurationRepository; /** * Handles the sending of Android Notifications to the Relay Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/PushNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/PushNotificationService.java index 515df79769e3..61a7e647997d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/PushNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/PushNotificationService.java @@ -37,6 +37,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.communication.repository.PushNotificationDeviceConfigurationRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; @@ -44,7 +45,6 @@ import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfiguration; import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceType; -import de.tum.cit.aet.artemis.repository.PushNotificationDeviceConfigurationRepository; import de.tum.cit.aet.artemis.service.notifications.InstantNotificationService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlService.java index db6412e59008..83fcd6df9249 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlService.java @@ -25,10 +25,10 @@ import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismResult; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmissionElement; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismComparisonRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismAnswerPostService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismAnswerPostService.java index 0a7351dc6675..9c904d0b20c9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismAnswerPostService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismAnswerPostService.java @@ -8,18 +8,18 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; +import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.communication.repository.PostRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.metis.AnswerPost; import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.AnswerPostRepository; -import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.cit.aet.artemis.repository.metis.PostRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.metis.PostingService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismCaseService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismCaseService.java index 1d7961a315bc..3d03e8c0b3d3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismCaseService.java @@ -12,16 +12,16 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.metis.Post; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismComparisonRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismSubmissionRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismSubmissionRepository; import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismVerdictDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionService.java index cb10f1dc5f48..ab42bdf762d5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionService.java @@ -19,7 +19,7 @@ import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismResult; import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeatureService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismPostService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismPostService.java index 837cff38e4a7..db698c6d5ddd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismPostService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismPostService.java @@ -9,19 +9,19 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.communication.repository.PostRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; import de.tum.cit.aet.artemis.domain.metis.Post; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.cit.aet.artemis.repository.metis.PostRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.metis.PostingService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismService.java index 9aeaecc62f32..1b36e7c65bcf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismService.java @@ -15,6 +15,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.participation.Participation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; @@ -22,9 +23,8 @@ import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java index 7b2cf9d2c21a..c348d6a1b621 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java @@ -44,8 +44,8 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.UriService; import de.tum.cit.aet.artemis.service.connectors.GitService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/AuxiliaryRepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/AuxiliaryRepositoryService.java index 734d9ce8ca0e..957bc65dc52f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/AuxiliaryRepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/AuxiliaryRepositoryService.java @@ -16,7 +16,7 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.repository.AuxiliaryRepositoryRepository; +import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.programming.ProgrammingExerciseResourceErrorKeys; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/JavaTemplateUpgradeService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/JavaTemplateUpgradeService.java index 780fd8815364..108b2884f058 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/JavaTemplateUpgradeService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/JavaTemplateUpgradeService.java @@ -28,11 +28,11 @@ import org.springframework.core.io.Resource; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.File; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Repository; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ResourceLoaderService; import de.tum.cit.aet.artemis.service.connectors.GitService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingAssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingAssessmentService.java index 13cd55e9c004..0909229bb7cc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingAssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingAssessmentService.java @@ -9,6 +9,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.AssessmentNote; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; @@ -18,13 +23,8 @@ import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.service.AssessmentService; import de.tum.cit.aet.artemis.service.ComplaintResponseService; import de.tum.cit.aet.artemis.service.ExerciseDateService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseCodeReviewFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseCodeReviewFeedbackService.java index d0e8f714b514..ef9fc066dd39 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseCodeReviewFeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseCodeReviewFeedbackService.java @@ -14,6 +14,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; @@ -21,8 +22,7 @@ import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.service.connectors.athena.AthenaFeedbackSuggestionsService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationService.java index f0982aef0308..10bd0a7ff192 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationService.java @@ -41,9 +41,9 @@ import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; import de.tum.cit.aet.artemis.domain.enumeration.Visibility; import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTestCaseType; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.repository.StaticCodeAnalysisCategoryRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseGradingService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseGradingService.java index 220a6642f9c0..fcfb871a1274 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseGradingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseGradingService.java @@ -30,6 +30,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.VersionControlException; @@ -54,14 +55,13 @@ import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPenaltyPolicy; import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.cit.aet.artemis.repository.StaticCodeAnalysisCategoryRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; +import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.FeedbackService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportBasicService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportBasicService.java index 7f7e8fa9ea29..3f600ebd988a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportBasicService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportBasicService.java @@ -27,15 +27,15 @@ import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismDetectionConfig; import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; -import de.tum.cit.aet.artemis.repository.AuxiliaryRepositoryRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.repository.StaticCodeAnalysisCategoryRepository; -import de.tum.cit.aet.artemis.repository.SubmissionPolicyRepository; -import de.tum.cit.aet.artemis.repository.hestia.ExerciseHintRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; +import de.tum.cit.aet.artemis.programming.repository.SubmissionPolicyRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.service.hestia.ExerciseHintService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportFromFileService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportFromFileService.java index d6693c498ea0..eb592264f869 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportFromFileService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportFromFileService.java @@ -32,7 +32,7 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ProfileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportService.java index 5a8712331ea3..78b8aeb85a76 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportService.java @@ -20,6 +20,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; @@ -29,9 +30,8 @@ import de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.domain.enumeration.Visibility; -import de.tum.cit.aet.artemis.repository.AuxiliaryRepositoryRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.UriService; import de.tum.cit.aet.artemis.service.connectors.GitService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseParticipationService.java index b605b470de28..27c0e269dad2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseParticipationService.java @@ -20,6 +20,7 @@ import org.springframework.util.FileSystemUtils; import de.tum.cit.aet.artemis.core.exception.VersionControlException; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Repository; @@ -35,12 +36,11 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; -import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlRepositoryPermission; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseService.java index 614dd9a5416a..c884c2bca19c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseService.java @@ -3,10 +3,10 @@ import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.SOLUTION; import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.TEMPLATE; -import static de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository.ProgrammingExerciseFetchOptions.AuxiliaryRepositories; -import static de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository.ProgrammingExerciseFetchOptions.GradingCriteria; -import static de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository.SolutionParticipationFetchOptions; -import static de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository.TemplateParticipationFetchOptions; +import static de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository.ProgrammingExerciseFetchOptions.AuxiliaryRepositories; +import static de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository.ProgrammingExerciseFetchOptions.GradingCriteria; +import static de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository.SolutionParticipationFetchOptions; +import static de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository.TemplateParticipationFetchOptions; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -42,6 +42,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; @@ -58,18 +60,16 @@ import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.repository.AuxiliaryRepositoryRepository; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseGitDiffReportRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseGitDiffReportRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.service.ExerciseSpecificationService; import de.tum.cit.aet.artemis.service.ParticipationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseTestCaseService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseTestCaseService.java index 7ed7f97b1c83..6d784b419ef3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseTestCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseTestCaseService.java @@ -21,8 +21,8 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseTestCaseDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingMessagingService.java index e1529227dd5f..e380a631f119 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingMessagingService.java @@ -24,7 +24,7 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.connectors.lti.LtiNewResultService; import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingSubmissionService.java index 2c7fcf33e80e..9911a89119c0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingSubmissionService.java @@ -21,8 +21,13 @@ import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.VersionControlException; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Commit; import de.tum.cit.aet.artemis.domain.Feedback; @@ -43,18 +48,13 @@ import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionPolicyRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.programming.repository.SubmissionPolicyRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.FeedbackService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingTriggerService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingTriggerService.java index 235141c8b465..a3a36efc223f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingTriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingTriggerService.java @@ -17,6 +17,7 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Course; @@ -31,12 +32,11 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryParticipationService.java index daff6a1f6bd9..d67f04542f53 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryParticipationService.java @@ -8,11 +8,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Repository; import de.tum.cit.aet.artemis.domain.participation.Participation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizBatchService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizBatchService.java index 61e4b79e50d9..202e06139222 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizBatchService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizBatchService.java @@ -23,9 +23,9 @@ import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.QuizBatchRepository; -import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizBatchRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.service.ParticipationService; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseImportService.java index 03d9ae87df3e..9413c3156cd6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseImportService.java @@ -20,6 +20,8 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; +import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.domain.quiz.AnswerOption; import de.tum.cit.aet.artemis.domain.quiz.DragAndDropMapping; import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; @@ -33,9 +35,7 @@ import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSolution; import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSpot; -import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.service.ExerciseImportService; import de.tum.cit.aet.artemis.service.FeedbackService; import de.tum.cit.aet.artemis.service.FilePathService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseService.java index 42a7a4521889..0efddf407fab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseService.java @@ -31,6 +31,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; import de.tum.cit.aet.artemis.domain.Result; @@ -45,11 +46,10 @@ import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; -import de.tum.cit.aet.artemis.repository.DragAndDropMappingRepository; -import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; -import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.ShortAnswerMappingRepository; +import de.tum.cit.aet.artemis.quiz.repository.DragAndDropMappingRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; +import de.tum.cit.aet.artemis.quiz.repository.ShortAnswerMappingRepository; import de.tum.cit.aet.artemis.service.ExerciseSpecificationService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizPoolService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizPoolService.java index 947c8e27faff..e34e654ed7af 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizPoolService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizPoolService.java @@ -22,11 +22,11 @@ import de.tum.cit.aet.artemis.domain.quiz.QuizGroup; import de.tum.cit.aet.artemis.domain.quiz.QuizPool; import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; -import de.tum.cit.aet.artemis.repository.DragAndDropMappingRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.QuizGroupRepository; -import de.tum.cit.aet.artemis.repository.QuizPoolRepository; -import de.tum.cit.aet.artemis.repository.ShortAnswerMappingRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.quiz.repository.DragAndDropMappingRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizGroupRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizPoolRepository; +import de.tum.cit.aet.artemis.quiz.repository.ShortAnswerMappingRepository; import de.tum.cit.aet.artemis.service.exam.ExamQuizQuestionsGenerator; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizResultService.java index 24675a6bc4b7..93723648461b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizResultService.java @@ -15,6 +15,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; @@ -22,11 +23,10 @@ import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; -import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.SubmittedAnswerRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizScheduleService.java index 84904c0b0ceb..ef04ed5fc2f3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizScheduleService.java @@ -23,8 +23,8 @@ import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.repository.QuizBatchRepository; -import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizBatchRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.scheduled.ScheduleService; import de.tum.cit.aet.artemis.service.util.Tuple; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizService.java index 760c1edb7690..fca7d96c7489 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizService.java @@ -25,8 +25,8 @@ import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerMapping; import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestionStatistic; -import de.tum.cit.aet.artemis.repository.DragAndDropMappingRepository; -import de.tum.cit.aet.artemis.repository.ShortAnswerMappingRepository; +import de.tum.cit.aet.artemis.quiz.repository.DragAndDropMappingRepository; +import de.tum.cit.aet.artemis.quiz.repository.ShortAnswerMappingRepository; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizStatisticService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizStatisticService.java index 0aab6b9ceaed..77e85ccad59e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizStatisticService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizStatisticService.java @@ -12,17 +12,17 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.domain.quiz.QuizPointStatistic; import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; import de.tum.cit.aet.artemis.domain.quiz.QuizQuestionStatistic; -import de.tum.cit.aet.artemis.repository.QuizPointStatisticRepository; -import de.tum.cit.aet.artemis.repository.QuizQuestionStatisticRepository; -import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizPointStatisticRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizQuestionStatisticRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.connectors.lti.LtiNewResultService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizSubmissionService.java index 5e69baebcccc..b8663f94f219 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizSubmissionService.java @@ -11,6 +11,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.exception.QuizSubmissionException; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.User; @@ -25,10 +26,9 @@ import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; -import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; -import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.service.AbstractQuizSubmissionService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.SubmissionVersionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AthenaScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AthenaScheduleService.java index 7bf2a361a3d4..8ab4802efe86 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AthenaScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AthenaScheduleService.java @@ -23,7 +23,7 @@ import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.ExerciseLifecycleService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.connectors.athena.AthenaSubmissionSendingService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AutomaticProgrammingExerciseCleanupService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AutomaticProgrammingExerciseCleanupService.java index 2dfbfcf8cba2..77a728234e5f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AutomaticProgrammingExerciseCleanupService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AutomaticProgrammingExerciseCleanupService.java @@ -23,8 +23,8 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.connectors.GitService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleService.java index 3c3d1e8dd7e7..7a5f4a18d700 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleService.java @@ -16,10 +16,10 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.repository.DataExportRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.DataExport; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.DataExportRepository; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.export.DataExportCreationService; import de.tum.cit.aet.artemis.service.export.DataExportService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ModelingExerciseScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ModelingExerciseScheduleService.java index c02bdf5618a7..3185d6d048ac 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ModelingExerciseScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ModelingExerciseScheduleService.java @@ -28,7 +28,7 @@ import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.service.compass.CompassService; import de.tum.cit.aet.artemis.service.exam.ExamDateService; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/NotificationScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/NotificationScheduleService.java index 9fd7d8816bf8..e3ea32615c64 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/NotificationScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/NotificationScheduleService.java @@ -19,7 +19,7 @@ import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ParticipantScoreScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ParticipantScoreScheduleService.java index 098a11e65366..8f755dce6768 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ParticipantScoreScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ParticipantScoreScheduleService.java @@ -28,6 +28,11 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; +import de.tum.cit.aet.artemis.assessment.repository.TeamScoreRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Result; @@ -38,13 +43,8 @@ import de.tum.cit.aet.artemis.domain.scores.ParticipantScore; import de.tum.cit.aet.artemis.domain.scores.StudentScore; import de.tum.cit.aet.artemis.domain.scores.TeamScore; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.ParticipantScoreRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentScoreRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; -import de.tum.cit.aet.artemis.repository.TeamScoreRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.service.util.RoundingUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ProgrammingExerciseScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ProgrammingExerciseScheduleService.java index d99820e3932d..5fa138a73acc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ProgrammingExerciseScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ProgrammingExerciseScheduleService.java @@ -34,6 +34,7 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; @@ -45,13 +46,12 @@ import de.tum.cit.aet.artemis.domain.exam.StudentExam; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.service.exam.ExamDateService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupService.java index 0dd437ef4419..9a6a969fec3c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupService.java @@ -10,7 +10,7 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.repository.PushNotificationDeviceConfigurationRepository; +import de.tum.cit.aet.artemis.communication.repository.PushNotificationDeviceConfigurationRepository; import tech.jhipster.config.JHipsterConstants; @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/UserScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/UserScheduleService.java index d293ae7918b7..b3ca8ff77674 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/UserScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/UserScheduleService.java @@ -18,8 +18,8 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.exception.VersionControlException; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/science/ScienceEventService.java b/src/main/java/de/tum/cit/aet/artemis/service/science/ScienceEventService.java index 0e5c52bee539..f22f20a0ad67 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/science/ScienceEventService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/science/ScienceEventService.java @@ -9,8 +9,8 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.repository.science.ScienceEventRepository; import de.tum.cit.aet.artemis.domain.science.ScienceEvent; -import de.tum.cit.aet.artemis.repository.science.ScienceEventRepository; import de.tum.cit.aet.artemis.web.rest.dto.science.ScienceEventDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/team/TeamImportStrategy.java b/src/main/java/de/tum/cit/aet/artemis/service/team/TeamImportStrategy.java index 2c7a1defa4f3..080f89149710 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/team/TeamImportStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/team/TeamImportStrategy.java @@ -6,7 +6,7 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; public abstract class TeamImportStrategy { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/team/strategies/CreateOnlyStrategy.java b/src/main/java/de/tum/cit/aet/artemis/service/team/strategies/CreateOnlyStrategy.java index f00240ff0ecd..e174ef647ed5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/team/strategies/CreateOnlyStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/team/strategies/CreateOnlyStrategy.java @@ -9,7 +9,7 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.service.team.TeamImportStrategy; public class CreateOnlyStrategy extends TeamImportStrategy { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/team/strategies/PurgeExistingStrategy.java b/src/main/java/de/tum/cit/aet/artemis/service/team/strategies/PurgeExistingStrategy.java index 4000b29f3485..a0547ed6ed6a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/team/strategies/PurgeExistingStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/team/strategies/PurgeExistingStrategy.java @@ -4,7 +4,7 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.team.TeamImportStrategy; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupChannelManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupChannelManagementService.java index bd3b83c8ed8b..200f81bdaec6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupChannelManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupChannelManagementService.java @@ -14,16 +14,16 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupRegistration; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRegistrationRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRepository; import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRegistrationRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; /** * Service for managing the channel connected to a tutorial group. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupFreePeriodService.java b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupFreePeriodService.java index 8302c5e6f0fa..7297f246f02e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupFreePeriodService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupFreePeriodService.java @@ -13,8 +13,8 @@ import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupFreePeriodRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupSessionRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupFreePeriodRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupSessionRepository; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupScheduleService.java index 134f2b8c9e34..d3cc2d13d181 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupScheduleService.java @@ -25,8 +25,8 @@ import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSchedule; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupScheduleRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupSessionRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupScheduleRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupSessionRepository; import de.tum.cit.aet.artemis.web.rest.tutorialgroups.errors.ScheduleOverlapsWithSessionException; import de.tum.cit.aet.artemis.web.rest.util.DateUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupService.java b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupService.java index b2fb522ce0f9..1180510fd646 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupService.java @@ -33,6 +33,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.Language; @@ -41,14 +42,13 @@ import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupRegistration; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRegistrationRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupSessionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationDTOService; import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRegistrationRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupSessionRepository; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupResource.TutorialGroupImportErrors; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupsConfigurationService.java b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupsConfigurationService.java index 684aadf5bd36..2ff4bc462698 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupsConfigurationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupsConfigurationService.java @@ -14,9 +14,9 @@ import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSchedule; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupFreePeriodRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupScheduleRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupSessionRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupFreePeriodRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupScheduleRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupSessionRepository; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/user/AuthorityService.java b/src/main/java/de/tum/cit/aet/artemis/service/user/AuthorityService.java index 8e013188a8fc..9801f9323c7d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/user/AuthorityService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/user/AuthorityService.java @@ -15,9 +15,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.domain.Authority; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.CourseRepository; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/user/UserCreationService.java b/src/main/java/de/tum/cit/aet/artemis/service/user/UserCreationService.java index f2f9eee789ec..1d8d4c8ee93e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/user/UserCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/user/UserCreationService.java @@ -24,14 +24,14 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.repository.AuthorityRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.OrganizationRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Authority; import de.tum.cit.aet.artemis.domain.Organization; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.AuthorityRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.OrganizationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/user/UserService.java b/src/main/java/de/tum/cit/aet/artemis/service/user/UserService.java index dcc1960223e5..bc525f67d511 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/user/UserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/user/UserService.java @@ -38,18 +38,18 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; +import de.tum.cit.aet.artemis.atlas.repository.science.ScienceEventRepository; import de.tum.cit.aet.artemis.core.exception.AccountRegistrationBlockedException; import de.tum.cit.aet.artemis.core.exception.UsernameAlreadyUsedException; import de.tum.cit.aet.artemis.core.exception.VersionControlException; +import de.tum.cit.aet.artemis.core.repository.AuthorityRepository; +import de.tum.cit.aet.artemis.core.repository.GuidedTourSettingsRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Authority; import de.tum.cit.aet.artemis.domain.GuidedTourSetting; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.participation.ParticipationVCSAccessToken; -import de.tum.cit.aet.artemis.repository.AuthorityRepository; -import de.tum.cit.aet.artemis.repository.GuidedTourSettingsRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.science.ScienceEventRepository; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ParticipationVcsAccessTokenService; diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/TextExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/text/repository/TextExerciseRepository.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/repository/TextExerciseRepository.java rename to src/main/java/de/tum/cit/aet/artemis/text/repository/TextExerciseRepository.java index eec0b6470fc6..5224204bb223 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/TextExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/repository/TextExerciseRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.text.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -15,8 +15,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the TextExercise entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/TextSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/text/repository/TextSubmissionRepository.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/repository/TextSubmissionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/text/repository/TextSubmissionRepository.java index 36580f7019f0..03340de8f3ba 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/TextSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/repository/TextSubmissionRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.text.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; @@ -12,8 +12,8 @@ import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.TextSubmission; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the TextSubmission entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupFreePeriodRepository.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupFreePeriodRepository.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupFreePeriodRepository.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupFreePeriodRepository.java index c054b2fc44f6..3bf6ab48b3d6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupFreePeriodRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupFreePeriodRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -11,9 +11,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupNotificationRepository.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupNotificationRepository.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupNotificationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupNotificationRepository.java index a2a57857f7e8..deae88679547 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupNotificationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupNotificationRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -7,8 +7,8 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.notification.TutorialGroupNotification; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupRegistrationRepository.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupRegistrationRepository.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupRegistrationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupRegistrationRepository.java index 7c93f7720726..6dfb19a1cfe7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupRegistrationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupRegistrationRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -12,12 +12,12 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupRegistration; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupRepository.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupRepository.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupRepository.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupRepository.java index 590f5ac9c3e4..db9f13bf5a43 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -12,10 +12,10 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupScheduleRepository.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupScheduleRepository.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupScheduleRepository.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupScheduleRepository.java index 9b9d71775696..e1f13f1d98c5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupScheduleRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupScheduleRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -10,9 +10,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSchedule; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupSessionRepository.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupSessionRepository.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupSessionRepository.java index 84c1fc3a8d10..c0adae9259db 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupSessionRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -13,12 +13,12 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSchedule; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupsConfigurationRepository.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupsConfigurationRepository.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupsConfigurationRepository.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupsConfigurationRepository.java index 8b076774820f..c535fed7c234 100644 --- a/src/main/java/de/tum/cit/aet/artemis/repository/tutorialgroups/TutorialGroupsConfigurationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupsConfigurationRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AbstractSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AbstractSubmissionResource.java index bab42098bbc8..07be1b973a4e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AbstractSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AbstractSubmissionResource.java @@ -4,14 +4,14 @@ import org.springframework.http.ResponseEntity; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.SubmissionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AccountResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AccountResource.java index 4eecf36d5a65..d4b9889865ca 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AccountResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AccountResource.java @@ -31,10 +31,10 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.programming.icl.ssh.HashUtils; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.AccountService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonDiagramResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonDiagramResource.java index c3d531a73bc2..d6d41a06c032 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonDiagramResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonDiagramResource.java @@ -20,14 +20,14 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.modeling.ApollonDiagram; -import de.tum.cit.aet.artemis.repository.ApollonDiagramRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.modeling.repository.ApollonDiagramRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AssessmentResource.java index 2f5acc8068db..00148a6f0ab7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AssessmentResource.java @@ -7,6 +7,9 @@ import org.springframework.http.ResponseEntity; import org.springframework.util.StringUtils; +import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -17,11 +20,8 @@ import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.participation.Participation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.service.AssessmentService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AthenaResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AthenaResource.java index ec03a1cf21ba..1a5ca4638868 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AthenaResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AthenaResource.java @@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.exception.NetworkingException; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; @@ -28,13 +29,10 @@ import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ModelingSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; -import de.tum.cit.aet.artemis.repository.TextExerciseRepository; -import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.connectors.athena.AthenaFeedbackSuggestionsService; import de.tum.cit.aet.artemis.service.connectors.athena.AthenaModuleService; @@ -42,6 +40,8 @@ import de.tum.cit.aet.artemis.service.dto.athena.ModelingFeedbackDTO; import de.tum.cit.aet.artemis.service.dto.athena.ProgrammingFeedbackDTO; import de.tum.cit.aet.artemis.service.dto.athena.TextFeedbackDTO; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; import de.tum.cit.aet.artemis.web.rest.util.ResponseUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AttachmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AttachmentResource.java index b1236c99fe86..a44b8ffab15e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AttachmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AttachmentResource.java @@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; @@ -34,8 +35,7 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; -import de.tum.cit.aet.artemis.repository.AttachmentRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/BonusResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/BonusResource.java index 8a3faca1b6ba..e33fb9119f75 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/BonusResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/BonusResource.java @@ -21,6 +21,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.repository.BonusRepository; +import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; @@ -30,9 +33,6 @@ import de.tum.cit.aet.artemis.domain.BonusStrategy; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.repository.BonusRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.BonusService; import de.tum.cit.aet.artemis.service.CourseScoreCalculationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResource.java index d0ba8726db4b..3738354822d6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResource.java @@ -21,6 +21,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; @@ -42,11 +46,7 @@ import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ComplaintService; import de.tum.cit.aet.artemis.service.dto.ComplaintRequestDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResponseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResponseResource.java index 1c843a31f086..20ead88a42cc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResponseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResponseResource.java @@ -17,12 +17,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.Complaint; import de.tum.cit.aet.artemis.domain.ComplaintResponse; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.ComplaintResponseService; import de.tum.cit.aet.artemis.service.dto.ComplaintAction; import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ConsistencyCheckResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ConsistencyCheckResource.java index d5fff21edb74..c98f38afa417 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ConsistencyCheckResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ConsistencyCheckResource.java @@ -16,7 +16,7 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ConsistencyCheckService; import de.tum.cit.aet.artemis.service.dto.ConsistencyErrorDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java index 71584c58bbfc..32e26840473e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java @@ -56,7 +56,11 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; @@ -72,13 +76,9 @@ import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; import de.tum.cit.aet.artemis.domain.participation.Participant; import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.GradingScaleRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; -import de.tum.cit.aet.artemis.repository.TutorParticipationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.service.AssessmentDashboardService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ComplaintService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java index 1557cee2a4bf..3a5e8084620f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java @@ -23,11 +23,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.repository.DataExportRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.DataExport; import de.tum.cit.aet.artemis.domain.enumeration.DataExportState; -import de.tum.cit.aet.artemis.repository.DataExportRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.export.DataExportService; import de.tum.cit.aet.artemis.web.rest.dto.DataExportDTO; import de.tum.cit.aet.artemis.web.rest.dto.RequestDataExportDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java index 9e242fb39aa3..477b439cf2a3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java @@ -50,7 +50,12 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.CustomAuditEventRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; @@ -67,13 +72,8 @@ import de.tum.cit.aet.artemis.domain.exam.SuspiciousSessionsAnalysisOptions; import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.CustomAuditEventRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.TutorParticipationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.AssessmentDashboardService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.SubmissionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java index 7270c05aebc7..ffe0ec5a0c69 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java @@ -19,12 +19,12 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.exam.ExamUser; -import de.tum.cit.aet.artemis.repository.ExamUserRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.exam.ExamAccessService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java index cceb2d59ff64..03f94bb1fd21 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java @@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; @@ -30,12 +31,11 @@ import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; -import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExampleSubmissionService; import de.tum.cit.aet.artemis.service.TextBlockService; +import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java index 5a5e526e5b37..44a766cea3b7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java @@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; @@ -32,9 +33,8 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExerciseGroupRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; import de.tum.cit.aet.artemis.service.ExerciseDeletionService; import de.tum.cit.aet.artemis.service.exam.ExamAccessService; import de.tum.cit.aet.artemis.service.exam.ExamImportService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java index 8dd1854dff53..70cce751414b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java @@ -21,6 +21,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; @@ -38,12 +41,9 @@ import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDeletionService; import de.tum.cit.aet.artemis.service.ExerciseService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseScoresChartResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseScoresChartResource.java index f71f5d77899a..ee1329a43e31 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseScoresChartResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseScoresChartResource.java @@ -15,13 +15,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.ExerciseScoresChartService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java index 2435a8004123..58add8445ec0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java @@ -39,6 +39,8 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; @@ -60,16 +62,14 @@ import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; import de.tum.cit.aet.artemis.domain.quiz.DragItem; -import de.tum.cit.aet.artemis.repository.AttachmentRepository; -import de.tum.cit.aet.artemis.repository.AttachmentUnitRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.DragItemRepository; -import de.tum.cit.aet.artemis.repository.ExamUserRepository; -import de.tum.cit.aet.artemis.repository.FileUploadSubmissionRepository; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.QuizQuestionRepository; -import de.tum.cit.aet.artemis.repository.SlideRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; +import de.tum.cit.aet.artemis.fileupload.repository.FileUploadSubmissionRepository; +import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; +import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.repository.SlideRepository; +import de.tum.cit.aet.artemis.quiz.repository.DragItemRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizQuestionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java index 474a11eed7cc..a0e580ce66e3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java @@ -17,6 +17,9 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; @@ -26,13 +29,10 @@ import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.FileUploadExerciseRepository; -import de.tum.cit.aet.artemis.repository.FileUploadSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; +import de.tum.cit.aet.artemis.fileupload.repository.FileUploadSubmissionRepository; import de.tum.cit.aet.artemis.service.AssessmentService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java index 217b22909b52..b99ebaa985da 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java @@ -26,6 +26,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; @@ -36,12 +40,8 @@ import de.tum.cit.aet.artemis.domain.GradingCriterion; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.FileUploadExerciseRepository; -import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.ExerciseDeletionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java index 9338da7a3fc5..db190cfc7750 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java @@ -26,8 +26,10 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.server.ResponseStatusException; +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.exception.EmptyFileException; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; @@ -39,13 +41,11 @@ import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.FileUploadExerciseRepository; -import de.tum.cit.aet.artemis.repository.FileUploadSubmissionRepository; -import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; +import de.tum.cit.aet.artemis.fileupload.repository.FileUploadSubmissionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.FileUploadSubmissionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/GradeStepResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/GradeStepResource.java index a91eaa24540a..01b7c8604ed7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/GradeStepResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/GradeStepResource.java @@ -15,6 +15,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.repository.GradeStepRepository; +import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; @@ -24,13 +28,9 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.GradeStepRepository; -import de.tum.cit.aet.artemis.repository.GradingScaleRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.dto.GradeDTO; import de.tum.cit.aet.artemis.web.rest.dto.GradeStepsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/GradingScaleResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/GradingScaleResource.java index b89e7bfc3729..3497115509af 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/GradingScaleResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/GradingScaleResource.java @@ -23,15 +23,15 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.GradingScale; import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.GradingScaleRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.GradingScaleService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java index cacbc9f158a3..6a5382528862 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java @@ -24,15 +24,15 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.atlas.repository.LearningPathRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.competency.LearningPath; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.LearningPathRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.LearningObjectService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java index 406f1a6a0c03..72703fb89e08 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java @@ -26,6 +26,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; @@ -38,10 +41,7 @@ import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.service.LectureImportService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java index 0d13afd1c2d4..f4edcaa9b5c3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java @@ -12,11 +12,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.repository.LongFeedbackTextRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.LongFeedbackText; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.repository.LongFeedbackTextRepository; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java index 09003ca33bbb..2790bd6fe0c4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java @@ -25,12 +25,12 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.nimbusds.jwt.SignedJWT; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; +import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.connectors.lti.LtiDeepLinkingService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/MetricsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/MetricsResource.java index 984de8174ef1..1f542d574357 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/MetricsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/MetricsResource.java @@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.metrics.LearningMetricsService; import de.tum.cit.aet.artemis.web.rest.dto.metrics.StudentMetricsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java index 303dd35283ee..5a533d58b03a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java @@ -20,6 +20,9 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; @@ -30,13 +33,10 @@ import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ModelingSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; import de.tum.cit.aet.artemis.service.AssessmentService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java index 4d56bd93b9a9..cc392907a90d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java @@ -27,6 +27,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; @@ -38,13 +42,9 @@ import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.ExerciseDeletionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java index 7465ec90432c..6bb1e248c221 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java @@ -26,6 +26,8 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; @@ -36,13 +38,11 @@ import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ModelingSubmissionRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ModelingSubmissionService; import de.tum.cit.aet.artemis.service.ResultService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationResource.java index 83c67f74ed87..30f19f1eea01 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationResource.java @@ -21,12 +21,12 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import de.tum.cit.aet.artemis.communication.repository.NotificationRepository; +import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.notification.Notification; -import de.tum.cit.aet.artemis.repository.NotificationRepository; -import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel; import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService; import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java index 8c21fe357c09..157b996880de 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java @@ -20,11 +20,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.NotificationSetting; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/OrganizationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/OrganizationResource.java index afeaff4ae33c..08237bd09a88 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/OrganizationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/OrganizationResource.java @@ -14,9 +14,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.repository.OrganizationRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.Organization; -import de.tum.cit.aet.artemis.repository.OrganizationRepository; /** * REST controller for managing the Organization entities diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java index 37d6bf76c901..7fd2e33f5245 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java @@ -13,12 +13,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipantScoreService; import de.tum.cit.aet.artemis.web.rest.dto.score.ScoreDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java index daba16ac2987..70a0e98a9960 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java @@ -41,8 +41,11 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ResponseStatusException; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.config.GuidedTourConfiguration; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; @@ -69,17 +72,14 @@ import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.SubmittedAnswerRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.GradingScaleService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java index 5c3c19b8e6fd..47b036b13c55 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java @@ -38,9 +38,11 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; import de.tum.cit.aet.artemis.core.exception.QuizJoinException; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; @@ -58,11 +60,9 @@ import de.tum.cit.aet.artemis.domain.quiz.DragItem; import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.repository.QuizBatchRepository; -import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizBatchRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.ExerciseDeletionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java index fac8acebd167..c180c6221b9c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java @@ -18,17 +18,17 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; -import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; -import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.SubmittedAnswerRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; +import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.quiz.QuizBatchService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java index c046731cd3fe..d78334c5f9cc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java @@ -14,11 +14,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.quiz.QuizPool; -import de.tum.cit.aet.artemis.repository.CourseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.exam.ExamAccessService; import de.tum.cit.aet.artemis.service.quiz.QuizPoolService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java index 6ba77c8919db..e8797803b964 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java @@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.exception.QuizSubmissionException; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; @@ -33,9 +34,8 @@ import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; -import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.exam.ExamSubmissionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java index db87046fb016..76da1a10b72a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java @@ -19,6 +19,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; @@ -27,9 +30,6 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.RatingService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java index 0c4e77d72995..f3a314b3e297 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java @@ -25,6 +25,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; @@ -41,11 +43,9 @@ import de.tum.cit.aet.artemis.domain.participation.Participation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java index ed5c45594eef..5e7783e961e3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java @@ -22,8 +22,8 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisCategory; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.StaticCodeAnalysisCategoryRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/StatisticsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/StatisticsResource.java index 15b132b82944..8d2b2080bb9a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/StatisticsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/StatisticsResource.java @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.Course; @@ -18,8 +19,7 @@ import de.tum.cit.aet.artemis.domain.enumeration.GraphType; import de.tum.cit.aet.artemis.domain.enumeration.SpanType; import de.tum.cit.aet.artemis.domain.enumeration.StatisticsView; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.StatisticsService; import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementStatisticsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java index 400cccb427be..9029090a8a45 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java @@ -36,6 +36,7 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.DomainObject; @@ -47,13 +48,12 @@ import de.tum.cit.aet.artemis.domain.exam.StudentExam; import de.tum.cit.aet.artemis.domain.exam.event.ExamLiveEvent; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ExamLiveEventRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionPolicyRepository; -import de.tum.cit.aet.artemis.repository.SubmittedAnswerRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamLiveEventRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.SubmissionPolicyRepository; +import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.exam.ExamAccessService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java index 3d5ebbf53710..408917a07ff7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java @@ -27,8 +27,8 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.service.SubmissionPolicyService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java index 05f11855bf57..a541a5a2a864 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; @@ -29,12 +30,11 @@ import de.tum.cit.aet.artemis.domain.SubmissionVersion; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.repository.BuildLogStatisticsEntryRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.SubmissionVersionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionVersionRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.service.ResultService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/SystemNotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/SystemNotificationResource.java index 93c725086146..3854f4769841 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/SystemNotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/SystemNotificationResource.java @@ -19,10 +19,10 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import de.tum.cit.aet.artemis.communication.repository.SystemNotificationRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.notification.SystemNotification; -import de.tum.cit.aet.artemis.repository.SystemNotificationRepository; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.PaginationUtil; import tech.jhipster.web.util.ResponseUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java index 9c7683723adb..af726439786b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java @@ -34,7 +34,10 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ResponseStatusException; +import de.tum.cit.aet.artemis.assessment.repository.TeamScoreRepository; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; @@ -47,12 +50,9 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.TeamImportStrategyType; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; -import de.tum.cit.aet.artemis.repository.TeamScoreRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.SubmissionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentEventResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentEventResource.java index f812e12799e2..3d8aa7a3e635 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentEventResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentEventResource.java @@ -18,6 +18,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.repository.TextAssessmentEventRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; @@ -26,11 +29,8 @@ import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.analytics.TextAssessmentEvent; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.TextAssessmentEventRepository; -import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; /** * REST controller for managing TextAssessmentEventResource. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java index b408f6897801..7a24708a48a0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java @@ -29,6 +29,11 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; @@ -45,21 +50,16 @@ import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.participation.Participation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.TextExerciseRepository; -import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.service.TextAssessmentService; import de.tum.cit.aet.artemis.service.TextBlockService; import de.tum.cit.aet.artemis.service.TextSubmissionService; import de.tum.cit.aet.artemis.service.connectors.athena.AthenaFeedbackSendingService; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.web.rest.dto.TextAssessmentDTO; import de.tum.cit.aet.artemis.web.rest.dto.TextAssessmentUpdateDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java index 56bfb61fecd3..2ceea0a203c3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java @@ -29,6 +29,14 @@ import org.springframework.web.bind.annotation.RestController; import de.jplag.exceptions.ExitException; +import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.repository.TextBlockRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; @@ -48,18 +56,9 @@ import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; -import de.tum.cit.aet.artemis.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.TextBlockRepository; -import de.tum.cit.aet.artemis.repository.TextExerciseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.ExerciseDateService; @@ -78,6 +77,7 @@ import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionConfigHelper; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionService; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java index 9a175743450f..f3deb9996a4f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java @@ -22,6 +22,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; @@ -31,19 +33,17 @@ import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.TextExerciseRepository; -import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.service.TextAssessmentService; import de.tum.cit.aet.artemis.service.TextSubmissionService; import de.tum.cit.aet.artemis.service.exam.ExamSubmissionService; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismService; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorEffortResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorEffortResource.java index b65d4570c764..06ae8e1d075f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorEffortResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorEffortResource.java @@ -13,15 +13,15 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.statistics.tutor.effort.TutorEffort; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.TutorEffortService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java index f75c2cc24cbf..db208f07bea4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java @@ -17,16 +17,16 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.core.config.GuidedTourConfiguration; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.ExampleSubmission; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.TutorParticipationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.TutorParticipationService; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/UserResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/UserResource.java index 37f694f84136..39888ab60178 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/UserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/UserResource.java @@ -23,10 +23,10 @@ import org.springframework.web.server.ResponseStatusException; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.connectors.lti.LtiService; import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.service.dto.UserInitializationDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java index e87b49232e38..ef806379d7c1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java @@ -25,6 +25,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; +import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; @@ -33,10 +37,6 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.competency.Competency; import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.repository.CompetencyRepository; -import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.LectureUnitService; import de.tum.cit.aet.artemis.service.competency.CompetencyService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java index e0443fc1cb57..234816c45e37 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java @@ -26,6 +26,11 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; +import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; @@ -36,11 +41,6 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.repository.CompetencyProgressRepository; -import de.tum.cit.aet.artemis.repository.CompetencyRelationRepository; -import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.competency.CompetencyJolService; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java index eb70e25c4df2..18d7131dcf99 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java @@ -25,6 +25,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; @@ -33,10 +37,6 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.domain.competency.Prerequisite; -import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.PrerequisiteRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.LectureUnitService; import de.tum.cit.aet.artemis.service.competency.CourseCompetencyService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/StandardizedCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/StandardizedCompetencyResource.java index 39126085f6b1..4d1be76f1e52 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/StandardizedCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/StandardizedCompetencyResource.java @@ -13,12 +13,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.atlas.repository.SourceRepository; +import de.tum.cit.aet.artemis.atlas.repository.competency.KnowledgeAreaRepository; +import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.domain.competency.KnowledgeArea; import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; -import de.tum.cit.aet.artemis.repository.SourceRepository; -import de.tum.cit.aet.artemis.repository.competency.KnowledgeAreaRepository; -import de.tum.cit.aet.artemis.repository.competency.StandardizedCompetencyRepository; import de.tum.cit.aet.artemis.service.competency.StandardizedCompetencyService; import de.tum.cit.aet.artemis.service.feature.Feature; import de.tum.cit.aet.artemis.service.feature.FeatureToggle; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CodeHintResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CodeHintResource.java index 8a638a0ad4e7..3dd8371c1c44 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CodeHintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CodeHintResource.java @@ -23,9 +23,9 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettingsType; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.hestia.CodeHintRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.CodeHintRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; import de.tum.cit.aet.artemis.service.hestia.CodeHintService; import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ExerciseHintResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ExerciseHintResource.java index 7d974840e042..c78e83fdbd8f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ExerciseHintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ExerciseHintResource.java @@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; @@ -28,10 +29,9 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.domain.hestia.ExerciseHint; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.hestia.ExerciseHintRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintRepository; import de.tum.cit.aet.artemis.service.hestia.CodeHintService; import de.tum.cit.aet.artemis.service.hestia.ExerciseHintService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java index f18627a917f8..946a8b1dac84 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java @@ -24,9 +24,9 @@ import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseGitDiffReportService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java index 6c6d53a0af7c..d6c293b9be93 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java @@ -29,10 +29,10 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.repository.hestia.CodeHintRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.CodeHintRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralSolutionEntryGenerationException; import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralTestCaseService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java index f11868bc93f1..f1b3836ad22a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java @@ -17,7 +17,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisCourseChatSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisCourseChatSessionResource.java index f8b63800f7f0..caa2a391ac87 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisCourseChatSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisCourseChatSessionResource.java @@ -12,12 +12,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; import de.tum.cit.aet.artemis.domain.iris.session.IrisCourseChatSession; import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettingsType; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.iris.IrisCourseChatSessionRepository; +import de.tum.cit.aet.artemis.iris.repository.IrisCourseChatSessionRepository; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisHealthIndicator; import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; import de.tum.cit.aet.artemis.service.iris.IrisSessionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisExerciseChatSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisExerciseChatSessionResource.java index 8de3e3bf51b0..2cc5b7fbc434 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisExerciseChatSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisExerciseChatSessionResource.java @@ -13,14 +13,14 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.iris.session.IrisExerciseChatSession; import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettingsType; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.iris.IrisExerciseChatSessionRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.iris.repository.IrisExerciseChatSessionRepository; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisHealthIndicator; import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; import de.tum.cit.aet.artemis.service.iris.IrisSessionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisMessageResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisMessageResource.java index f08eb114b6e5..b3286c3cff93 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisMessageResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisMessageResource.java @@ -17,13 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; import de.tum.cit.aet.artemis.domain.iris.message.IrisMessageSender; import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.iris.IrisMessageRepository; -import de.tum.cit.aet.artemis.repository.iris.IrisSessionRepository; +import de.tum.cit.aet.artemis.iris.repository.IrisMessageRepository; +import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; import de.tum.cit.aet.artemis.service.iris.IrisMessageService; import de.tum.cit.aet.artemis.service.iris.IrisSessionService; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisResource.java index bfa3fb716995..b78164d94017 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisResource.java @@ -7,8 +7,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisHealthIndicator; import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisSettingsResource.java index ba24f225db66..723c5fb3223d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisSettingsResource.java @@ -9,6 +9,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; @@ -16,9 +18,7 @@ import de.tum.cit.aet.artemis.domain.iris.settings.IrisCourseSettings; import de.tum.cit.aet.artemis.domain.iris.settings.IrisExerciseSettings; import de.tum.cit.aet.artemis.domain.iris.settings.IrisSettings; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedSettingsDTO; import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java index e9f191c9aa50..cc1f2f352411 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java @@ -34,8 +34,8 @@ import de.tum.cit.aet.artemis.domain.Attachment; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; -import de.tum.cit.aet.artemis.repository.AttachmentUnitRepository; -import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.AttachmentUnitService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/ExerciseUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/ExerciseUnitResource.java index 941918b2e32b..d4d507884f65 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/ExerciseUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/ExerciseUnitResource.java @@ -23,8 +23,8 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; -import de.tum.cit.aet.artemis.repository.ExerciseUnitRepository; -import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.repository.ExerciseUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java index 391fe3f6647b..5fc7eeb73989 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java @@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; @@ -29,9 +30,8 @@ import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.LectureUnitRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.LectureUnitService; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java index 9cfda1e3279d..85dcbd96f017 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java @@ -32,8 +32,8 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.lecture.OnlineUnit; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.OnlineUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.repository.OnlineUnitRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.LectureUnitService; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java index 1bc3e2ab786b..981ee2b142ad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java @@ -22,8 +22,8 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.lecture.TextUnit; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.TextUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java index cffa44355e88..54d4444b2897 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java @@ -24,8 +24,8 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.lecture.VideoUnit; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.VideoUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.repository.VideoUnitRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.LectureUnitService; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildJobQueueResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildJobQueueResource.java index aafa3778afa7..08e3ed9c3b1f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildJobQueueResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildJobQueueResource.java @@ -20,12 +20,12 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.cit.aet.artemis.domain.BuildJob; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.repository.BuildJobRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.connectors.localci.SharedQueueManagementService; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildPlanResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildPlanResource.java index 27d620bcb726..5f0c9b509ea5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildPlanResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildPlanResource.java @@ -15,8 +15,8 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.domain.BuildPlan; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.repository.BuildPlanRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.programming.ProgrammingTriggerService; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java index 9e212dfa39c1..19774d951749 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java @@ -28,13 +28,13 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; import de.tum.cit.aet.artemis.domain.metis.CreatedConversationMessage; import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.metis.ConversationMessagingService; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java index e869301e7c72..5c64b8cde7c2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java @@ -30,16 +30,16 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationDTOService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationManagementResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationManagementResource.java index 1bbf3cc29e7c..5dd1307425ba 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationManagementResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationManagementResource.java @@ -3,9 +3,9 @@ import org.springframework.http.HttpStatus; import org.springframework.web.server.ResponseStatusException; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.cit.aet.artemis.repository.CourseRepository; public class ConversationManagementResource { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java index 4712c1421490..f4ee5d543d45 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java @@ -25,13 +25,13 @@ import org.springframework.web.server.ResponseStatusException; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ConductAgreementService; import de.tum.cit.aet.artemis.service.dto.ResponsibleUserDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/GroupChatResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/GroupChatResource.java index 78278da2e4fb..bffaf545560c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/GroupChatResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/GroupChatResource.java @@ -21,12 +21,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.communication.repository.conversation.GroupChatRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.GroupChatRepository; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationDTOService; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; import de.tum.cit.aet.artemis.service.metis.conversation.GroupChatService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/OneToOneChatResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/OneToOneChatResource.java index f98fdabd16b6..346370c03f07 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/OneToOneChatResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/OneToOneChatResource.java @@ -18,10 +18,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationDTOService; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; import de.tum.cit.aet.artemis.service.metis.conversation.OneToOneChatService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicAccountResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicAccountResource.java index 5e27278feb21..9d5dd608c95a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicAccountResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicAccountResource.java @@ -25,10 +25,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.AccountService; import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.service.notifications.MailService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicBuildPlanResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicBuildPlanResource.java index 2dc6675a1af6..0d4aa08e73ec 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicBuildPlanResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicBuildPlanResource.java @@ -13,7 +13,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.domain.BuildPlan; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicProgrammingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicProgrammingSubmissionResource.java index 6558f8cc82cb..423c438a78c5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicProgrammingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicProgrammingSubmissionResource.java @@ -24,7 +24,7 @@ import de.tum.cit.aet.artemis.domain.participation.Participation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.service.programming.ProgrammingMessagingService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java index 632e3ea5de3e..108703f73023 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java @@ -20,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; @@ -27,9 +29,7 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismDetectionConfig; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismCaseService; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java index 663280d4330e..70e65482aa41 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java @@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; @@ -26,11 +28,9 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismComparisonRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismService; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismComparisonStatusDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java index 0981890591e2..f9dbddaf94f4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java @@ -19,6 +19,9 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; @@ -27,13 +30,10 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.exam.ExamService; import de.tum.cit.aet.artemis.service.programming.ProgrammingAssessmentService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java index 86ab7723720c..c0c509909360 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java @@ -40,6 +40,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; @@ -53,11 +55,9 @@ import de.tum.cit.aet.artemis.domain.enumeration.Visibility; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.AuxiliaryRepositoryRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ConsistencyCheckService; import de.tum.cit.aet.artemis.service.CourseService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java index 0943bd30bd5e..734734d11798 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java @@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; @@ -21,9 +23,7 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseGradingService; import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseGradingStatisticsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java index 6cab80b38c5b..a24c7dc36358 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java @@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; @@ -33,11 +34,10 @@ import de.tum.cit.aet.artemis.domain.participation.Participation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.service.ResultService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java index 595bfa97e5d8..f2e062ab88e1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java @@ -24,8 +24,8 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.feature.Feature; import de.tum.cit.aet.artemis.service.feature.FeatureToggle; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java index 748a3abcef5d..b400cfd7bba1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java @@ -38,7 +38,11 @@ import com.fasterxml.jackson.core.JsonProcessingException; +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; @@ -54,16 +58,12 @@ import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.BuildLogStatisticsEntryRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.ExerciseDeletionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java index 8e1f81f09d39..87fb45171659 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java @@ -16,15 +16,15 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseService; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseTestCaseService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java index 7e59511a3eb3..d45d437c79a3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java @@ -21,6 +21,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; @@ -37,13 +39,11 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationResource.java index df63a0df145b..2a6ceff579d4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationResource.java @@ -24,14 +24,14 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.communication.repository.PushNotificationDeviceConfigurationRepository; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.jwt.TokenProvider; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfiguration; import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfigurationId; -import de.tum.cit.aet.artemis.repository.PushNotificationDeviceConfigurationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import io.jsonwebtoken.ExpiredJwtException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java index 4d162801b823..1e0a1935ad34 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java @@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ResponseStatusException; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.BuildLogEntry; @@ -42,11 +43,10 @@ import de.tum.cit.aet.artemis.domain.participation.Participation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionRepository; -import de.tum.cit.aet.artemis.repository.SubmissionPolicyRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.programming.repository.SubmissionPolicyRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryResource.java index f658e0652fb7..f4422b588b4b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryResource.java @@ -28,13 +28,13 @@ import org.springframework.web.server.ResponseStatusException; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.File; import de.tum.cit.aet.artemis.domain.FileType; import de.tum.cit.aet.artemis.domain.Repository; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.connectors.GitService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/TestRepositoryResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/TestRepositoryResource.java index 9052ae3a593d..6661191ba9ee 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/TestRepositoryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/TestRepositoryResource.java @@ -27,14 +27,14 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ResponseStatusException; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.FileType; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Repository; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.connectors.GitService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceSettingsResource.java index c5ebe3d917ba..6ccfae44ff87 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceSettingsResource.java @@ -20,11 +20,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.atlas.repository.science.ScienceSettingRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.science.ScienceSetting; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.science.ScienceSettingRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/settings/ide/IdeSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/settings/ide/IdeSettingsResource.java index 33c64060d00f..6ecbaba058e4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/settings/ide/IdeSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/settings/ide/IdeSettingsResource.java @@ -17,14 +17,14 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.settings.ide.Ide; import de.tum.cit.aet.artemis.domain.settings.ide.UserIdeMapping; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.settings.IdeRepository; -import de.tum.cit.aet.artemis.repository.settings.UserIdeMappingRepository; +import de.tum.cit.aet.artemis.programming.repository.settings.IdeRepository; +import de.tum.cit.aet.artemis.programming.repository.settings.UserIdeMappingRepository; import de.tum.cit.aet.artemis.web.rest.dto.settings.ide.IdeDTO; import de.tum.cit.aet.artemis.web.rest.dto.settings.ide.IdeMappingDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java index 836c5363bbdc..afa3ca4c5233 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java @@ -27,12 +27,12 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupFreePeriodRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupsConfigurationRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.feature.Feature; import de.tum.cit.aet.artemis.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupFreePeriodService; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupFreePeriodRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupsConfigurationRepository; import de.tum.cit.aet.artemis.web.rest.dto.TutorialGroupFreePeriodDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java index 9b1bb085f91f..dc6d0e0a85bd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java @@ -43,6 +43,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; @@ -53,11 +55,6 @@ import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSchedule; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupNotificationRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupsConfigurationRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.feature.Feature; @@ -67,6 +64,9 @@ import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupChannelManagementService; import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupScheduleService; import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupService; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupNotificationRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupsConfigurationRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java index 987c391c01dc..70dd4eb52341 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java @@ -43,15 +43,15 @@ import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupFreePeriodRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupScheduleRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupSessionRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupsConfigurationRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.feature.Feature; import de.tum.cit.aet.artemis.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupService; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupFreePeriodRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupScheduleRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupSessionRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupsConfigurationRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.tutorialgroups.errors.SessionOverlapsWithSessionException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java index f4b405958f89..9dc680fe193b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java @@ -23,16 +23,16 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupsConfigurationRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.feature.Feature; import de.tum.cit.aet.artemis.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupChannelManagementService; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupsConfigurationRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java index af43161bb126..24ba2ee98ca9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java @@ -19,7 +19,7 @@ import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.participation.Participation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/ParticipationTeamWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/ParticipationTeamWebsocketService.java index 68cbaf299dc7..8ef071a91069 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/ParticipationTeamWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/ParticipationTeamWebsocketService.java @@ -32,6 +32,7 @@ import com.hazelcast.core.HazelcastInstance; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Submission; @@ -41,9 +42,8 @@ import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.service.ModelingSubmissionService; import de.tum.cit.aet.artemis.service.TextSubmissionService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractArtemisIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractArtemisIntegrationTest.java index 57c802e022dd..9e7af8509d2b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractArtemisIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractArtemisIntegrationTest.java @@ -23,15 +23,15 @@ import org.springframework.mail.javamail.JavaMailSender; import org.springframework.test.context.junit.jupiter.SpringExtension; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.MockDelegate; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ModelingSubmissionService; import de.tum.cit.aet.artemis.service.TextBlockService; diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java index 4bbf3276428c..9493c0667966 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java @@ -26,7 +26,7 @@ import de.tum.cit.aet.artemis.domain.participation.AbstractBaseProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; +import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.service.exam.ExamLiveEventsService; import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java index 913d87b81573..12f58a360e0b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java @@ -36,12 +36,12 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.localvcci.LocalVCLocalCITestService; import de.tum.cit.aet.artemis.localvcci.TestBuildAgentConfiguration; -import de.tum.cit.aet.artemis.repository.BuildJobRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.service.ResourceLoaderService; import de.tum.cit.aet.artemis.service.connectors.localci.LocalCIService; import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCService; diff --git a/src/test/java/de/tum/cit/aet/artemis/BuildPlanIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/BuildPlanIntegrationTest.java index 5518bc61ede3..a92988dbe6ae 100644 --- a/src/test/java/de/tum/cit/aet/artemis/BuildPlanIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/BuildPlanIntegrationTest.java @@ -15,9 +15,9 @@ import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.cit.aet.artemis.repository.BuildPlanRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; class BuildPlanIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/FileIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/FileIntegrationTest.java index 4459ebd8fbce..986de9109b10 100644 --- a/src/test/java/de/tum/cit/aet/artemis/FileIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/FileIntegrationTest.java @@ -35,10 +35,10 @@ import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.lecture.LectureFactory; import de.tum.cit.aet.artemis.lecture.LectureUtilService; -import de.tum.cit.aet.artemis.repository.AttachmentRepository; -import de.tum.cit.aet.artemis.repository.AttachmentUnitRepository; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.LectureUnitCompletionRepository; +import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; +import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.web.rest.dto.ExamUserDTO; class FileIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/LtiQuizIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/LtiQuizIntegrationTest.java index d3d158f3c97d..2114441b415e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/LtiQuizIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/LtiQuizIntegrationTest.java @@ -36,9 +36,9 @@ import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.service.quiz.QuizExerciseService; import de.tum.cit.aet.artemis.service.quiz.QuizSubmissionService; import de.tum.cit.aet.artemis.util.RequestUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/ManagementResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/ManagementResourceIntegrationTest.java index 115aabdb48af..78ca37351cce 100644 --- a/src/test/java/de/tum/cit/aet/artemis/ManagementResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/ManagementResourceIntegrationTest.java @@ -21,14 +21,14 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; +import de.tum.cit.aet.artemis.core.repository.PersistenceAuditEventRepository; import de.tum.cit.aet.artemis.domain.PersistentAuditEvent; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.PersistenceAuditEventRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.service.feature.Feature; import de.tum.cit.aet.artemis.service.feature.FeatureToggleService; diff --git a/src/test/java/de/tum/cit/aet/artemis/MetricsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/MetricsIntegrationTest.java index 308ccc30488b..28499bb3c0c1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/MetricsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/MetricsIntegrationTest.java @@ -26,7 +26,7 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.repository.metrics.ExerciseMetricsRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseMetricsRepository; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.web.rest.dto.metrics.ExerciseInformationDTO; import de.tum.cit.aet.artemis.web.rest.dto.metrics.ResourceTimestampDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/OAuth2JWKSIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/OAuth2JWKSIntegrationTest.java index b4e12c6edbfe..75a2a5cd27fc 100644 --- a/src/test/java/de/tum/cit/aet/artemis/OAuth2JWKSIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/OAuth2JWKSIntegrationTest.java @@ -14,7 +14,7 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; -import de.tum.cit.aet.artemis.repository.OnlineCourseConfigurationRepository; +import de.tum.cit.aet.artemis.lti.repository.OnlineCourseConfigurationRepository; class OAuth2JWKSIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/StatisticsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/StatisticsIntegrationTest.java index a56a113e0ac3..166fe336ae1a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/StatisticsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/StatisticsIntegrationTest.java @@ -20,6 +20,10 @@ import org.springframework.util.MultiValueMap; import de.tum.cit.aet.artemis.assessment.GradingScaleFactory; +import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; +import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.GradingScale; import de.tum.cit.aet.artemis.domain.TextExercise; @@ -32,15 +36,11 @@ import de.tum.cit.aet.artemis.domain.metis.AnswerPost; import de.tum.cit.aet.artemis.domain.metis.Post; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.GradingScaleRepository; -import de.tum.cit.aet.artemis.repository.ParticipantScoreRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.TextExerciseRepository; -import de.tum.cit.aet.artemis.repository.metis.AnswerPostRepository; -import de.tum.cit.aet.artemis.repository.metis.PostRepository; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementStatisticsDTO; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseManagementStatisticsDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/StudentScoreUtilService.java b/src/test/java/de/tum/cit/aet/artemis/StudentScoreUtilService.java index 4382638401c8..c0bde7a6f546 100644 --- a/src/test/java/de/tum/cit/aet/artemis/StudentScoreUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/StudentScoreUtilService.java @@ -3,11 +3,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.scores.StudentScore; -import de.tum.cit.aet.artemis.repository.StudentScoreRepository; /** * Service responsible for initializing the database with specific testdata related to student scores for use in integration tests. diff --git a/src/test/java/de/tum/cit/aet/artemis/architecture/RepositoryArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/architecture/RepositoryArchitectureTest.java index e35271c32631..4da6ae949585 100644 --- a/src/test/java/de/tum/cit/aet/artemis/architecture/RepositoryArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/architecture/RepositoryArchitectureTest.java @@ -33,8 +33,8 @@ import com.tngtech.archunit.lang.ConditionEvents; import com.tngtech.archunit.lang.SimpleConditionEvent; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.repository.base.RepositoryImpl; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.core.repository.base.RepositoryImpl; /** * This class contains architecture tests for the persistence layer. diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentComplaintIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentComplaintIntegrationTest.java index 65869e4c8466..d65cf9f41243 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentComplaintIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentComplaintIntegrationTest.java @@ -17,6 +17,8 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; import de.tum.cit.aet.artemis.domain.Complaint; import de.tum.cit.aet.artemis.domain.ComplaintResponse; import de.tum.cit.aet.artemis.domain.Course; @@ -37,16 +39,14 @@ import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.ExamFactory; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.ComplaintResponseRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; import de.tum.cit.aet.artemis.service.dto.ComplaintAction; import de.tum.cit.aet.artemis.service.dto.ComplaintRequestDTO; import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java index a35a3f9950f6..30918920d4fb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java @@ -15,6 +15,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.domain.Complaint; import de.tum.cit.aet.artemis.domain.ComplaintResponse; import de.tum.cit.aet.artemis.domain.Course; @@ -29,10 +30,9 @@ import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; import de.tum.cit.aet.artemis.service.dto.ComplaintAction; import de.tum.cit.aet.artemis.service.dto.ComplaintRequestDTO; import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintResponseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintResponseIntegrationTest.java index 70984ec2f252..3e47834d1416 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintResponseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintResponseIntegrationTest.java @@ -15,6 +15,8 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Complaint; import de.tum.cit.aet.artemis.domain.ComplaintResponse; @@ -26,11 +28,9 @@ import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.participation.ParticipationFactory; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.ComplaintResponseRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.dto.ComplaintAction; import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintUtilService.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintUtilService.java index 8ccf8c531490..3bb4974c0ecb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintUtilService.java @@ -3,6 +3,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Complaint; import de.tum.cit.aet.artemis.domain.ComplaintResponse; import de.tum.cit.aet.artemis.domain.Result; @@ -11,10 +15,6 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.ComplaintResponseRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ExampleSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ExampleSubmissionIntegrationTest.java index 0cbedf31d97a..cc8be039a165 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ExampleSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ExampleSubmissionIntegrationTest.java @@ -20,6 +20,8 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ExampleSubmission; import de.tum.cit.aet.artemis.domain.Exercise; @@ -40,8 +42,6 @@ import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; -import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.util.TestResourceUtils; import de.tum.cit.aet.artemis.web.rest.dto.TextAssessmentDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java index f903909a8bb1..acca6951a9e4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java @@ -18,15 +18,15 @@ import org.springframework.test.util.ReflectionTestUtils; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ParticipantScoreRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.team.TeamUtilService; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseScoresDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/GradeStepIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/GradeStepIntegrationTest.java index fc074d02b6f2..6dcbbe709606 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/GradeStepIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/GradeStepIntegrationTest.java @@ -13,6 +13,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.GradeStep; import de.tum.cit.aet.artemis.domain.GradeType; @@ -23,11 +24,10 @@ import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.GradingScaleRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.web.rest.dto.GradeDTO; import de.tum.cit.aet.artemis.web.rest.dto.GradeStepsDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleIntegrationTest.java index 39cac8f1c897..28b3087e5aeb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleIntegrationTest.java @@ -13,6 +13,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.GradeStep; import de.tum.cit.aet.artemis.domain.GradeType; @@ -20,8 +21,7 @@ import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.exam.ExamUtilService; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; class GradingScaleIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleUtilService.java b/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleUtilService.java index 19cb86364065..37d1f86f7b10 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleUtilService.java @@ -18,12 +18,12 @@ import com.opencsv.CSVReader; +import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.GradeStep; import de.tum.cit.aet.artemis.domain.GradeType; import de.tum.cit.aet.artemis.domain.GradingScale; import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.repository.GradingScaleRepository; /** * Service responsible for initializing the database with specific testdata related to grading for use in integration tests. diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java index 3dc97d50b2bb..35117cc918b9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java @@ -18,6 +18,8 @@ import org.springframework.test.util.ReflectionTestUtils; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -30,14 +32,12 @@ import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.GradingScaleRepository; -import de.tum.cit.aet.artemis.repository.LectureUnitRepository; -import de.tum.cit.aet.artemis.repository.ParticipantScoreRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.team.TeamUtilService; import de.tum.cit.aet.artemis.web.rest.dto.score.ScoreDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java index 57e756c1916f..2b3457a89039 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java @@ -26,6 +26,8 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.FileUploadExercise; @@ -51,27 +53,25 @@ import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseFactory; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.repository.FileUploadExerciseRepository; -import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; -import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.web.rest.dto.ResultWithPointsPerGradingCriterionDTO; import de.tum.cit.aet.artemis.web.rest.dto.feedback.FeedbackDetailDTO; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorEffortIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorEffortIntegrationTest.java index d1849e1fc3bf..7957ece0e0a2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorEffortIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorEffortIntegrationTest.java @@ -14,16 +14,16 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.repository.TextAssessmentEventRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.analytics.TextAssessmentEvent; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.domain.statistics.tutor.effort.TutorEffort; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.TextAssessmentEventRepository; -import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; class TutorEffortIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationIntegrationTest.java index f4443947c632..d6a5aa5cea36 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationIntegrationTest.java @@ -17,6 +17,8 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.assessment.repository.GradingInstructionRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ExampleSubmission; import de.tum.cit.aet.artemis.domain.Exercise; @@ -29,11 +31,9 @@ import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; import de.tum.cit.aet.artemis.exercise.ExerciseFactory; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.repository.GradingInstructionRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; import de.tum.cit.aet.artemis.service.ExampleSubmissionService; import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.service.SubmissionService; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationResourceIntegrationTest.java index f43e4c8e5405..752eda0ff51b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationResourceIntegrationTest.java @@ -11,14 +11,14 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ExampleSubmission; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; -import de.tum.cit.aet.artemis.repository.TutorParticipationRepository; class TutorParticipationResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/authentication/InternalAuthenticationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/InternalAuthenticationIntegrationTest.java index c2c9420397fe..8bf0c5da74c4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authentication/InternalAuthenticationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/InternalAuthenticationIntegrationTest.java @@ -28,6 +28,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.connector.GitlabRequestMockProvider; +import de.tum.cit.aet.artemis.core.repository.AuthorityRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.course.CourseFactory; @@ -36,8 +37,7 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.cit.aet.artemis.repository.AuthorityRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.user.PasswordService; import de.tum.cit.aet.artemis.tutorialgroups.TutorialGroupUtilService; import de.tum.cit.aet.artemis.web.rest.vm.LoginVM; diff --git a/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java index 0a3f27cf389d..edbeb2f212ee 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java @@ -21,6 +21,8 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.core.repository.AuthorityRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Authority; @@ -28,9 +30,7 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.cit.aet.artemis.repository.AuthorityRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; import de.tum.cit.aet.artemis.web.rest.vm.LoginVM; diff --git a/src/test/java/de/tum/cit/aet/artemis/authentication/UserJenkinsGitlabIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/UserJenkinsGitlabIntegrationTest.java index 955c43f7d013..72d555283c26 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authentication/UserJenkinsGitlabIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/UserJenkinsGitlabIntegrationTest.java @@ -18,11 +18,11 @@ import org.springframework.test.util.ReflectionTestUtils; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabPersonalAccessTokenManagementService; import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabUserManagementService; import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsUserManagementService; diff --git a/src/test/java/de/tum/cit/aet/artemis/bonus/BonusIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/bonus/BonusIntegrationTest.java index e2ce03a9985a..35bcf0b9df5c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/bonus/BonusIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/bonus/BonusIntegrationTest.java @@ -19,6 +19,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.GradingScaleFactory; import de.tum.cit.aet.artemis.assessment.GradingScaleUtilService; +import de.tum.cit.aet.artemis.assessment.repository.BonusRepository; +import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.domain.Bonus; import de.tum.cit.aet.artemis.domain.BonusStrategy; import de.tum.cit.aet.artemis.domain.Course; @@ -29,10 +31,8 @@ import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; -import de.tum.cit.aet.artemis.repository.BonusRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; class BonusIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/AbstractCompetencyPrerequisiteIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/AbstractCompetencyPrerequisiteIntegrationTest.java index a49a309dcf0e..9a809cd9a858 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/AbstractCompetencyPrerequisiteIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/AbstractCompetencyPrerequisiteIntegrationTest.java @@ -17,6 +17,9 @@ import org.springframework.http.HttpStatus; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; +import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.domain.Lecture; @@ -35,14 +38,11 @@ import de.tum.cit.aet.artemis.domain.lecture.TextUnit; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.lecture.LectureUtilService; -import de.tum.cit.aet.artemis.repository.AttachmentUnitRepository; -import de.tum.cit.aet.artemis.repository.CompetencyRelationRepository; -import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; -import de.tum.cit.aet.artemis.repository.ExerciseUnitRepository; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.LectureUnitRepository; -import de.tum.cit.aet.artemis.repository.PrerequisiteRepository; -import de.tum.cit.aet.artemis.repository.TextUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.ExerciseUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyJolIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyJolIntegrationTest.java index a80b749b3748..02f6a415fd32 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyJolIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyJolIntegrationTest.java @@ -14,10 +14,10 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.atlas.repository.competency.CompetencyJolRepository; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.competency.Competency; import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; -import de.tum.cit.aet.artemis.repository.competency.CompetencyJolRepository; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolPairDTO; class CompetencyJolIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyProgressUtilService.java b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyProgressUtilService.java index db9d461400c1..faea1a3937ef 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyProgressUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyProgressUtilService.java @@ -3,10 +3,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.repository.CompetencyProgressRepository; /** * Service responsible for initializing the database with specific testdata related to competency progress for use in integration tests. diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyUtilService.java b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyUtilService.java index 6157c3478be9..1a8bf61dfc32 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyUtilService.java @@ -7,6 +7,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; +import de.tum.cit.aet.artemis.atlas.repository.competency.CompetencyJolRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; @@ -16,11 +19,8 @@ import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; import de.tum.cit.aet.artemis.domain.competency.RelationType; import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.repository.CompetencyRelationRepository; -import de.tum.cit.aet.artemis.repository.CompetencyRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.LectureUnitRepository; -import de.tum.cit.aet.artemis.repository.competency.CompetencyJolRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; /** * Service responsible for initializing the database with specific test data related to competencies for use in integration tests. diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/CourseCompetencyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/CourseCompetencyIntegrationTest.java index 8c4cdbbbdce1..843e734512ad 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/CourseCompetencyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/CourseCompetencyIntegrationTest.java @@ -21,6 +21,10 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; import de.tum.cit.aet.artemis.StudentScoreUtilService; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; +import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -49,20 +53,16 @@ import de.tum.cit.aet.artemis.domain.participation.Participant; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.ExerciseUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.AttachmentUnitRepository; -import de.tum.cit.aet.artemis.repository.CompetencyRelationRepository; -import de.tum.cit.aet.artemis.repository.CompetencyRepository; -import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.ExerciseUnitRepository; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.PrerequisiteRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.TextUnitRepository; import de.tum.cit.aet.artemis.service.LectureUnitService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.team.TeamUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java index 941953aed1e5..edc7d1993e9c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java @@ -25,6 +25,10 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.StudentScoreUtilService; +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; +import de.tum.cit.aet.artemis.atlas.repository.LearningPathRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.GradingCriterion; @@ -40,12 +44,8 @@ import de.tum.cit.aet.artemis.domain.lecture.TextUnit; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.lecture.LectureUtilService; -import de.tum.cit.aet.artemis.repository.CompetencyProgressRepository; -import de.tum.cit.aet.artemis.repository.CompetencyRelationRepository; -import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.repository.LearningPathRepository; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.LectureUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.service.LectureUnitService; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathUtilService.java b/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathUtilService.java index 2ecb5c58fb6a..a788f6378b78 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathUtilService.java @@ -5,14 +5,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; +import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.atlas.repository.LearningPathRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.domain.competency.LearningPath; -import de.tum.cit.aet.artemis.repository.CompetencyRepository; -import de.tum.cit.aet.artemis.repository.CourseCompetencyRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.LearningPathRepository; import de.tum.cit.aet.artemis.service.learningpath.LearningPathService; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteUtilService.java b/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteUtilService.java index 6c0692280afe..91bdd4a11712 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteUtilService.java @@ -6,9 +6,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.competency.Prerequisite; -import de.tum.cit.aet.artemis.repository.PrerequisiteRepository; /** * Service responsible for initializing the database with specific test data related to prerequisites for use in integration tests. diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyIntegrationTest.java index abc73f4d0a1b..962a15b27700 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyIntegrationTest.java @@ -18,15 +18,15 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; +import de.tum.cit.aet.artemis.atlas.repository.SourceRepository; +import de.tum.cit.aet.artemis.atlas.repository.competency.KnowledgeAreaRepository; +import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; import de.tum.cit.aet.artemis.domain.competency.Competency; import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; import de.tum.cit.aet.artemis.domain.competency.KnowledgeArea; import de.tum.cit.aet.artemis.domain.competency.Source; import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; -import de.tum.cit.aet.artemis.repository.CompetencyRepository; -import de.tum.cit.aet.artemis.repository.SourceRepository; -import de.tum.cit.aet.artemis.repository.competency.KnowledgeAreaRepository; -import de.tum.cit.aet.artemis.repository.competency.StandardizedCompetencyRepository; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaRequestDTO; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaResultDTO; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.SourceDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyUtilService.java b/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyUtilService.java index cabd529aa78f..786cbfdac4b4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyUtilService.java @@ -9,12 +9,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.repository.competency.KnowledgeAreaRepository; +import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; import de.tum.cit.aet.artemis.domain.competency.KnowledgeArea; import de.tum.cit.aet.artemis.domain.competency.Source; import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; -import de.tum.cit.aet.artemis.repository.competency.KnowledgeAreaRepository; -import de.tum.cit.aet.artemis.repository.competency.StandardizedCompetencyRepository; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaRequestDTO; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyRequestDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/config/MetricsBeanTest.java b/src/test/java/de/tum/cit/aet/artemis/config/MetricsBeanTest.java index 1e8419251717..86e90aace49e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/config/MetricsBeanTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/config/MetricsBeanTest.java @@ -14,6 +14,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.core.config.MetricsBean; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; @@ -23,17 +24,16 @@ import de.tum.cit.aet.artemis.domain.exam.ExamUser; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExamUserRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.user.UserUtilService; import io.micrometer.core.instrument.MeterRegistry; diff --git a/src/test/java/de/tum/cit/aet/artemis/connector/GitlabRequestMockProvider.java b/src/test/java/de/tum/cit/aet/artemis/connector/GitlabRequestMockProvider.java index 881dd4e2b803..70655c305864 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connector/GitlabRequestMockProvider.java +++ b/src/test/java/de/tum/cit/aet/artemis/connector/GitlabRequestMockProvider.java @@ -90,13 +90,13 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.UriService; import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabException; import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabUserDoesNotExistException; diff --git a/src/test/java/de/tum/cit/aet/artemis/connector/JenkinsRequestMockProvider.java b/src/test/java/de/tum/cit/aet/artemis/connector/JenkinsRequestMockProvider.java index 0ea96204aa1a..7847eac78d03 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connector/JenkinsRequestMockProvider.java +++ b/src/test/java/de/tum/cit/aet/artemis/connector/JenkinsRequestMockProvider.java @@ -48,7 +48,7 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.connectors.jenkins.dto.JenkinsUserDTO; import de.tum.cit.aet.artemis.service.connectors.jenkins.jobs.JenkinsJobPermissionsService; diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java index 2a4462623001..d5be43a38c51 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java @@ -43,6 +43,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProvider; import de.tum.cit.aet.artemis.core.security.lti.Lti13TokenRetriever; import de.tum.cit.aet.artemis.domain.Course; @@ -57,12 +60,9 @@ import de.tum.cit.aet.artemis.domain.lti.LtiResourceLaunch; import de.tum.cit.aet.artemis.domain.lti.Scopes; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.Lti13ResourceLaunchRepository; -import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.lti.repository.Lti13ResourceLaunchRepository; +import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; import de.tum.cit.aet.artemis.service.connectors.lti.Lti13Service; import de.tum.cit.aet.artemis.service.connectors.lti.LtiService; diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java index 96d6c490f835..a4cc4347614c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java @@ -24,7 +24,7 @@ import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.domain.lti.Lti13ClientRegistration; import de.tum.cit.aet.artemis.domain.lti.Lti13PlatformConfiguration; -import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; +import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.service.connectors.lti.LtiDynamicRegistrationService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiServiceTest.java index 2f6ee71e5fc5..ff0a64e9f2bf 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiServiceTest.java @@ -28,6 +28,7 @@ import org.springframework.web.util.UriComponents; import org.springframework.web.util.UriComponentsBuilder; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProvider; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.jwt.JWTCookieService; @@ -36,7 +37,6 @@ import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; import de.tum.cit.aet.artemis.service.connectors.lti.LtiService; import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; diff --git a/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java b/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java index b7f3f0dc34bf..4b151044a88b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java @@ -61,9 +61,19 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.atlas.repository.LearningPathRepository; +import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.competency.PrerequisiteUtilService; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.CustomAuditEventRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Complaint; import de.tum.cit.aet.artemis.domain.ComplaintResponse; @@ -106,38 +116,27 @@ import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; import de.tum.cit.aet.artemis.exam.ExamFactory; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.MockDelegate; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; +import de.tum.cit.aet.artemis.lti.repository.OnlineCourseConfigurationRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.CustomAuditEventRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExamUserRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.FileUploadExerciseRepository; -import de.tum.cit.aet.artemis.repository.LearningPathRepository; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; -import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; -import de.tum.cit.aet.artemis.repository.OnlineCourseConfigurationRepository; -import de.tum.cit.aet.artemis.repository.ParticipantScoreRepository; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.TextExerciseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ConversationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; @@ -148,6 +147,7 @@ import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.team.TeamUtilService; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/course/CourseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/course/CourseUtilService.java index 1edcfd8f2185..9b6a84521ff3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/course/CourseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/course/CourseUtilService.java @@ -20,7 +20,12 @@ import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; import de.tum.cit.aet.artemis.assessment.GradingScaleUtilService; +import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Attachment; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -53,6 +58,8 @@ import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseFactory; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; @@ -60,32 +67,25 @@ import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.fileupload.repository.FileUploadSubmissionRepository; import de.tum.cit.aet.artemis.lecture.LectureFactory; import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; import de.tum.cit.aet.artemis.organization.OrganizationUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.AttachmentRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ExerciseGroupRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.FileUploadSubmissionRepository; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.ModelingSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; -import de.tum.cit.aet.artemis.repository.TutorParticipationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.ModelingSubmissionService; +import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.TestResourceUtils; diff --git a/src/test/java/de/tum/cit/aet/artemis/dataexport/DataExportResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/dataexport/DataExportResourceIntegrationTest.java index 6e3d651aac88..73f2154eb91c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/dataexport/DataExportResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/dataexport/DataExportResourceIntegrationTest.java @@ -27,9 +27,9 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.repository.DataExportRepository; import de.tum.cit.aet.artemis.domain.DataExport; import de.tum.cit.aet.artemis.domain.enumeration.DataExportState; -import de.tum.cit.aet.artemis.repository.DataExportRepository; import de.tum.cit.aet.artemis.service.export.DataExportService; import de.tum.cit.aet.artemis.web.rest.dto.DataExportDTO; import de.tum.cit.aet.artemis.web.rest.dto.RequestDataExportDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/ResultTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/ResultTest.java index f172f6dc8f6c..7e8e1f001545 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/ResultTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/ResultTest.java @@ -11,13 +11,13 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.enumeration.Visibility; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.cit.aet.artemis.repository.ResultRepository; class ResultTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/entitylistener/ResultListenerIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/entitylistener/ResultListenerIntegrationTest.java index 19365c79ef57..2f6d63c1af09 100644 --- a/src/test/java/de/tum/cit/aet/artemis/entitylistener/ResultListenerIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/entitylistener/ResultListenerIntegrationTest.java @@ -20,6 +20,8 @@ import org.springframework.test.util.ReflectionTestUtils; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -31,12 +33,10 @@ import de.tum.cit.aet.artemis.domain.scores.ParticipantScore; import de.tum.cit.aet.artemis.domain.scores.StudentScore; import de.tum.cit.aet.artemis.domain.scores.TeamScore; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ParticipantScoreRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.StudentScoreRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.team.TeamUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java index dfe827d1b983..e9f586938353 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java @@ -41,6 +41,7 @@ import org.springframework.util.MultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.FileUploadSubmission; @@ -62,19 +63,18 @@ import de.tum.cit.aet.artemis.domain.quiz.QuizGroup; import de.tum.cit.aet.artemis.domain.quiz.QuizPool; import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.exam.repository.ExamLiveEventRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; -import de.tum.cit.aet.artemis.repository.ExamLiveEventRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExamUserRepository; -import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; -import de.tum.cit.aet.artemis.repository.QuizPoolRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizPoolRepository; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.exam.ExamDateService; import de.tum.cit.aet.artemis.service.exam.ExamService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java index a6cae4002226..a282865bf10f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java @@ -34,6 +34,9 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.assessment.GradingScaleUtilService; +import de.tum.cit.aet.artemis.assessment.repository.BonusRepository; +import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.bonus.BonusFactory; import de.tum.cit.aet.artemis.domain.BonusStrategy; import de.tum.cit.aet.artemis.domain.Course; @@ -59,24 +62,21 @@ import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseTestService; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.BonusRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExamUserRepository; -import de.tum.cit.aet.artemis.repository.GradingScaleRepository; -import de.tum.cit.aet.artemis.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.repository.ParticipationTestRepository; -import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; -import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.service.exam.ExamService; import de.tum.cit.aet.artemis.service.exam.StudentExamService; import de.tum.cit.aet.artemis.service.quiz.QuizSubmissionService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java index 6544f33d98b7..2d808a86f64c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java @@ -19,14 +19,14 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.domain.exam.ExamUser; import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExamUserRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.exam.ExamRegistrationService; import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamSessionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamSessionIntegrationTest.java index 3fa320cd4517..8136b37d1448 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamSessionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamSessionIntegrationTest.java @@ -11,8 +11,8 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.repository.ExamSessionRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamSessionRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.service.exam.ExamSessionService; import inet.ipaddr.IPAddressString; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java index 08e031af3216..c0c7a61328f0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java @@ -43,17 +43,17 @@ import de.tum.cit.aet.artemis.domain.participation.Participation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseTestService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExerciseGroupRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; import de.tum.cit.aet.artemis.repository.ParticipationTestRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlRepositoryPermission; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamUserIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamUserIntegrationTest.java index e50d28cfec60..17454bff4c41 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamUserIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamUserIntegrationTest.java @@ -37,9 +37,9 @@ import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.domain.exam.ExamUser; import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseTestService; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; import de.tum.cit.aet.artemis.util.LocalRepository; import de.tum.cit.aet.artemis.web.rest.dto.ExamUserAttendanceCheckDTO; import de.tum.cit.aet.artemis.web.rest.dto.ExamUserDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamUtilService.java index b3be58ab6d4e..08a9a5e4b09c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamUtilService.java @@ -14,6 +14,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; @@ -40,6 +43,11 @@ import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.domain.quiz.QuizPool; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamSessionRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; +import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseFactory; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; @@ -48,23 +56,15 @@ import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.post.ConversationFactory; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExamSessionRepository; -import de.tum.cit.aet.artemis.repository.ExamUserRepository; -import de.tum.cit.aet.artemis.repository.ExerciseGroupRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ConversationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.quiz.QuizPoolService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExerciseGroupIntegrationJenkinsGitlabTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExerciseGroupIntegrationJenkinsGitlabTest.java index bdba1551916a..ca40fe411251 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExerciseGroupIntegrationJenkinsGitlabTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExerciseGroupIntegrationJenkinsGitlabTest.java @@ -29,13 +29,13 @@ import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.user.UserUtilService; class ExerciseGroupIntegrationJenkinsGitlabTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ProgrammingExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ProgrammingExamIntegrationTest.java index df83a494069c..dee9c9b7f8ff 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ProgrammingExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ProgrammingExamIntegrationTest.java @@ -35,14 +35,14 @@ import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseTestService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.util.ExamPrepareExercisesTestUtil; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java index 5419efba0b8c..81fe066f3786 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java @@ -60,6 +60,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.assessment.GradingScaleUtilService; +import de.tum.cit.aet.artemis.assessment.repository.BonusRepository; +import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.bonus.BonusFactory; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.BonusStrategy; @@ -105,22 +107,20 @@ import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamSessionRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseTestService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionVersionRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.BonusRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExamSessionRepository; -import de.tum.cit.aet.artemis.repository.ExamUserRepository; -import de.tum.cit.aet.artemis.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.SubmissionVersionRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.exam.ExamQuizService; import de.tum.cit.aet.artemis.service.exam.StudentExamService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/TestExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/TestExamIntegrationTest.java index 7c23a635bea4..fdd73c71b443 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/TestExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/TestExamIntegrationTest.java @@ -14,15 +14,15 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.domain.exam.ExamUser; import de.tum.cit.aet.artemis.domain.exam.StudentExam; import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExamUserRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.service.user.PasswordService; import de.tum.cit.aet.artemis.user.UserFactory; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaExerciseIntegrationTest.java index d273604dc206..5ea3f494d084 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaExerciseIntegrationTest.java @@ -29,8 +29,8 @@ import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; class AthenaExerciseIntegrationTest extends AbstractAthenaTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaResourceIntegrationTest.java index 8f8b75e5f338..67c1d01264c7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaResourceIntegrationTest.java @@ -24,6 +24,7 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractAthenaTest; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; @@ -38,16 +39,15 @@ import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; -import de.tum.cit.aet.artemis.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ModelingSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.TextExerciseRepository; -import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; class AthenaResourceIntegrationTest extends AbstractAthenaTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java index df631a131aaa..b7aa41c48c80 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java @@ -22,6 +22,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.FileUploadExercise; @@ -45,13 +46,12 @@ import de.tum.cit.aet.artemis.domain.quiz.QuizPointStatistic; import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.util.TestResourceUtils; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseDetailsDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseUtilService.java index 4acbb4afe32d..2fab48d88f62 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseUtilService.java @@ -14,6 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; +import de.tum.cit.aet.artemis.communication.repository.PostRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.FileUploadExercise; @@ -42,19 +46,15 @@ import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.post.ConversationFactory; import de.tum.cit.aet.artemis.post.ConversationUtilService; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.metis.AnswerPostRepository; -import de.tum.cit.aet.artemis.repository.metis.PostRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.service.ModelingSubmissionService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java index 85f50279f5b2..ab825b46a8e3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java @@ -24,6 +24,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Complaint; import de.tum.cit.aet.artemis.domain.ComplaintResponse; @@ -43,13 +44,12 @@ import de.tum.cit.aet.artemis.domain.participation.Participation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.FileUploadExerciseRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; import de.tum.cit.aet.artemis.web.rest.dto.FileUploadAssessmentDTO; import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java index a7e8434fdb57..b7fea778841a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java @@ -30,6 +30,9 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -46,13 +49,10 @@ import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.repository.FileUploadExerciseRepository; -import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider; import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider.InvalidExamExerciseDateConfiguration; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseUtilService.java index 9049cede28e9..73c02d62f765 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseUtilService.java @@ -13,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -23,14 +25,12 @@ import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.fileupload.repository.FileUploadSubmissionRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.FileUploadSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; import de.tum.cit.aet.artemis.user.UserUtilService; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java index 4a417fa666cb..9775aba4b9cc 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java @@ -41,10 +41,10 @@ import de.tum.cit.aet.artemis.domain.participation.Participation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.fileupload.repository.FileUploadSubmissionRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.FileUploadSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonDiagramResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonDiagramResourceIntegrationTest.java index 74cf1ac7e66c..452c120e2dc5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonDiagramResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonDiagramResourceIntegrationTest.java @@ -18,7 +18,7 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; import de.tum.cit.aet.artemis.domain.modeling.ApollonDiagram; -import de.tum.cit.aet.artemis.repository.ApollonDiagramRepository; +import de.tum.cit.aet.artemis.modeling.repository.ApollonDiagramRepository; class ApollonDiagramResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java index 64d5072efb37..130f4fed73c5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java @@ -27,6 +27,9 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; +import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Complaint; import de.tum.cit.aet.artemis.domain.ComplaintResponse; @@ -53,18 +56,15 @@ import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus; import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingSubmissionElement; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelClusterRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelElementRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.plagiarism.PlagiarismUtilService; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.ComplaintResponseRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ModelClusterRepository; -import de.tum.cit.aet.artemis.repository.ModelElementRepository; -import de.tum.cit.aet.artemis.repository.ModelingSubmissionRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; import de.tum.cit.aet.artemis.service.AssessmentService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.compass.CompassService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java index 144cc3e45179..0a7c627381d1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java @@ -30,6 +30,10 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ExampleSubmission; @@ -54,16 +58,12 @@ import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; -import de.tum.cit.aet.artemis.repository.TutorParticipationRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; import de.tum.cit.aet.artemis.util.ExerciseIntegrationTestService; import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider; import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider.InvalidExamExerciseDateConfiguration; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseUtilService.java index 4b324600c0c2..c84061cbbd27 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseUtilService.java @@ -17,6 +17,9 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -32,16 +35,13 @@ import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ModelingSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.service.AssessmentService; import de.tum.cit.aet.artemis.service.ModelingSubmissionService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java index 254280c78ed0..09fc8a36f3e4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java @@ -21,6 +21,7 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Result; @@ -42,19 +43,18 @@ import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingSubmissionElement; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionVersionRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExerciseGroupRepository; -import de.tum.cit.aet.artemis.repository.ModelingSubmissionRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionVersionRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; -import de.tum.cit.aet.artemis.repository.metis.PostRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.service.compass.CompassService; import de.tum.cit.aet.artemis.util.TestResourceUtils; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java index e3ee6f8ae01c..389c7b27ee68 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java @@ -14,8 +14,8 @@ import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; -import de.tum.cit.aet.artemis.repository.AuxiliaryRepositoryRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.programming.AuxiliaryRepositoryService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/CourseGitlabJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/CourseGitlabJenkinsIntegrationTest.java index cbb5b354724a..9dac13ca21c1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/CourseGitlabJenkinsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/CourseGitlabJenkinsIntegrationTest.java @@ -25,7 +25,7 @@ import de.tum.cit.aet.artemis.course.CourseTestService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; class CourseGitlabJenkinsIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/GitlabServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/GitlabServiceTest.java index 2db9a4d4284d..072c9b2c9741 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/GitlabServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/GitlabServiceTest.java @@ -34,8 +34,8 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; class GitlabServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java index 70b2fa87cda2..f5a7d4d51c7e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java @@ -27,6 +27,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.AssessmentNote; import de.tum.cit.aet.artemis.domain.Complaint; @@ -50,15 +51,14 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; import de.tum.cit.aet.artemis.util.TestResourceUtils; import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseBuildPlanTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseBuildPlanTest.java index a5c1503fdf3b..3392e63cf65d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseBuildPlanTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseBuildPlanTest.java @@ -11,7 +11,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationGitlabCIGitlabSamlTest; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; class ProgrammingExerciseBuildPlanTest extends AbstractSpringIntegrationGitlabCIGitlabSamlTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java index 5ed7e0c77d07..a23cee9df1de 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java @@ -30,7 +30,7 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.util.GitUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java index e6395e5fbe8e..d86494b35a7e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java @@ -30,6 +30,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -50,16 +51,15 @@ import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StaticCodeAnalysisCategoryRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseGradingService; import de.tum.cit.aet.artemis.service.util.RoundingUtil; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java index d8084ebf1dff..cfacc35a10d5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java @@ -64,7 +64,10 @@ import com.fasterxml.jackson.core.type.TypeReference; +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.domain.Course; @@ -91,18 +94,15 @@ import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.plagiarism.PlagiarismUtilService; -import de.tum.cit.aet.artemis.repository.AuxiliaryRepositoryRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.UriService; import de.tum.cit.aet.artemis.service.connectors.GitService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java index 6629cb51ab38..71f31458e3c4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java @@ -37,11 +37,11 @@ import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.web.rest.dto.CommitInfoDTO; class ProgrammingExerciseParticipationIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseRepositoryServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseRepositoryServiceTest.java index d9ea545f96b9..2d3e385545b7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseRepositoryServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseRepositoryServiceTest.java @@ -17,7 +17,7 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseRepositoryService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java index 969f6fae1b0e..abdba50879a0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java @@ -33,6 +33,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; @@ -50,15 +52,13 @@ import de.tum.cit.aet.artemis.hestia.TestwiseCoverageTestUtil; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.repository.ParticipationVCSAccessTokenRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.ParticipationVCSAccessTokenRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.connectors.GitService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java index dd4e24e565db..cb1d0aa9cf30 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java @@ -43,13 +43,13 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.service.messaging.InstanceMessageReceiveService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceIntegrationTest.java index 4117c3040daf..a1eddae32bbe 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceIntegrationTest.java @@ -26,7 +26,7 @@ import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPenaltyPolicy; import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseImportBasicService; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseService; import de.tum.cit.aet.artemis.util.ExerciseIntegrationTestService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceTest.java index a3d41b8ae86e..228ffb0c7058 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceTest.java @@ -13,7 +13,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestRepository; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTest.java index ebf6c1e7a581..3faece2732d8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTest.java @@ -24,6 +24,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; @@ -39,10 +40,9 @@ import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.user.UserUtilService; class ProgrammingExerciseTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java index 39e20d118b4d..34785247f034 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java @@ -30,8 +30,8 @@ import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseFeedbackCreationService; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseTestCaseService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java index 0ec672867281..636933f0151f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java @@ -73,6 +73,8 @@ import de.tum.cit.aet.artemis.core.config.StaticCodeAnalysisConfigurer; import de.tum.cit.aet.artemis.core.exception.GitException; import de.tum.cit.aet.artemis.core.exception.VersionControlException; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Authority; @@ -107,28 +109,26 @@ import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.cit.aet.artemis.exam.ExamFactory; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.AuxiliaryRepositoryRepository; -import de.tum.cit.aet.artemis.repository.BuildLogStatisticsEntryRepository; -import de.tum.cit.aet.artemis.repository.BuildPlanRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExamUserRepository; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationTestRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.repository.StaticCodeAnalysisCategoryRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.UriService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java index fd0f48c85245..9a02a568a774 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java @@ -26,6 +26,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.domain.Course; @@ -54,29 +56,27 @@ import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.AuxiliaryRepositoryRepository; -import de.tum.cit.aet.artemis.repository.BuildPlanRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; +import de.tum.cit.aet.artemis.programming.repository.SubmissionPolicyRepository; +import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.CodeHintRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.cit.aet.artemis.repository.StaticCodeAnalysisCategoryRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionPolicyRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; -import de.tum.cit.aet.artemis.repository.hestia.CodeHintRepository; -import de.tum.cit.aet.artemis.repository.hestia.ExerciseHintRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java index 3cd20704661d..917a68ba2f11 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java @@ -36,9 +36,9 @@ import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.BuildLogStatisticsEntryRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.CommitDTO; import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestCaseDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java index 88dcc1fd39cb..6400e7e566e6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java @@ -21,7 +21,7 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.util.RequestUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java index fb32fc1a145c..e17368014544 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java @@ -54,12 +54,12 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.util.TestConstants; import de.tum.cit.aet.artemis.util.TestResourceUtils; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java index 974b9489272b..f3dcf1ce7f54 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java @@ -53,6 +53,7 @@ import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.read.ListAppender; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.domain.BuildLogEntry; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.FileType; @@ -72,16 +73,15 @@ import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.metis.PostRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlRepositoryPermission; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryProgrammingExerciseParticipationJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryProgrammingExerciseParticipationJenkinsIntegrationTest.java index b3fd6edb7daf..913487fec288 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryProgrammingExerciseParticipationJenkinsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryProgrammingExerciseParticipationJenkinsIntegrationTest.java @@ -26,7 +26,7 @@ import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.util.TestConstants; class RepositoryProgrammingExerciseParticipationJenkinsIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java index 2146f703d16d..4ac3cb278617 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java @@ -34,8 +34,8 @@ import de.tum.cit.aet.artemis.domain.enumeration.CategoryState; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.StaticCodeAnalysisCategoryRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseFeedbackCreationService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java index 0e99569c3848..42826c0226d1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java @@ -31,7 +31,7 @@ import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPenaltyPolicy; import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.CommitDTO; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseGradingService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java index e59b40552d53..9e18da25f68f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java @@ -37,8 +37,8 @@ import de.tum.cit.aet.artemis.domain.FileType; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.util.GitUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java index a89ff207b1bd..aa166abef428 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java @@ -42,6 +42,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Team; @@ -73,13 +74,12 @@ import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSolution; import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSpot; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; -import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmittedAnswerRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; +import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.service.quiz.QuizExerciseService; import de.tum.cit.aet.artemis.util.ExerciseIntegrationTestService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseUtilService.java index fa1db2e9f499..ed2b2567f368 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseUtilService.java @@ -15,6 +15,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.ResourceUtils; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; @@ -38,18 +39,17 @@ import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedText; import de.tum.cit.aet.artemis.exam.ExamFactory; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.DragAndDropMappingRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.QuizBatchRepository; -import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; -import de.tum.cit.aet.artemis.repository.QuizQuestionRepository; -import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmittedAnswerRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.quiz.repository.DragAndDropMappingRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizBatchRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizQuestionRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; +import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.quiz.QuizScheduleService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java index 4d4ad2161dae..f8396649bf35 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java @@ -60,11 +60,11 @@ import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedText; import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; -import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.service.quiz.QuizBatchService; import de.tum.cit.aet.artemis.service.quiz.QuizExerciseService; import de.tum.cit.aet.artemis.service.quiz.QuizStatisticService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextExerciseUtilService.java index 97314cadd0a5..844e28a657b3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextExerciseUtilService.java @@ -11,6 +11,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.repository.TextBlockRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -33,20 +38,15 @@ import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.TextBlockRepository; -import de.tum.cit.aet.artemis.repository.TextExerciseRepository; -import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.user.UserUtilService; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintIntegrationTest.java index c939f769afa3..3e6f511cf20e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintIntegrationTest.java @@ -20,9 +20,9 @@ import de.tum.cit.aet.artemis.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.repository.hestia.CodeHintRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.CodeHintRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; class CodeHintIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintServiceTest.java index 454a0908862b..733281a48150 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintServiceTest.java @@ -26,10 +26,10 @@ import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTestCaseType; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.repository.hestia.CodeHintRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.CodeHintRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.service.hestia.CodeHintService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java index f27c950da862..713a157dc1f2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java @@ -31,11 +31,11 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintActivationRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.repository.hestia.ExerciseHintActivationRepository; -import de.tum.cit.aet.artemis.repository.hestia.ExerciseHintRepository; import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; class ExerciseHintIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java index 4941a1d1079c..9caf48e398af 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java @@ -13,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; @@ -29,14 +31,12 @@ import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintActivationRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.hestia.ExerciseHintActivationRepository; -import de.tum.cit.aet.artemis.repository.hestia.ExerciseHintRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.service.hestia.ExerciseHintService; import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/HestiaDatabaseTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/HestiaDatabaseTest.java index 9676e01ca819..967581156aaa 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/HestiaDatabaseTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/HestiaDatabaseTest.java @@ -19,11 +19,11 @@ import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.repository.hestia.CodeHintRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.CodeHintRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.user.UserUtilService; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java index f7b94dc12405..15413c9f9127 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java @@ -19,7 +19,7 @@ import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseGitDiffReportRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseGitDiffReportRepository; import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseGitDiffReportService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.HestiaUtilTestService; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseSolutionEntryIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseSolutionEntryIntegrationTest.java index a79eae2f1bb9..70aed126212e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseSolutionEntryIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseSolutionEntryIntegrationTest.java @@ -19,10 +19,10 @@ import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.repository.hestia.CodeHintRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.CodeHintRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; class ProgrammingExerciseSolutionEntryIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskIntegrationTest.java index 5cd53430aa75..9cd9d6a94be8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskIntegrationTest.java @@ -22,10 +22,10 @@ import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; class ProgrammingExerciseTaskIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskServiceTest.java index e3a80268f3d5..3e9c0cfa3e09 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskServiceTest.java @@ -21,10 +21,10 @@ import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.repository.hestia.CodeHintRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.CodeHintRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/StructuralTestCaseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/StructuralTestCaseServiceTest.java index ac762c9f9ab0..454da4e6f982 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/StructuralTestCaseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/StructuralTestCaseServiceTest.java @@ -20,7 +20,7 @@ import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTestCaseType; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.service.hestia.structural.StructuralSolutionEntryGenerationException; import de.tum.cit.aet.artemis.service.hestia.structural.StructuralTestCaseService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageIntegrationTest.java index 334782fde809..51ffd5f580f0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageIntegrationTest.java @@ -21,12 +21,12 @@ import de.tum.cit.aet.artemis.domain.hestia.CoverageReport; import de.tum.cit.aet.artemis.domain.hestia.TestwiseCoverageReportEntry; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageFileReportRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageReportRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.TestwiseCoverageReportEntryRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.cit.aet.artemis.repository.hestia.CoverageFileReportRepository; -import de.tum.cit.aet.artemis.repository.hestia.CoverageReportRepository; -import de.tum.cit.aet.artemis.repository.hestia.TestwiseCoverageReportEntryRepository; class TestwiseCoverageIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageReportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageReportServiceTest.java index cadd5fdea37a..0ae50f81109d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageReportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageReportServiceTest.java @@ -22,10 +22,10 @@ import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.cit.aet.artemis.repository.hestia.CoverageReportRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageReportRepository; import de.tum.cit.aet.artemis.service.hestia.TestwiseCoverageService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.HestiaUtilTestService; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java index 3156c93c0903..b29ca7e389a4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java @@ -26,12 +26,12 @@ import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.cit.aet.artemis.repository.hestia.CoverageFileReportRepository; -import de.tum.cit.aet.artemis.repository.hestia.CoverageReportRepository; -import de.tum.cit.aet.artemis.repository.hestia.ProgrammingExerciseGitDiffReportRepository; -import de.tum.cit.aet.artemis.repository.hestia.TestwiseCoverageReportEntryRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageFileReportRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageReportRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseGitDiffReportRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.TestwiseCoverageReportEntryRepository; import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralTestCaseService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.HestiaUtilTestService; diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java index 4556c0936c24..fbee64fc0fda 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java @@ -23,9 +23,9 @@ import de.tum.cit.aet.artemis.domain.iris.IrisTemplate; import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettings; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.iris.IrisSettingsRepository; -import de.tum.cit.aet.artemis.repository.iris.IrisTemplateRepository; +import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; +import de.tum.cit.aet.artemis.iris.repository.IrisTemplateRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; public abstract class AbstractIrisIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatMessageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatMessageIntegrationTest.java index 8786ac87339d..374c51d15141 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatMessageIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatMessageIntegrationTest.java @@ -41,9 +41,9 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.iris.repository.IrisMessageRepository; +import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.iris.IrisMessageRepository; -import de.tum.cit.aet.artemis.repository.iris.IrisSessionRepository; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageState; diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/IrisExerciseChatSessionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisExerciseChatSessionIntegrationTest.java index 4f4664b7c112..206346321a33 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/IrisExerciseChatSessionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisExerciseChatSessionIntegrationTest.java @@ -14,7 +14,7 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.iris.session.IrisExerciseChatSession; import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; -import de.tum.cit.aet.artemis.repository.iris.IrisExerciseChatSessionRepository; +import de.tum.cit.aet.artemis.iris.repository.IrisExerciseChatSessionRepository; import de.tum.cit.aet.artemis.web.rest.iris.IrisStatusDTO; class IrisExerciseChatSessionIntegrationTest extends AbstractIrisIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/PyrisLectureIngestionTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/PyrisLectureIngestionTest.java index e1b4678568f0..4121b4784b52 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/PyrisLectureIngestionTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/PyrisLectureIngestionTest.java @@ -20,9 +20,9 @@ import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.iris.settings.IrisCourseSettings; import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; import de.tum.cit.aet.artemis.lecture.LectureUtilService; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.iris.IrisSettingsRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisJobService; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisStatusUpdateService; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisWebhookService; diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/settings/IrisSettingsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/settings/IrisSettingsIntegrationTest.java index 23650865c173..45d0ca6f935d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/settings/IrisSettingsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/settings/IrisSettingsIntegrationTest.java @@ -21,8 +21,8 @@ import de.tum.cit.aet.artemis.domain.iris.settings.IrisLectureIngestionSubSettings; import de.tum.cit.aet.artemis.domain.iris.settings.IrisSettings; import de.tum.cit.aet.artemis.iris.AbstractIrisIntegrationTest; -import de.tum.cit.aet.artemis.repository.iris.IrisSettingsRepository; -import de.tum.cit.aet.artemis.repository.iris.IrisSubSettingsRepository; +import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; +import de.tum.cit.aet.artemis.iris.repository.IrisSubSettingsRepository; import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedSettingsDTO; class IrisSettingsIntegrationTest extends AbstractIrisIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentResourceIntegrationTest.java index 1f935aa2e1db..5c9894f67c60 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentResourceIntegrationTest.java @@ -24,8 +24,8 @@ import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; -import de.tum.cit.aet.artemis.repository.AttachmentRepository; -import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; class AttachmentResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitIntegrationTest.java index 5b1b41dc4e24..6150d117af1d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitIntegrationTest.java @@ -44,10 +44,10 @@ import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; import de.tum.cit.aet.artemis.domain.lecture.Slide; -import de.tum.cit.aet.artemis.repository.AttachmentRepository; -import de.tum.cit.aet.artemis.repository.AttachmentUnitRepository; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.SlideRepository; +import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; +import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.repository.SlideRepository; class AttachmentUnitIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java index 344a18a13d9c..17a9cdddbf8f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java @@ -31,8 +31,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; -import de.tum.cit.aet.artemis.repository.AttachmentUnitRepository; -import de.tum.cit.aet.artemis.repository.SlideRepository; +import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.SlideRepository; import de.tum.cit.aet.artemis.service.LectureUnitProcessingService; import de.tum.cit.aet.artemis.web.rest.dto.LectureUnitInformationDTO; import de.tum.cit.aet.artemis.web.rest.dto.LectureUnitSplitDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/ExerciseUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/ExerciseUnitIntegrationTest.java index 9a135ecbfb2b..2d0ef2a08408 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/ExerciseUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/ExerciseUnitIntegrationTest.java @@ -26,11 +26,11 @@ import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.repository.FileUploadExerciseRepository; -import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; -import de.tum.cit.aet.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; class ExerciseUnitIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureIntegrationTest.java index babea6d79947..d98a8a17bc27 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureIntegrationTest.java @@ -22,6 +22,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.domain.Attachment; import de.tum.cit.aet.artemis.domain.Course; @@ -35,12 +36,11 @@ import de.tum.cit.aet.artemis.domain.lecture.TextUnit; import de.tum.cit.aet.artemis.domain.lecture.VideoUnit; import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.post.ConversationUtilService; -import de.tum.cit.aet.artemis.repository.AttachmentRepository; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.LectureUnitRepository; -import de.tum.cit.aet.artemis.repository.TextExerciseRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; class LectureIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitIntegrationTest.java index c318a5582f96..021f5d58519b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitIntegrationTest.java @@ -26,9 +26,9 @@ import de.tum.cit.aet.artemis.domain.lecture.LectureUnitCompletion; import de.tum.cit.aet.artemis.domain.lecture.OnlineUnit; import de.tum.cit.aet.artemis.domain.lecture.TextUnit; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.LectureUnitCompletionRepository; -import de.tum.cit.aet.artemis.repository.TextUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; +import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; import de.tum.cit.aet.artemis.web.rest.dto.lectureunit.LectureUnitForLearningPathNodeDetailsDTO; class LectureUnitIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitServiceTest.java index 4826456e6aeb..055796add0e7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitServiceTest.java @@ -14,7 +14,7 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; import de.tum.cit.aet.artemis.domain.lecture.LectureUnitCompletion; -import de.tum.cit.aet.artemis.repository.LectureUnitCompletionRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.service.LectureUnitService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUtilService.java b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUtilService.java index ec7ceabce32c..33889d2d3e3a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUtilService.java @@ -15,6 +15,8 @@ import org.springframework.stereotype.Service; import org.springframework.util.ResourceUtils; +import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Attachment; @@ -33,21 +35,19 @@ import de.tum.cit.aet.artemis.domain.lecture.TextUnit; import de.tum.cit.aet.artemis.domain.lecture.VideoUnit; import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; +import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.ExerciseUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.OnlineUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.SlideRepository; +import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.VideoUnitRepository; import de.tum.cit.aet.artemis.post.ConversationFactory; -import de.tum.cit.aet.artemis.repository.AttachmentRepository; -import de.tum.cit.aet.artemis.repository.AttachmentUnitRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExerciseUnitRepository; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.LectureUnitCompletionRepository; -import de.tum.cit.aet.artemis.repository.LectureUnitRepository; -import de.tum.cit.aet.artemis.repository.OnlineUnitRepository; -import de.tum.cit.aet.artemis.repository.SlideRepository; -import de.tum.cit.aet.artemis.repository.TextExerciseRepository; -import de.tum.cit.aet.artemis.repository.TextUnitRepository; -import de.tum.cit.aet.artemis.repository.VideoUnitRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ConversationRepository; import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; /** * Service responsible for initializing the database with specific testdata related to lectures for use in integration tests. diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/OnlineUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/OnlineUnitIntegrationTest.java index 97bab62ab819..60298948b8d8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/OnlineUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/OnlineUnitIntegrationTest.java @@ -34,8 +34,8 @@ import de.tum.cit.aet.artemis.domain.competency.Competency; import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; import de.tum.cit.aet.artemis.domain.lecture.OnlineUnit; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.OnlineUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.repository.OnlineUnitRepository; import de.tum.cit.aet.artemis.web.rest.dto.OnlineResourceDTO; class OnlineUnitIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/TextUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/TextUnitIntegrationTest.java index eaa0868aa442..5ff2b0d463c6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/TextUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/TextUnitIntegrationTest.java @@ -21,8 +21,8 @@ import de.tum.cit.aet.artemis.domain.competency.Competency; import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; import de.tum.cit.aet.artemis.domain.lecture.TextUnit; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.TextUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; class TextUnitIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/VideoUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/VideoUnitIntegrationTest.java index d3ad4e16d07e..2b65e4e89fc0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/VideoUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/VideoUnitIntegrationTest.java @@ -21,8 +21,8 @@ import de.tum.cit.aet.artemis.domain.competency.Competency; import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; import de.tum.cit.aet.artemis.domain.lecture.VideoUnit; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.VideoUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.repository.VideoUnitRepository; class VideoUnitIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java index a4764c741d89..609f74fcdde7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java @@ -20,12 +20,12 @@ import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.AuxiliaryRepositoryRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java index 8b4248990dcc..12f1791e5cce 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java @@ -52,6 +52,7 @@ import com.github.dockerjava.api.command.InspectImageCmd; import com.github.dockerjava.api.command.InspectImageResponse; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; @@ -61,10 +62,9 @@ import de.tum.cit.aet.artemis.domain.participation.ParticipationVCSAccessToken; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; import de.tum.cit.aet.artemis.service.ParticipationVcsAccessTokenService; import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java index 0380c69756e5..e1beff22aa65 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java @@ -19,6 +19,14 @@ import org.springframework.http.HttpStatus; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; +import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.GroupChatRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.OneToOneChatRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; @@ -26,14 +34,6 @@ import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.ConversationMessageRepository; -import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ConversationRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.GroupChatRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.OneToOneChatRepository; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/AnswerMessageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/AnswerMessageIntegrationTest.java index c00528a34e4d..a062bc9b0c95 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/AnswerMessageIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/AnswerMessageIntegrationTest.java @@ -25,6 +25,8 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; +import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Lecture; @@ -39,8 +41,6 @@ import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.lecture.LectureUtilService; import de.tum.cit.aet.artemis.post.ConversationUtilService; -import de.tum.cit.aet.artemis.repository.metis.AnswerPostRepository; -import de.tum.cit.aet.artemis.repository.metis.ConversationMessageRepository; import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; class AnswerMessageIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java index fa0629e9aea4..f1b2d5cf5abd 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java @@ -28,10 +28,10 @@ import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.post.ConversationUtilService; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRepository; import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupChannelManagementService; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; import de.tum.cit.aet.artemis.tutorialgroups.TutorialGroupUtilService; import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/MessageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/MessageIntegrationTest.java index a214776250c3..497901efe540 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/MessageIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/MessageIntegrationTest.java @@ -45,6 +45,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; +import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationNotificationRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.OneToOneChatRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -61,10 +65,6 @@ import de.tum.cit.aet.artemis.domain.notification.Notification; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; import de.tum.cit.aet.artemis.post.ConversationUtilService; -import de.tum.cit.aet.artemis.repository.metis.ConversationMessageRepository; -import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ConversationNotificationRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.OneToOneChatRepository; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/PostingServiceUnitTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/PostingServiceUnitTest.java index febf94159bbd..9b83b54ac6e0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/PostingServiceUnitTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/PostingServiceUnitTest.java @@ -20,9 +20,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.metis.ConversationMessagingService; import de.tum.cit.aet.artemis.service.metis.PostingService; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/ReactionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/ReactionIntegrationTest.java index 1e4cba4aba78..b95c01616481 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/ReactionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/ReactionIntegrationTest.java @@ -24,6 +24,9 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; +import de.tum.cit.aet.artemis.communication.repository.PostRepository; +import de.tum.cit.aet.artemis.communication.repository.ReactionRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; @@ -33,9 +36,6 @@ import de.tum.cit.aet.artemis.domain.metis.PostSortCriterion; import de.tum.cit.aet.artemis.domain.metis.Reaction; import de.tum.cit.aet.artemis.post.ConversationUtilService; -import de.tum.cit.aet.artemis.repository.metis.ConversationMessageRepository; -import de.tum.cit.aet.artemis.repository.metis.PostRepository; -import de.tum.cit.aet.artemis.repository.metis.ReactionRepository; class ReactionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/migration/MigrationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/migration/MigrationServiceTest.java index 5bf1c861c9a0..3dd50162543b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/migration/MigrationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/migration/MigrationServiceTest.java @@ -27,11 +27,11 @@ import de.tum.cit.aet.artemis.core.config.migration.MigrationIntegrityException; import de.tum.cit.aet.artemis.core.config.migration.MigrationRegistry; import de.tum.cit.aet.artemis.core.config.migration.MigrationService; +import de.tum.cit.aet.artemis.core.repository.MigrationChangeRepository; import de.tum.cit.aet.artemis.domain.MigrationChangelog; import de.tum.cit.aet.artemis.migration.entries.TestChangeEntry20211214_231800; import de.tum.cit.aet.artemis.migration.entries.TestChangeEntry20211215_231800; import de.tum.cit.aet.artemis.migration.entries.TestChangeEntry20211216_231800; -import de.tum.cit.aet.artemis.repository.MigrationChangeRepository; class MigrationServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/GroupNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/GroupNotificationServiceTest.java index 03feab66015c..ec78ed1ce440 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/GroupNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/GroupNotificationServiceTest.java @@ -44,6 +44,9 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.repository.NotificationRepository; +import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Attachment; import de.tum.cit.aet.artemis.domain.Course; @@ -62,13 +65,10 @@ import de.tum.cit.aet.artemis.domain.notification.Notification; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.NotificationRepository; -import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationResourceIntegrationTest.java index e3fb9abfe0fe..4643150e069b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationResourceIntegrationTest.java @@ -13,6 +13,8 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.repository.NotificationRepository; +import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.NotificationSetting; import de.tum.cit.aet.artemis.domain.User; @@ -23,8 +25,6 @@ import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; import de.tum.cit.aet.artemis.domain.notification.SingleUserNotification; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; -import de.tum.cit.aet.artemis.repository.NotificationRepository; -import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; class NotificationResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationScheduleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationScheduleServiceTest.java index 69d196dbd4a5..8cd311a2dd9b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationScheduleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationScheduleServiceTest.java @@ -20,6 +20,9 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.communication.repository.NotificationRepository; +import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -28,12 +31,9 @@ import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.NotificationRepository; -import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; import de.tum.cit.aet.artemis.service.messaging.InstanceMessageReceiveService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsResourceIntegrationTest.java index e04b12ab930e..c06275c2afc9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsResourceIntegrationTest.java @@ -13,12 +13,12 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.NotificationSetting; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; import de.tum.cit.aet.artemis.post.ConversationUtilService; -import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; class NotificationSettingsResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsServiceTest.java index 274c1899aa59..acba493f13a1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsServiceTest.java @@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.NotificationSetting; import de.tum.cit.aet.artemis.domain.User; @@ -31,7 +32,6 @@ import de.tum.cit.aet.artemis.domain.notification.GroupNotification; import de.tum.cit.aet.artemis.domain.notification.Notification; import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; -import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel; import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/PushNotificationResourceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/PushNotificationResourceTest.java index 4619181cc8bb..f56617055d9b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/PushNotificationResourceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/PushNotificationResourceTest.java @@ -14,11 +14,11 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.repository.PushNotificationDeviceConfigurationRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfiguration; import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceType; -import de.tum.cit.aet.artemis.repository.PushNotificationDeviceConfigurationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.push_notification.PushNotificationRegisterBody; import de.tum.cit.aet.artemis.web.rest.push_notification.PushNotificationRegisterDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/SingleUserNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/SingleUserNotificationServiceTest.java index 235d7e0f9f9f..9ad07ef36787 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/SingleUserNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/SingleUserNotificationServiceTest.java @@ -66,6 +66,9 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.communication.repository.NotificationRepository; +import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; @@ -96,12 +99,9 @@ import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.NotificationRepository; -import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/SystemNotificationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/SystemNotificationIntegrationTest.java index eddaffe6c2ad..e7d2d4146d48 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/SystemNotificationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/SystemNotificationIntegrationTest.java @@ -14,8 +14,8 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.repository.SystemNotificationRepository; import de.tum.cit.aet.artemis.domain.notification.SystemNotification; -import de.tum.cit.aet.artemis.repository.SystemNotificationRepository; class SystemNotificationIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationIntegrationTest.java index 93e95c22e21c..539080c3975c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationIntegrationTest.java @@ -14,11 +14,11 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.repository.OrganizationRepository; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Organization; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.OrganizationRepository; import de.tum.cit.aet.artemis.web.rest.dto.OrganizationCountDTO; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationUtilService.java b/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationUtilService.java index 4e2edf98053d..94a499c622d4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationUtilService.java @@ -5,8 +5,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.repository.OrganizationRepository; import de.tum.cit.aet.artemis.domain.Organization; -import de.tum.cit.aet.artemis.repository.OrganizationRepository; /** * Service responsible for initializing the database with specific testdata related to organizations for use in integration tests. diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java index 99cb2f3afc1f..9a6b950dd3af 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java @@ -73,19 +73,19 @@ import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedText; import de.tum.cit.aet.artemis.exam.ExamFactory; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseTestService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.GradingScaleService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.feature.Feature; diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationSubmissionIntegrationTest.java index 0cbbd14f6b1a..f0409635d02e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationSubmissionIntegrationTest.java @@ -15,8 +15,8 @@ import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; class ParticipationSubmissionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java index 05be8e5931d3..7b540b16c630 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java @@ -21,6 +21,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.assessment.repository.RatingRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ExampleSubmission; import de.tum.cit.aet.artemis.domain.Exercise; @@ -53,23 +57,19 @@ import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; -import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.repository.ModelingSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.repository.RatingRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; -import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.ParticipationVcsAccessTokenService; import de.tum.cit.aet.artemis.service.UriService; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.TestResourceUtils; diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionIntegrationTest.java index f31f8bc0ba8e..281ecd67eb22 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionIntegrationTest.java @@ -21,9 +21,9 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionVersionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.SubmissionVersionRepository; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionVersionDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java index 211ac0fba386..c1bd6bb08e06 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java @@ -39,10 +39,10 @@ import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismComparisonRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.service.plagiarism.ContinuousPlagiarismControlService; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismCaseService; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionService; diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismAnswerPostIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismAnswerPostIntegrationTest.java index 550f7efb0048..affeeae83a82 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismAnswerPostIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismAnswerPostIntegrationTest.java @@ -16,13 +16,13 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; +import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.domain.metis.AnswerPost; import de.tum.cit.aet.artemis.domain.metis.Post; import de.tum.cit.aet.artemis.post.ConversationUtilService; -import de.tum.cit.aet.artemis.repository.metis.AnswerPostRepository; -import de.tum.cit.aet.artemis.repository.metis.PostRepository; class PlagiarismAnswerPostIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCaseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCaseIntegrationTest.java index 2bc7cfa8f61d..9a7eef6e5c73 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCaseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCaseIntegrationTest.java @@ -16,6 +16,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Team; @@ -30,9 +31,8 @@ import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; -import de.tum.cit.aet.artemis.repository.metis.PostRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismVerdictDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionConfigHelperTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionConfigHelperTest.java index c9369dcb7ec7..ffbe5dde3891 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionConfigHelperTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionConfigHelperTest.java @@ -11,7 +11,7 @@ import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismDetectionConfig; -import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionConfigHelper; class PlagiarismDetectionConfigHelperTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionServiceTest.java index a2331dc88439..6e9657ccb553 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionServiceTest.java @@ -21,7 +21,7 @@ import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismDetectionConfig; import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.service.plagiarism.ModelingPlagiarismDetectionService; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionService; import de.tum.cit.aet.artemis.service.plagiarism.ProgrammingLanguageNotSupportedForPlagiarismDetectionException; diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismIntegrationTest.java index 5ef04337a8f2..2733399f513e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismIntegrationTest.java @@ -26,10 +26,10 @@ import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.TextExerciseRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismComparisonRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismComparisonStatusDTO; class PlagiarismIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismPostIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismPostIntegrationTest.java index 03c079e8ba3a..733549087411 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismPostIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismPostIntegrationTest.java @@ -25,6 +25,8 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; +import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; @@ -33,10 +35,8 @@ import de.tum.cit.aet.artemis.domain.metis.UserRole; import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.post.ConversationUtilService; -import de.tum.cit.aet.artemis.repository.metis.ConversationMessageRepository; -import de.tum.cit.aet.artemis.repository.metis.PostRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismUtilService.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismUtilService.java index b39b9fdbe5cd..450b370cc317 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismUtilService.java @@ -10,6 +10,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.LinkedMultiValueMap; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Submission; @@ -21,13 +22,12 @@ import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; import de.tum.cit.aet.artemis.team.TeamUtilService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/post/ConversationUtilService.java b/src/test/java/de/tum/cit/aet/artemis/post/ConversationUtilService.java index 0dbd01c2d7b4..c645c960ac21 100644 --- a/src/test/java/de/tum/cit/aet/artemis/post/ConversationUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/post/ConversationUtilService.java @@ -14,6 +14,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; +import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.communication.repository.PostRepository; +import de.tum.cit.aet.artemis.communication.repository.ReactionRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.OneToOneChatRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; @@ -33,19 +40,12 @@ import de.tum.cit.aet.artemis.domain.metis.conversation.OneToOneChat; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.lecture.LectureFactory; import de.tum.cit.aet.artemis.lecture.LectureUtilService; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.metis.AnswerPostRepository; -import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.cit.aet.artemis.repository.metis.PostRepository; -import de.tum.cit.aet.artemis.repository.metis.ReactionRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ConversationRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.OneToOneChatRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.user.UserUtilService; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/repository/ParticipationTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/repository/ParticipationTestRepository.java index a3573dc2d092..6b6061f9fa76 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repository/ParticipationTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/repository/ParticipationTestRepository.java @@ -7,8 +7,8 @@ import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Repository public interface ParticipationTestRepository extends ArtemisJpaRepository { diff --git a/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseStudentParticipationTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseStudentParticipationTestRepository.java index df20e33c0170..f631d299f2be 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseStudentParticipationTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseStudentParticipationTestRepository.java @@ -6,8 +6,8 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA testing repository for the ProgrammingExerciseStudentParticipation entity. diff --git a/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseTestRepository.java index 4ed41a1cfd1a..59c5c1563feb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseTestRepository.java @@ -11,8 +11,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; @Repository public interface ProgrammingExerciseTestRepository extends ArtemisJpaRepository { diff --git a/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionTestRepository.java index 1b593b6a4ee7..8f92a5dba8e7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionTestRepository.java @@ -12,9 +12,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the ProgrammingSubmission entity tests. diff --git a/src/test/java/de/tum/cit/aet/artemis/repository/StatisticsRepositoryTest.java b/src/test/java/de/tum/cit/aet/artemis/repository/StatisticsRepositoryTest.java index c6288c2cda3c..6615e753c83e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repository/StatisticsRepositoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/repository/StatisticsRepositoryTest.java @@ -16,6 +16,8 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.repository.PersistenceAuditEventRepository; +import de.tum.cit.aet.artemis.core.repository.StatisticsRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.PersistentAuditEvent; import de.tum.cit.aet.artemis.domain.enumeration.GraphType; diff --git a/src/test/java/de/tum/cit/aet/artemis/repository/UserRepositoryTest.java b/src/test/java/de/tum/cit/aet/artemis/repository/UserRepositoryTest.java index 1a680d50da1c..84479603f7f3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repository/UserRepositoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/repository/UserRepositoryTest.java @@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Authority; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.user.PasswordService; diff --git a/src/test/java/de/tum/cit/aet/artemis/repository/UserTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/repository/UserTestRepository.java index 113125339180..ff136a3face6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repository/UserTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/repository/UserTestRepository.java @@ -2,8 +2,8 @@ import java.util.Set; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.base.ArtemisJpaRepository; public interface UserTestRepository extends ArtemisJpaRepository { diff --git a/src/test/java/de/tum/cit/aet/artemis/science/ScienceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/science/ScienceIntegrationTest.java index 9d48bb239d6b..21076fa3a785 100644 --- a/src/test/java/de/tum/cit/aet/artemis/science/ScienceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/science/ScienceIntegrationTest.java @@ -12,8 +12,8 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.atlas.repository.science.ScienceEventRepository; import de.tum.cit.aet.artemis.domain.science.ScienceEventType; -import de.tum.cit.aet.artemis.repository.science.ScienceEventRepository; import de.tum.cit.aet.artemis.service.feature.Feature; import de.tum.cit.aet.artemis.service.feature.FeatureToggleService; import de.tum.cit.aet.artemis.web.rest.dto.science.ScienceEventDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/science/ScienceSettingsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/science/ScienceSettingsIntegrationTest.java index 1a30f9340700..30399915c854 100644 --- a/src/test/java/de/tum/cit/aet/artemis/science/ScienceSettingsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/science/ScienceSettingsIntegrationTest.java @@ -12,9 +12,9 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.atlas.repository.science.ScienceSettingRepository; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.science.ScienceSetting; -import de.tum.cit.aet.artemis.repository.science.ScienceSettingRepository; class ScienceSettingsIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/science/ScienceUtilService.java b/src/test/java/de/tum/cit/aet/artemis/science/ScienceUtilService.java index de91936dca7d..1ff5cdc968e2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/science/ScienceUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/science/ScienceUtilService.java @@ -7,9 +7,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.repository.science.ScienceEventRepository; import de.tum.cit.aet.artemis.domain.science.ScienceEvent; import de.tum.cit.aet.artemis.domain.science.ScienceEventType; -import de.tum.cit.aet.artemis.repository.science.ScienceEventRepository; @Service public class ScienceUtilService { diff --git a/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java b/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java index 0a00cbaea928..36a92a645318 100644 --- a/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java @@ -48,7 +48,7 @@ import de.tum.cit.aet.artemis.core.web.filter.Lti13LaunchFilter; import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer; -import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; +import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.service.connectors.lti.Lti13Service; import uk.ac.ox.ctl.lti13.lti.Claims; import uk.ac.ox.ctl.lti13.security.oauth2.client.lti.authentication.OidcAuthenticationToken; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/AssessmentServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/AssessmentServiceTest.java index e5919b4cc73e..0fc8aef0428a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/AssessmentServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/AssessmentServiceTest.java @@ -16,6 +16,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -37,11 +38,10 @@ import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseFactory; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; import de.tum.cit.aet.artemis.user.UserUtilService; class AssessmentServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/AuthorizationCheckServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/AuthorizationCheckServiceTest.java index 5021ec00ac19..a6bbd4410c54 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/AuthorizationCheckServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/AuthorizationCheckServiceTest.java @@ -14,6 +14,8 @@ import org.springframework.stereotype.Component; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Result; @@ -21,8 +23,6 @@ import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ComplaintResponseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ComplaintResponseServiceTest.java index 2e7a1b1d31bc..0f83d01ce88b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ComplaintResponseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ComplaintResponseServiceTest.java @@ -12,6 +12,9 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Complaint; import de.tum.cit.aet.artemis.domain.Course; @@ -23,9 +26,6 @@ import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.team.TeamUtilService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ConsistencyCheckTestService.java b/src/test/java/de/tum/cit/aet/artemis/service/ConsistencyCheckTestService.java index db618e314e05..083e1fcfe8ea 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ConsistencyCheckTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ConsistencyCheckTestService.java @@ -11,13 +11,13 @@ import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exercise.programming.MockDelegate; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.dto.ConsistencyErrorDTO; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.RequestUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationServiceTest.java index a22aecd895dc..596823f17673 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationServiceTest.java @@ -19,6 +19,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.GradingScaleFactory; +import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -29,11 +31,9 @@ import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.GradingScaleRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.service.dto.MaxAndReachablePoints; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.dto.BonusSourceResultDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java index ef6f718a4165..463616a10705 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java @@ -21,17 +21,17 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.enumeration.Language; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/DataExportCreationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/DataExportCreationServiceTest.java index 494aecd6e38d..0189b4cfea4b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/DataExportCreationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/DataExportCreationServiceTest.java @@ -41,7 +41,10 @@ import org.springframework.web.client.RestTemplate; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; +import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.connector.apollon.ApollonRequestMockProvider; +import de.tum.cit.aet.artemis.core.repository.DataExportRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.DataExport; @@ -60,18 +63,15 @@ import de.tum.cit.aet.artemis.domain.science.ScienceEvent; import de.tum.cit.aet.artemis.domain.science.ScienceEventType; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseTestService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.post.ConversationUtilService; -import de.tum.cit.aet.artemis.repository.DataExportRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.repository.metis.AnswerPostRepository; -import de.tum.cit.aet.artemis.repository.metis.PostRepository; import de.tum.cit.aet.artemis.science.ScienceUtilService; import de.tum.cit.aet.artemis.service.connectors.apollon.ApollonConversionService; import de.tum.cit.aet.artemis.service.export.DataExportCreationService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/EmailSummaryServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/EmailSummaryServiceTest.java index d9f635e18fc7..67430d94d92d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/EmailSummaryServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/EmailSummaryServiceTest.java @@ -22,15 +22,15 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.NotificationSetting; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; import de.tum.cit.aet.artemis.user.UserUtilService; class EmailSummaryServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ExerciseDateServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ExerciseDateServiceTest.java index e8d50e6fe5ff..228ca147e0a8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ExerciseDateServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ExerciseDateServiceTest.java @@ -21,15 +21,15 @@ import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; import de.tum.cit.aet.artemis.domain.participation.Participation; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ModelingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; import de.tum.cit.aet.artemis.user.UserUtilService; class ExerciseDateServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/FeedbackServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/FeedbackServiceTest.java index 166f5c64a33e..cc87d7e2e7df 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/FeedbackServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/FeedbackServiceTest.java @@ -8,11 +8,11 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.assessment.repository.LongFeedbackTextRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.LongFeedbackText; -import de.tum.cit.aet.artemis.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.repository.LongFeedbackTextRepository; class FeedbackServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java index d0cd0c7fa6ec..a1e9ab9a8913 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java @@ -39,12 +39,12 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.BuildLogStatisticsEntryRepository; -import de.tum.cit.aet.artemis.repository.BuildPlanRepository; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.service.connectors.gitlabci.GitLabCIResultService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java index 0621ebada4a7..434e388b5878 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java @@ -17,6 +17,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.GradingScaleUtilService; +import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; @@ -25,8 +26,7 @@ import de.tum.cit.aet.artemis.domain.GradingScale; import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.exam.ExamUtilService; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsServiceTest.java index 6ea84a0d5f84..0bed9934e6c8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsServiceTest.java @@ -41,9 +41,9 @@ import de.tum.cit.aet.artemis.exercise.programming.ContinuousIntegrationTestService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.BuildPlanRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.connectors.jenkins.build_plan.JenkinsBuildPlanUtils; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseImportService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java index 8f6d2e6d2378..a6515bd4f6a2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java @@ -20,6 +20,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.StudentScoreUtilService; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.competency.CompetencyProgressUtilService; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.competency.LearningPathUtilService; @@ -37,10 +38,9 @@ import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.LectureUtilService; -import de.tum.cit.aet.artemis.repository.CompetencyRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.LectureUnitRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.service.learningpath.LearningPathNgxService; import de.tum.cit.aet.artemis.service.learningpath.LearningPathRecommendationService; import de.tum.cit.aet.artemis.service.learningpath.LearningPathService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/LectureImportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/LectureImportServiceTest.java index 0a4b1b984a14..d4fe6ecec92f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/LectureImportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/LectureImportServiceTest.java @@ -18,7 +18,7 @@ import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; import de.tum.cit.aet.artemis.lecture.LectureUtilService; -import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.user.UserUtilService; class LectureImportServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/LectureServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/LectureServiceTest.java index 8584b94bf8d1..27b05ebe2ab7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/LectureServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/LectureServiceTest.java @@ -21,7 +21,7 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.lecture.LectureFactory; import de.tum.cit.aet.artemis.lecture.LectureUtilService; -import de.tum.cit.aet.artemis.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationServiceTest.java index 30f863517a9c..0270a09ba31b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationServiceTest.java @@ -20,7 +20,7 @@ import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; -import de.tum.cit.aet.artemis.repository.LtiPlatformConfigurationRepository; +import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckServiceTest.java index 22d4e4305d95..48dea12d1234 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckServiceTest.java @@ -18,9 +18,9 @@ import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java index 95b98301c277..15d61bf80cfb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java @@ -18,6 +18,8 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.BuildLogEntry; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -33,11 +35,9 @@ import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.BuildLogEntryRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildLogEntryRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.user.UserUtilService; class ParticipationServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationServiceTest.java index f80eceffdba6..2bad9722c4dd 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationServiceTest.java @@ -17,9 +17,9 @@ import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.user.UserUtilService; class PresentationPointsCalculationServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/RepositoryAccessServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/RepositoryAccessServiceTest.java index cd4ff60c242b..6b632346110c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/RepositoryAccessServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/RepositoryAccessServiceTest.java @@ -19,6 +19,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; @@ -27,8 +28,7 @@ import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseGradingService; import de.tum.cit.aet.artemis.service.programming.RepositoryAccessService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ResultServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ResultServiceTest.java index 86f2d19aa2f9..797297b06786 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ResultServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ResultServiceTest.java @@ -22,13 +22,13 @@ import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.user.UserUtilService; class ResultServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java index 3dd740248062..4feaef8a9fc0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java @@ -17,6 +17,9 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Complaint; import de.tum.cit.aet.artemis.domain.Course; @@ -38,12 +41,9 @@ import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ResultRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionWithComplaintDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/TeamWebsocketServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/TeamWebsocketServiceTest.java index a465a6d37019..35126278f0a3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/TeamWebsocketServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/TeamWebsocketServiceTest.java @@ -15,6 +15,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -24,9 +25,8 @@ import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; import de.tum.cit.aet.artemis.domain.enumeration.TeamImportStrategyType; import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.team.TeamUtilService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.websocket.dto.TeamAssignmentPayload; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionServiceTest.java index 763ee30a7d93..6d978ecd526e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionServiceTest.java @@ -10,21 +10,21 @@ import org.springframework.cache.CacheManager; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.repository.OrganizationRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.modeling.repository.ApollonDiagramRepository; import de.tum.cit.aet.artemis.organization.OrganizationUtilService; -import de.tum.cit.aet.artemis.repository.ApollonDiagramRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.LectureRepository; -import de.tum.cit.aet.artemis.repository.OrganizationRepository; -import de.tum.cit.aet.artemis.repository.hestia.ExerciseHintRepository; +import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintRepository; import de.tum.cit.aet.artemis.service.util.Tuple; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java index 13a518945a70..228565defca7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java @@ -16,6 +16,8 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractAthenaTest; +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.assessment.repository.TextBlockRepository; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.GradingCriterion; import de.tum.cit.aet.artemis.domain.GradingInstruction; @@ -32,10 +34,8 @@ import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; -import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.TextBlockRepository; -import de.tum.cit.aet.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; class AthenaFeedbackSendingServiceTest extends AbstractAthenaTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java index 76ccf98a98ef..1819978923b8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java @@ -23,7 +23,7 @@ import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; import de.tum.cit.aet.artemis.web.rest.errors.ServiceUnavailableException; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java index 00dfb512caf2..afcb76a2a802 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java @@ -23,8 +23,8 @@ import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; class AthenaSubmissionSelectionServiceTest extends AbstractAthenaTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java index 17ee1f82db68..d5921432102c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java @@ -18,10 +18,10 @@ import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.Language; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; import de.tum.cit.aet.artemis.user.UserUtilService; class AthenaSubmissionSendingServiceTest extends AbstractAthenaTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementServiceTest.java index ab49f92a62e4..e8de244661c5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementServiceTest.java @@ -30,8 +30,8 @@ import org.springframework.web.client.RestTemplate; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.service.connectors.gitlab.dto.GitLabPersonalAccessTokenListResponseDTO; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreatorTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreatorTest.java index db6032e333dc..0c329f2baf9b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreatorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreatorTest.java @@ -15,9 +15,9 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; -import de.tum.cit.aet.artemis.repository.BuildPlanRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; class JenkinsPipelineScriptCreatorTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java index f46041d14f72..e1dc2bbea388 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java @@ -37,7 +37,7 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import uk.ac.ox.ctl.lti13.lti.Claims; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalServiceTest.java index f7e6af788b75..20bca9febfce 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalServiceTest.java @@ -22,8 +22,8 @@ import org.junit.jupiter.params.provider.MethodSource; import org.mockito.Mockito; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.UserRepository; class VcsTokenRenewalServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java index c79446f0e5de..fbcd594ba30a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java @@ -15,6 +15,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; @@ -24,10 +25,9 @@ import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; import de.tum.cit.aet.artemis.domain.exam.StudentExam; import de.tum.cit.aet.artemis.exam.ExamUtilService; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExamUserRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamQuizServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamQuizServiceTest.java index 79d2438447d6..519f464e0487 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamQuizServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamQuizServiceTest.java @@ -28,13 +28,13 @@ import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExerciseGroupRepository; -import de.tum.cit.aet.artemis.repository.QuizExerciseRepository; -import de.tum.cit.aet.artemis.repository.QuizSubmissionRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.service.quiz.QuizExerciseService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java index 968eb3371855..5618ecc21c98 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java @@ -26,9 +26,9 @@ import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.exam.ExamUtilService; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.dto.ExamChecklistDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionServiceTest.java index b8891ce10686..b6a656fd9a18 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionServiceTest.java @@ -11,6 +11,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -21,13 +22,12 @@ import de.tum.cit.aet.artemis.domain.exam.StudentExam; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessServiceTest.java index f353eaa6956a..5d7781cceddc 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessServiceTest.java @@ -17,7 +17,7 @@ import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.domain.exam.StudentExam; import de.tum.cit.aet.artemis.exam.ExamUtilService; -import de.tum.cit.aet.artemis.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/export/CourseExamExportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/export/CourseExamExportServiceTest.java index 2b8bbe4dcd81..7ad3025dacdc 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/export/CourseExamExportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/export/CourseExamExportServiceTest.java @@ -15,11 +15,11 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.user.UserUtilService; class CourseExamExportServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationServiceTest.java index e9dad4f7cd9e..325feb7981bd 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationServiceTest.java @@ -15,6 +15,12 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; +import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.communication.repository.NotificationRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationNotificationRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.DomainObject; @@ -24,12 +30,6 @@ import de.tum.cit.aet.artemis.domain.metis.conversation.OneToOneChat; import de.tum.cit.aet.artemis.domain.notification.ConversationNotification; import de.tum.cit.aet.artemis.domain.notification.Notification; -import de.tum.cit.aet.artemis.repository.NotificationRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.ConversationMessageRepository; -import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ConversationNotificationRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ConversationRepository; import de.tum.cit.aet.artemis.user.UserUtilService; class ConversationNotificationServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationServiceTest.java index 14476d19db37..95715d45718f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationServiceTest.java @@ -26,6 +26,8 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.NotificationSetting; @@ -36,11 +38,9 @@ import de.tum.cit.aet.artemis.domain.notification.TutorialGroupNotification; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupRegistration; -import de.tum.cit.aet.artemis.repository.NotificationSettingRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupNotificationRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRegistrationRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupNotificationRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRegistrationRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; import de.tum.cit.aet.artemis.user.UserUtilService; class TutorialGroupNotificationServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/AppleFirebasePushNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/AppleFirebasePushNotificationServiceTest.java index 3bc7c63de09f..0f8406797473 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/AppleFirebasePushNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/AppleFirebasePushNotificationServiceTest.java @@ -24,6 +24,7 @@ import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; +import de.tum.cit.aet.artemis.communication.repository.PushNotificationDeviceConfigurationRepository; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType; import de.tum.cit.aet.artemis.domain.notification.GroupNotification; @@ -31,7 +32,6 @@ import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfiguration; import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceType; -import de.tum.cit.aet.artemis.repository.PushNotificationDeviceConfigurationRepository; class AppleFirebasePushNotificationServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java index 6256bf9882e3..94e791ab0aa9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java @@ -27,9 +27,9 @@ import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleServiceTest.java index 316eca21fdcd..b2a1140dc492 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleServiceTest.java @@ -27,10 +27,10 @@ import org.springframework.scheduling.config.ScheduledTaskHolder; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.repository.DataExportRepository; import de.tum.cit.aet.artemis.domain.DataExport; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.DataExportState; -import de.tum.cit.aet.artemis.repository.DataExportRepository; import de.tum.cit.aet.artemis.user.UserUtilService; @ExtendWith(MockitoExtension.class) diff --git a/src/test/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupServiceTest.java index ad4693325a03..ca4411763fd9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupServiceTest.java @@ -14,10 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.repository.PushNotificationDeviceConfigurationRepository; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfiguration; import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceType; -import de.tum.cit.aet.artemis.repository.PushNotificationDeviceConfigurationRepository; import de.tum.cit.aet.artemis.user.UserUtilService; class PushNotificationDeviceConfigurationCleanupServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/settings/ide/IdePreferencesIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/settings/ide/IdePreferencesIntegrationTest.java index 2584bee606c0..4fc41b1566b2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/settings/ide/IdePreferencesIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/settings/ide/IdePreferencesIntegrationTest.java @@ -18,8 +18,8 @@ import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.settings.ide.Ide; import de.tum.cit.aet.artemis.domain.settings.ide.UserIdeMapping; -import de.tum.cit.aet.artemis.repository.settings.IdeRepository; -import de.tum.cit.aet.artemis.repository.settings.UserIdeMappingRepository; +import de.tum.cit.aet.artemis.programming.repository.settings.IdeRepository; +import de.tum.cit.aet.artemis.programming.repository.settings.UserIdeMappingRepository; import de.tum.cit.aet.artemis.web.rest.dto.settings.ide.IdeDTO; import de.tum.cit.aet.artemis.web.rest.dto.settings.ide.IdeMappingDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/team/TeamImportIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/team/TeamImportIntegrationTest.java index 68f7f28a20f0..24c3f1010521 100644 --- a/src/test/java/de/tum/cit/aet/artemis/team/TeamImportIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/team/TeamImportIntegrationTest.java @@ -24,7 +24,7 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; import de.tum.cit.aet.artemis.domain.enumeration.TeamImportStrategyType; -import de.tum.cit.aet.artemis.repository.TeamRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; class TeamImportIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/team/TeamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/team/TeamIntegrationTest.java index aea4ee83bd8c..abad3d39e396 100644 --- a/src/test/java/de/tum/cit/aet/artemis/team/TeamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/team/TeamIntegrationTest.java @@ -30,10 +30,10 @@ import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.TeamRepository; import de.tum.cit.aet.artemis.service.dto.TeamSearchUserDTO; import de.tum.cit.aet.artemis.web.rest.dto.CoursesForDashboardDTO; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseDetailsDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/team/TeamUtilService.java b/src/test/java/de/tum/cit/aet/artemis/team/TeamUtilService.java index 44395e183a03..f3002edfb52e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/team/TeamUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/team/TeamUtilService.java @@ -9,13 +9,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Authority; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.TeamRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.user.UserUtilService; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/text/AssessmentEventIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/AssessmentEventIntegrationTest.java index 93b68002aa40..9b28d744c2df 100644 --- a/src/test/java/de/tum/cit/aet/artemis/text/AssessmentEventIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/AssessmentEventIntegrationTest.java @@ -11,17 +11,17 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.repository.TextAssessmentEventRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.analytics.TextAssessmentEvent; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.TextAssessmentEventRepository; -import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; class AssessmentEventIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java index 13ad88e02ebe..1e4ab3c3980d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java @@ -36,6 +36,9 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; +import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.assessment.repository.TextBlockRepository; import de.tum.cit.aet.artemis.connector.AthenaRequestMockProvider; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Complaint; @@ -60,22 +63,19 @@ import de.tum.cit.aet.artemis.domain.participation.Participation; import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseFactory; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.repository.ExamRepository; -import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ExerciseGroupRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.TextBlockRepository; -import de.tum.cit.aet.artemis.repository.TextExerciseRepository; -import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.service.TextAssessmentService; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; import de.tum.cit.aet.artemis.web.rest.dto.TextAssessmentDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/text/TextExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/TextExerciseIntegrationTest.java index 4b7382babf7f..4492a22a9152 100644 --- a/src/test/java/de/tum/cit/aet/artemis/text/TextExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/TextExerciseIntegrationTest.java @@ -35,6 +35,10 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ExampleSubmission; @@ -62,20 +66,16 @@ import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.plagiarism.PlagiarismUtilService; -import de.tum.cit.aet.artemis.repository.ExampleSubmissionRepository; -import de.tum.cit.aet.artemis.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; -import de.tum.cit.aet.artemis.repository.TextExerciseRepository; -import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.util.ExerciseIntegrationTestService; import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider; import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider.InvalidExamExerciseDateConfiguration; diff --git a/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java index 77637f536020..1803c9766d1c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java @@ -19,6 +19,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.SubmissionVersion; @@ -37,17 +38,16 @@ import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingSubmissionElement; import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; +import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionVersionRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.SubmissionVersionRepository; -import de.tum.cit.aet.artemis.repository.TeamRepository; -import de.tum.cit.aet.artemis.repository.TextSubmissionRepository; -import de.tum.cit.aet.artemis.repository.metis.PostRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismCaseRepository; -import de.tum.cit.aet.artemis.repository.plagiarism.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseDetailsDTO; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/AbstractTutorialGroupIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/AbstractTutorialGroupIntegrationTest.java index 203a38adcfbc..286c48c184cc 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/AbstractTutorialGroupIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/AbstractTutorialGroupIntegrationTest.java @@ -22,6 +22,10 @@ import org.springframework.http.HttpStatus; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseTestService; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.User; @@ -34,19 +38,15 @@ import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSchedule; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.metis.ConversationParticipantRepository; -import de.tum.cit.aet.artemis.repository.metis.conversation.ChannelRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupFreePeriodRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupNotificationRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRegistrationRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupScheduleRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupSessionRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupsConfigurationRepository; import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupChannelManagementService; import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupService; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupFreePeriodRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupNotificationRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRegistrationRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupScheduleRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupSessionRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupsConfigurationRepository; import de.tum.cit.aet.artemis.user.UserUtilService; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java index b92322f2f360..1659b5a56dbb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java @@ -9,7 +9,6 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import java.time.LocalDate; import java.util.ArrayList; @@ -31,6 +30,7 @@ import com.google.common.collect.ImmutableSet; +import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; import de.tum.cit.aet.artemis.domain.enumeration.Language; @@ -40,7 +40,6 @@ import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupRegistration; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; import de.tum.cit.aet.artemis.post.ConversationUtilService; -import de.tum.cit.aet.artemis.repository.metis.PostRepository; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupResource; diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupUtilService.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupUtilService.java index e93a518c8a2c..5b8f96affd85 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupUtilService.java @@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; @@ -24,12 +25,11 @@ import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupRegistration; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupFreePeriodRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRegistrationRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupSessionRepository; -import de.tum.cit.aet.artemis.repository.tutorialgroups.TutorialGroupsConfigurationRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupFreePeriodRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRegistrationRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupSessionRepository; +import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupsConfigurationRepository; /** * Service responsible for initializing the database with specific testdata related to tutorial groups for use in integration tests. diff --git a/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java b/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java index 360743bc9f4c..35c96f27ee88 100644 --- a/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java @@ -27,7 +27,11 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.springframework.util.LinkedMultiValueMap; +import de.tum.cit.aet.artemis.atlas.repository.science.ScienceEventRepository; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.repository.AuthorityRepository; +import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Authority; @@ -39,13 +43,9 @@ import de.tum.cit.aet.artemis.domain.science.ScienceEventType; import de.tum.cit.aet.artemis.exercise.programming.MockDelegate; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.cit.aet.artemis.repository.AuthorityRepository; -import de.tum.cit.aet.artemis.repository.CourseRepository; -import de.tum.cit.aet.artemis.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.repository.ParticipationVCSAccessTokenRepository; -import de.tum.cit.aet.artemis.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; -import de.tum.cit.aet.artemis.repository.science.ScienceEventRepository; +import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.programming.repository.ParticipationVCSAccessTokenRepository; import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; import de.tum.cit.aet.artemis.service.connectors.lti.LtiService; import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; diff --git a/src/test/java/de/tum/cit/aet/artemis/user/UserUtilService.java b/src/test/java/de/tum/cit/aet/artemis/user/UserUtilService.java index e0f1ee036768..c293ce3e46a7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/user/UserUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/UserUtilService.java @@ -20,11 +20,11 @@ import org.springframework.security.test.context.TestSecurityContextHolder; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.repository.AuthorityRepository; +import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Authority; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.repository.AuthorityRepository; -import de.tum.cit.aet.artemis.repository.UserRepository; import de.tum.cit.aet.artemis.repository.UserTestRepository; import de.tum.cit.aet.artemis.service.user.PasswordService; diff --git a/src/test/java/de/tum/cit/aet/artemis/util/HestiaUtilTestService.java b/src/test/java/de/tum/cit/aet/artemis/util/HestiaUtilTestService.java index 7a794aad4f0d..92ea63e1a1d1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/util/HestiaUtilTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/HestiaUtilTestService.java @@ -25,12 +25,12 @@ import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.repository.SolutionProgrammingExerciseParticipationRepository; -import de.tum.cit.aet.artemis.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.service.connectors.GitService; /** From 9462ce60bb721bcf00db135c00b7a3400a34e55f Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Wed, 11 Sep 2024 15:52:23 +0200 Subject: [PATCH 05/43] Migrate slash-separated paths from in.www1.artemis to cit.ww1.artemis --- docs/dev/guidelines/database.rst | 2 +- .../artemis/metis/linkpreview/LinkPreviewIntegrationTest.java | 2 +- .../metis/linkpreview/mockFiles/github_pull_request_6618.txt | 4 ++-- .../generate_code_cov_table/generate_code_cov_table.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/dev/guidelines/database.rst b/docs/dev/guidelines/database.rst index 0c7119159a9d..65365549f10a 100644 --- a/docs/dev/guidelines/database.rst +++ b/docs/dev/guidelines/database.rst @@ -352,7 +352,7 @@ Solutions for known issues There is a problem with the way you save the associated objects. You must follow this procedure: - #. Save the child entity (e.g., `Feedback `_) without connection to the parent entity (e.g., `Result `_) + #. Save the child entity (e.g., `Feedback `_) without connection to the parent entity (e.g., `Result `_) #. Add back the connection of the child entity to the parent entity. #. Save the parent entity. #. Always use the returned value after saving the entity, see: ``feedback = feedbackRepository.save(feedback);`` diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/linkpreview/LinkPreviewIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/linkpreview/LinkPreviewIntegrationTest.java index 1a357ebb5268..e58b065418d0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/linkpreview/LinkPreviewIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/linkpreview/LinkPreviewIntegrationTest.java @@ -31,7 +31,7 @@ class LinkPreviewIntegrationTest extends AbstractSpringIntegrationIndependentTes // this link will return null for all fields because it does not include OG tags private static final String GOOGLE_URL = "https://google.com"; - private static final String MOCK_FILE_PATH_PREFIX = "src/test/java/de/tum/in/www1/artemis/metis/linkpreview/mockFiles/"; + private static final String MOCK_FILE_PATH_PREFIX = "src/test/java/de/tum/cit/aet/artemis/metis/linkpreview/mockFiles/"; @Autowired private CacheManager cacheManager; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/linkpreview/mockFiles/github_pull_request_6618.txt b/src/test/java/de/tum/cit/aet/artemis/metis/linkpreview/mockFiles/github_pull_request_6618.txt index eb8566bd6bf2..a10d7a146154 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/linkpreview/mockFiles/github_pull_request_6618.txt +++ b/src/test/java/de/tum/cit/aet/artemis/metis/linkpreview/mockFiles/github_pull_request_6618.txt @@ -1770,7 +1770,7 @@ General

- src/main/java/de/tum/in/www1/artemis/web/rest/CourseResource.java Outdated + src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java Outdated Show resolved @@ -1790,7 +1790,7 @@ General
- src/main/java/de/tum/in/www1/artemis/web/rest/CourseResource.java Outdated + src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java Outdated Show resolved diff --git a/supporting_scripts/generate_code_cov_table/generate_code_cov_table.py b/supporting_scripts/generate_code_cov_table/generate_code_cov_table.py index fe4aa46f4ed1..af68a21d4e97 100644 --- a/supporting_scripts/generate_code_cov_table/generate_code_cov_table.py +++ b/supporting_scripts/generate_code_cov_table/generate_code_cov_table.py @@ -195,7 +195,7 @@ def filter_file_changes(file_changes): client_file_changes[file_name[len("src/main/webapp/") :]] = change_type continue elif file_name.startswith( - "src/main/java/de/tum/in/www1/artemis" + "src/main/java/de/tum/cit/aet/artemis" ) and file_name.endswith(".java"): server_file_changes[file_name[len("src/main/java/") :]] = change_type continue From 9cf2603dfe532e5d5b3b8ef20790698d16861109 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Wed, 11 Sep 2024 15:54:08 +0200 Subject: [PATCH 06/43] move domain classes into modules (part 1) WORK IN PROGRESS --- .../domain/AssessmentNote.java | 5 +- .../domain}/ParticipantScore.java | 4 +- .../domain}/StudentScore.java | 4 +- .../domain}/TeamScore.java | 4 +- .../domain}/TutorParticipation.java | 2 +- .../dto}/ScoreDistribution.java | 2 +- .../dto}/TutorEffort.java | 3 +- .../dto}/dashboard/ExerciseMapEntry.java | 2 +- .../dto}/dashboard/ExerciseRatingCount.java | 2 +- .../dto}/dashboard/ResultCount.java | 2 +- ...aderboardAnsweredMoreFeedbackRequests.java | 2 +- .../tutor/TutorLeaderboardAssessments.java | 2 +- .../TutorLeaderboardComplaintResponses.java | 2 +- .../tutor/TutorLeaderboardComplaints.java | 2 +- .../TutorLeaderboardMoreFeedbackRequests.java | 2 +- .../repository/ComplaintRepository.java | 34 +++---- .../ComplaintResponseRepository.java | 6 +- .../ParticipantScoreRepository.java | 6 +- .../repository/RatingRepository.java | 2 +- .../repository/ResultRepository.java | 4 +- .../repository/StudentScoreRepository.java | 2 +- .../repository/TeamScoreRepository.java | 2 +- .../TextAssessmentEventRepository.java | 2 +- .../repository/TextBlockRepository.java | 2 +- .../TutorParticipationRepository.java | 2 +- .../domain/competency/BaseCompetency.java | 2 +- .../domain/competency/Competency.java | 2 +- .../domain/competency/CompetencyJol.java | 2 +- .../domain/competency/CompetencyProgress.java | 2 +- .../domain/competency/CompetencyRelation.java | 2 +- .../domain/competency/CompetencyTaxonomy.java | 2 +- .../domain/competency/CourseCompetency.java | 6 +- .../domain/competency/KnowledgeArea.java | 2 +- .../domain/competency/LearningPath.java | 2 +- .../domain/competency/Prerequisite.java | 2 +- .../domain/competency/RelationType.java | 2 +- .../{ => atlas}/domain/competency/Source.java | 2 +- .../competency/StandardizedCompetency.java | 2 +- .../domain/science/ScienceEvent.java | 2 +- .../domain/science/ScienceEventType.java | 2 +- .../domain/science/ScienceSetting.java | 2 +- .../CompetencyMetricsRepository.java | 2 +- .../CompetencyProgressRepository.java | 4 +- .../CompetencyRelationRepository.java | 6 +- .../repository/CompetencyRepository.java | 2 +- .../CourseCompetencyRepository.java | 4 +- .../repository/LearningPathRepository.java | 2 +- .../repository/PrerequisiteRepository.java | 2 +- .../atlas/repository/SourceRepository.java | 2 +- .../competency/CompetencyJolRepository.java | 2 +- .../competency/KnowledgeAreaRepository.java | 2 +- .../StandardizedCompetencyRepository.java | 2 +- .../science/ScienceEventRepository.java | 4 +- .../science/ScienceSettingRepository.java | 2 +- .../ConversationSettings.java | 2 +- .../domain}/AnswerPost.java | 2 +- .../domain}/ConversationParticipant.java | 6 +- .../ConversationParticipantSettingsView.java | 2 +- .../domain}/ConversationType.java | 2 +- .../domain}/CourseWideContext.java | 2 +- .../domain}/CreatedConversationMessage.java | 4 +- .../metis => communication/domain}/Post.java | 6 +- .../domain}/PostConstraints.java | 2 +- .../PostContextConstraintValidator.java | 2 +- .../domain}/PostSortCriterion.java | 2 +- .../domain}/Posting.java | 2 +- .../domain}/Reaction.java | 2 +- .../domain}/ReactionConstraintValidator.java | 2 +- .../domain}/ReactionConstraints.java | 2 +- .../domain}/UserRole.java | 2 +- .../domain}/conversation/Channel.java | 8 +- .../domain}/conversation/ChannelSubType.java | 2 +- .../domain}/conversation/Conversation.java | 6 +- .../domain}/conversation/GroupChat.java | 8 +- .../domain}/conversation/OneToOneChat.java | 8 +- .../ConversationNotification.java | 6 +- .../ConversationNotificationFactory.java | 8 +- .../notification/GroupNotification.java | 2 +- .../GroupNotificationFactory.java | 22 ++--- .../domain/notification/Notification.java | 2 +- .../notification/NotificationConstants.java | 2 +- .../NotificationPlaceholderCreator.java | 2 +- .../notification/NotificationTarget.java | 2 +- .../NotificationTargetFactory.java | 10 +- .../notification/SingleUserNotification.java | 2 +- .../SingleUserNotificationFactory.java | 92 +++++++++--------- .../notification/SystemNotification.java | 2 +- .../TutorialGroupNotification.java | 4 +- .../TutorialGroupNotificationFactory.java | 12 +-- .../PushNotificationDeviceConfiguration.java | 2 +- ...PushNotificationDeviceConfigurationId.java | 2 +- .../PushNotificationDeviceType.java | 2 +- .../dto}/ConversationSummary.java | 4 +- .../dto}/GeneralConversationInfo.java | 3 +- .../dto}/UserConversationInfo.java | 5 +- .../repository/AnswerPostRepository.java | 2 +- .../ConversationMessageRepository.java | 2 +- .../ConversationParticipantRepository.java | 2 +- .../repository/CustomPostRepository.java | 2 +- .../repository/CustomPostRepositoryImpl.java | 4 +- .../GroupNotificationRepository.java | 2 +- .../repository/MessageSpecs.java | 18 ++-- .../repository/NotificationRepository.java | 2 +- .../repository/PostRepository.java | 2 +- ...ficationDeviceConfigurationRepository.java | 6 +- .../repository/ReactionRepository.java | 2 +- .../SingleUserNotificationRepository.java | 2 +- .../SystemNotificationRepository.java | 2 +- .../conversation/ChannelRepository.java | 2 +- .../ConversationNotificationRepository.java | 2 +- .../conversation/ConversationRepository.java | 6 +- .../conversation/GroupChatRepository.java | 2 +- .../conversation/OneToOneChatRepository.java | 2 +- .../core/config/CacheConfiguration.java | 4 +- .../aet/artemis/core/config/Constants.java | 2 +- .../aet/artemis/core/config/MetricsBean.java | 4 +- .../MigrationEntry20240614_140000.java | 2 +- .../websocket/WebsocketConfiguration.java | 2 +- .../dto}/CourseStatisticsAverageScore.java | 3 +- .../dto}/StatisticsEntry.java | 2 +- .../core/repository/CourseRepository.java | 8 +- .../core/repository/StatisticsRepository.java | 64 ++++++------ .../core/web/admin/AdminCourseResource.java | 2 +- .../core/web/admin/AdminExamResource.java | 2 +- .../AdminStandardizedCompetencyResource.java | 2 +- .../AdminSystemNotificationResource.java | 4 +- .../AdminTextAssessmentEventResource.java | 2 +- .../admin/iris/AdminIrisSettingsResource.java | 2 +- .../core/web/filter/Lti13LaunchFilter.java | 4 +- .../cit/aet/artemis/domain/Attachment.java | 2 +- .../cit/aet/artemis/domain/BaseExercise.java | 2 +- .../tum/cit/aet/artemis/domain/Complaint.java | 2 +- .../de/tum/cit/aet/artemis/domain/Course.java | 16 +-- .../cit/aet/artemis/domain/DomainObject.java | 2 +- .../aet/artemis/domain/ExampleSubmission.java | 2 +- .../tum/cit/aet/artemis/domain/Exercise.java | 25 ++--- .../cit/aet/artemis/domain/GradingScale.java | 2 +- .../aet/artemis/domain/LearningObject.java | 2 +- .../tum/cit/aet/artemis/domain/Lecture.java | 4 +- .../artemis/domain/ProgrammingExercise.java | 14 +-- .../domain/ProgrammingExerciseTestCase.java | 10 +- .../artemis/domain/ProgrammingSubmission.java | 4 +- .../cit/aet/artemis/domain/Repository.java | 2 +- .../de/tum/cit/aet/artemis/domain/Result.java | 11 ++- .../cit/aet/artemis/domain/Submission.java | 9 +- .../de/tum/cit/aet/artemis/domain/Team.java | 2 +- .../de/tum/cit/aet/artemis/domain/User.java | 14 +-- .../CompetencyProgressConfidenceReason.java | 2 +- .../domain/enumeration/ExerciseLifecycle.java | 6 +- .../domain/enumeration/ExerciseType.java | 6 +- .../enumeration/IExerciseLifecycle.java | 4 +- .../TutorialGroupSessionStatus.java | 4 +- .../{domain/exam => exam/domain}/Exam.java | 2 +- .../exam => exam/domain}/ExamSession.java | 2 +- .../exam => exam/domain}/ExamUser.java | 2 +- .../exam => exam/domain}/ExerciseGroup.java | 2 +- .../exam => exam/domain}/StudentExam.java | 4 +- .../domain}/SuspiciousExamSessions.java | 2 +- .../domain}/SuspiciousSessionReason.java | 2 +- .../SuspiciousSessionsAnalysisOptions.java | 2 +- .../event/ExamAttendanceCheckEvent.java | 2 +- .../domain}/event/ExamLiveEvent.java | 2 +- .../event/ExamWideAnnouncementEvent.java | 2 +- .../event/ProblemStatementUpdateEvent.java | 2 +- .../domain}/event/WorkingTimeUpdateEvent.java | 2 +- .../repository/ExamLiveEventRepository.java | 2 +- .../exam/repository/ExamRepository.java | 4 +- .../repository/ExamSessionRepository.java | 2 +- .../exam/repository/ExamUserRepository.java | 2 +- .../repository/ExerciseGroupRepository.java | 2 +- .../repository/StudentExamRepository.java | 10 +- .../IdToPresentationScoreSum.java | 2 +- .../domain/participation/Participant.java | 2 +- .../domain/participation/Participation.java | 7 +- .../participation/ParticipationInterface.java | 2 +- .../participation/StudentParticipation.java | 4 +- .../dto}/ExerciseTypeMetricsEntry.java | 2 +- .../repository/ExerciseRepository.java | 18 ++-- .../repository/ParticipationRepository.java | 2 +- .../StudentParticipationRepository.java | 14 +-- .../repository/SubmissionRepository.java | 20 ++-- .../iris => iris/domain}/IrisTemplate.java | 2 +- .../message/IrisJsonMessageContent.java | 2 +- .../domain}/message/IrisMessage.java | 4 +- .../domain}/message/IrisMessageContent.java | 2 +- .../domain}/message/IrisMessageSender.java | 2 +- .../message/IrisTextMessageContent.java | 2 +- .../domain}/session/IrisChatSession.java | 2 +- .../session/IrisCourseChatSession.java | 2 +- .../session/IrisExerciseChatSession.java | 2 +- .../domain}/session/IrisHestiaSession.java | 4 +- .../domain}/session/IrisSession.java | 4 +- .../domain}/settings/IrisChatSubSettings.java | 4 +- .../IrisCompetencyGenerationSubSettings.java | 4 +- .../domain}/settings/IrisCourseSettings.java | 2 +- .../settings/IrisExerciseSettings.java | 2 +- .../domain}/settings/IrisGlobalSettings.java | 2 +- .../settings/IrisHestiaSubSettings.java | 4 +- .../IrisLectureIngestionSubSettings.java | 2 +- .../settings/IrisModelListConverter.java | 2 +- .../domain}/settings/IrisSettings.java | 2 +- .../domain}/settings/IrisSettingsType.java | 2 +- .../domain}/settings/IrisSubSettings.java | 2 +- .../domain}/settings/IrisSubSettingsType.java | 2 +- .../IrisCourseChatSessionRepository.java | 2 +- .../IrisExerciseChatSessionRepository.java | 2 +- .../IrisHestiaSessionRepository.java | 2 +- .../repository/IrisMessageRepository.java | 4 +- .../repository/IrisSessionRepository.java | 2 +- .../repository/IrisSettingsRepository.java | 8 +- .../repository/IrisSubSettingsRepository.java | 2 +- .../repository/IrisTemplateRepository.java | 2 +- .../domain}/AttachmentUnit.java | 2 +- .../domain}/ExerciseUnit.java | 4 +- .../domain}/LectureUnit.java | 4 +- .../domain}/LectureUnitCompletion.java | 2 +- .../domain}/OnlineUnit.java | 2 +- .../lecture => lecture/domain}/Slide.java | 2 +- .../lecture => lecture/domain}/TextUnit.java | 2 +- .../lecture => lecture/domain}/VideoUnit.java | 2 +- .../repository/AttachmentUnitRepository.java | 2 +- .../repository/ExerciseUnitRepository.java | 2 +- .../LectureUnitCompletionRepository.java | 4 +- .../LectureUnitMetricsRepository.java | 2 +- .../repository/LectureUnitRepository.java | 2 +- .../repository/OnlineUnitRepository.java | 2 +- .../lecture/repository/SlideRepository.java | 2 +- .../repository/TextUnitRepository.java | 2 +- .../repository/VideoUnitRepository.java | 2 +- .../lti => lti/domain}/LtiResourceLaunch.java | 3 +- .../{domain/lti => lti/dto}/Claims.java | 2 +- .../lti => lti/dto}/Lti13AgsClaim.java | 2 +- .../dto}/Lti13ClientRegistration.java | 2 +- .../dto}/Lti13DeepLinkingResponse.java | 2 +- .../lti => lti/dto}/Lti13LaunchRequest.java | 2 +- .../dto}/Lti13PlatformConfiguration.java | 2 +- .../dto}/LtiAuthenticationResponse.java | 2 +- .../{domain/lti => lti/dto}/Scopes.java | 2 +- .../Lti13ResourceLaunchRepository.java | 2 +- .../domain}/ApollonDiagram.java | 2 +- .../domain}/ModelCluster.java | 2 +- .../domain}/ModelElement.java | 2 +- .../domain}/ModelingExercise.java | 2 +- .../domain}/ModelingSubmission.java | 2 +- .../domain}/SimilarElementCount.java | 2 +- .../repository/ApollonDiagramRepository.java | 2 +- .../repository/ModelClusterRepository.java | 2 +- .../repository/ModelElementRepository.java | 2 +- .../ModelingExerciseRepository.java | 2 +- .../ModelingSubmissionRepository.java | 2 +- .../domain}/PlagiarismCase.java | 4 +- .../domain}/PlagiarismComparison.java | 4 +- .../domain}/PlagiarismDetectionConfig.java | 2 +- .../domain}/PlagiarismMatch.java | 2 +- .../domain}/PlagiarismResult.java | 6 +- .../domain}/PlagiarismStatus.java | 2 +- .../domain}/PlagiarismSubmission.java | 10 +- .../domain}/PlagiarismSubmissionElement.java | 2 +- .../domain}/PlagiarismVerdict.java | 2 +- .../modeling/ModelingPlagiarismResult.java | 4 +- .../modeling/ModelingSubmissionElement.java | 4 +- .../domain}/text/TextPlagiarismResult.java | 6 +- .../domain}/text/TextSubmissionElement.java | 6 +- .../repository/PlagiarismCaseRepository.java | 2 +- .../PlagiarismComparisonRepository.java | 4 +- .../PlagiarismResultRepository.java | 2 +- .../PlagiarismSubmissionRepository.java | 4 +- ...tBaseProgrammingExerciseParticipation.java | 5 +- .../domain}/BuildLogStatisticsEntry.java | 2 +- .../domain}/ParticipationVCSAccessToken.java | 3 +- .../ProgrammingExerciseParticipation.java | 3 +- ...ogrammingExerciseStudentParticipation.java | 5 +- ...utionProgrammingExerciseParticipation.java | 2 +- ...plateProgrammingExerciseParticipation.java | 2 +- .../domain/hestia/CodeHint.java | 2 +- .../domain/hestia/CoverageFileReport.java | 2 +- .../domain/hestia/CoverageReport.java | 2 +- .../domain/hestia/ExerciseHint.java | 2 +- .../domain/hestia/ExerciseHintActivation.java | 2 +- .../ProgrammingExerciseGitDiffEntry.java | 2 +- .../ProgrammingExerciseGitDiffReport.java | 2 +- .../ProgrammingExerciseSolutionEntry.java | 2 +- .../hestia/ProgrammingExerciseTask.java | 2 +- .../ProgrammingExerciseTestCaseType.java | 2 +- .../hestia/TestwiseCoverageReportEntry.java | 2 +- .../domain}/ide/Ide.java | 2 +- .../domain}/ide/UserIdeMapping.java | 2 +- .../LockRepositoryPolicy.java | 4 +- .../SubmissionPenaltyPolicy.java | 4 +- .../submissionpolicy/SubmissionPolicy.java | 2 +- .../BuildLogStatisticsEntryRepository.java | 4 +- ...ParticipationVCSAccessTokenRepository.java | 2 +- .../ProgrammingExerciseRepository.java | 12 +-- ...xerciseStudentParticipationRepository.java | 2 +- ...ammingExerciseParticipationRepository.java | 6 +- .../SubmissionPolicyRepository.java | 2 +- ...ammingExerciseParticipationRepository.java | 4 +- .../repository/hestia/CodeHintRepository.java | 2 +- .../hestia/CoverageFileReportRepository.java | 2 +- .../hestia/CoverageReportRepository.java | 2 +- .../ExerciseHintActivationRepository.java | 2 +- .../hestia/ExerciseHintRepository.java | 2 +- ...ammingExerciseGitDiffReportRepository.java | 2 +- ...ammingExerciseSolutionEntryRepository.java | 2 +- .../ProgrammingExerciseTaskRepository.java | 2 +- ...TestwiseCoverageReportEntryRepository.java | 2 +- .../repository/settings/IdeRepository.java | 2 +- .../settings/UserIdeMappingRepository.java | 4 +- .../view => quiz/config}/QuizView.java | 4 +- .../domain}/AbstractQuizSubmission.java | 6 +- .../quiz => quiz/domain}/AnswerCounter.java | 2 +- .../quiz => quiz/domain}/AnswerOption.java | 4 +- .../domain}/DragAndDropMapping.java | 4 +- .../domain}/DragAndDropQuestion.java | 12 +-- .../domain}/DragAndDropQuestionStatistic.java | 2 +- .../domain}/DragAndDropSubmittedAnswer.java | 6 +- .../quiz => quiz/domain}/DragItem.java | 4 +- .../quiz => quiz/domain}/DropLocation.java | 4 +- .../domain}/DropLocationCounter.java | 2 +- .../domain}/MultipleChoiceQuestion.java | 12 +-- .../MultipleChoiceQuestionStatistic.java | 2 +- .../MultipleChoiceSubmittedAnswer.java | 4 +- .../quiz => quiz/domain}/PointCounter.java | 2 +- .../quiz => quiz/domain}/QuizBatch.java | 4 +- .../domain}/QuizConfiguration.java | 2 +- .../quiz => quiz/domain}/QuizExercise.java | 8 +- .../quiz => quiz/domain}/QuizGroup.java | 2 +- .../domain}/QuizPointStatistic.java | 2 +- .../quiz => quiz/domain}/QuizPool.java | 6 +- .../quiz => quiz/domain}/QuizQuestion.java | 6 +- .../domain}/QuizQuestionComponent.java | 2 +- .../domain}/QuizQuestionStatistic.java | 2 +- .../QuizQuestionStatisticComponent.java | 2 +- .../quiz => quiz/domain}/QuizStatistic.java | 2 +- .../domain}/QuizStatisticCounter.java | 2 +- .../quiz => quiz/domain}/QuizSubmission.java | 2 +- .../domain}/QuizSubmittedAnswerCount.java | 2 +- .../domain}/ShortAnswerMapping.java | 4 +- .../domain}/ShortAnswerQuestion.java | 12 +-- .../domain}/ShortAnswerQuestionStatistic.java | 2 +- .../domain}/ShortAnswerSolution.java | 4 +- .../quiz => quiz/domain}/ShortAnswerSpot.java | 4 +- .../domain}/ShortAnswerSpotCounter.java | 2 +- .../domain}/ShortAnswerSubmittedAnswer.java | 6 +- .../domain}/ShortAnswerSubmittedText.java | 4 +- .../quiz => quiz/domain}/SubmittedAnswer.java | 4 +- .../domain}/compare/DnDMapping.java | 2 +- .../domain}/compare/SAMapping.java | 2 +- .../domain}/scoring/ScoringStrategy.java | 6 +- ...coringStrategyDragAndDropAllOrNothing.java | 14 +-- ...egyDragAndDropProportionalWithPenalty.java | 14 +-- ...DragAndDropProportionalWithoutPenalty.java | 14 +-- ...ingStrategyMultipleChoiceAllOrNothing.java | 12 +-- ...MultipleChoiceProportionalWithPenalty.java | 12 +-- ...tipleChoiceProportionalWithoutPenalty.java | 12 +-- ...coringStrategyShortAnswerAllOrNothing.java | 10 +- ...egyShortAnswerProportionalWithPenalty.java | 10 +- ...ShortAnswerProportionalWithoutPenalty.java | 10 +- .../ScoringStrategyShortAnswerUtil.java | 12 +-- .../DragAndDropMappingRepository.java | 2 +- .../quiz/repository/DragItemRepository.java | 2 +- .../quiz/repository/QuizBatchRepository.java | 4 +- .../repository/QuizExerciseRepository.java | 2 +- .../quiz/repository/QuizGroupRepository.java | 2 +- .../QuizPointStatisticRepository.java | 2 +- .../quiz/repository/QuizPoolRepository.java | 2 +- .../repository/QuizQuestionRepository.java | 4 +- .../QuizQuestionStatisticRepository.java | 2 +- .../repository/QuizSubmissionRepository.java | 2 +- .../ShortAnswerMappingRepository.java | 2 +- .../repository/SubmittedAnswerRepository.java | 8 +- .../AbstractQuizSubmissionService.java | 4 +- .../service/AssessmentDashboardService.java | 4 +- .../artemis/service/AssessmentService.java | 6 +- .../service/AttachmentUnitService.java | 6 +- .../service/AuthorizationCheckService.java | 6 +- .../service/ComplaintResponseService.java | 2 +- .../aet/artemis/service/ComplaintService.java | 8 +- .../CourseScoreCalculationService.java | 8 +- .../aet/artemis/service/CourseService.java | 10 +- ...ragAndDropQuizAnswerConversionService.java | 8 +- .../service/ExampleSubmissionService.java | 8 +- .../artemis/service/ExerciseDateService.java | 4 +- .../service/ExerciseDeletionService.java | 16 +-- .../service/ExerciseImportService.java | 2 +- .../service/ExerciseLifecycleService.java | 4 +- .../service/ExerciseScoresChartService.java | 6 +- .../aet/artemis/service/ExerciseService.java | 10 +- .../service/ExerciseSpecificationService.java | 8 +- .../service/FileUploadSubmissionService.java | 2 +- .../service/LearningObjectService.java | 4 +- .../artemis/service/LectureImportService.java | 12 +-- .../aet/artemis/service/LectureService.java | 8 +- .../service/LectureUnitProcessingService.java | 2 +- .../artemis/service/LectureUnitService.java | 12 +-- .../ModelingExerciseImportService.java | 4 +- .../service/ModelingExerciseService.java | 4 +- .../service/ModelingSubmissionService.java | 8 +- .../service/ParticipantScoreService.java | 6 +- ...articipationAuthorizationCheckService.java | 8 +- .../ParticipationLifecycleService.java | 2 +- .../artemis/service/ParticipationService.java | 10 +- .../ParticipationVcsAccessTokenService.java | 4 +- .../aet/artemis/service/RatingService.java | 2 +- .../aet/artemis/service/ResultService.java | 12 +-- .../artemis/service/SlideSplitterService.java | 4 +- .../artemis/service/StatisticsService.java | 6 +- .../service/SubmissionPolicyService.java | 12 +-- .../artemis/service/SubmissionService.java | 8 +- .../service/SubmissionVersionService.java | 6 +- .../service/SystemNotificationService.java | 2 +- .../service/TextAssessmentService.java | 4 +- .../aet/artemis/service/TextBlockService.java | 4 +- .../service/TextExerciseFeedbackService.java | 8 +- .../service/TextExerciseImportService.java | 8 +- .../artemis/service/TextExerciseService.java | 2 +- .../service/TextSubmissionService.java | 6 +- .../service/TitleCacheEvictionService.java | 8 +- .../artemis/service/TutorEffortService.java | 4 +- .../service/TutorLeaderboardService.java | 12 +-- .../service/TutorParticipationService.java | 2 +- .../service/compass/CompassService.java | 10 +- .../compass/controller/FeedbackSelector.java | 2 +- .../controller/ModelClusterFactory.java | 8 +- .../competency/CompetencyJolService.java | 4 +- .../competency/CompetencyProgressService.java | 10 +- .../competency/CompetencyRelationService.java | 6 +- .../service/competency/CompetencyService.java | 4 +- .../competency/CourseCompetencyService.java | 10 +- .../competency/KnowledgeAreaService.java | 2 +- .../competency/PrerequisiteService.java | 4 +- .../StandardizedCompetencyService.java | 8 +- .../service/connectors/GitService.java | 6 +- .../athena/AthenaDTOConverterService.java | 8 +- .../AthenaFeedbackSuggestionsService.java | 8 +- .../athena/AthenaRepositoryExportService.java | 2 +- ...actContinuousIntegrationResultService.java | 4 +- .../ContinuousIntegrationResultService.java | 2 +- .../ci/ContinuousIntegrationService.java | 2 +- .../ContinuousIntegrationTriggerService.java | 2 +- .../connectors/gitlab/GitLabService.java | 4 +- .../gitlabci/GitLabCIResultService.java | 2 +- .../connectors/gitlabci/GitLabCIService.java | 2 +- .../gitlabci/GitLabCITriggerService.java | 2 +- .../jenkins/JenkinsResultService.java | 2 +- .../connectors/jenkins/JenkinsService.java | 2 +- .../jenkins/JenkinsTriggerService.java | 2 +- .../build_plan/JenkinsBuildPlanService.java | 2 +- .../LocalCIResultProcessingService.java | 4 +- .../connectors/localci/LocalCIService.java | 2 +- .../localci/LocalCITriggerService.java | 4 +- .../connectors/localvc/LocalVCService.java | 4 +- .../localvc/LocalVCServletService.java | 6 +- .../service/connectors/lti/Lti13Service.java | 12 +-- .../connectors/lti/LtiDeepLinkingService.java | 2 +- .../lti/LtiDynamicRegistrationService.java | 4 +- .../connectors/lti/LtiNewResultService.java | 2 +- .../connectors/pyris/PyrisDTOService.java | 4 +- .../pyris/PyrisPipelineService.java | 8 +- .../connectors/pyris/PyrisWebhookService.java | 4 +- ...petencyExtractionPipelineExecutionDTO.java | 2 +- .../PyrisCompetencyRecommendationDTO.java | 2 +- .../pyris/dto/data/PyrisCompetencyDTO.java | 4 +- .../pyris/dto/data/PyrisExamDTO.java | 2 +- .../pyris/dto/data/PyrisMessageDTO.java | 8 +- .../connectors/pyris/job/PyrisJob.java | 2 +- .../vcs/AbstractVersionControlService.java | 4 +- .../connectors/vcs/VersionControlService.java | 4 +- .../CoverageReportAndSubmissionDateDTO.java | 2 +- .../aet/artemis/service/dto/UserRoleDTO.java | 2 +- .../dto/athena/ModelingExerciseDTO.java | 2 +- .../dto/athena/ModelingSubmissionDTO.java | 2 +- .../service/dto/athena/TextExerciseDTO.java | 2 +- .../service/dto/athena/TextFeedbackDTO.java | 2 +- .../service/dto/athena/TextSubmissionDTO.java | 2 +- .../service/exam/ExamAccessService.java | 6 +- .../artemis/service/exam/ExamDateService.java | 6 +- .../service/exam/ExamDeletionService.java | 10 +- .../service/exam/ExamImportService.java | 10 +- .../service/exam/ExamLiveEventsService.java | 14 +-- .../exam/ExamQuizQuestionsGenerator.java | 2 +- .../artemis/service/exam/ExamQuizService.java | 6 +- .../service/exam/ExamRegistrationService.java | 8 +- .../aet/artemis/service/exam/ExamService.java | 32 +++--- .../service/exam/ExamSessionService.java | 10 +- .../service/exam/ExamSubmissionService.java | 8 +- .../artemis/service/exam/ExamUserService.java | 2 +- .../exam/StudentExamAccessService.java | 4 +- .../service/exam/StudentExamService.java | 34 +++---- .../export/CourseExamExportService.java | 8 +- .../DataExportCommunicationDataService.java | 6 +- .../export/DataExportExamCreationService.java | 2 +- .../DataExportExerciseCreationService.java | 14 +-- ...DataExportQuizExerciseCreationService.java | 22 ++--- .../export/DataExportScienceEventService.java | 2 +- ...gExerciseWithSubmissionsExportService.java | 2 +- .../ModelingSubmissionExportService.java | 2 +- .../ProgrammingExerciseExportService.java | 4 +- ...zExerciseWithSubmissionsExportService.java | 4 +- .../export/SubmissionExportService.java | 2 +- ...tExerciseWithSubmissionsExportService.java | 2 +- .../export/TextSubmissionExportService.java | 2 +- .../service/hestia/CodeHintService.java | 8 +- .../service/hestia/ExerciseHintService.java | 6 +- ...ogrammingExerciseGitDiffReportService.java | 10 +- .../ProgrammingExerciseTaskService.java | 2 +- .../hestia/TestwiseCoverageService.java | 8 +- .../behavioral/BehavioralBlackboard.java | 6 +- .../behavioral/BehavioralTestCaseService.java | 2 +- .../hestia/behavioral/GroupedFile.java | 4 +- .../CreateSolutionEntries.java | 2 +- .../DropRemovedGitDiffEntries.java | 6 +- .../knowledgesource/ExtractChangedLines.java | 3 +- .../knowledgesource/ExtractCoveredLines.java | 3 +- ...dCoverageEntriesByFilePathAndTestCase.java | 6 +- .../structural/StructuralTestCaseService.java | 4 +- .../iris/IrisCompetencyGenerationService.java | 2 +- .../iris/IrisDefaultTemplateService.java | 2 +- .../service/iris/IrisMessageService.java | 6 +- .../service/iris/IrisSessionService.java | 10 +- .../iris/dto/IrisChatWebsocketDTO.java | 2 +- .../dto/IrisCombinedChatSubSettingsDTO.java | 2 +- ...nedCompetencyGenerationSubSettingsDTO.java | 2 +- .../dto/IrisCombinedHestiaSubSettingsDTO.java | 2 +- .../AbstractIrisChatSessionService.java | 2 +- .../IrisButtonBasedFeatureInterface.java | 2 +- .../IrisChatBasedFeatureInterface.java | 4 +- .../session/IrisCourseChatSessionService.java | 12 +-- .../IrisExerciseChatSessionService.java | 10 +- .../session/IrisHestiaSessionService.java | 6 +- .../iris/session/IrisSubFeatureInterface.java | 2 +- .../iris/settings/IrisSettingsService.java | 28 +++--- .../iris/settings/IrisSubSettingsService.java | 18 ++-- .../websocket/IrisChatWebsocketService.java | 4 +- .../LearningPathNavigationService.java | 4 +- .../learningpath/LearningPathNgxService.java | 10 +- .../LearningPathRecommendationService.java | 12 +-- .../learningpath/LearningPathService.java | 16 +-- .../service/listeners/ResultListener.java | 5 +- .../InstanceMessageReceiveService.java | 2 +- .../service/metis/AnswerMessageService.java | 10 +- .../metis/ConversationMessagingService.java | 20 ++-- .../artemis/service/metis/PostingService.java | 16 +-- .../service/metis/ReactionService.java | 8 +- .../metis/conversation/ChannelService.java | 6 +- .../conversation/ConversationDTOService.java | 14 +-- .../conversation/ConversationService.java | 14 +-- .../metis/conversation/GroupChatService.java | 4 +- .../conversation/OneToOneChatService.java | 4 +- .../auth/ChannelAuthorizationService.java | 4 +- .../auth/GroupChatAuthorizationService.java | 4 +- .../OneToOneChatAuthorizationService.java | 2 +- .../PostSimilarityComparisonStrategy.java | 2 +- ...TitleJaccardSimilarityCompareStrategy.java | 2 +- .../ConversationNotificationService.java | 24 ++--- .../GeneralInstantNotificationService.java | 6 +- .../GroupNotificationService.java | 18 ++-- .../InstantNotificationService.java | 2 +- .../service/notifications/MailService.java | 12 +-- .../NotificationSettingsService.java | 6 +- .../SingleUserNotificationService.java | 48 ++++----- .../TutorialGroupNotificationService.java | 8 +- .../ApplePushNotificationService.java | 2 +- .../FirebasePushNotificationService.java | 2 +- .../PushNotificationService.java | 8 +- ...sPlagiarismControlPostContentProvider.java | 2 +- .../ContinuousPlagiarismControlService.java | 16 +-- .../ModelingPlagiarismDetectionService.java | 14 +-- .../PlagiarismAnswerPostService.java | 4 +- .../plagiarism/PlagiarismCaseService.java | 10 +- .../PlagiarismDetectionConfigHelper.java | 2 +- .../PlagiarismDetectionService.java | 10 +- .../plagiarism/PlagiarismPostService.java | 4 +- .../service/plagiarism/PlagiarismService.java | 12 +-- ...ProgrammingPlagiarismDetectionService.java | 6 +- .../TextPlagiarismDetectionService.java | 10 +- .../programming/CommitHistoryService.java | 4 +- .../ProgrammingAssessmentService.java | 6 +- ...mingExerciseCodeReviewFeedbackService.java | 2 +- ...ammingExerciseFeedbackCreationService.java | 2 +- .../ProgrammingExerciseGradingService.java | 18 ++-- ...ProgrammingExerciseImportBasicService.java | 10 +- ...ogrammingExerciseParticipationService.java | 12 +-- .../ProgrammingExerciseRepositoryService.java | 2 +- .../ProgrammingExerciseService.java | 8 +- .../ProgrammingMessagingService.java | 8 +- .../ProgrammingSubmissionService.java | 18 ++-- .../ProgrammingTriggerService.java | 8 +- .../programming/RepositoryAccessService.java | 6 +- .../RepositoryParticipationService.java | 4 +- .../programming/RepositoryService.java | 4 +- .../service/quiz/QuizBatchService.java | 6 +- .../quiz/QuizExerciseImportService.java | 26 ++--- .../service/quiz/QuizExerciseService.java | 18 ++-- .../service/quiz/QuizMessagingService.java | 4 +- .../artemis/service/quiz/QuizPoolService.java | 8 +- .../service/quiz/QuizResultService.java | 6 +- .../service/quiz/QuizScheduleService.java | 4 +- .../aet/artemis/service/quiz/QuizService.java | 26 ++--- .../service/quiz/QuizStatisticService.java | 10 +- .../service/quiz/QuizSubmissionService.java | 14 +-- ...aticProgrammingExerciseCleanupService.java | 2 +- .../ModelingExerciseScheduleService.java | 2 +- .../ParticipantScoreScheduleService.java | 10 +- .../ProgrammingExerciseScheduleService.java | 8 +- .../service/scheduled/ScheduleService.java | 6 +- .../service/science/ScienceEventService.java | 2 +- ...TutorialGroupChannelManagementService.java | 6 +- .../TutorialGroupFreePeriodService.java | 4 +- .../TutorialGroupScheduleService.java | 10 +- .../tutorialgroups/TutorialGroupService.java | 6 +- .../TutorialGroupsConfigurationService.java | 8 +- .../aet/artemis/service/user/UserService.java | 2 +- .../domain}/TextAssessmentEvent.java | 3 +- .../artemis/{ => text}/domain/TextBlock.java | 4 +- .../{ => text}/domain/TextBlockType.java | 2 +- .../{ => text}/domain/TextEmbedding.java | 2 +- .../{ => text}/domain/TextExercise.java | 3 +- .../{ => text}/domain/TextSubmission.java | 3 +- .../repository/TextExerciseRepository.java | 2 +- .../repository/TextSubmissionRepository.java | 2 +- .../domain}/TutorialGroup.java | 4 +- .../domain}/TutorialGroupFreePeriod.java | 2 +- .../domain}/TutorialGroupRegistration.java | 2 +- .../domain}/TutorialGroupSchedule.java | 2 +- .../domain}/TutorialGroupSession.java | 2 +- .../domain}/TutorialGroupsConfiguration.java | 2 +- .../TutorialGroupFreePeriodRepository.java | 2 +- .../TutorialGroupNotificationRepository.java | 2 +- .../TutorialGroupRegistrationRepository.java | 4 +- .../repository/TutorialGroupRepository.java | 4 +- .../TutorialGroupScheduleRepository.java | 2 +- .../TutorialGroupSessionRepository.java | 6 +- ...TutorialGroupsConfigurationRepository.java | 2 +- .../web/rest/ApollonDiagramResource.java | 2 +- .../artemis/web/rest/AssessmentResource.java | 4 +- .../artemis/web/rest/ComplaintResource.java | 10 +- .../aet/artemis/web/rest/CourseResource.java | 4 +- .../aet/artemis/web/rest/ExamResource.java | 12 +-- .../artemis/web/rest/ExamUserResource.java | 2 +- .../web/rest/ExampleSubmissionResource.java | 4 +- .../web/rest/ExerciseGroupResource.java | 4 +- .../artemis/web/rest/ExerciseResource.java | 10 +- .../aet/artemis/web/rest/FileResource.java | 12 +-- .../rest/FileUploadAssessmentResource.java | 2 +- .../web/rest/FileUploadExerciseResource.java | 2 +- .../rest/FileUploadSubmissionResource.java | 2 +- .../web/rest/GitDiffReportParserService.java | 2 +- .../artemis/web/rest/GradeStepResource.java | 4 +- .../web/rest/GradingScaleResource.java | 2 +- .../web/rest/LearningPathResource.java | 2 +- .../aet/artemis/web/rest/LectureResource.java | 8 +- .../web/rest/LongFeedbackTextResource.java | 2 +- .../web/rest/ModelingAssessmentResource.java | 6 +- .../web/rest/ModelingExerciseResource.java | 6 +- .../web/rest/ModelingSubmissionResource.java | 6 +- .../web/rest/NotificationResource.java | 6 +- .../web/rest/ParticipantScoreResource.java | 2 +- .../web/rest/ParticipationResource.java | 20 ++-- .../web/rest/QuizExerciseResource.java | 10 +- .../web/rest/QuizParticipationResource.java | 6 +- .../artemis/web/rest/QuizPoolResource.java | 2 +- .../web/rest/QuizSubmissionResource.java | 8 +- .../aet/artemis/web/rest/RatingResource.java | 2 +- .../aet/artemis/web/rest/ResultResource.java | 8 +- .../artemis/web/rest/StudentExamResource.java | 10 +- .../web/rest/SubmissionPolicyResource.java | 2 +- .../artemis/web/rest/SubmissionResource.java | 2 +- .../web/rest/SystemNotificationResource.java | 2 +- .../aet/artemis/web/rest/TeamResource.java | 2 +- .../web/rest/TextAssessmentEventResource.java | 4 +- .../web/rest/TextAssessmentResource.java | 10 +- .../web/rest/TextExerciseResource.java | 10 +- .../web/rest/TextSubmissionResource.java | 6 +- .../artemis/web/rest/TutorEffortResource.java | 2 +- .../web/rest/TutorParticipationResource.java | 2 +- .../rest/competency/CompetencyResource.java | 4 +- .../competency/CourseCompetencyResource.java | 4 +- .../rest/competency/PrerequisiteResource.java | 6 +- .../StandardizedCompetencyResource.java | 4 +- .../artemis/web/rest/dto/BonusResultDTO.java | 2 +- .../web/rest/dto/BonusSourceResultDTO.java | 2 +- .../dto/CourseManagementStatisticsDTO.java | 2 +- .../web/rest/dto/CoursesForDashboardDTO.java | 2 +- .../artemis/web/rest/dto/ExamScoresDTO.java | 2 +- .../artemis/web/rest/dto/ExamSessionDTO.java | 2 +- .../web/rest/dto/ExerciseDetailsDTO.java | 2 +- .../web/rest/dto/ParticipationDTO.java | 2 +- .../dto/ParticipationWithExerciseDTO.java | 2 +- .../web/rest/dto/PostContextFilterDTO.java | 2 +- .../ProgrammingExerciseGitDiffEntryDTO.java | 2 +- .../ProgrammingExerciseGitDiffReportDTO.java | 2 +- .../web/rest/dto/StudentExamWithGradeDTO.java | 2 +- .../web/rest/dto/TextAssessmentDTO.java | 2 +- .../web/rest/dto/TextAssessmentUpdateDTO.java | 2 +- .../competency/CompetencyGraphEdgeDTO.java | 4 +- .../competency/CompetencyGraphNodeDTO.java | 2 +- .../CompetencyImportResponseDTO.java | 4 +- .../rest/dto/competency/CompetencyJolDTO.java | 2 +- .../dto/competency/CompetencyJolPairDTO.java | 2 +- .../dto/competency/CompetencyNameDTO.java | 4 +- .../dto/competency/CompetencyRelationDTO.java | 4 +- .../CompetencyWithTailRelationDTO.java | 4 +- .../LearningPathInformationDTO.java | 2 +- .../LearningPathNavigationObjectDTO.java | 2 +- .../competency/LinkedCourseCompetencyDTO.java | 4 +- .../ExamAttendanceCheckEventDTO.java | 4 +- .../dto/examevent/ExamLiveEventBaseDTO.java | 2 +- .../ExamWideAnnouncementEventDTO.java | 2 +- .../ProblemStatementUpdateEventDTO.java | 2 +- .../examevent/WorkingTimeUpdateEventDTO.java | 2 +- ...tureUnitForLearningPathNodeDetailsDTO.java | 2 +- .../dto/metrics/CompetencyInformationDTO.java | 2 +- .../metrics/LectureUnitInformationDTO.java | 2 +- .../dto/plagiarism/PlagiarismCaseInfoDTO.java | 2 +- .../PlagiarismComparisonStatusDTO.java | 2 +- .../dto/plagiarism/PlagiarismResultDTO.java | 4 +- .../dto/plagiarism/PlagiarismVerdictDTO.java | 2 +- .../web/rest/dto/science/ScienceEventDTO.java | 2 +- .../web/rest/dto/settings/ide/IdeDTO.java | 2 +- .../rest/dto/settings/ide/IdeMappingDTO.java | 2 +- .../KnowledgeAreaRequestDTO.java | 2 +- .../KnowledgeAreaResultDTO.java | 2 +- .../dto/standardizedCompetency/SourceDTO.java | 2 +- .../StandardizedCompetencyCatalogDTO.java | 8 +- .../StandardizedCompetencyRequestDTO.java | 4 +- .../StandardizedCompetencyResultDTO.java | 4 +- .../errors/ExamConfigurationException.java | 2 +- .../web/rest/hestia/CodeHintResource.java | 4 +- .../rest/hestia/CoverageReportResource.java | 2 +- .../web/rest/hestia/ExerciseHintResource.java | 6 +- ...grammingExerciseGitDiffReportResource.java | 4 +- ...grammingExerciseSolutionEntryResource.java | 6 +- .../ProgrammingExerciseTaskResource.java | 4 +- .../iris/IrisCourseChatSessionResource.java | 4 +- .../iris/IrisExerciseChatSessionResource.java | 4 +- .../web/rest/iris/IrisMessageResource.java | 6 +- .../web/rest/iris/IrisSettingsResource.java | 6 +- .../rest/lecture/AttachmentUnitResource.java | 2 +- .../rest/lecture/ExerciseUnitResource.java | 2 +- .../web/rest/lecture/LectureUnitResource.java | 2 +- .../web/rest/lecture/OnlineUnitResource.java | 2 +- .../web/rest/lecture/TextUnitResource.java | 2 +- .../web/rest/lecture/VideoUnitResource.java | 2 +- .../web/rest/metis/AnswerMessageResource.java | 2 +- .../metis/ConversationMessageResource.java | 4 +- .../web/rest/metis/ReactionResource.java | 2 +- .../metis/conversation/ChannelResource.java | 4 +- .../conversation/ConversationResource.java | 4 +- .../metis/conversation/GroupChatResource.java | 4 +- .../metis/conversation/dtos/ChannelDTO.java | 4 +- .../conversation/dtos/ConversationDTO.java | 2 +- .../metis/conversation/dtos/GroupChatDTO.java | 2 +- .../conversation/dtos/OneToOneChatDTO.java | 2 +- .../PublicProgrammingSubmissionResource.java | 6 +- .../web/rest/open/PublicResultResource.java | 2 +- .../PublicSystemNotificationResource.java | 2 +- .../PlagiarismAnswerPostResource.java | 2 +- .../plagiarism/PlagiarismCaseResource.java | 4 +- .../plagiarism/PlagiarismPostResource.java | 2 +- .../rest/plagiarism/PlagiarismResource.java | 4 +- .../PlagiarismResultResponseBuilder.java | 6 +- .../ProgrammingAssessmentResource.java | 2 +- ...ogrammingExerciseExportImportResource.java | 4 +- ...grammingExerciseParticipationResource.java | 6 +- ...ProgrammingExercisePlagiarismResource.java | 2 +- .../ProgrammingExerciseResource.java | 4 +- .../ProgrammingSubmissionResource.java | 8 +- .../PushNotificationRegisterBody.java | 2 +- .../PushNotificationResource.java | 4 +- .../PushNotificationUnregisterRequest.java | 2 +- ...grammingExerciseParticipationResource.java | 6 +- .../rest/science/ScienceSettingsResource.java | 2 +- .../settings/ide/IdeSettingsResource.java | 4 +- .../TutorialGroupFreePeriodResource.java | 4 +- .../tutorialgroups/TutorialGroupResource.java | 6 +- .../TutorialGroupSessionResource.java | 6 +- .../TutorialGroupsConfigurationResource.java | 2 +- .../ScheduleOverlapsWithSessionException.java | 2 +- .../SessionOverlapsWithSessionException.java | 2 +- .../web/websocket/ResultWebsocketService.java | 4 +- .../web/websocket/dto/SubmissionPatch.java | 2 +- .../websocket/dto/TeamAssignmentPayload.java | 2 +- .../web/websocket/dto/metis/PostDTO.java | 4 +- .../ParticipationTeamWebsocketService.java | 10 +- .../websocket/team/TeamWebsocketService.java | 2 +- ...ringIntegrationGitlabCIGitlabSamlTest.java | 6 +- ...tractSpringIntegrationIndependentTest.java | 6 +- ...actSpringIntegrationJenkinsGitlabTest.java | 6 +- ...ctSpringIntegrationLocalCILocalVCTest.java | 6 +- .../aet/artemis/DatabaseQueryCountTest.java | 2 +- .../cit/aet/artemis/FileIntegrationTest.java | 6 +- .../LtiDeepLinkingIntegrationTest.java | 2 +- .../aet/artemis/LtiQuizIntegrationTest.java | 8 +- .../artemis/StatisticsIntegrationTest.java | 8 +- .../aet/artemis/StudentScoreUtilService.java | 2 +- .../AssessmentComplaintIntegrationTest.java | 12 +-- ...ssessmentTeamComplaintIntegrationTest.java | 6 +- .../ComplaintResponseIntegrationTest.java | 6 +- .../assessment/ComplaintUtilService.java | 2 +- .../ExampleSubmissionIntegrationTest.java | 12 +-- .../ExerciseScoresChartIntegrationTest.java | 2 +- .../assessment/GradeStepIntegrationTest.java | 8 +- .../assessment/GradingScaleFactory.java | 2 +- .../GradingScaleIntegrationTest.java | 2 +- .../assessment/GradingScaleUtilService.java | 2 +- .../ParticipantScoreIntegrationTest.java | 8 +- .../RatingResourceIntegrationTest.java | 4 +- .../ResultServiceIntegrationTest.java | 16 +-- .../TutorEffortIntegrationTest.java | 8 +- ...utorLeaderboardServiceIntegrationTest.java | 2 +- .../TutorParticipationIntegrationTest.java | 10 +- ...rParticipationResourceIntegrationTest.java | 2 +- .../artemis/bonus/BonusIntegrationTest.java | 2 +- ...CompetencyPrerequisiteIntegrationTest.java | 20 ++-- .../competency/CompetencyIntegrationTest.java | 4 +- .../CompetencyJolIntegrationTest.java | 4 +- .../CompetencyProgressUtilService.java | 4 +- .../competency/CompetencyUtilService.java | 12 +-- .../CourseCompetencyIntegrationTest.java | 30 +++--- .../LearningPathIntegrationTest.java | 14 +-- .../competency/LearningPathUtilService.java | 4 +- .../PrerequisiteIntegrationTest.java | 4 +- .../competency/PrerequisiteUtilService.java | 2 +- ...StandardizedCompetencyIntegrationTest.java | 12 +-- .../StandardizedCompetencyUtilService.java | 8 +- .../aet/artemis/config/MetricsBeanTest.java | 6 +- .../connector/GitlabRequestMockProvider.java | 2 +- .../artemis/connectors/Lti13ServiceTest.java | 8 +- .../LtiDynamicRegistrationServiceTest.java | 4 +- .../connectors/LtiNewResultServiceTest.java | 4 +- .../artemis/connectors/LtiServiceTest.java | 2 +- .../aet/artemis/course/CourseTestService.java | 30 +++--- .../aet/artemis/course/CourseUtilService.java | 20 ++-- .../cit/aet/artemis/domain/ExerciseTest.java | 9 +- .../aet/artemis/domain/ObjectMethodTest.java | 2 +- .../domain/ObjectMethodTestExclusions.java | 2 +- .../cit/aet/artemis/domain/ResultTest.java | 6 +- .../domain/ShortAnswerQuestionTest.java | 6 +- .../domain/ShortAnswerSubmittedTextTest.java | 6 +- .../domain/enumeration/ExerciseTypeTest.java | 6 +- .../GroupNotificationFactoryTest.java | 97 ++++++++++--------- ...tificationPlaceholderArchitectureTest.java | 1 + .../NotificationPlaceholderSignatureTest.java | 1 + .../SingleUserNotificationFactoryTest.java | 86 ++++++++-------- .../TutorialGroupNotificationFactoryTest.java | 15 +-- .../ResultListenerIntegrationTest.java | 12 +-- .../tum/cit/aet/artemis/exam/ExamFactory.java | 8 +- .../aet/artemis/exam/ExamIntegrationTest.java | 28 +++--- .../ExamParticipationIntegrationTest.java | 20 ++-- .../exam/ExamRegistrationIntegrationTest.java | 6 +- .../exam/ExamSessionIntegrationTest.java | 4 +- .../cit/aet/artemis/exam/ExamStartTest.java | 20 ++-- .../artemis/exam/ExamUserIntegrationTest.java | 6 +- .../cit/aet/artemis/exam/ExamUtilService.java | 22 ++--- ...ciseGroupIntegrationJenkinsGitlabTest.java | 6 +- .../exam/ProgrammingExamIntegrationTest.java | 6 +- .../artemis/exam/QuizPoolIntegrationTest.java | 14 +-- .../exam/StudentExamIntegrationTest.java | 56 +++++------ .../artemis/exam/TestExamIntegrationTest.java | 8 +- .../AthenaExerciseIntegrationTest.java | 4 +- .../AthenaResourceIntegrationTest.java | 10 +- .../aet/artemis/exercise/ExerciseFactory.java | 6 +- .../exercise/ExerciseIntegrationTest.java | 22 ++--- .../artemis/exercise/ExerciseUtilService.java | 24 ++--- .../FileUploadAssessmentIntegrationTest.java | 8 +- .../fileupload/FileUploadExerciseFactory.java | 2 +- .../FileUploadExerciseIntegrationTest.java | 8 +- .../FileUploadExerciseUtilService.java | 4 +- .../FileUploadSubmissionIntegrationTest.java | 8 +- ...ApollonDiagramResourceIntegrationTest.java | 2 +- .../ModelingAssessmentIntegrationTest.java | 18 ++-- .../modeling/ModelingComparisonTest.java | 4 +- .../modeling/ModelingExerciseFactory.java | 10 +- .../ModelingExerciseIntegrationTest.java | 14 +-- .../modeling/ModelingExerciseUtilService.java | 10 +- .../ModelingSubmissionIntegrationTest.java | 22 ++--- .../controller/FeedbackSelectorTest.java | 2 +- .../controller/ModelClusterFactoryTest.java | 8 +- .../umlmodel/AbstractUMLDiagramTest.java | 4 +- .../ContinuousIntegrationTestService.java | 2 +- .../exercise/programming/MockDelegate.java | 6 +- .../ProgrammingAssessmentIntegrationTest.java | 10 +- .../ProgrammingExerciseFactory.java | 2 +- ...ProgrammingExerciseGradingServiceTest.java | 12 +-- ...rammingExerciseIntegrationTestService.java | 14 +-- ...ExerciseLocalVCLocalCIIntegrationTest.java | 8 +- ...gExerciseParticipationIntegrationTest.java | 10 +- ...grammingExerciseRepositoryServiceTest.java | 2 +- .../ProgrammingExerciseResultTestService.java | 8 +- ...rogrammingExerciseScheduleServiceTest.java | 10 +- ...rammingExerciseServiceIntegrationTest.java | 10 +- .../programming/ProgrammingExerciseTest.java | 8 +- ...rogrammingExerciseTestCaseServiceTest.java | 2 +- .../ProgrammingExerciseTestService.java | 22 ++--- .../ProgrammingExerciseUtilService.java | 22 ++--- ...issionAndResultIntegrationTestService.java | 2 +- .../ProgrammingSubmissionIntegrationTest.java | 12 +-- .../RepositoryIntegrationTest.java | 18 ++-- .../SubmissionPolicyIntegrationTest.java | 10 +- .../exercise/quiz/QuizComparisonTest.java | 36 +++---- .../exercise/quiz/QuizExerciseFactory.java | 44 ++++----- .../quiz/QuizExerciseIntegrationTest.java | 40 ++++---- .../quiz/QuizExerciseUtilService.java | 28 +++--- .../quiz/QuizSubmissionIntegrationTest.java | 38 ++++---- .../exercise/text/TextComparisonTest.java | 4 +- .../exercise/text/TextExerciseFactory.java | 14 +-- .../text/TextExerciseUtilService.java | 18 ++-- .../hestia/CodeHintIntegrationTest.java | 4 +- .../artemis/hestia/CodeHintServiceTest.java | 8 +- .../hestia/ExerciseHintIntegrationTest.java | 10 +- .../hestia/ExerciseHintServiceTest.java | 8 +- .../artemis/hestia/HestiaDatabaseTest.java | 6 +- ...gExerciseGitDiffReportIntegrationTest.java | 4 +- ...mmingExerciseGitDiffReportServiceTest.java | 4 +- ...gExerciseSolutionEntryIntegrationTest.java | 6 +- ...rogrammingExerciseTaskIntegrationTest.java | 4 +- .../ProgrammingExerciseTaskServiceTest.java | 4 +- .../hestia/StructuralTestCaseServiceTest.java | 2 +- .../TestwiseCoverageIntegrationTest.java | 6 +- .../TestwiseCoverageReportServiceTest.java | 2 +- .../hestia/TestwiseCoverageTestUtil.java | 4 +- .../BehavioralTestCaseServiceTest.java | 14 +-- .../behavioral/CreateSolutionEntriesTest.java | 2 +- .../DropRemovedGitDiffEntriesTest.java | 4 +- .../behavioral/ExtractChangedLinesTest.java | 2 +- .../behavioral/ExtractCoveredLinesTest.java | 2 +- ...erageEntriesByFilePathAndTestCaseTest.java | 10 +- .../iris/AbstractIrisIntegrationTest.java | 4 +- .../iris/IrisChatMessageIntegrationTest.java | 16 +-- .../artemis/iris/IrisChatWebsocketTest.java | 2 +- ...isCompetencyGenerationIntegrationTest.java | 2 +- ...risExerciseChatSessionIntegrationTest.java | 4 +- .../IrisSessionActivationIntegrationTest.java | 8 +- .../iris/PyrisLectureIngestionTest.java | 4 +- .../settings/IrisSettingsIntegrationTest.java | 14 +-- .../AttachmentResourceIntegrationTest.java | 2 +- .../AttachmentUnitIntegrationTest.java | 8 +- .../AttachmentUnitsIntegrationTest.java | 2 +- .../lecture/ExerciseUnitIntegrationTest.java | 8 +- .../aet/artemis/lecture/LectureFactory.java | 2 +- .../lecture/LectureIntegrationTest.java | 18 ++-- .../lecture/LectureUnitIntegrationTest.java | 10 +- .../lecture/LectureUnitServiceTest.java | 4 +- .../artemis/lecture/LectureUtilService.java | 22 ++--- .../lecture/OnlineUnitIntegrationTest.java | 6 +- .../lecture/TextUnitIntegrationTest.java | 6 +- .../lecture/VideoUnitIntegrationTest.java | 6 +- ...AbstractLocalCILocalVCIntegrationTest.java | 4 +- .../localvcci/LocalCIIntegrationTest.java | 2 +- .../artemis/localvcci/LocalCIServiceTest.java | 2 +- .../LocalVCLocalCIIntegrationTest.java | 12 +-- ...VCLocalCIParticipationIntegrationTest.java | 4 +- .../localvcci/LocalVCLocalCITestService.java | 4 +- .../artemis/localvcci/LocalVCServiceTest.java | 2 +- .../metis/AbstractConversationTest.java | 4 +- .../metis/AnswerMessageIntegrationTest.java | 10 +- .../artemis/metis/ChannelIntegrationTest.java | 4 +- .../metis/ConversationIntegrationTest.java | 8 +- .../artemis/metis/MessageIntegrationTest.java | 16 +-- .../metis/ReactionIntegrationTest.java | 8 +- ...eJaccardSimilarityCompareStrategyTest.java | 2 +- .../GroupNotificationServiceTest.java | 44 ++++----- .../notification/NotificationFactory.java | 6 +- .../NotificationResourceIntegrationTest.java | 8 +- .../NotificationScheduleServiceTest.java | 2 +- ...cationSettingsResourceIntegrationTest.java | 2 +- .../NotificationSettingsServiceTest.java | 6 +- .../NotificationTargetFactoryTest.java | 40 ++++---- .../PushNotificationResourceTest.java | 4 +- .../SingleUserNotificationServiceTest.java | 72 +++++++------- .../SystemNotificationIntegrationTest.java | 2 +- .../participation/ParticipationFactory.java | 10 +- .../ParticipationIntegrationTest.java | 32 +++--- ...articipationSubmissionIntegrationTest.java | 4 +- .../ParticipationUtilService.java | 20 ++-- .../SubmissionExportIntegrationTest.java | 10 +- .../SubmissionIntegrationTest.java | 4 +- ...ontinuousPlagiarismControlServiceTest.java | 26 ++--- .../PlagiarismAnswerPostIntegrationTest.java | 4 +- .../PlagiarismCaseIntegrationTest.java | 24 ++--- .../PlagiarismDetectionConfigHelperTest.java | 6 +- .../PlagiarismDetectionServiceTest.java | 10 +- .../plagiarism/PlagiarismIntegrationTest.java | 18 ++-- .../PlagiarismPostIntegrationTest.java | 8 +- .../plagiarism/PlagiarismUtilService.java | 6 +- .../aet/artemis/post/ConversationFactory.java | 6 +- .../artemis/post/ConversationUtilService.java | 22 ++--- .../ParticipationTestRepository.java | 2 +- ...iseStudentParticipationTestRepository.java | 2 +- .../repository/StatisticsRepositoryTest.java | 2 +- .../science/ScienceIntegrationTest.java | 2 +- .../ScienceSettingsIntegrationTest.java | 2 +- .../artemis/science/ScienceUtilService.java | 4 +- .../security/lti/Lti13TokenRetrieverTest.java | 2 +- .../service/AssessmentServiceTest.java | 14 +-- .../AuthorizationCheckServiceTest.java | 4 +- .../service/ComplaintResponseServiceTest.java | 2 +- .../CourseScoreCalculationServiceTest.java | 6 +- .../artemis/service/CourseServiceTest.java | 4 +- .../DataExportCreationServiceTest.java | 12 +-- .../service/ExerciseDateServiceTest.java | 8 +- .../service/ExerciseLifecycleServiceTest.java | 2 +- .../artemis/service/GitlabCIServiceTest.java | 6 +- .../service/GradingScaleServiceTest.java | 2 +- .../service/LearningObjectServiceTest.java | 4 +- .../service/LearningPathServiceTest.java | 8 +- .../service/LectureImportServiceTest.java | 4 +- ...cipationAuthorizationCheckServiceTest.java | 6 +- .../ParticipationLifecycleServiceTest.java | 2 +- .../service/ParticipationServiceTest.java | 4 +- ...ParticipationTeamWebsocketServiceTest.java | 12 +-- ...sentationPointsCalculationServiceTest.java | 2 +- .../service/RepositoryAccessServiceTest.java | 4 +- .../artemis/service/ResultServiceTest.java | 6 +- .../service/SubmissionServiceTest.java | 10 +- .../service/TeamWebsocketServiceTest.java | 4 +- .../artemis/service/TextBlockServiceTest.java | 4 +- .../aet/artemis/service/UriServiceTest.java | 6 +- .../AthenaFeedbackSendingServiceTest.java | 12 +-- .../AthenaFeedbackSuggestionsServiceTest.java | 6 +- .../AthenaRepositoryExportServiceTest.java | 2 +- .../AthenaSubmissionSelectionServiceTest.java | 4 +- .../AthenaSubmissionSendingServiceTest.java | 4 +- .../lti/LtiDeepLinkingServiceTest.java | 6 +- .../service/exam/ExamAccessServiceTest.java | 8 +- .../service/exam/ExamQuizServiceTest.java | 18 ++-- .../artemis/service/exam/ExamServiceTest.java | 12 +-- .../exam/ExamSubmissionServiceTest.java | 6 +- .../exam/StudentExamAccessServiceTest.java | 4 +- .../ConversationNotificationServiceTest.java | 12 +-- ...GeneralInstantNotificationServiceTest.java | 6 +- .../notifications/MailServiceTest.java | 8 +- .../TutorialGroupNotificationServiceTest.java | 12 +-- ...leFirebasePushNotificationServiceTest.java | 10 +- ...ngExerciseFeedbackCreationServiceTest.java | 4 +- ...DeviceConfigurationCleanupServiceTest.java | 4 +- .../ide/IdePreferencesIntegrationTest.java | 4 +- .../aet/artemis/team/TeamIntegrationTest.java | 8 +- .../text/AssessmentEventIntegrationTest.java | 6 +- .../text/TextAssessmentIntegrationTest.java | 14 +-- .../text/TextEmbeddingIntegrationTest.java | 2 +- .../text/TextExerciseIntegrationTest.java | 28 +++--- .../text/TextSubmissionIntegrationTest.java | 18 ++-- .../AbstractTutorialGroupIntegrationTest.java | 14 +-- .../tutorialgroups/TutorialGroupFactory.java | 4 +- ...utorialGroupFreePeriodIntegrationTest.java | 6 +- .../TutorialGroupIntegrationTest.java | 8 +- .../TutorialGroupScheduleIntegrationTest.java | 2 +- .../TutorialGroupSessionIntegrationTest.java | 4 +- .../TutorialGroupUtilService.java | 10 +- ...ialGroupsConfigurationIntegrationTest.java | 4 +- .../cit/aet/artemis/user/UserTestService.java | 4 +- .../util/ExamPrepareExercisesTestUtil.java | 2 +- .../cit/aet/artemis/util/GitUtilService.java | 2 +- .../util/SensitiveInformationUtil.java | 4 +- .../PlagiarismResultResponseBuilderTest.java | 8 +- 1057 files changed, 3213 insertions(+), 3166 deletions(-) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/domain/AssessmentNote.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{domain/scores => assessment/domain}/ParticipantScore.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/scores => assessment/domain}/StudentScore.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{domain/scores => assessment/domain}/TeamScore.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{domain/participation => assessment/domain}/TutorParticipation.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/statistics => assessment/dto}/ScoreDistribution.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{domain/statistics/tutor/effort => assessment/dto}/TutorEffort.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{domain/assessment => assessment/dto}/dashboard/ExerciseMapEntry.java (76%) rename src/main/java/de/tum/cit/aet/artemis/{domain/assessment => assessment/dto}/dashboard/ExerciseRatingCount.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{domain/assessment => assessment/dto}/dashboard/ResultCount.java (80%) rename src/main/java/de/tum/cit/aet/artemis/{domain/leaderboard => assessment/dto}/tutor/TutorLeaderboardAnsweredMoreFeedbackRequests.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{domain/leaderboard => assessment/dto}/tutor/TutorLeaderboardAssessments.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{domain/leaderboard => assessment/dto}/tutor/TutorLeaderboardComplaintResponses.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{domain/leaderboard => assessment/dto}/tutor/TutorLeaderboardComplaints.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{domain/leaderboard => assessment/dto}/tutor/TutorLeaderboardMoreFeedbackRequests.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/domain/competency/BaseCompetency.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/domain/competency/Competency.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/domain/competency/CompetencyJol.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/domain/competency/CompetencyProgress.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/domain/competency/CompetencyRelation.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/domain/competency/CompetencyTaxonomy.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/domain/competency/CourseCompetency.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/domain/competency/KnowledgeArea.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/domain/competency/LearningPath.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/domain/competency/Prerequisite.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/domain/competency/RelationType.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/domain/competency/Source.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/domain/competency/StandardizedCompetency.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/domain/science/ScienceEvent.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/domain/science/ScienceEventType.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/domain/science/ScienceSetting.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/metis/conversation => communication}/ConversationSettings.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{domain/metis => communication/domain}/AnswerPost.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/metis => communication/domain}/ConversationParticipant.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{domain/metis => communication/domain}/ConversationParticipantSettingsView.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{domain/metis => communication/domain}/ConversationType.java (50%) rename src/main/java/de/tum/cit/aet/artemis/{domain/metis => communication/domain}/CourseWideContext.java (79%) rename src/main/java/de/tum/cit/aet/artemis/{domain/metis => communication/domain}/CreatedConversationMessage.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{domain/metis => communication/domain}/Post.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/metis => communication/domain}/PostConstraints.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{domain/metis => communication/domain}/PostContextConstraintValidator.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{domain/metis => communication/domain}/PostSortCriterion.java (58%) rename src/main/java/de/tum/cit/aet/artemis/{domain/metis => communication/domain}/Posting.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/metis => communication/domain}/Reaction.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/metis => communication/domain}/ReactionConstraintValidator.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{domain/metis => communication/domain}/ReactionConstraints.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{domain/metis => communication/domain}/UserRole.java (50%) rename src/main/java/de/tum/cit/aet/artemis/{domain/metis => communication/domain}/conversation/Channel.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/metis => communication/domain}/conversation/ChannelSubType.java (79%) rename src/main/java/de/tum/cit/aet/artemis/{domain/metis => communication/domain}/conversation/Conversation.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/metis => communication/domain}/conversation/GroupChat.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{domain/metis => communication/domain}/conversation/OneToOneChat.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/domain/notification/ConversationNotification.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/domain/notification/ConversationNotificationFactory.java (80%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/domain/notification/GroupNotification.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/domain/notification/GroupNotificationFactory.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/domain/notification/Notification.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/domain/notification/NotificationConstants.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/domain/notification/NotificationPlaceholderCreator.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/domain/notification/NotificationTarget.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/domain/notification/NotificationTargetFactory.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/domain/notification/SingleUserNotification.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/domain/notification/SingleUserNotificationFactory.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/domain/notification/SystemNotification.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/domain/notification/TutorialGroupNotification.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/domain/notification/TutorialGroupNotificationFactory.java (84%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/domain/push_notification/PushNotificationDeviceConfiguration.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/domain/push_notification/PushNotificationDeviceConfigurationId.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/domain/push_notification/PushNotificationDeviceType.java (66%) rename src/main/java/de/tum/cit/aet/artemis/{domain/metis/conversation => communication/dto}/ConversationSummary.java (80%) rename src/main/java/de/tum/cit/aet/artemis/{domain/metis/conversation => communication/dto}/GeneralConversationInfo.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{domain/metis/conversation => communication/dto}/UserConversationInfo.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{domain/statistics => core/dto}/CourseStatisticsAverageScore.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/statistics => core/dto}/StatisticsEntry.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/exam => exam/domain}/Exam.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{domain/exam => exam/domain}/ExamSession.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/exam => exam/domain}/ExamUser.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/exam => exam/domain}/ExerciseGroup.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/exam => exam/domain}/StudentExam.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/exam => exam/domain}/SuspiciousExamSessions.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{domain/exam => exam/domain}/SuspiciousSessionReason.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{domain/exam => exam/domain}/SuspiciousSessionsAnalysisOptions.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/exam => exam/domain}/event/ExamAttendanceCheckEvent.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{domain/exam => exam/domain}/event/ExamLiveEvent.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/exam => exam/domain}/event/ExamWideAnnouncementEvent.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{domain/exam => exam/domain}/event/ProblemStatementUpdateEvent.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/exam => exam/domain}/event/WorkingTimeUpdateEvent.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/domain/participation/IdToPresentationScoreSum.java (60%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/domain/participation/Participant.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/domain/participation/Participation.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/domain/participation/ParticipationInterface.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/domain/participation/StudentParticipation.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/metrics => exercise/dto}/ExerciseTypeMetricsEntry.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{domain/iris => iris/domain}/IrisTemplate.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/iris => iris/domain}/message/IrisJsonMessageContent.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/iris => iris/domain}/message/IrisMessage.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/iris => iris/domain}/message/IrisMessageContent.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/iris => iris/domain}/message/IrisMessageSender.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{domain/iris => iris/domain}/message/IrisTextMessageContent.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/iris => iris/domain}/session/IrisChatSession.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{domain/iris => iris/domain}/session/IrisCourseChatSession.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/iris => iris/domain}/session/IrisExerciseChatSession.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/iris => iris/domain}/session/IrisHestiaSession.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{domain/iris => iris/domain}/session/IrisSession.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/iris => iris/domain}/settings/IrisChatSubSettings.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{domain/iris => iris/domain}/settings/IrisCompetencyGenerationSubSettings.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{domain/iris => iris/domain}/settings/IrisCourseSettings.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/iris => iris/domain}/settings/IrisExerciseSettings.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/iris => iris/domain}/settings/IrisGlobalSettings.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{domain/iris => iris/domain}/settings/IrisHestiaSubSettings.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{domain/iris => iris/domain}/settings/IrisLectureIngestionSubSettings.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{domain/iris => iris/domain}/settings/IrisModelListConverter.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{domain/iris => iris/domain}/settings/IrisSettings.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/iris => iris/domain}/settings/IrisSettingsType.java (54%) rename src/main/java/de/tum/cit/aet/artemis/{domain/iris => iris/domain}/settings/IrisSubSettings.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/iris => iris/domain}/settings/IrisSubSettingsType.java (64%) rename src/main/java/de/tum/cit/aet/artemis/{domain/lecture => lecture/domain}/AttachmentUnit.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/lecture => lecture/domain}/ExerciseUnit.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{domain/lecture => lecture/domain}/LectureUnit.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/lecture => lecture/domain}/LectureUnitCompletion.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/lecture => lecture/domain}/OnlineUnit.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{domain/lecture => lecture/domain}/Slide.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/lecture => lecture/domain}/TextUnit.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{domain/lecture => lecture/domain}/VideoUnit.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{domain/lti => lti/domain}/LtiResourceLaunch.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/lti => lti/dto}/Claims.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{domain/lti => lti/dto}/Lti13AgsClaim.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/lti => lti/dto}/Lti13ClientRegistration.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{domain/lti => lti/dto}/Lti13DeepLinkingResponse.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{domain/lti => lti/dto}/Lti13LaunchRequest.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/lti => lti/dto}/Lti13PlatformConfiguration.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{domain/lti => lti/dto}/LtiAuthenticationResponse.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{domain/lti => lti/dto}/Scopes.java (84%) rename src/main/java/de/tum/cit/aet/artemis/{domain/modeling => modeling/domain}/ApollonDiagram.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/modeling => modeling/domain}/ModelCluster.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/modeling => modeling/domain}/ModelElement.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/modeling => modeling/domain}/ModelingExercise.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/modeling => modeling/domain}/ModelingSubmission.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/modeling => modeling/domain}/SimilarElementCount.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{domain/plagiarism => plagiarism/domain}/PlagiarismCase.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/plagiarism => plagiarism/domain}/PlagiarismComparison.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/plagiarism => plagiarism/domain}/PlagiarismDetectionConfig.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{domain/plagiarism => plagiarism/domain}/PlagiarismMatch.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/plagiarism => plagiarism/domain}/PlagiarismResult.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/plagiarism => plagiarism/domain}/PlagiarismStatus.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{domain/plagiarism => plagiarism/domain}/PlagiarismSubmission.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{domain/plagiarism => plagiarism/domain}/PlagiarismSubmissionElement.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{domain/plagiarism => plagiarism/domain}/PlagiarismVerdict.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{domain/plagiarism => plagiarism/domain}/modeling/ModelingPlagiarismResult.java (64%) rename src/main/java/de/tum/cit/aet/artemis/{domain/plagiarism => plagiarism/domain}/modeling/ModelingSubmissionElement.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{domain/plagiarism => plagiarism/domain}/text/TextPlagiarismResult.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{domain/plagiarism => plagiarism/domain}/text/TextSubmissionElement.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{domain/participation => programming/domain}/AbstractBaseProgrammingExerciseParticipation.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{domain/statistics => programming/domain}/BuildLogStatisticsEntry.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/participation => programming/domain}/ParticipationVCSAccessToken.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{domain/participation => programming/domain}/ProgrammingExerciseParticipation.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{domain/participation => programming/domain}/ProgrammingExerciseStudentParticipation.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{domain/participation => programming/domain}/SolutionProgrammingExerciseParticipation.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{domain/participation => programming/domain}/TemplateProgrammingExerciseParticipation.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/hestia/CodeHint.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/hestia/CoverageFileReport.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/hestia/CoverageReport.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/hestia/ExerciseHint.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/hestia/ExerciseHintActivation.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/hestia/ProgrammingExerciseGitDiffEntry.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/hestia/ProgrammingExerciseGitDiffReport.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/hestia/ProgrammingExerciseSolutionEntry.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/hestia/ProgrammingExerciseTask.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/hestia/ProgrammingExerciseTestCaseType.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/hestia/TestwiseCoverageReportEntry.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/settings => programming/domain}/ide/Ide.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/settings => programming/domain}/ide/UserIdeMapping.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/submissionpolicy/LockRepositoryPolicy.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/submissionpolicy/SubmissionPenaltyPolicy.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/submissionpolicy/SubmissionPolicy.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/view => quiz/config}/QuizView.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/AbstractQuizSubmission.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/AnswerCounter.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/AnswerOption.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/DragAndDropMapping.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/DragAndDropQuestion.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/DragAndDropQuestionStatistic.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/DragAndDropSubmittedAnswer.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/DragItem.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/DropLocation.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/DropLocationCounter.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/MultipleChoiceQuestion.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/MultipleChoiceQuestionStatistic.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/MultipleChoiceSubmittedAnswer.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/PointCounter.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/QuizBatch.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/QuizConfiguration.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/QuizExercise.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/QuizGroup.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/QuizPointStatistic.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/QuizPool.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/QuizQuestion.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/QuizQuestionComponent.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/QuizQuestionStatistic.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/QuizQuestionStatisticComponent.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/QuizStatistic.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/QuizStatisticCounter.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/QuizSubmission.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/QuizSubmittedAnswerCount.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/ShortAnswerMapping.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/ShortAnswerQuestion.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/ShortAnswerQuestionStatistic.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/ShortAnswerSolution.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/ShortAnswerSpot.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/ShortAnswerSpotCounter.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/ShortAnswerSubmittedAnswer.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/ShortAnswerSubmittedText.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/SubmittedAnswer.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/compare/DnDMapping.java (56%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/compare/SAMapping.java (54%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/scoring/ScoringStrategy.java (71%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/scoring/ScoringStrategyDragAndDropAllOrNothing.java (79%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/scoring/ScoringStrategyDragAndDropProportionalWithPenalty.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/scoring/ScoringStrategyDragAndDropProportionalWithoutPenalty.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/scoring/ScoringStrategyMultipleChoiceAllOrNothing.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/scoring/ScoringStrategyMultipleChoiceProportionalWithPenalty.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/scoring/ScoringStrategyMultipleChoiceProportionalWithoutPenalty.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/scoring/ScoringStrategyShortAnswerAllOrNothing.java (79%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/scoring/ScoringStrategyShortAnswerProportionalWithPenalty.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/scoring/ScoringStrategyShortAnswerProportionalWithoutPenalty.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{domain/quiz => quiz/domain}/scoring/ScoringStrategyShortAnswerUtil.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{domain/analytics => text/domain}/TextAssessmentEvent.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => text}/domain/TextBlock.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => text}/domain/TextBlockType.java (54%) rename src/main/java/de/tum/cit/aet/artemis/{ => text}/domain/TextEmbedding.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => text}/domain/TextExercise.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => text}/domain/TextSubmission.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/tutorialgroups => tutorialgroup/domain}/TutorialGroup.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/tutorialgroups => tutorialgroup/domain}/TutorialGroupFreePeriod.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/tutorialgroups => tutorialgroup/domain}/TutorialGroupRegistration.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/tutorialgroups => tutorialgroup/domain}/TutorialGroupSchedule.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{domain/tutorialgroups => tutorialgroup/domain}/TutorialGroupSession.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{domain/tutorialgroups => tutorialgroup/domain}/TutorialGroupsConfiguration.java (98%) diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/AssessmentNote.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/AssessmentNote.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/domain/AssessmentNote.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/domain/AssessmentNote.java index df8abfc9afad..e501cd5e4ecb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/AssessmentNote.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/AssessmentNote.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.assessment.domain; import java.time.Instant; @@ -16,6 +16,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.domain.User; + /** * Represents an internal assessment note. */ diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/scores/ParticipantScore.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/ParticipantScore.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/scores/ParticipantScore.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/domain/ParticipantScore.java index 41e504e1929b..faacac5932f2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/scores/ParticipantScore.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/ParticipantScore.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.scores; +package de.tum.cit.aet.artemis.assessment.domain; import java.time.Instant; @@ -29,7 +29,7 @@ import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.participation.Participant; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/scores/StudentScore.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/StudentScore.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/domain/scores/StudentScore.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/domain/StudentScore.java index 3bec848ab19c..63469ac2ed5e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/scores/StudentScore.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/StudentScore.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.scores; +package de.tum.cit.aet.artemis.assessment.domain; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.participation.Participant; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; @Entity @DiscriminatorValue("SS") diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/scores/TeamScore.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/TeamScore.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/domain/scores/TeamScore.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/domain/TeamScore.java index 10c4e48cc26e..cb0ec0cdb40f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/scores/TeamScore.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/TeamScore.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.scores; +package de.tum.cit.aet.artemis.assessment.domain; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.participation.Participant; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; @Entity @DiscriminatorValue("TS") diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/participation/TutorParticipation.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/TutorParticipation.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/participation/TutorParticipation.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/domain/TutorParticipation.java index 36d29671edd7..283fa7c71bb0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/participation/TutorParticipation.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/TutorParticipation.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.participation; +package de.tum.cit.aet.artemis.assessment.domain; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/statistics/ScoreDistribution.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/ScoreDistribution.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/domain/statistics/ScoreDistribution.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/ScoreDistribution.java index 5b5fc3ffba18..b5baf193d413 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/statistics/ScoreDistribution.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/ScoreDistribution.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.statistics; +package de.tum.cit.aet.artemis.assessment.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/statistics/tutor/effort/TutorEffort.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/TutorEffort.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/domain/statistics/tutor/effort/TutorEffort.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/TutorEffort.java index bae64ebaa759..e997a0c0eee3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/statistics/tutor/effort/TutorEffort.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/TutorEffort.java @@ -1,9 +1,10 @@ -package de.tum.cit.aet.artemis.domain.statistics.tutor.effort; +package de.tum.cit.aet.artemis.assessment.dto; /** * A data entry used by the tutor effort statistics page. It represents the respective information in terms of * number of submissions assessed as well as time spent for each tutor in a particular exercise. */ +// TODO convert to record public class TutorEffort { private Long userId; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/assessment/dashboard/ExerciseMapEntry.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/dashboard/ExerciseMapEntry.java similarity index 76% rename from src/main/java/de/tum/cit/aet/artemis/domain/assessment/dashboard/ExerciseMapEntry.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/dashboard/ExerciseMapEntry.java index 8d4c7521f1a6..ab754a76440b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/assessment/dashboard/ExerciseMapEntry.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/dashboard/ExerciseMapEntry.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.assessment.dashboard; +package de.tum.cit.aet.artemis.assessment.dto.dashboard; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/assessment/dashboard/ExerciseRatingCount.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/dashboard/ExerciseRatingCount.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/domain/assessment/dashboard/ExerciseRatingCount.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/dashboard/ExerciseRatingCount.java index d580b40f1494..efa3cecea370 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/assessment/dashboard/ExerciseRatingCount.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/dashboard/ExerciseRatingCount.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.assessment.dashboard; +package de.tum.cit.aet.artemis.assessment.dto.dashboard; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/assessment/dashboard/ResultCount.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/dashboard/ResultCount.java similarity index 80% rename from src/main/java/de/tum/cit/aet/artemis/domain/assessment/dashboard/ResultCount.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/dashboard/ResultCount.java index 16c03e42982e..01f89a594904 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/assessment/dashboard/ResultCount.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/dashboard/ResultCount.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.assessment.dashboard; +package de.tum.cit.aet.artemis.assessment.dto.dashboard; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardAnsweredMoreFeedbackRequests.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/tutor/TutorLeaderboardAnsweredMoreFeedbackRequests.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardAnsweredMoreFeedbackRequests.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/tutor/TutorLeaderboardAnsweredMoreFeedbackRequests.java index 9e2b58048056..fdb8e1022de3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardAnsweredMoreFeedbackRequests.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/tutor/TutorLeaderboardAnsweredMoreFeedbackRequests.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.leaderboard.tutor; +package de.tum.cit.aet.artemis.assessment.dto.tutor; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardAssessments.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/tutor/TutorLeaderboardAssessments.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardAssessments.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/tutor/TutorLeaderboardAssessments.java index 2830bfb1bdd1..68c81198695f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardAssessments.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/tutor/TutorLeaderboardAssessments.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.leaderboard.tutor; +package de.tum.cit.aet.artemis.assessment.dto.tutor; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardComplaintResponses.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/tutor/TutorLeaderboardComplaintResponses.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardComplaintResponses.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/tutor/TutorLeaderboardComplaintResponses.java index c0e58a6bdf7d..8a21dc808767 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardComplaintResponses.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/tutor/TutorLeaderboardComplaintResponses.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.leaderboard.tutor; +package de.tum.cit.aet.artemis.assessment.dto.tutor; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardComplaints.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/tutor/TutorLeaderboardComplaints.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardComplaints.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/tutor/TutorLeaderboardComplaints.java index 5afcefb1df75..0bb734b1c3f3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardComplaints.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/tutor/TutorLeaderboardComplaints.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.leaderboard.tutor; +package de.tum.cit.aet.artemis.assessment.dto.tutor; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardMoreFeedbackRequests.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/tutor/TutorLeaderboardMoreFeedbackRequests.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardMoreFeedbackRequests.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/tutor/TutorLeaderboardMoreFeedbackRequests.java index ca3c79b67284..fe898e65a444 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/leaderboard/tutor/TutorLeaderboardMoreFeedbackRequests.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/tutor/TutorLeaderboardMoreFeedbackRequests.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.leaderboard.tutor; +package de.tum.cit.aet.artemis.assessment.dto.tutor; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintRepository.java index 26035bd92aff..2217cb3eb1cd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintRepository.java @@ -15,14 +15,14 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntry; +import de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardAnsweredMoreFeedbackRequests; +import de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardComplaintResponses; +import de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardComplaints; +import de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardMoreFeedbackRequests; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Complaint; -import de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseMapEntry; import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; -import de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardAnsweredMoreFeedbackRequests; -import de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardComplaintResponses; -import de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardComplaints; -import de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardMoreFeedbackRequests; /** * Spring Data JPA repository for the Complaint entity. @@ -151,7 +151,7 @@ SELECT COUNT(c) * @return list of exercise ids with the number of complaints based on the complaint type */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseMapEntry( + SELECT new de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntry( c.result.participation.exercise.id, COUNT(DISTINCT c) ) @@ -170,7 +170,7 @@ SELECT COUNT(c) * @return list of exercise ids with the number of complaints based on the complaint type */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseMapEntry( + SELECT new de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntry( c.result.participation.exercise.id, COUNT(DISTINCT c) ) @@ -273,7 +273,7 @@ SELECT COUNT(c) * @return list of TutorLeaderboardComplaints */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardComplaints( + SELECT new de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardComplaints( r.assessor.id, COUNT(c), SUM( CASE WHEN (c.accepted = TRUE ) THEN 1L ELSE 0L END), @@ -299,7 +299,7 @@ SELECT COUNT(c) * @return list of TutorLeaderboardComplaints */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardComplaints( + SELECT new de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardComplaints( r.assessor.id, COUNT(c), SUM( CASE WHEN (c.accepted = TRUE ) THEN 1L ELSE 0L END), @@ -325,7 +325,7 @@ SELECT COUNT(c) * @return list of TutorLeaderboardComplaints */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardComplaints( + SELECT new de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardComplaints( r.assessor.id, COUNT(c), SUM( CASE WHEN (c.accepted = TRUE ) THEN 1L ELSE 0L END), @@ -351,7 +351,7 @@ SELECT COUNT(c) * @return list of TutorLeaderboardComplaintResponses */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardComplaintResponses( + SELECT new de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardComplaintResponses( cr.reviewer.id, COUNT(c), SUM(e.maxPoints) @@ -376,7 +376,7 @@ SELECT COUNT(c) * @return list of TutorLeaderboardComplaintResponses */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardComplaintResponses( + SELECT new de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardComplaintResponses( cr.reviewer.id, COUNT(c), SUM(e.maxPoints) @@ -401,7 +401,7 @@ SELECT COUNT(c) * @return list of TutorLeaderboardComplaintResponses */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardComplaintResponses( + SELECT new de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardComplaintResponses( cr.reviewer.id, COUNT(c), SUM(e.maxPoints) @@ -428,7 +428,7 @@ SELECT COUNT(c) * @return list of TutorLeaderboardMoreFeedbackRequests */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardMoreFeedbackRequests( + SELECT new de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardMoreFeedbackRequests( r.assessor.id, COUNT(c), SUM( CASE WHEN (c.accepted IS NULL) THEN 1L ELSE 0L END), @@ -453,7 +453,7 @@ SELECT COUNT(c) * @return list of TutorLeaderboardMoreFeedbackRequests */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardMoreFeedbackRequests( + SELECT new de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardMoreFeedbackRequests( r.assessor.id, COUNT(c), SUM( CASE WHEN (c.accepted IS NULL) THEN 1L ELSE 0L END), @@ -478,7 +478,7 @@ SELECT COUNT(c) * @return list of TutorLeaderboardAnsweredMoreFeedbackRequests */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardAnsweredMoreFeedbackRequests( + SELECT new de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardAnsweredMoreFeedbackRequests( cr.reviewer.id, COUNT(c), SUM(e.maxPoints) @@ -503,7 +503,7 @@ SELECT COUNT(c) * @return list of TutorLeaderboardAnsweredMoreFeedbackRequests */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardAnsweredMoreFeedbackRequests( + SELECT new de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardAnsweredMoreFeedbackRequests( cr.reviewer.id, COUNT(c), SUM(e.maxPoints) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintResponseRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintResponseRepository.java index 480cbf14919c..1cbd7ea6164c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintResponseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintResponseRepository.java @@ -13,9 +13,9 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntry; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.ComplaintResponse; -import de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseMapEntry; import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; /** @@ -69,7 +69,7 @@ SELECT COUNT (DISTINCT cr) * @return List of exercise ids with their number of complaints */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseMapEntry( + SELECT new de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntry( cr.complaint.result.participation.exercise.id, COUNT(DISTINCT cr) ) @@ -91,7 +91,7 @@ List countComplaintsByExerciseIdsAndComplaintComplaintTypeIgno * @return list of exercise ids with their number of complaints based on the complaint type */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseMapEntry( + SELECT new de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntry( cr.complaint.result.participation.exercise.id, COUNT(DISTINCT cr) ) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java index 8ff4428c7314..72f5a087c275 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java @@ -20,11 +20,11 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.assessment.domain.ParticipantScore; +import de.tum.cit.aet.artemis.assessment.dto.ScoreDistribution; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.scores.ParticipantScore; -import de.tum.cit.aet.artemis.domain.statistics.ScoreDistribution; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementOverviewExerciseStatisticsDTO; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseScoresAggregatedInformation; diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/RatingRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/RatingRepository.java index 2dd300a4ea71..74c3c9dfd629 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/RatingRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/RatingRepository.java @@ -12,9 +12,9 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseRatingCount; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Rating; -import de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseRatingCount; /** * Spring Data JPA repository for the Rating entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java index 0f570fd49ba9..98ca9a1a769c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java @@ -21,6 +21,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.assessment.dto.dashboard.ResultCount; +import de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardAssessments; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.DomainObject; @@ -32,9 +34,7 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.assessment.dashboard.ResultCount; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardAssessments; import de.tum.cit.aet.artemis.service.util.RoundingUtil; import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; import de.tum.cit.aet.artemis.web.rest.dto.ResultWithPointsPerGradingCriterionDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/StudentScoreRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/StudentScoreRepository.java index 8c00edd12cc2..747a7e26fe3a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/StudentScoreRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/StudentScoreRepository.java @@ -15,10 +15,10 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.assessment.domain.StudentScore; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.scores.StudentScore; import de.tum.cit.aet.artemis.web.rest.dto.score.StudentScoreSum; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TeamScoreRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TeamScoreRepository.java index d4c8a46d1ad2..228d32dd7ef0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TeamScoreRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TeamScoreRepository.java @@ -15,11 +15,11 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.assessment.domain.TeamScore; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.scores.TeamScore; import de.tum.cit.aet.artemis.web.rest.dto.score.TeamScoreSum; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TextAssessmentEventRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TextAssessmentEventRepository.java index 835b3bb3184f..5ab413e316af 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TextAssessmentEventRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TextAssessmentEventRepository.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.analytics.TextAssessmentEvent; +import de.tum.cit.aet.artemis.text.domain.TextAssessmentEvent; /** * Spring Data repository for the TextAssessmentEvent entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TextBlockRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TextBlockRepository.java index d514e757c7b9..53d2540e9e0d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TextBlockRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TextBlockRepository.java @@ -10,7 +10,7 @@ import org.springframework.transaction.annotation.Transactional; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.TextBlock; +import de.tum.cit.aet.artemis.text.domain.TextBlock; /** * Spring Data repository for the TextBlock entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TutorParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TutorParticipationRepository.java index c8119c304be1..5070bab3842c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TutorParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TutorParticipationRepository.java @@ -11,11 +11,11 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; /** * Spring Data JPA repository for the TutorParticipation entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/competency/BaseCompetency.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/BaseCompetency.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/competency/BaseCompetency.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/BaseCompetency.java index c62ede25aaed..7720d6b59329 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/competency/BaseCompetency.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/BaseCompetency.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.competency; +package de.tum.cit.aet.artemis.atlas.domain.competency; import jakarta.persistence.Column; import jakarta.persistence.Convert; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/competency/Competency.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/Competency.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/domain/competency/Competency.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/Competency.java index 2333252f8eb0..26192d0c9326 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/competency/Competency.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/Competency.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.competency; +package de.tum.cit.aet.artemis.atlas.domain.competency; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/competency/CompetencyJol.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CompetencyJol.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/competency/CompetencyJol.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CompetencyJol.java index bca876b49f34..9d7a2f39070e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/competency/CompetencyJol.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CompetencyJol.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.competency; +package de.tum.cit.aet.artemis.atlas.domain.competency; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/competency/CompetencyProgress.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CompetencyProgress.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/competency/CompetencyProgress.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CompetencyProgress.java index 3eb8356924ab..17e1e91d4e7d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/competency/CompetencyProgress.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CompetencyProgress.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.competency; +package de.tum.cit.aet.artemis.atlas.domain.competency; import java.io.Serial; import java.io.Serializable; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/competency/CompetencyRelation.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CompetencyRelation.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/competency/CompetencyRelation.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CompetencyRelation.java index 9964580c6dbc..4b8613df1903 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/competency/CompetencyRelation.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CompetencyRelation.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.competency; +package de.tum.cit.aet.artemis.atlas.domain.competency; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/competency/CompetencyTaxonomy.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CompetencyTaxonomy.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/competency/CompetencyTaxonomy.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CompetencyTaxonomy.java index 3441872c9e11..af880f9e8d3a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/competency/CompetencyTaxonomy.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CompetencyTaxonomy.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.competency; +package de.tum.cit.aet.artemis.atlas.domain.competency; import jakarta.persistence.AttributeConverter; import jakarta.persistence.Converter; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/competency/CourseCompetency.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CourseCompetency.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/competency/CourseCompetency.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CourseCompetency.java index e6e8502fcbac..75c6c2cbccf9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/competency/CourseCompetency.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CourseCompetency.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.competency; +package de.tum.cit.aet.artemis.atlas.domain.competency; import java.time.ZonedDateTime; import java.util.HashSet; @@ -30,8 +30,8 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; /** * CourseCompetency is an abstract class for all competency types that are part of a course. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/competency/KnowledgeArea.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/KnowledgeArea.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/competency/KnowledgeArea.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/KnowledgeArea.java index 9f38109b946d..c81fa74244e1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/competency/KnowledgeArea.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/KnowledgeArea.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.competency; +package de.tum.cit.aet.artemis.atlas.domain.competency; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/competency/LearningPath.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/LearningPath.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/competency/LearningPath.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/LearningPath.java index 1a5e20fda3a1..a1e206f7dba3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/competency/LearningPath.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/LearningPath.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.competency; +package de.tum.cit.aet.artemis.atlas.domain.competency; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/competency/Prerequisite.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/Prerequisite.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/domain/competency/Prerequisite.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/Prerequisite.java index 0655f0f1dcc1..73e247929bed 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/competency/Prerequisite.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/Prerequisite.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.competency; +package de.tum.cit.aet.artemis.atlas.domain.competency; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/competency/RelationType.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/RelationType.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/domain/competency/RelationType.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/RelationType.java index 5aec2a28b357..e562ec938852 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/competency/RelationType.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/RelationType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.competency; +package de.tum.cit.aet.artemis.atlas.domain.competency; public enum RelationType { /** diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/competency/Source.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/Source.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/competency/Source.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/Source.java index f2ac2640da7e..d5444b56d2b0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/competency/Source.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/Source.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.competency; +package de.tum.cit.aet.artemis.atlas.domain.competency; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/competency/StandardizedCompetency.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/StandardizedCompetency.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/competency/StandardizedCompetency.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/StandardizedCompetency.java index 4b162fc039a1..1f409a567eff 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/competency/StandardizedCompetency.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/StandardizedCompetency.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.competency; +package de.tum.cit.aet.artemis.atlas.domain.competency; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/science/ScienceEvent.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/science/ScienceEvent.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/science/ScienceEvent.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/domain/science/ScienceEvent.java index 07611b69763c..6cb660adb0b5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/science/ScienceEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/science/ScienceEvent.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.science; +package de.tum.cit.aet.artemis.atlas.domain.science; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/science/ScienceEventType.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/science/ScienceEventType.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/domain/science/ScienceEventType.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/domain/science/ScienceEventType.java index a80605178187..1ad9f7bee711 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/science/ScienceEventType.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/science/ScienceEventType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.science; +package de.tum.cit.aet.artemis.atlas.domain.science; /** * Types of events that can be logged for scientific purposes. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/science/ScienceSetting.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/science/ScienceSetting.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/science/ScienceSetting.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/domain/science/ScienceSetting.java index e9ad638681a1..d74999a68f65 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/science/ScienceSetting.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/science/ScienceSetting.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.science; +package de.tum.cit.aet.artemis.atlas.domain.science; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyMetricsRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyMetricsRepository.java index 919059b8e5bc..d840b9cba5ea 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyMetricsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyMetricsRepository.java @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.competency.Competency; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO; import de.tum.cit.aet.artemis.web.rest.dto.metrics.CompetencyInformationDTO; import de.tum.cit.aet.artemis.web.rest.dto.metrics.CompetencyProgressDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyProgressRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyProgressRepository.java index d3f0ea99c847..6e4300b2f0ea 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyProgressRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyProgressRepository.java @@ -14,10 +14,10 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyRelationRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyRelationRepository.java index 9cfa787d35d7..c3ad55c9eed0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyRelationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyRelationRepository.java @@ -11,9 +11,9 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyRelation; +import de.tum.cit.aet.artemis.atlas.domain.competency.RelationType; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.competency.CompetencyRelation; -import de.tum.cit.aet.artemis.domain.competency.RelationType; /** * Spring Data JPA repository for the Competency Relation entity. @@ -91,7 +91,7 @@ WITH RECURSIVE transitive_closure(id) AS END FROM competency_relation AS relation JOIN transitive_closure AS tc ON relation.tail_competency_id = tc.id OR relation.head_competency_id = tc.id - WHERE relation.type = :#{T(de.tum.cit.aet.artemis.domain.competency.RelationType).MATCHES.ordinal()} + WHERE relation.type = :#{T(de.tum.cit.aet.artemis.atlas.domain.competency.RelationType).MATCHES.ordinal()} ) ) SELECT * FROM transitive_closure diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyRepository.java index 619ad4abe767..49375f9efc20 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyRepository.java @@ -12,9 +12,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.competency.Competency; /** * Spring Data JPA repository for the Competency entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CourseCompetencyRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CourseCompetencyRepository.java index c5e0d179e2c3..4ab9a0de5940 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CourseCompetencyRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CourseCompetencyRepository.java @@ -10,12 +10,12 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.LearningObject; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.web.rest.dto.metrics.CompetencyExerciseMasteryCalculationDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/LearningPathRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/LearningPathRepository.java index e33df99f848a..ace7318ceace 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/LearningPathRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/LearningPathRepository.java @@ -13,8 +13,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.competency.LearningPath; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/PrerequisiteRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/PrerequisiteRepository.java index aaa7e5f753a3..6b67e57775b4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/PrerequisiteRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/PrerequisiteRepository.java @@ -7,9 +7,9 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.competency.Prerequisite; /** * Spring Data JPA repository for the {@link Prerequisite} entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/SourceRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/SourceRepository.java index 8a8634880e9a..2c045c36d440 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/SourceRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/SourceRepository.java @@ -5,8 +5,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.atlas.domain.competency.Source; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.competency.Source; /** * Spring Data JPA repository for the {@link Source} entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/CompetencyJolRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/CompetencyJolRepository.java index d4d40165f635..18297b2631a5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/CompetencyJolRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/CompetencyJolRepository.java @@ -10,8 +10,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyJol; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.competency.CompetencyJol; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/KnowledgeAreaRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/KnowledgeAreaRepository.java index 4eac74aa27f1..384516c67562 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/KnowledgeAreaRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/KnowledgeAreaRepository.java @@ -14,8 +14,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.atlas.domain.competency.KnowledgeArea; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.competency.KnowledgeArea; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/StandardizedCompetencyRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/StandardizedCompetencyRepository.java index 1fdb76d24ab7..ca63f429122d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/StandardizedCompetencyRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/StandardizedCompetencyRepository.java @@ -5,8 +5,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.atlas.domain.competency.StandardizedCompetency; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; /** * Spring Data JPA repository for the {@link StandardizedCompetency} entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/science/ScienceEventRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/science/ScienceEventRepository.java index cfbb99092845..94a30b92eb23 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/science/ScienceEventRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/science/ScienceEventRepository.java @@ -11,9 +11,9 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.atlas.domain.science.ScienceEvent; +import de.tum.cit.aet.artemis.atlas.domain.science.ScienceEventType; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.science.ScienceEvent; -import de.tum.cit.aet.artemis.domain.science.ScienceEventType; /** * Spring Data repository for the ScienceEvent entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/science/ScienceSettingRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/science/ScienceSettingRepository.java index 57af211187b6..c5e1bd252096 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/science/ScienceSettingRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/science/ScienceSettingRepository.java @@ -7,8 +7,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.atlas.domain.science.ScienceSetting; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.science.ScienceSetting; /** * Spring Data repository for the ScienceSetting entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/ConversationSettings.java b/src/main/java/de/tum/cit/aet/artemis/communication/ConversationSettings.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/ConversationSettings.java rename to src/main/java/de/tum/cit/aet/artemis/communication/ConversationSettings.java index caa7ba79cad0..6809be199cac 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/ConversationSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/ConversationSettings.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.metis.conversation; +package de.tum.cit.aet.artemis.communication; public final class ConversationSettings { diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/metis/AnswerPost.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/AnswerPost.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/metis/AnswerPost.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/AnswerPost.java index dc722329e404..9542445bae04 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/metis/AnswerPost.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/AnswerPost.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.metis; +package de.tum.cit.aet.artemis.communication.domain; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/metis/ConversationParticipant.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/ConversationParticipant.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/domain/metis/ConversationParticipant.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/ConversationParticipant.java index ea7c89a7440e..fbbf98d11900 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/metis/ConversationParticipant.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/ConversationParticipant.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.metis; +package de.tum.cit.aet.artemis.communication.domain; import java.time.ZonedDateTime; @@ -12,9 +12,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonIncludeProperties; +import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; @Entity @Table(name = "conversation_participant") @@ -31,7 +31,7 @@ public class ConversationParticipant extends DomainObject { private User user; /** - * Currently only used for {@link de.tum.cit.aet.artemis.domain.metis.conversation.Channel} + * Currently only used for {@link de.tum.cit.aet.artemis.communication.domain.conversation.Channel} */ @Column(name = "is_moderator") private Boolean isModerator; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/metis/ConversationParticipantSettingsView.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/ConversationParticipantSettingsView.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/domain/metis/ConversationParticipantSettingsView.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/ConversationParticipantSettingsView.java index cfa68eabfc5e..92d72701f2df 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/metis/ConversationParticipantSettingsView.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/ConversationParticipantSettingsView.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.metis; +package de.tum.cit.aet.artemis.communication.domain; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/metis/ConversationType.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/ConversationType.java similarity index 50% rename from src/main/java/de/tum/cit/aet/artemis/domain/metis/ConversationType.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/ConversationType.java index 89585c83b8fd..5233a190b067 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/metis/ConversationType.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/ConversationType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.metis; +package de.tum.cit.aet.artemis.communication.domain; public enum ConversationType { CHANNEL, DIRECT diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/metis/CourseWideContext.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/CourseWideContext.java similarity index 79% rename from src/main/java/de/tum/cit/aet/artemis/domain/metis/CourseWideContext.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/CourseWideContext.java index 1ab9f4cfed10..6a2ca5f22bf1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/metis/CourseWideContext.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/CourseWideContext.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.metis; +package de.tum.cit.aet.artemis.communication.domain; /** * The CourseWideContext enumeration for linking posts to other contexts besides certain exercises or lectures. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/metis/CreatedConversationMessage.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/CreatedConversationMessage.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/domain/metis/CreatedConversationMessage.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/CreatedConversationMessage.java index 3eef5b782b20..01d43708e95a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/metis/CreatedConversationMessage.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/CreatedConversationMessage.java @@ -1,9 +1,9 @@ -package de.tum.cit.aet.artemis.domain.metis; +package de.tum.cit.aet.artemis.communication.domain; import java.util.Set; +import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; /** * Encapsulates data needed after a new message has been created in a conversation. This data is used to send notifications to involved users about the new message asynchronously diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/metis/Post.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/Post.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/metis/Post.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/Post.java index cc428cda1778..51824d1c1b66 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/metis/Post.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/Post.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.metis; +package de.tum.cit.aet.artemis.communication.domain; import java.util.HashSet; import java.util.Set; @@ -25,12 +25,12 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonIncludeProperties; +import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; -import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; /** * A Post, i.e. start of a Metis thread. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/metis/PostConstraints.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/PostConstraints.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/domain/metis/PostConstraints.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/PostConstraints.java index 7f8842880734..a8543c782780 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/metis/PostConstraints.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/PostConstraints.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.metis; +package de.tum.cit.aet.artemis.communication.domain; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/metis/PostContextConstraintValidator.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/PostContextConstraintValidator.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/domain/metis/PostContextConstraintValidator.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/PostContextConstraintValidator.java index 8d2821b5c01d..1765b8d28429 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/metis/PostContextConstraintValidator.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/PostContextConstraintValidator.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.metis; +package de.tum.cit.aet.artemis.communication.domain; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/metis/PostSortCriterion.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/PostSortCriterion.java similarity index 58% rename from src/main/java/de/tum/cit/aet/artemis/domain/metis/PostSortCriterion.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/PostSortCriterion.java index 47de4d7dc3fd..befa7abbbcf9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/metis/PostSortCriterion.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/PostSortCriterion.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.metis; +package de.tum.cit.aet.artemis.communication.domain; public enum PostSortCriterion { CREATION_DATE, VOTES, ANSWER_COUNT diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/metis/Posting.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/Posting.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/metis/Posting.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/Posting.java index d71253287399..c9a5f9eec9f1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/metis/Posting.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/Posting.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.metis; +package de.tum.cit.aet.artemis.communication.domain; import java.time.ZonedDateTime; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/metis/Reaction.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/Reaction.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/metis/Reaction.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/Reaction.java index 9c337bfcbca6..b0d6c55797c6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/metis/Reaction.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/Reaction.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.metis; +package de.tum.cit.aet.artemis.communication.domain; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/metis/ReactionConstraintValidator.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/ReactionConstraintValidator.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/domain/metis/ReactionConstraintValidator.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/ReactionConstraintValidator.java index f4a4e8558b8d..a122457e06fa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/metis/ReactionConstraintValidator.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/ReactionConstraintValidator.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.metis; +package de.tum.cit.aet.artemis.communication.domain; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/metis/ReactionConstraints.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/ReactionConstraints.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/domain/metis/ReactionConstraints.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/ReactionConstraints.java index 6f2791a1ff3e..b3452c69170e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/metis/ReactionConstraints.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/ReactionConstraints.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.metis; +package de.tum.cit.aet.artemis.communication.domain; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/metis/UserRole.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/UserRole.java similarity index 50% rename from src/main/java/de/tum/cit/aet/artemis/domain/metis/UserRole.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/UserRole.java index 6f6361654567..9a9b89955b25 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/metis/UserRole.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/UserRole.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.metis; +package de.tum.cit.aet.artemis.communication.domain; public enum UserRole { INSTRUCTOR, TUTOR, USER diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/Channel.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/Channel.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/Channel.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/Channel.java index 80f0f440ca19..8d71301b8c33 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/Channel.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/Channel.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.metis.conversation; +package de.tum.cit.aet.artemis.communication.domain.conversation; import java.time.ZonedDateTime; import java.util.Set; @@ -16,13 +16,13 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; -import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.exam.domain.Exam; @Entity @DiscriminatorValue("C") diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/ChannelSubType.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/ChannelSubType.java similarity index 79% rename from src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/ChannelSubType.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/ChannelSubType.java index 90b607cc87a8..6a27df3facf7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/ChannelSubType.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/ChannelSubType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.metis.conversation; +package de.tum.cit.aet.artemis.communication.domain.conversation; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/Conversation.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/Conversation.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/Conversation.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/Conversation.java index b5d7a411ea7b..5287168398d9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/Conversation.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/Conversation.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.metis.conversation; +package de.tum.cit.aet.artemis.communication.domain.conversation; import java.time.ZonedDateTime; import java.util.HashSet; @@ -29,11 +29,11 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; -import de.tum.cit.aet.artemis.domain.metis.Post; @Entity @Table(name = "conversation") diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/GroupChat.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/GroupChat.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/GroupChat.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/GroupChat.java index 282edef7f6d0..902c4985a96a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/GroupChat.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/GroupChat.java @@ -1,6 +1,6 @@ -package de.tum.cit.aet.artemis.domain.metis.conversation; +package de.tum.cit.aet.artemis.communication.domain.conversation; -import static de.tum.cit.aet.artemis.domain.metis.conversation.ConversationSettings.MAX_GROUP_CHAT_PARTICIPANTS; +import static de.tum.cit.aet.artemis.communication.ConversationSettings.MAX_GROUP_CHAT_PARTICIPANTS; import java.time.ZonedDateTime; import java.util.Set; @@ -15,11 +15,11 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; -import de.tum.cit.aet.artemis.domain.metis.Post; @Entity @DiscriminatorValue("G") diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/OneToOneChat.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/OneToOneChat.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/OneToOneChat.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/OneToOneChat.java index 7753a31786b9..85122ad4582b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/OneToOneChat.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/OneToOneChat.java @@ -1,6 +1,6 @@ -package de.tum.cit.aet.artemis.domain.metis.conversation; +package de.tum.cit.aet.artemis.communication.domain.conversation; -import static de.tum.cit.aet.artemis.domain.metis.conversation.ConversationSettings.MAX_ONE_TO_ONE_CHAT_PARTICIPANTS; +import static de.tum.cit.aet.artemis.communication.ConversationSettings.MAX_ONE_TO_ONE_CHAT_PARTICIPANTS; import java.time.ZonedDateTime; import java.util.Set; @@ -10,10 +10,10 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; -import de.tum.cit.aet.artemis.domain.metis.Post; @Entity @DiscriminatorValue("O") diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/notification/ConversationNotification.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/ConversationNotification.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/domain/notification/ConversationNotification.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/ConversationNotification.java index cfe65b9ca583..5d72d31e2b16 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/notification/ConversationNotification.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/ConversationNotification.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.notification; +package de.tum.cit.aet.artemis.communication.domain.notification; import java.time.ZonedDateTime; @@ -10,9 +10,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; /** * A Notification concerning all new messages in a conversation. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/notification/ConversationNotificationFactory.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/ConversationNotificationFactory.java similarity index 80% rename from src/main/java/de/tum/cit/aet/artemis/domain/notification/ConversationNotificationFactory.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/ConversationNotificationFactory.java index 23df93e0157d..864419557a4c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/notification/ConversationNotificationFactory.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/ConversationNotificationFactory.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.domain.notification; +package de.tum.cit.aet.artemis.communication.domain.notification; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.findCorrespondingNotificationTitleOrThrow; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createConversationMessageTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.findCorrespondingNotificationTitleOrThrow; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createConversationMessageTarget; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; -import de.tum.cit.aet.artemis.domain.metis.Post; public class ConversationNotificationFactory { diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/notification/GroupNotification.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/GroupNotification.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/notification/GroupNotification.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/GroupNotification.java index d4293945f710..a1301771b054 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/notification/GroupNotification.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/GroupNotification.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.notification; +package de.tum.cit.aet.artemis.communication.domain.notification; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/notification/GroupNotificationFactory.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/GroupNotificationFactory.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/domain/notification/GroupNotificationFactory.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/GroupNotificationFactory.java index 8092d8467396..b7ef1fd0e00e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/notification/GroupNotificationFactory.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/GroupNotificationFactory.java @@ -1,5 +1,13 @@ -package de.tum.cit.aet.artemis.domain.notification; +package de.tum.cit.aet.artemis.communication.domain.notification; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createAttachmentUpdatedTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createCoursePostTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createCourseTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createDuplicateTestCaseTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createExamExerciseTargetWithExerciseUpdate; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createExamProgrammingExerciseOrTestCaseTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createExerciseReleasedTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createExerciseUpdatedTarget; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority.HIGH; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority.MEDIUM; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.ATTACHMENT_CHANGE; @@ -20,19 +28,12 @@ import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PROGRAMMING_REPOSITORY_LOCKS; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PROGRAMMING_TEST_CASES_CHANGED; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.QUIZ_EXERCISE_STARTED; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createAttachmentUpdatedTarget; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createCoursePostTarget; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createCourseTarget; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createDuplicateTestCaseTarget; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createExamExerciseTargetWithExerciseUpdate; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createExamProgrammingExerciseOrTestCaseTarget; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createExerciseReleasedTarget; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createExerciseUpdatedTarget; import java.util.List; import org.jsoup.Jsoup; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.domain.Attachment; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -42,8 +43,7 @@ import de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType; import de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.exam.domain.Exam; public class GroupNotificationFactory { diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/notification/Notification.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/Notification.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/domain/notification/Notification.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/Notification.java index e9808962faf5..449c7a814c4d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/notification/Notification.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/Notification.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.notification; +package de.tum.cit.aet.artemis.communication.domain.notification; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/notification/NotificationConstants.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/NotificationConstants.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/domain/notification/NotificationConstants.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/NotificationConstants.java index 468d6e764841..5c3c591107a8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/notification/NotificationConstants.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/NotificationConstants.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.notification; +package de.tum.cit.aet.artemis.communication.domain.notification; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.ATTACHMENT_CHANGE; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_CHANNEL; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderCreator.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/NotificationPlaceholderCreator.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderCreator.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/NotificationPlaceholderCreator.java index 87085fc6f5b9..0102c6e18dea 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderCreator.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/NotificationPlaceholderCreator.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.notification; +package de.tum.cit.aet.artemis.communication.domain.notification; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/notification/NotificationTarget.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/NotificationTarget.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/notification/NotificationTarget.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/NotificationTarget.java index 86951b49c1ee..8d29ed821f7e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/notification/NotificationTarget.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/NotificationTarget.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.notification; +package de.tum.cit.aet.artemis.communication.domain.notification; import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_EMPTY; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/notification/NotificationTargetFactory.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/NotificationTargetFactory.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/notification/NotificationTargetFactory.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/NotificationTargetFactory.java index 4fff741de9d9..a228afd8a14c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/notification/NotificationTargetFactory.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/NotificationTargetFactory.java @@ -1,14 +1,14 @@ -package de.tum.cit.aet.artemis.domain.notification; +package de.tum.cit.aet.artemis.communication.domain.notification; +import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.DataExport; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.metis.AnswerPost; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; public class NotificationTargetFactory { diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/notification/SingleUserNotification.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/SingleUserNotification.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/domain/notification/SingleUserNotification.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/SingleUserNotification.java index 4bb300f27cca..96b379e41fa5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/notification/SingleUserNotification.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/SingleUserNotification.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.notification; +package de.tum.cit.aet.artemis.communication.domain.notification; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/notification/SingleUserNotificationFactory.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/SingleUserNotificationFactory.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/domain/notification/SingleUserNotificationFactory.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/SingleUserNotificationFactory.java index 314986a0d564..473bc1ef6ae7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/notification/SingleUserNotificationFactory.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/SingleUserNotificationFactory.java @@ -1,5 +1,43 @@ -package de.tum.cit.aet.artemis.domain.notification; - +package de.tum.cit.aet.artemis.communication.domain.notification; + +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_CHANNEL_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_GROUP_CHAT_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.CONVERSATION_DELETE_CHANNEL_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.CONVERSATION_REMOVE_USER_CHANNEL_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.CONVERSATION_REMOVE_USER_GROUP_CHAT_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.DATA_EXPORT_CREATED_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.DATA_EXPORT_CREATED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.DATA_EXPORT_FAILED_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.DATA_EXPORT_FAILED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.EXERCISE_SUBMISSION_ASSESSED_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.EXERCISE_SUBMISSION_ASSESSED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.FILE_SUBMISSION_SUCCESSFUL_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.FILE_SUBMISSION_SUCCESSFUL_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.MESSAGE_REPLY_IN_CHANNEL_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.MESSAGE_REPLY_IN_CONVERSATION_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.NEW_CPC_PLAGIARISM_CASE_STUDENT_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.NEW_CPC_PLAGIARISM_CASE_STUDENT_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.NEW_PLAGIARISM_CASE_STUDENT_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.NEW_PLAGIARISM_CASE_STUDENT_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.PLAGIARISM_CASE_VERDICT_STUDENT_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.PLAGIARISM_CASE_VERDICT_STUDENT_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_ASSIGNED_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_STUDENT_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_TUTOR_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_MULTIPLE_TUTOR_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_STUDENT_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_TUTOR_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_UNASSIGNED_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.findCorrespondingNotificationTitleOrThrow; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createConversationCreationTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createConversationDeletionTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createConversationMessageTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createDataExportCreatedTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createDataExportFailedTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createExerciseTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createMessageReplyTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createPlagiarismCaseTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createTutorialGroupTarget; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority.HIGH; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_CHANNEL; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_GROUP_CHAT; @@ -28,59 +66,21 @@ import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_STUDENT; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_TUTOR; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UNASSIGNED; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_CHANNEL_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_GROUP_CHAT_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_DELETE_CHANNEL_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_REMOVE_USER_CHANNEL_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_REMOVE_USER_GROUP_CHAT_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.DATA_EXPORT_CREATED_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.DATA_EXPORT_CREATED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.DATA_EXPORT_FAILED_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.DATA_EXPORT_FAILED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXERCISE_SUBMISSION_ASSESSED_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXERCISE_SUBMISSION_ASSESSED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.FILE_SUBMISSION_SUCCESSFUL_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.FILE_SUBMISSION_SUCCESSFUL_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.MESSAGE_REPLY_IN_CHANNEL_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.MESSAGE_REPLY_IN_CONVERSATION_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_CPC_PLAGIARISM_CASE_STUDENT_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_CPC_PLAGIARISM_CASE_STUDENT_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_PLAGIARISM_CASE_STUDENT_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_PLAGIARISM_CASE_STUDENT_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.PLAGIARISM_CASE_VERDICT_STUDENT_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.PLAGIARISM_CASE_VERDICT_STUDENT_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_ASSIGNED_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_STUDENT_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_TUTOR_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_MULTIPLE_TUTOR_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_STUDENT_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_TUTOR_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_UNASSIGNED_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.findCorrespondingNotificationTitleOrThrow; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createConversationCreationTarget; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createConversationDeletionTarget; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createConversationMessageTarget; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createDataExportCreatedTarget; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createDataExportFailedTarget; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createExerciseTarget; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createMessageReplyTarget; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createPlagiarismCaseTarget; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createTutorialGroupTarget; import java.util.Set; import jakarta.validation.constraints.NotNull; +import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; import de.tum.cit.aet.artemis.domain.DataExport; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; -import de.tum.cit.aet.artemis.domain.metis.AnswerPost; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; public class SingleUserNotificationFactory { diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/notification/SystemNotification.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/SystemNotification.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/domain/notification/SystemNotification.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/SystemNotification.java index 077a854d324b..2ba2a4722bf8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/notification/SystemNotification.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/SystemNotification.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.notification; +package de.tum.cit.aet.artemis.communication.domain.notification; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/notification/TutorialGroupNotification.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/TutorialGroupNotification.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/notification/TutorialGroupNotification.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/TutorialGroupNotification.java index 0d7f51e3ab3e..ce82925fcb9d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/notification/TutorialGroupNotification.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/TutorialGroupNotification.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.notification; +package de.tum.cit.aet.artemis.communication.domain.notification; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DELETED; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UPDATED; @@ -16,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; /** * A Notification concerning all students and the assigned tutor of a tutorial group. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/notification/TutorialGroupNotificationFactory.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/TutorialGroupNotificationFactory.java similarity index 84% rename from src/main/java/de/tum/cit/aet/artemis/domain/notification/TutorialGroupNotificationFactory.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/TutorialGroupNotificationFactory.java index 3330d3d29748..2d5308463508 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/notification/TutorialGroupNotificationFactory.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/TutorialGroupNotificationFactory.java @@ -1,14 +1,14 @@ -package de.tum.cit.aet.artemis.domain.notification; +package de.tum.cit.aet.artemis.communication.domain.notification; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_DELETED_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_UPDATED_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.findCorrespondingNotificationTitleOrThrow; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createTutorialGroupTarget; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DELETED; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UPDATED; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DELETED_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_UPDATED_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.findCorrespondingNotificationTitleOrThrow; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createTutorialGroupTarget; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; public class TutorialGroupNotificationFactory { diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/push_notification/PushNotificationDeviceConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/push_notification/PushNotificationDeviceConfiguration.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/push_notification/PushNotificationDeviceConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/push_notification/PushNotificationDeviceConfiguration.java index 56e77c3252a0..f593a00a3066 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/push_notification/PushNotificationDeviceConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/push_notification/PushNotificationDeviceConfiguration.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.push_notification; +package de.tum.cit.aet.artemis.communication.domain.push_notification; import java.util.Arrays; import java.util.Date; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/push_notification/PushNotificationDeviceConfigurationId.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/push_notification/PushNotificationDeviceConfigurationId.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/domain/push_notification/PushNotificationDeviceConfigurationId.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/push_notification/PushNotificationDeviceConfigurationId.java index 8fdc84d4f094..9b9d6da07d46 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/push_notification/PushNotificationDeviceConfigurationId.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/push_notification/PushNotificationDeviceConfigurationId.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.push_notification; +package de.tum.cit.aet.artemis.communication.domain.push_notification; import java.io.Serializable; import java.util.Objects; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/push_notification/PushNotificationDeviceType.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/push_notification/PushNotificationDeviceType.java similarity index 66% rename from src/main/java/de/tum/cit/aet/artemis/domain/push_notification/PushNotificationDeviceType.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/push_notification/PushNotificationDeviceType.java index 4eda21369841..6827cc239218 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/push_notification/PushNotificationDeviceType.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/push_notification/PushNotificationDeviceType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.push_notification; +package de.tum.cit.aet.artemis.communication.domain.push_notification; /** * The Enum DeviceType used for PushNotificationDeviceConfiguration diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/ConversationSummary.java b/src/main/java/de/tum/cit/aet/artemis/communication/dto/ConversationSummary.java similarity index 80% rename from src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/ConversationSummary.java rename to src/main/java/de/tum/cit/aet/artemis/communication/dto/ConversationSummary.java index 95ea795e21c8..bb887a57bf1f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/ConversationSummary.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/dto/ConversationSummary.java @@ -1,4 +1,6 @@ -package de.tum.cit.aet.artemis.domain.metis.conversation; +package de.tum.cit.aet.artemis.communication.dto; + +import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; /** * Summaries user related and general information about a conversation. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/GeneralConversationInfo.java b/src/main/java/de/tum/cit/aet/artemis/communication/dto/GeneralConversationInfo.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/GeneralConversationInfo.java rename to src/main/java/de/tum/cit/aet/artemis/communication/dto/GeneralConversationInfo.java index 922cda28bc67..bd3d66c82d8d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/GeneralConversationInfo.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/dto/GeneralConversationInfo.java @@ -1,8 +1,9 @@ -package de.tum.cit.aet.artemis.domain.metis.conversation; +package de.tum.cit.aet.artemis.communication.dto; /** * Stores general information about a conversation that is not related to a user */ +// TODO: convert to record public class GeneralConversationInfo { private final long conversationId; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/UserConversationInfo.java b/src/main/java/de/tum/cit/aet/artemis/communication/dto/UserConversationInfo.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/UserConversationInfo.java rename to src/main/java/de/tum/cit/aet/artemis/communication/dto/UserConversationInfo.java index 27fdb18fae98..7d50d085b836 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/metis/conversation/UserConversationInfo.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/dto/UserConversationInfo.java @@ -1,12 +1,13 @@ -package de.tum.cit.aet.artemis.domain.metis.conversation; +package de.tum.cit.aet.artemis.communication.dto; import java.time.ZonedDateTime; -import de.tum.cit.aet.artemis.domain.metis.ConversationParticipantSettingsView; +import de.tum.cit.aet.artemis.communication.domain.ConversationParticipantSettingsView; /** * Stores user-related information about a conversation */ +// TODO: convert to record public class UserConversationInfo { private final long conversationId; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/AnswerPostRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/AnswerPostRepository.java index 052af555db31..c6a915b994e2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/AnswerPostRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/AnswerPostRepository.java @@ -9,8 +9,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.communication.domain.AnswerPost; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.metis.AnswerPost; /** * Spring Data repository for the AnswerPost entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java index 49be6049c3a2..4e1c14b2d81f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java @@ -26,9 +26,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.metis.Post; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationParticipantRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationParticipantRepository.java index 2b33de98a5f9..1cbe9deb3490 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationParticipantRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationParticipantRepository.java @@ -14,8 +14,8 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; /** * Spring Data repository for the ConversationParticipant entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/CustomPostRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/CustomPostRepository.java index b7b065f1157c..d40778fbaae6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/CustomPostRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/CustomPostRepository.java @@ -4,7 +4,7 @@ import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.domain.Specification; -import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.communication.domain.Post; public interface CustomPostRepository { diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/CustomPostRepositoryImpl.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/CustomPostRepositoryImpl.java index 22eeed4a7ae5..cfdd5f71443e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/CustomPostRepositoryImpl.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/CustomPostRepositoryImpl.java @@ -15,8 +15,8 @@ import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.domain.Specification; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.metis.Post_; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.Post_; public class CustomPostRepositoryImpl implements CustomPostRepository { diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/GroupNotificationRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/GroupNotificationRepository.java index 5ea23f8d9727..fa21f225260d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/GroupNotificationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/GroupNotificationRepository.java @@ -7,8 +7,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.communication.domain.notification.GroupNotification; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.notification.GroupNotification; /** * Spring Data repository for the Notification entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/MessageSpecs.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/MessageSpecs.java index 3342d2555f5f..6baba5fd8367 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/MessageSpecs.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/MessageSpecs.java @@ -13,18 +13,18 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.data.jpa.domain.Specification; +import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.AnswerPost_; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.PostSortCriterion; +import de.tum.cit.aet.artemis.communication.domain.Post_; +import de.tum.cit.aet.artemis.communication.domain.Reaction_; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel_; +import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation_; import de.tum.cit.aet.artemis.domain.Course_; import de.tum.cit.aet.artemis.domain.User_; import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; -import de.tum.cit.aet.artemis.domain.metis.AnswerPost; -import de.tum.cit.aet.artemis.domain.metis.AnswerPost_; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.metis.PostSortCriterion; -import de.tum.cit.aet.artemis.domain.metis.Post_; -import de.tum.cit.aet.artemis.domain.metis.Reaction_; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel_; -import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation_; public class MessageSpecs { diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/NotificationRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/NotificationRepository.java index 78562d02f6bc..4fcb50c78a8f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/NotificationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/NotificationRepository.java @@ -14,8 +14,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.notification.Notification; /** * Spring Data repository for the Notification entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/PostRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/PostRepository.java index c8bbafed86ab..a7249138e2cf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/PostRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/PostRepository.java @@ -12,8 +12,8 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.metis.Post; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/PushNotificationDeviceConfigurationRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/PushNotificationDeviceConfigurationRepository.java index c72f7d2b41ee..c99d84f2ebb2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/PushNotificationDeviceConfigurationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/PushNotificationDeviceConfigurationRepository.java @@ -12,11 +12,11 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfiguration; +import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfigurationId; +import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceType; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfiguration; -import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfigurationId; -import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceType; /** * The Repository used for PushNotificationDeviceConfiguration diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/ReactionRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ReactionRepository.java index 8380a998cb0e..5a9914c6472b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/ReactionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ReactionRepository.java @@ -7,8 +7,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.communication.domain.Reaction; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.metis.Reaction; /** * Spring Data repository for the Reaction entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/SingleUserNotificationRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/SingleUserNotificationRepository.java index 4a1dbe85da1d..cf2111716da1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/SingleUserNotificationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/SingleUserNotificationRepository.java @@ -5,8 +5,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotification; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.notification.SingleUserNotification; /** * Spring Data repository for the Notification entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/SystemNotificationRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/SystemNotificationRepository.java index b68ecb81fd95..78924e424cbc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/SystemNotificationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/SystemNotificationRepository.java @@ -10,8 +10,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.communication.domain.notification.SystemNotification; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.notification.SystemNotification; /** * Spring Data repository for the Notification entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/ChannelRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/ChannelRepository.java index e91d20da911b..d7cbc2ae86c2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/ChannelRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/ChannelRepository.java @@ -10,8 +10,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/ConversationNotificationRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/ConversationNotificationRepository.java index 97a1da954bf1..63fc978105fc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/ConversationNotificationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/ConversationNotificationRepository.java @@ -5,8 +5,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.communication.domain.notification.ConversationNotification; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.notification.ConversationNotification; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/ConversationRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/ConversationRepository.java index 6ce205db14f3..8e8e36e18a80 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/ConversationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/ConversationRepository.java @@ -14,10 +14,10 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; +import de.tum.cit.aet.artemis.communication.dto.GeneralConversationInfo; +import de.tum.cit.aet.artemis.communication.dto.UserConversationInfo; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; -import de.tum.cit.aet.artemis.domain.metis.conversation.GeneralConversationInfo; -import de.tum.cit.aet.artemis.domain.metis.conversation.UserConversationInfo; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/GroupChatRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/GroupChatRepository.java index 69a0f210c95a..5cf28c6a4d13 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/GroupChatRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/GroupChatRepository.java @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.communication.domain.conversation.GroupChat; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/OneToOneChatRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/OneToOneChatRepository.java index 870484d10d59..38b7e944c1ec 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/OneToOneChatRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/OneToOneChatRepository.java @@ -10,8 +10,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.communication.domain.conversation.OneToOneChat; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.metis.conversation.OneToOneChat; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/CacheConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/CacheConfiguration.java index 19e9922b0113..1fceb0e11d08 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/CacheConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/CacheConfiguration.java @@ -241,8 +241,8 @@ public HazelcastInstance hazelcastInstance(JHipsterProperties jHipsterProperties } config.getMapConfigs().put("default", initializeDefaultMapConfig(jHipsterProperties)); config.getMapConfigs().put("files", initializeFilesMapConfig(jHipsterProperties)); - // TODO: add all future domain paths here - config.getMapConfigs().put("de.tum.cit.aet.artemis.domain.*", initializeDomainMapConfig(jHipsterProperties)); + // TODO Ole: investigate if the following * in artemis.*.domain works for database entity caching or if we need to specify all module domain paths here + config.getMapConfigs().put("de.tum.cit.aet.artemis.*.domain.*", initializeDomainMapConfig(jHipsterProperties)); // Configure split brain protection if the cluster was split at some point var splitBrainProtectionConfig = new SplitBrainProtectionConfig(); diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java b/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java index 6949ead64326..1c6c0a200d92 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java @@ -4,7 +4,7 @@ import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.service.programming.ProgrammingSubmissionService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java b/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java index b8bb8c163911..4de89459f424 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java @@ -40,10 +40,10 @@ import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.metrics.ExerciseTypeMetricsEntry; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseTypeMetricsEntry; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.connectors.localci.SharedQueueManagementService; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/migration/entries/MigrationEntry20240614_140000.java b/src/main/java/de/tum/cit/aet/artemis/core/config/migration/entries/MigrationEntry20240614_140000.java index 6877bf432a4b..b0c74f4f17a2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/migration/entries/MigrationEntry20240614_140000.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/migration/entries/MigrationEntry20240614_140000.java @@ -6,11 +6,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.core.config.migration.MigrationEntry; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.competency.Competency; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; public class MigrationEntry20240614_140000 extends MigrationEntry { diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java index a7af8a0541b8..0339275f4dba 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java @@ -62,8 +62,8 @@ import de.tum.cit.aet.artemis.core.security.jwt.TokenProvider; import de.tum.cit.aet.artemis.core.validation.InetSocketAddressValidator; import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/statistics/CourseStatisticsAverageScore.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseStatisticsAverageScore.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/statistics/CourseStatisticsAverageScore.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/CourseStatisticsAverageScore.java index 454194d3f393..c959c19f4089 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/statistics/CourseStatisticsAverageScore.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseStatisticsAverageScore.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.statistics; +package de.tum.cit.aet.artemis.core.dto; import java.time.ZonedDateTime; import java.util.Set; @@ -8,6 +8,7 @@ import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; @JsonInclude(JsonInclude.Include.NON_EMPTY) +// TODO: convert to record public class CourseStatisticsAverageScore { private final long exerciseId; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/statistics/StatisticsEntry.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/StatisticsEntry.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/statistics/StatisticsEntry.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/StatisticsEntry.java index d6fd36cf4714..e57959d0cce9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/statistics/StatisticsEntry.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/StatisticsEntry.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.statistics; +package de.tum.cit.aet.artemis.core.dto; import java.time.temporal.TemporalAccessor; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/CourseRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/CourseRepository.java index 46eb7381042c..495192f8e39d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/CourseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/CourseRepository.java @@ -21,17 +21,17 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.dto.StatisticsEntry; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.FileUploadExercise; import de.tum.cit.aet.artemis.domain.Organization; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** @@ -262,7 +262,7 @@ WHERE TYPE(e) = QuizExercise * @return A list with a map for every submission containing date and the username */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( SUBSTRING(CAST(s.submissionDate AS string), 1, 10), p.student.login ) diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/StatisticsRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/StatisticsRepository.java index 4dec0ce370fb..adab6c7e1dab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/StatisticsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/StatisticsRepository.java @@ -25,14 +25,14 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.dto.CourseStatisticsAverageScore; +import de.tum.cit.aet.artemis.core.dto.StatisticsEntry; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.GraphType; import de.tum.cit.aet.artemis.domain.enumeration.SpanType; import de.tum.cit.aet.artemis.domain.enumeration.StatisticsView; -import de.tum.cit.aet.artemis.domain.statistics.CourseStatisticsAverageScore; -import de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry; /** * Spring Data JPA repository for the statistics pages @@ -42,7 +42,7 @@ public interface StatisticsRepository extends ArtemisJpaRepository { @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( s.submissionDate, count(s.id) ) @@ -59,7 +59,7 @@ OR EXISTS (SELECT c FROM Course c WHERE s.participation.exercise.course.testCour List getTotalSubmissions(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( s.submissionDate, count(s.id) ) @@ -74,7 +74,7 @@ List getTotalSubmissionsForCourse(@Param("startDate") ZonedDate @Param("exerciseIds") List exerciseIds); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( s.submissionDate, count(s.id) ) @@ -89,7 +89,7 @@ List getTotalSubmissionsForExercise(@Param("startDate") ZonedDa @Param("exerciseId") long exerciseId); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( submission.submissionDate, p.student.login ) @@ -138,7 +138,7 @@ SELECT COUNT(DISTINCT p.student.id) Long countActiveUsers(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( submission.submissionDate, p.student.login ) @@ -154,7 +154,7 @@ List getActiveUsersForCourse(@Param("startDate") ZonedDateTime @Param("exerciseIds") List exerciseIds); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( submission.submissionDate, p.student.login ) @@ -169,7 +169,7 @@ List getActiveUsersForCourse(@Param("startDate") ZonedDateTime List getActiveUsersForExercise(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate, @Param("exerciseId") long exerciseId); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( e.releaseDate, COUNT(e.id) ) FROM Exercise e @@ -182,7 +182,7 @@ e.releaseDate, COUNT(e.id) List getReleasedExercises(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( e.releaseDate, COUNT(e.id) ) FROM Exercise e @@ -196,7 +196,7 @@ List getReleasedExercisesForCourse(@Param("startDate") ZonedDat @Param("exerciseIds") List exerciseIds); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( e.dueDate, COUNT(e.id) ) FROM Exercise e @@ -209,7 +209,7 @@ e.dueDate, COUNT(e.id) List getExercisesDue(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( e.dueDate, count(e.id) ) FROM Exercise e @@ -223,7 +223,7 @@ List getExercisesDueForCourse(@Param("startDate") ZonedDateTime @Param("exerciseIds") List exerciseIds); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( p.auditEventDate, u.login ) FROM User u @@ -236,7 +236,7 @@ List getExercisesDueForCourse(@Param("startDate") ZonedDateTime List getLoggedInUsers(@Param("startDate") Instant startDate, @Param("endDate") Instant endDate); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( e.endDate, COUNT(e.id) ) FROM Exam e @@ -249,7 +249,7 @@ e.endDate, COUNT(e.id) List getConductedExams(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( e.endDate, COUNT(e.id) ) FROM Exam e @@ -262,7 +262,7 @@ e.endDate, COUNT(e.id) List getConductedExamsForCourse(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate, @Param("courseId") long courseId); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( e.endDate, COUNT(e.id) ) FROM Exam e @@ -277,7 +277,7 @@ e.endDate, COUNT(e.id) List getExamParticipations(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( e.endDate, COUNT(e.id) ) FROM Exam e @@ -292,7 +292,7 @@ e.endDate, COUNT(e.id) List getExamParticipationsForCourse(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate, @Param("courseId") long courseId); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( e.endDate, SUM(SIZE(e.examUsers)) ) FROM Exam e @@ -305,7 +305,7 @@ e.endDate, SUM(SIZE(e.examUsers)) List getExamRegistrations(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( e.endDate, SUM(SIZE(e.examUsers)) ) FROM Exam e @@ -318,7 +318,7 @@ e.endDate, SUM(SIZE(e.examUsers)) List getExamRegistrationsForCourse(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate, @Param("courseId") long courseId); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( r.completionDate, r.assessor.login ) @@ -337,7 +337,7 @@ OR EXISTS (SELECT c FROM Course c WHERE r.participation.exercise.course.testCour List getActiveTutors(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( r.completionDate, r.assessor.login ) @@ -354,7 +354,7 @@ List getActiveTutorsForCourse(@Param("startDate") ZonedDateTime @Param("exerciseIds") List exerciseIds); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( r.completionDate, r.assessor.login ) @@ -370,7 +370,7 @@ List getActiveTutorsForCourse(@Param("startDate") ZonedDateTime List getActiveTutorsForExercise(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate, @Param("exerciseId") long exerciseId); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( r.completionDate, COUNT(r.id) ) FROM Result r @@ -386,7 +386,7 @@ OR EXISTS (SELECT c FROM Course c WHERE r.participation.exercise.course.testCour List getCreatedResults(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( r.completionDate, COUNT(r.id) ) FROM Result r @@ -400,7 +400,7 @@ List getCreatedResultsForCourse(@Param("startDate") ZonedDateTi @Param("exerciseIds") List exerciseIds); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( r.completionDate, COUNT(r.id) ) FROM Result r @@ -413,7 +413,7 @@ r.completionDate, COUNT(r.id) List getCreatedResultsForExercise(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate, @Param("exerciseId") long exerciseId); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( r.completionDate, SUM(SIZE(r.feedbacks)) ) FROM Result r @@ -428,7 +428,7 @@ OR EXISTS(SELECT c FROM Course c WHERE r.participation.exercise.course.testCours List getResultFeedbacks(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( r.completionDate, SUM(SIZE(r.feedbacks)) ) FROM Result r @@ -442,7 +442,7 @@ List getResultFeedbacksForCourse(@Param("startDate") ZonedDateT @Param("exerciseIds") List exerciseIds); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( r.completionDate, SUM(SIZE(r.feedbacks)) ) FROM Result r @@ -455,7 +455,7 @@ r.completionDate, SUM(SIZE(r.feedbacks)) List getResultFeedbacksForExercise(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate, @Param("exerciseId") long exerciseId); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( post.creationDate, COUNT(post.id) ) FROM Post post @@ -470,7 +470,7 @@ LEFT JOIN TREAT (post.conversation AS Channel) channel List getPostsForCourseInDateRange(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate, @Param("courseId") long courseId); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( post.creationDate, COUNT(post.id) ) FROM Post post @@ -503,7 +503,7 @@ LEFT JOIN TREAT (post.conversation AS Channel) channel long getNumberOfResolvedExercisePosts(@Param("exerciseId") long exerciseId); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( answer.creationDate, COUNT(answer.id) ) FROM AnswerPost answer @@ -520,7 +520,7 @@ LEFT JOIN TREAT (post.conversation AS Channel) channel List getResolvedCoursePostsInDateRange(@Param("startDate") ZonedDateTime startDate, @Param("endDate") ZonedDateTime endDate, @Param("courseId") long courseId); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry( + SELECT new de.tum.cit.aet.artemis.core.dto.StatisticsEntry( answer.creationDate, COUNT(answer.id) ) FROM AnswerPost answer diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java index c8c6683d4ea7..5351a796abf2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java @@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -35,7 +36,6 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.DefaultChannelType; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminExamResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminExamResource.java index 14fc5ef7dc11..463bb2d184b9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminExamResource.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStandardizedCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStandardizedCompetencyResource.java index 7963ead826b6..a0e93be6493e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStandardizedCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStandardizedCompetencyResource.java @@ -22,8 +22,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.atlas.domain.competency.StandardizedCompetency; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; import de.tum.cit.aet.artemis.service.competency.KnowledgeAreaService; import de.tum.cit.aet.artemis.service.competency.StandardizedCompetencyService; import de.tum.cit.aet.artemis.service.feature.Feature; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminSystemNotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminSystemNotificationResource.java index ab0a30e51be2..9d3708ea8180 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminSystemNotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminSystemNotificationResource.java @@ -18,10 +18,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.communication.domain.notification.Notification; +import de.tum.cit.aet.artemis.communication.domain.notification.SystemNotification; import de.tum.cit.aet.artemis.communication.repository.SystemNotificationRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.domain.notification.Notification; -import de.tum.cit.aet.artemis.domain.notification.SystemNotification; import de.tum.cit.aet.artemis.service.SystemNotificationService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminTextAssessmentEventResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminTextAssessmentEventResource.java index c6ce98429959..8faaa57ad1fe 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminTextAssessmentEventResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminTextAssessmentEventResource.java @@ -13,7 +13,7 @@ import de.tum.cit.aet.artemis.assessment.repository.TextAssessmentEventRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.domain.analytics.TextAssessmentEvent; +import de.tum.cit.aet.artemis.text.domain.TextAssessmentEvent; /** * REST controller for administrating TextAssessmentEventResource. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/iris/AdminIrisSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/iris/AdminIrisSettingsResource.java index 8ad018d8ba80..c7fe60071130 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/iris/AdminIrisSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/iris/AdminIrisSettingsResource.java @@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisSettings; import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/filter/Lti13LaunchFilter.java b/src/main/java/de/tum/cit/aet/artemis/core/web/filter/Lti13LaunchFilter.java index 0016f759f1c5..50b0004dc2c3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/filter/Lti13LaunchFilter.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/filter/Lti13LaunchFilter.java @@ -23,9 +23,9 @@ import de.tum.cit.aet.artemis.core.exception.LtiEmailAlreadyInUseException; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.lti.Claims; -import de.tum.cit.aet.artemis.domain.lti.LtiAuthenticationResponse; import de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer; +import de.tum.cit.aet.artemis.lti.dto.Claims; +import de.tum.cit.aet.artemis.lti.dto.LtiAuthenticationResponse; import de.tum.cit.aet.artemis.service.connectors.lti.Lti13Service; import uk.ac.ox.ctl.lti13.security.oauth2.client.lti.authentication.OidcAuthenticationToken; import uk.ac.ox.ctl.lti13.security.oauth2.client.lti.web.OAuth2LoginAuthenticationFilter; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/Attachment.java b/src/main/java/de/tum/cit/aet/artemis/domain/Attachment.java index c64c439e2d94..fe69983b0caf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/Attachment.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/Attachment.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; -import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; /** * A Attachment. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/BaseExercise.java b/src/main/java/de/tum/cit/aet/artemis/domain/BaseExercise.java index 700282cf2365..bba31df0722c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/BaseExercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/BaseExercise.java @@ -15,7 +15,7 @@ import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.quiz.config.QuizView; import de.tum.cit.aet.artemis.web.rest.util.StringUtil; @MappedSuperclass diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/Complaint.java b/src/main/java/de/tum/cit/aet/artemis/domain/Complaint.java index 523655ba8058..5b96bba57e09 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/Complaint.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/Complaint.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; -import de.tum.cit.aet.artemis.domain.participation.Participant; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; /** * A Complaint. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/Course.java b/src/main/java/de/tum/cit/aet/artemis/domain/Course.java index 09176cba0145..883a022ec78a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/Course.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/Course.java @@ -34,17 +34,17 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.domain.competency.Competency; -import de.tum.cit.aet.artemis.domain.competency.LearningPath; -import de.tum.cit.aet.artemis.domain.competency.Prerequisite; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; +import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; +import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.domain.enumeration.Language; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.quiz.config.QuizView; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/DomainObject.java b/src/main/java/de/tum/cit/aet/artemis/domain/DomainObject.java index d2cfee1a28a9..8cf1ad0342c1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/DomainObject.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/DomainObject.java @@ -13,7 +13,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.quiz.config.QuizView; /** * Base abstract class for entities which have an id that is generated automatically (basically all domain objects). diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/ExampleSubmission.java b/src/main/java/de/tum/cit/aet/artemis/domain/ExampleSubmission.java index deb01263cad2..192a287ce5f5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/ExampleSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/ExampleSubmission.java @@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; +import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; /** * A ExampleSubmission. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/Exercise.java b/src/main/java/de/tum/cit/aet/artemis/domain/Exercise.java index ad5fc53b94b5..e3bcabbbb8b0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/Exercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/Exercise.java @@ -48,23 +48,24 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismDetectionConfig; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismDetectionConfig; +import de.tum.cit.aet.artemis.quiz.config.QuizView; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.ExerciseDateService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/GradingScale.java b/src/main/java/de/tum/cit/aet/artemis/domain/GradingScale.java index db809487a3b8..6d3d33365d93 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/GradingScale.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/GradingScale.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.exam.domain.Exam; /** * A grading scale for a course or an exam that consists of grade steps diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/LearningObject.java b/src/main/java/de/tum/cit/aet/artemis/domain/LearningObject.java index c79e290b6f35..f2258257a9ab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/LearningObject.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/LearningObject.java @@ -4,7 +4,7 @@ import java.util.Optional; import java.util.Set; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; public interface LearningObject { diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/Lecture.java b/src/main/java/de/tum/cit/aet/artemis/domain/Lecture.java index d6ab8dcbf8bc..b2add91d1f4b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/Lecture.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/Lecture.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonIncludeProperties; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; /** * A Lecture. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingExercise.java b/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingExercise.java index 23325c473c43..c7e19d5d5754 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingExercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingExercise.java @@ -44,13 +44,13 @@ import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; import de.tum.cit.aet.artemis.domain.enumeration.Visibility; -import de.tum.cit.aet.artemis.domain.hestia.ExerciseHint; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeature; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingExerciseTestCase.java b/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingExerciseTestCase.java index 7f1076b540eb..b02e83cc37f3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingExerciseTestCase.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingExerciseTestCase.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.domain; -import static de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTestCaseType.DEFAULT; +import static de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTestCaseType.DEFAULT; import java.util.HashSet; import java.util.Set; @@ -28,10 +28,10 @@ import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.enumeration.Visibility; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTestCaseType; -import de.tum.cit.aet.artemis.domain.hestia.TestwiseCoverageReportEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTestCaseType; +import de.tum.cit.aet.artemis.programming.domain.hestia.TestwiseCoverageReportEntry; /** * A ProgrammingExerciseTestCase. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingSubmission.java b/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingSubmission.java index f4b2a4764f03..17bf684bcbc9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingSubmission.java @@ -20,8 +20,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; /** * A ProgrammingSubmission. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/Repository.java b/src/main/java/de/tum/cit/aet/artemis/domain/Repository.java index 8285b867f58e..3d6d2f753925 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/Repository.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/Repository.java @@ -6,7 +6,7 @@ import org.eclipse.jgit.lib.BaseRepositoryBuilder; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/Result.java b/src/main/java/de/tum/cit/aet/artemis/domain/Result.java index da5afa8d5505..60d170ddfcde 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/Result.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/Result.java @@ -43,14 +43,15 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentNote; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.hestia.CoverageFileReport; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageFileReport; +import de.tum.cit.aet.artemis.quiz.config.QuizView; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.listeners.ResultListener; import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/Submission.java b/src/main/java/de/tum/cit/aet/artemis/domain/Submission.java index 2bf3494c9663..8ad4b9613f46 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/Submission.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/Submission.java @@ -39,10 +39,11 @@ import com.fasterxml.jackson.annotation.JsonView; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.quiz.config.QuizView; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; /** * A Submission. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/Team.java b/src/main/java/de/tum/cit/aet/artemis/domain/Team.java index 36e2d95ad1c7..3ee9227257a5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/Team.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/Team.java @@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import de.tum.cit.aet.artemis.domain.participation.Participant; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; /** * A Team of students. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/User.java b/src/main/java/de/tum/cit/aet/artemis/domain/User.java index 030141aaf14a..8dea83dc2f8f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/User.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/User.java @@ -38,15 +38,15 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; +import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; +import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfiguration; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; -import de.tum.cit.aet.artemis.domain.competency.LearningPath; -import de.tum.cit.aet.artemis.domain.exam.ExamUser; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnitCompletion; -import de.tum.cit.aet.artemis.domain.participation.Participant; -import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfiguration; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupRegistration; +import de.tum.cit.aet.artemis.exam.domain.ExamUser; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnitCompletion; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/CompetencyProgressConfidenceReason.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/CompetencyProgressConfidenceReason.java index 9a94a8094ce9..12c27a00ca7b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/CompetencyProgressConfidenceReason.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/CompetencyProgressConfidenceReason.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.domain.enumeration; -import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; /** * Enum to define the different reasons why the confidence is above/below 1 in the {@link CompetencyProgress}. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseLifecycle.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseLifecycle.java index 9184b248e6e8..cca44f562b52 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseLifecycle.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseLifecycle.java @@ -4,9 +4,9 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; public enum ExerciseLifecycle implements IExerciseLifecycle { RELEASE { diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseType.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseType.java index 6c5b43cca490..f05ddeee440f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseType.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseType.java @@ -3,9 +3,9 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.FileUploadExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.text.domain.TextExercise; public enum ExerciseType { diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/IExerciseLifecycle.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/IExerciseLifecycle.java index 923c165dc496..2c0696d043ad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/IExerciseLifecycle.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/IExerciseLifecycle.java @@ -3,8 +3,8 @@ import java.time.ZonedDateTime; import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; public interface IExerciseLifecycle { diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TutorialGroupSessionStatus.java b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TutorialGroupSessionStatus.java index b9416f8dae89..3620e3b3bbe6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TutorialGroupSessionStatus.java +++ b/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TutorialGroupSessionStatus.java @@ -1,7 +1,9 @@ package de.tum.cit.aet.artemis.domain.enumeration; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; + /** - * Describes the status of a {@link de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession} + * Describes the status of a {@link TutorialGroupSession} */ public enum TutorialGroupSessionStatus { /** diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/exam/Exam.java b/src/main/java/de/tum/cit/aet/artemis/exam/domain/Exam.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/domain/exam/Exam.java rename to src/main/java/de/tum/cit/aet/artemis/exam/domain/Exam.java index b3fc7506b84e..d39c9556dbb4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/exam/Exam.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/domain/Exam.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.exam; +package de.tum.cit.aet.artemis.exam.domain; import java.time.Duration; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/exam/ExamSession.java b/src/main/java/de/tum/cit/aet/artemis/exam/domain/ExamSession.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/exam/ExamSession.java rename to src/main/java/de/tum/cit/aet/artemis/exam/domain/ExamSession.java index db39c412e01f..27637c7ca964 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/exam/ExamSession.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/domain/ExamSession.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.exam; +package de.tum.cit.aet.artemis.exam.domain; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/exam/ExamUser.java b/src/main/java/de/tum/cit/aet/artemis/exam/domain/ExamUser.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/exam/ExamUser.java rename to src/main/java/de/tum/cit/aet/artemis/exam/domain/ExamUser.java index 41bdf358adbf..0c2195eadf77 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/exam/ExamUser.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/domain/ExamUser.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.exam; +package de.tum.cit.aet.artemis.exam.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/exam/ExerciseGroup.java b/src/main/java/de/tum/cit/aet/artemis/exam/domain/ExerciseGroup.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/exam/ExerciseGroup.java rename to src/main/java/de/tum/cit/aet/artemis/exam/domain/ExerciseGroup.java index f05de252a0b2..46dd0ad43714 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/exam/ExerciseGroup.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/domain/ExerciseGroup.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.exam; +package de.tum.cit.aet.artemis.exam.domain; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/exam/StudentExam.java b/src/main/java/de/tum/cit/aet/artemis/exam/domain/StudentExam.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/exam/StudentExam.java rename to src/main/java/de/tum/cit/aet/artemis/exam/domain/StudentExam.java index 0df30e66df51..af2e6eedc1f4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/exam/StudentExam.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/domain/StudentExam.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.exam; +package de.tum.cit.aet.artemis.exam.domain; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -31,7 +31,7 @@ import de.tum.cit.aet.artemis.domain.AbstractAuditingEntity; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; @Entity @Table(name = "student_exam") diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/exam/SuspiciousExamSessions.java b/src/main/java/de/tum/cit/aet/artemis/exam/domain/SuspiciousExamSessions.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/domain/exam/SuspiciousExamSessions.java rename to src/main/java/de/tum/cit/aet/artemis/exam/domain/SuspiciousExamSessions.java index 1e97db5c3d7b..9cd6277a22e9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/exam/SuspiciousExamSessions.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/domain/SuspiciousExamSessions.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.exam; +package de.tum.cit.aet.artemis.exam.domain; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/exam/SuspiciousSessionReason.java b/src/main/java/de/tum/cit/aet/artemis/exam/domain/SuspiciousSessionReason.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/domain/exam/SuspiciousSessionReason.java rename to src/main/java/de/tum/cit/aet/artemis/exam/domain/SuspiciousSessionReason.java index b960ebc18880..915532d56ebf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/exam/SuspiciousSessionReason.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/domain/SuspiciousSessionReason.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.exam; +package de.tum.cit.aet.artemis.exam.domain; /** * Enum representing reasons why a session is considered suspicious. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/exam/SuspiciousSessionsAnalysisOptions.java b/src/main/java/de/tum/cit/aet/artemis/exam/domain/SuspiciousSessionsAnalysisOptions.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/exam/SuspiciousSessionsAnalysisOptions.java rename to src/main/java/de/tum/cit/aet/artemis/exam/domain/SuspiciousSessionsAnalysisOptions.java index 6e3d3a91e223..dc494ed74eba 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/exam/SuspiciousSessionsAnalysisOptions.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/domain/SuspiciousSessionsAnalysisOptions.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.exam; +package de.tum.cit.aet.artemis.exam.domain; /** * Options for the analysis of suspicious sessions. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/exam/event/ExamAttendanceCheckEvent.java b/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamAttendanceCheckEvent.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/domain/exam/event/ExamAttendanceCheckEvent.java rename to src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamAttendanceCheckEvent.java index 596c59b7ae28..952db3db9555 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/exam/event/ExamAttendanceCheckEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamAttendanceCheckEvent.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.exam.event; +package de.tum.cit.aet.artemis.exam.domain.event; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/exam/event/ExamLiveEvent.java b/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamLiveEvent.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/exam/event/ExamLiveEvent.java rename to src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamLiveEvent.java index d93728f6d7ee..96fffdde0971 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/exam/event/ExamLiveEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamLiveEvent.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.exam.event; +package de.tum.cit.aet.artemis.exam.domain.event; import java.time.Instant; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/exam/event/ExamWideAnnouncementEvent.java b/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamWideAnnouncementEvent.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/domain/exam/event/ExamWideAnnouncementEvent.java rename to src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamWideAnnouncementEvent.java index f132bec417d7..33cb9470cb96 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/exam/event/ExamWideAnnouncementEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamWideAnnouncementEvent.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.exam.event; +package de.tum.cit.aet.artemis.exam.domain.event; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/exam/event/ProblemStatementUpdateEvent.java b/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ProblemStatementUpdateEvent.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/exam/event/ProblemStatementUpdateEvent.java rename to src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ProblemStatementUpdateEvent.java index f1b9aef3ba1c..424c947545ce 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/exam/event/ProblemStatementUpdateEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ProblemStatementUpdateEvent.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.exam.event; +package de.tum.cit.aet.artemis.exam.domain.event; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/exam/event/WorkingTimeUpdateEvent.java b/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/WorkingTimeUpdateEvent.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/exam/event/WorkingTimeUpdateEvent.java rename to src/main/java/de/tum/cit/aet/artemis/exam/domain/event/WorkingTimeUpdateEvent.java index 72382f108da0..d25cb16b9d8a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/exam/event/WorkingTimeUpdateEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/WorkingTimeUpdateEvent.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.exam.event; +package de.tum.cit.aet.artemis.exam.domain.event; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamLiveEventRepository.java b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamLiveEventRepository.java index 3b262d82c5f7..497531b96045 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamLiveEventRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamLiveEventRepository.java @@ -11,7 +11,7 @@ import org.springframework.transaction.annotation.Transactional; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.exam.event.ExamLiveEvent; +import de.tum.cit.aet.artemis.exam.domain.event.ExamLiveEvent; /** * Spring Data JPA repository for the ExamLiveEvent entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamRepository.java b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamRepository.java index 124360ff90a7..86207dea5d43 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamRepository.java @@ -25,8 +25,8 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.web.rest.dto.CourseContentCount; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamSessionRepository.java index 45a2621d0cd9..69a131152f0c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamSessionRepository.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.exam.ExamSession; +import de.tum.cit.aet.artemis.exam.domain.ExamSession; /** * Spring Data JPA repository for the ExamSession entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamUserRepository.java b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamUserRepository.java index b54b837fd5bb..3c98d36c6cef 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamUserRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamUserRepository.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.exam.ExamUser; +import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.web.rest.dto.ExamUserAttendanceCheckDTO; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExerciseGroupRepository.java b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExerciseGroupRepository.java index c758051d03ae..db247f6ee770 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExerciseGroupRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExerciseGroupRepository.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; /** * Spring Data JPA repository for the ExerciseGroup entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/repository/StudentExamRepository.java b/src/main/java/de/tum/cit/aet/artemis/exam/repository/StudentExamRepository.java index 2b63ce4ab052..28128c1bd919 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/repository/StudentExamRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/repository/StudentExamRepository.java @@ -24,11 +24,11 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; import de.tum.cit.aet.artemis.service.exam.ExamQuizQuestionsGenerator; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/participation/IdToPresentationScoreSum.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/IdToPresentationScoreSum.java similarity index 60% rename from src/main/java/de/tum/cit/aet/artemis/domain/participation/IdToPresentationScoreSum.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/IdToPresentationScoreSum.java index 4c66734e96e1..29e8aeeb6801 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/participation/IdToPresentationScoreSum.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/IdToPresentationScoreSum.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.participation; +package de.tum.cit.aet.artemis.exercise.domain.participation; public record IdToPresentationScoreSum(long participantId, double presentationScoreSum) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/participation/Participant.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/Participant.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/domain/participation/Participant.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/Participant.java index 7c10e62c4897..0e72afb7faee 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/participation/Participant.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/Participant.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.participation; +package de.tum.cit.aet.artemis.exercise.domain.participation; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/participation/Participation.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/Participation.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/participation/Participation.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/Participation.java index 4d1f113789f0..fab696a6b383 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/participation/Participation.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/Participation.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.participation; +package de.tum.cit.aet.artemis.exercise.domain.participation; import java.time.ZonedDateTime; import java.util.Comparator; @@ -40,7 +40,10 @@ import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.quiz.config.QuizView; /** * A Participation. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/participation/ParticipationInterface.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/ParticipationInterface.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/domain/participation/ParticipationInterface.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/ParticipationInterface.java index 11d4649ee588..220c20a3e2f7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/participation/ParticipationInterface.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/ParticipationInterface.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.participation; +package de.tum.cit.aet.artemis.exercise.domain.participation; import java.time.ZonedDateTime; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/participation/StudentParticipation.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/StudentParticipation.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/participation/StudentParticipation.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/StudentParticipation.java index ae6eacbf3242..29a013556743 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/participation/StudentParticipation.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/StudentParticipation.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.participation; +package de.tum.cit.aet.artemis.exercise.domain.participation; import java.util.Optional; import java.util.Set; @@ -15,7 +15,7 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.quiz.config.QuizView; @Entity @DiscriminatorValue(value = "SP") diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/metrics/ExerciseTypeMetricsEntry.java b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseTypeMetricsEntry.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/domain/metrics/ExerciseTypeMetricsEntry.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseTypeMetricsEntry.java index 398e8e92e256..192f70946521 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/metrics/ExerciseTypeMetricsEntry.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseTypeMetricsEntry.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.metrics; +package de.tum.cit.aet.artemis.exercise.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java index 979a7bf8cb2f..4458514b6a87 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java @@ -23,7 +23,7 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.metrics.ExerciseTypeMetricsEntry; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseTypeMetricsEntry; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** @@ -97,7 +97,7 @@ public interface ExerciseRepository extends ArtemisJpaRepository * @return a list of ExerciseTypeMetricsEntries, one for each exercise type */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.metrics.ExerciseTypeMetricsEntry( + SELECT new de.tum.cit.aet.artemis.exercise.dto.ExerciseTypeMetricsEntry( TYPE(e), COUNT(e.id) ) @@ -116,7 +116,7 @@ GROUP BY TYPE(e) * @return a list of ExerciseTypeMetricsEntries, one for each exercise type */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.metrics.ExerciseTypeMetricsEntry( + SELECT new de.tum.cit.aet.artemis.exercise.dto.ExerciseTypeMetricsEntry( TYPE(e), COUNT(e.id) ) @@ -135,7 +135,7 @@ GROUP BY TYPE(e) * @return a list of ExerciseTypeMetricsEntries, one for each exercise type */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.metrics.ExerciseTypeMetricsEntry( + SELECT new de.tum.cit.aet.artemis.exercise.dto.ExerciseTypeMetricsEntry( TYPE(e), COUNT(e.id) ) @@ -156,7 +156,7 @@ GROUP BY TYPE(e) * @return a list of ExerciseTypeMetricsEntries, one for each exercise type */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.metrics.ExerciseTypeMetricsEntry( + SELECT new de.tum.cit.aet.artemis.exercise.dto.ExerciseTypeMetricsEntry( TYPE(e), COUNT(DISTINCT user.id) ) @@ -179,7 +179,7 @@ GROUP BY TYPE(e) * @return a list of ExerciseTypeMetricsEntries, one for each exercise type */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.metrics.ExerciseTypeMetricsEntry( + SELECT new de.tum.cit.aet.artemis.exercise.dto.ExerciseTypeMetricsEntry( TYPE(e), COUNT(DISTINCT user.id) ) @@ -203,7 +203,7 @@ List countActiveStudentsInExercisesWithDueDateBetweenG * @return a list of ExerciseTypeMetricsEntries, one for each exercise type */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.metrics.ExerciseTypeMetricsEntry( + SELECT new de.tum.cit.aet.artemis.exercise.dto.ExerciseTypeMetricsEntry( TYPE(e), COUNT(e.id) ) @@ -224,7 +224,7 @@ GROUP BY TYPE(e) * @return a list of ExerciseTypeMetricsEntries, one for each exercise type */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.metrics.ExerciseTypeMetricsEntry( + SELECT new de.tum.cit.aet.artemis.exercise.dto.ExerciseTypeMetricsEntry( TYPE(e), COUNT(DISTINCT user.id) ) @@ -248,7 +248,7 @@ List countStudentsInExercisesWithReleaseDateBetweenGro * @return a list of ExerciseTypeMetricsEntries, one for each exercise type */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.metrics.ExerciseTypeMetricsEntry( + SELECT new de.tum.cit.aet.artemis.exercise.dto.ExerciseTypeMetricsEntry( TYPE(e), COUNT(DISTINCT user.id) ) diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ParticipationRepository.java index 3e00302c15a9..ae0745a4eb46 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ParticipationRepository.java @@ -18,7 +18,7 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java index a3a1e6f84d7e..b63e2e61833a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java @@ -34,11 +34,11 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.participation.IdToPresentationScoreSum; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmittedAnswerCount; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; +import de.tum.cit.aet.artemis.exercise.domain.participation.IdToPresentationScoreSum; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmittedAnswerCount; import de.tum.cit.aet.artemis.web.rest.dto.feedback.FeedbackDetailDTO; /** @@ -1147,7 +1147,7 @@ default void checkTestRunsExist(Exercise exercise) { } @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.quiz.QuizSubmittedAnswerCount(COUNT(a.id), s.id, p.id) + SELECT new de.tum.cit.aet.artemis.quiz.domain.QuizSubmittedAnswerCount(COUNT(a.id), s.id, p.id) FROM SubmittedAnswer a LEFT JOIN a.submission s LEFT JOIN s.participation p @@ -1181,7 +1181,7 @@ SELECT COALESCE(SUM(p.presentationScore), 0) * @return a set of id to presentation score sum mappings */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.participation.IdToPresentationScoreSum( + SELECT new de.tum.cit.aet.artemis.exercise.domain.participation.IdToPresentationScoreSum( COALESCE(p.student.id, ts.id), COALESCE(SUM(p.presentationScore), 0) ) diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java index d65f47b79e90..d527c6c19132 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java @@ -15,6 +15,7 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntry; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.FileUploadExercise; @@ -22,16 +23,15 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseMapEntry; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @@ -327,7 +327,7 @@ SELECT COUNT(DISTINCT p) * exercise due date at all */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseMapEntry( + SELECT new de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntry( p.exercise.id, COUNT(DISTINCT p) ) @@ -378,7 +378,7 @@ SELECT COUNT(DISTINCT s) * @return the numbers of submissions belonging to each exercise id, which have the submitted flag set to true and the submission date after the exercise due date */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseMapEntry( + SELECT new de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntry( e.id, COUNT(DISTINCT p) ) diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/iris/IrisTemplate.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/IrisTemplate.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/iris/IrisTemplate.java rename to src/main/java/de/tum/cit/aet/artemis/iris/domain/IrisTemplate.java index 15751126eebd..0c7b6ca9577e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/iris/IrisTemplate.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/IrisTemplate.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.iris; +package de.tum.cit.aet.artemis.iris.domain; import java.util.Objects; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisJsonMessageContent.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/message/IrisJsonMessageContent.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisJsonMessageContent.java rename to src/main/java/de/tum/cit/aet/artemis/iris/domain/message/IrisJsonMessageContent.java index ca9672c17329..7a6c94d65d6c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisJsonMessageContent.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/message/IrisJsonMessageContent.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.iris.message; +package de.tum.cit.aet.artemis.iris.domain.message; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisMessage.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/message/IrisMessage.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisMessage.java rename to src/main/java/de/tum/cit/aet/artemis/iris/domain/message/IrisMessage.java index 9ec0b9e1a4c6..0a90b062e2e3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisMessage.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/message/IrisMessage.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.iris.message; +package de.tum.cit.aet.artemis.iris.domain.message; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -26,7 +26,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; +import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; /** * An IrisMessage represents a single message in an IrisSession. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisMessageContent.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/message/IrisMessageContent.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisMessageContent.java rename to src/main/java/de/tum/cit/aet/artemis/iris/domain/message/IrisMessageContent.java index f4fc9ceeceb8..2a7fcda9b154 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisMessageContent.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/message/IrisMessageContent.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.iris.message; +package de.tum.cit.aet.artemis.iris.domain.message; import jakarta.annotation.Nullable; import jakarta.persistence.DiscriminatorColumn; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisMessageSender.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/message/IrisMessageSender.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisMessageSender.java rename to src/main/java/de/tum/cit/aet/artemis/iris/domain/message/IrisMessageSender.java index ab4d74998913..c5c3559b714a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisMessageSender.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/message/IrisMessageSender.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.iris.message; +package de.tum.cit.aet.artemis.iris.domain.message; /** * This enum represents the different senders of Iris messages. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisTextMessageContent.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/message/IrisTextMessageContent.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisTextMessageContent.java rename to src/main/java/de/tum/cit/aet/artemis/iris/domain/message/IrisTextMessageContent.java index e7e509098408..4fbc061f9e4f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/iris/message/IrisTextMessageContent.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/message/IrisTextMessageContent.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.iris.message; +package de.tum.cit.aet.artemis.iris.domain.message; import jakarta.annotation.Nullable; import jakarta.persistence.Column; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisChatSession.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisChatSession.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisChatSession.java rename to src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisChatSession.java index 8549e359407c..01a179a4594d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisChatSession.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisChatSession.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.iris.session; +package de.tum.cit.aet.artemis.iris.domain.session; import jakarta.persistence.Entity; import jakarta.persistence.ManyToOne; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisCourseChatSession.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisCourseChatSession.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisCourseChatSession.java rename to src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisCourseChatSession.java index c7d66ccbee8e..1ac52cea110f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisCourseChatSession.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisCourseChatSession.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.iris.session; +package de.tum.cit.aet.artemis.iris.domain.session; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisExerciseChatSession.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisExerciseChatSession.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisExerciseChatSession.java rename to src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisExerciseChatSession.java index 3e1b8326f800..5a14ea4caa75 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisExerciseChatSession.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisExerciseChatSession.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.iris.session; +package de.tum.cit.aet.artemis.iris.domain.session; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisHestiaSession.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisHestiaSession.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisHestiaSession.java rename to src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisHestiaSession.java index f32e5c9e39bb..f23603711cf5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisHestiaSession.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisHestiaSession.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.iris.session; +package de.tum.cit.aet.artemis.iris.domain.session; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; /** * An Iris session for a hestia code hint. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisSession.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisSession.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisSession.java rename to src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisSession.java index 0730d4ab141e..5e8cbaf25f38 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/iris/session/IrisSession.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisSession.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.iris.session; +package de.tum.cit.aet.artemis.iris.domain.session; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -24,7 +24,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; /** * An IrisSession represents a list of messages of Artemis, a user, and an LLM. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisChatSubSettings.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisChatSubSettings.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisChatSubSettings.java rename to src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisChatSubSettings.java index 2114ce6328c9..4305461b71cf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisChatSubSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisChatSubSettings.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.iris.settings; +package de.tum.cit.aet.artemis.iris.domain.settings; import jakarta.annotation.Nullable; import jakarta.persistence.CascadeType; @@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.iris.IrisTemplate; +import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; /** * An {@link IrisSubSettings} implementation for chat settings. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisCompetencyGenerationSubSettings.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisCompetencyGenerationSubSettings.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisCompetencyGenerationSubSettings.java rename to src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisCompetencyGenerationSubSettings.java index 5af0c7389b08..f68ae30d4b53 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisCompetencyGenerationSubSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisCompetencyGenerationSubSettings.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.iris.settings; +package de.tum.cit.aet.artemis.iris.domain.settings; import jakarta.annotation.Nullable; import jakarta.persistence.CascadeType; @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.iris.IrisTemplate; +import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; /** * An {@link IrisSubSettings} implementation for the settings for competency generation. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisCourseSettings.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisCourseSettings.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisCourseSettings.java rename to src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisCourseSettings.java index d3664dcd713f..020735cb3974 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisCourseSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisCourseSettings.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.iris.settings; +package de.tum.cit.aet.artemis.iris.domain.settings; import jakarta.persistence.CascadeType; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisExerciseSettings.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisExerciseSettings.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisExerciseSettings.java rename to src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisExerciseSettings.java index 43257ce0a807..63c1fe91b5b1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisExerciseSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisExerciseSettings.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.iris.settings; +package de.tum.cit.aet.artemis.iris.domain.settings; import jakarta.persistence.CascadeType; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisGlobalSettings.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisGlobalSettings.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisGlobalSettings.java rename to src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisGlobalSettings.java index 7f990d5b9fb8..0ae60c36edd8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisGlobalSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisGlobalSettings.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.iris.settings; +package de.tum.cit.aet.artemis.iris.domain.settings; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisHestiaSubSettings.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisHestiaSubSettings.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisHestiaSubSettings.java rename to src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisHestiaSubSettings.java index db45b6e94b73..1c478a8ccfbe 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisHestiaSubSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisHestiaSubSettings.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.iris.settings; +package de.tum.cit.aet.artemis.iris.domain.settings; import jakarta.annotation.Nullable; import jakarta.persistence.CascadeType; @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.iris.IrisTemplate; +import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; /** * An {@link IrisSubSettings} implementation for the Hestia integration settings. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisLectureIngestionSubSettings.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisLectureIngestionSubSettings.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisLectureIngestionSubSettings.java rename to src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisLectureIngestionSubSettings.java index b34f644a9be7..064ab511f41f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisLectureIngestionSubSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisLectureIngestionSubSettings.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.iris.settings; +package de.tum.cit.aet.artemis.iris.domain.settings; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisModelListConverter.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisModelListConverter.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisModelListConverter.java rename to src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisModelListConverter.java index 99b971615bd8..938ce5dae0c7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisModelListConverter.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisModelListConverter.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.iris.settings; +package de.tum.cit.aet.artemis.iris.domain.settings; import java.util.Comparator; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisSettings.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSettings.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisSettings.java rename to src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSettings.java index 5d2d9ae970bc..5f1029add7ee 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSettings.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.iris.settings; +package de.tum.cit.aet.artemis.iris.domain.settings; import jakarta.persistence.DiscriminatorColumn; import jakarta.persistence.DiscriminatorType; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisSettingsType.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSettingsType.java similarity index 54% rename from src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisSettingsType.java rename to src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSettingsType.java index 773f18b7bf97..68b96c0971d6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisSettingsType.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSettingsType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.iris.settings; +package de.tum.cit.aet.artemis.iris.domain.settings; public enum IrisSettingsType { GLOBAL, COURSE, EXERCISE diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisSubSettings.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSubSettings.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisSubSettings.java rename to src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSubSettings.java index d248c0ce0c4b..3bc8ecfc4148 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisSubSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSubSettings.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.iris.settings; +package de.tum.cit.aet.artemis.iris.domain.settings; import java.util.SortedSet; import java.util.TreeSet; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisSubSettingsType.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSubSettingsType.java similarity index 64% rename from src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisSubSettingsType.java rename to src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSubSettingsType.java index 823642b71eed..d938134f4555 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/iris/settings/IrisSubSettingsType.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSubSettingsType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.iris.settings; +package de.tum.cit.aet.artemis.iris.domain.settings; public enum IrisSubSettingsType { CHAT, HESTIA, COMPETENCY_GENERATION, LECTURE_INGESTION diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisCourseChatSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisCourseChatSessionRepository.java index dafe1f0e082c..a96e4c6e3fb6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisCourseChatSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisCourseChatSessionRepository.java @@ -14,7 +14,7 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.iris.session.IrisCourseChatSession; +import de.tum.cit.aet.artemis.iris.domain.session.IrisCourseChatSession; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisExerciseChatSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisExerciseChatSessionRepository.java index 9d867bdaa6e4..8f10d7216795 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisExerciseChatSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisExerciseChatSessionRepository.java @@ -14,7 +14,7 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.iris.session.IrisExerciseChatSession; +import de.tum.cit.aet.artemis.iris.domain.session.IrisExerciseChatSession; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisHestiaSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisHestiaSessionRepository.java index 4c15480ebd54..1e1fb72106b7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisHestiaSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisHestiaSessionRepository.java @@ -7,7 +7,7 @@ import org.springframework.data.jpa.repository.EntityGraph; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.iris.session.IrisHestiaSession; +import de.tum.cit.aet.artemis.iris.domain.session.IrisHestiaSession; /** * Repository interface for managing {@link IrisHestiaSession} entities. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisMessageRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisMessageRepository.java index ce1a0694079c..6626e8f56a67 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisMessageRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisMessageRepository.java @@ -13,8 +13,8 @@ import org.springframework.data.repository.query.Param; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; -import de.tum.cit.aet.artemis.domain.iris.message.IrisMessageSender; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessageSender; /** * Spring Data repository for the IrisMessage entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSessionRepository.java index d9b64f097158..fe08b870b6ad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSessionRepository.java @@ -8,7 +8,7 @@ import org.springframework.data.repository.query.Param; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; +import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSettingsRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSettingsRepository.java index ee1838de7492..7560ddf6219b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSettingsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSettingsRepository.java @@ -8,10 +8,10 @@ import org.springframework.data.repository.query.Param; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisCourseSettings; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisExerciseSettings; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisGlobalSettings; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisCourseSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisExerciseSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisGlobalSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisSettings; /** * Spring Data repository for the IrisSettings entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSubSettingsRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSubSettingsRepository.java index 2f05a3fca4c6..d3118f2e9203 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSubSettingsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSubSettingsRepository.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.iris.repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettings; /** * Spring Data repository for the IrisSubSettings entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisTemplateRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisTemplateRepository.java index 5e2090c6ed1f..2b1a930d7aef 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisTemplateRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisTemplateRepository.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.iris.repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.iris.IrisTemplate; +import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; /** * Spring Data repository for the IrisTemplate entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/lecture/AttachmentUnit.java b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/AttachmentUnit.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/lecture/AttachmentUnit.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/domain/AttachmentUnit.java index e7c16fd05a9b..da0d6ba16be5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/lecture/AttachmentUnit.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/AttachmentUnit.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.lecture; +package de.tum.cit.aet.artemis.lecture.domain; import java.time.ZonedDateTime; import java.util.ArrayList; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/lecture/ExerciseUnit.java b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/ExerciseUnit.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/domain/lecture/ExerciseUnit.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/domain/ExerciseUnit.java index 9a2320b12a4a..92210f3a1385 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/lecture/ExerciseUnit.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/ExerciseUnit.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.lecture; +package de.tum.cit.aet.artemis.lecture.domain; import java.time.ZonedDateTime; import java.util.HashSet; @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; @Entity @DiscriminatorValue("E") diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/lecture/LectureUnit.java b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/LectureUnit.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/lecture/LectureUnit.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/domain/LectureUnit.java index d3e4a0a099a1..bbc4289ea826 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/lecture/LectureUnit.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/LectureUnit.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.lecture; +package de.tum.cit.aet.artemis.lecture.domain; import java.time.ZonedDateTime; import java.util.HashSet; @@ -33,11 +33,11 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.domain.LearningObject; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; @Entity @Table(name = "lecture_unit") diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/lecture/LectureUnitCompletion.java b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/LectureUnitCompletion.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/lecture/LectureUnitCompletion.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/domain/LectureUnitCompletion.java index 62a9ac59f77b..6e0e9156664f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/lecture/LectureUnitCompletion.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/LectureUnitCompletion.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.lecture; +package de.tum.cit.aet.artemis.lecture.domain; import java.io.Serial; import java.io.Serializable; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/lecture/OnlineUnit.java b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/OnlineUnit.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/domain/lecture/OnlineUnit.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/domain/OnlineUnit.java index 4ceee1a9cbad..d38767bc965e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/lecture/OnlineUnit.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/OnlineUnit.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.lecture; +package de.tum.cit.aet.artemis.lecture.domain; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/lecture/Slide.java b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/Slide.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/lecture/Slide.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/domain/Slide.java index eb1327b21c46..dd1cea4764f3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/lecture/Slide.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/Slide.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.lecture; +package de.tum.cit.aet.artemis.lecture.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/lecture/TextUnit.java b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/TextUnit.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/domain/lecture/TextUnit.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/domain/TextUnit.java index 8b111bb011f1..8b98aa1f3983 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/lecture/TextUnit.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/TextUnit.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.lecture; +package de.tum.cit.aet.artemis.lecture.domain; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/lecture/VideoUnit.java b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/VideoUnit.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/domain/lecture/VideoUnit.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/domain/VideoUnit.java index e497857ef3ad..129e81aad6a3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/lecture/VideoUnit.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/VideoUnit.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.lecture; +package de.tum.cit.aet.artemis.lecture.domain; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentUnitRepository.java index a5616eaf0f50..26a15ed1cd1a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentUnitRepository.java @@ -13,7 +13,7 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; -import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/ExerciseUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/ExerciseUnitRepository.java index 420a805851be..7fed45abdec0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/ExerciseUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/ExerciseUnitRepository.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; /** * Spring Data JPA repository for the Exercise Unit entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitCompletionRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitCompletionRepository.java index 2a35491e41fd..c98b8f8683d4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitCompletionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitCompletionRepository.java @@ -13,8 +13,8 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnitCompletion; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnitCompletion; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitMetricsRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitMetricsRepository.java index 5d53a9da3ec2..b73fb254a4d8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitMetricsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitMetricsRepository.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.web.rest.dto.metrics.LectureUnitInformationDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitRepository.java index 48c10587344b..fceab652c24d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitRepository.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; /** * Spring Data JPA repository for the Lecture Unit entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/OnlineUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/OnlineUnitRepository.java index d99b4a000440..f1f360d8e1f0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/OnlineUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/OnlineUnitRepository.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.lecture.OnlineUnit; +import de.tum.cit.aet.artemis.lecture.domain.OnlineUnit; /** * Spring Data JPA repository for the Online Unit entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/SlideRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/SlideRepository.java index 595c5623a4c3..f9c2241c02d2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/SlideRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/SlideRepository.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.lecture.Slide; +import de.tum.cit.aet.artemis.lecture.domain.Slide; /** * Spring Data JPA repository for the Attachment Unit entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/TextUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/TextUnitRepository.java index ad51afd5486e..38fc336c4642 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/TextUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/TextUnitRepository.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.lecture.TextUnit; +import de.tum.cit.aet.artemis.lecture.domain.TextUnit; /** * Spring Data JPA repository for the Text Unit entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/VideoUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/VideoUnitRepository.java index 1d19cfc2ce1f..419e607a1ecc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/VideoUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/VideoUnitRepository.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.lecture.VideoUnit; +import de.tum.cit.aet.artemis.lecture.domain.VideoUnit; /** * Spring Data JPA repository for the Video Unit entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/lti/LtiResourceLaunch.java b/src/main/java/de/tum/cit/aet/artemis/lti/domain/LtiResourceLaunch.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/lti/LtiResourceLaunch.java rename to src/main/java/de/tum/cit/aet/artemis/lti/domain/LtiResourceLaunch.java index 2430ad0ed481..86d926f9bc18 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/lti/LtiResourceLaunch.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/domain/LtiResourceLaunch.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.lti; +package de.tum.cit.aet.artemis.lti.domain; import jakarta.persistence.Entity; import jakarta.persistence.ManyToOne; @@ -9,6 +9,7 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.lti.dto.Lti13LaunchRequest; /** * Represents an LTI 1.3 Resource Link Launch. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/lti/Claims.java b/src/main/java/de/tum/cit/aet/artemis/lti/dto/Claims.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/domain/lti/Claims.java rename to src/main/java/de/tum/cit/aet/artemis/lti/dto/Claims.java index 95f165c63a74..41659ae1210b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/lti/Claims.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/dto/Claims.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.lti; +package de.tum.cit.aet.artemis.lti.dto; public class Claims extends uk.ac.ox.ctl.lti13.lti.Claims { diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13AgsClaim.java b/src/main/java/de/tum/cit/aet/artemis/lti/dto/Lti13AgsClaim.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13AgsClaim.java rename to src/main/java/de/tum/cit/aet/artemis/lti/dto/Lti13AgsClaim.java index 53ee6ec18b7b..c3ba3dab86d0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13AgsClaim.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/dto/Lti13AgsClaim.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.lti; +package de.tum.cit.aet.artemis.lti.dto; import java.util.Collections; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13ClientRegistration.java b/src/main/java/de/tum/cit/aet/artemis/lti/dto/Lti13ClientRegistration.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13ClientRegistration.java rename to src/main/java/de/tum/cit/aet/artemis/lti/dto/Lti13ClientRegistration.java index 9eb12d5beb1b..f61dc9af1367 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13ClientRegistration.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/dto/Lti13ClientRegistration.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.lti; +package de.tum.cit.aet.artemis.lti.dto; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13DeepLinkingResponse.java b/src/main/java/de/tum/cit/aet/artemis/lti/dto/Lti13DeepLinkingResponse.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13DeepLinkingResponse.java rename to src/main/java/de/tum/cit/aet/artemis/lti/dto/Lti13DeepLinkingResponse.java index 61441e0798b3..8d9986d433c0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13DeepLinkingResponse.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/dto/Lti13DeepLinkingResponse.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.lti; +package de.tum.cit.aet.artemis.lti.dto; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13LaunchRequest.java b/src/main/java/de/tum/cit/aet/artemis/lti/dto/Lti13LaunchRequest.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13LaunchRequest.java rename to src/main/java/de/tum/cit/aet/artemis/lti/dto/Lti13LaunchRequest.java index 6b3fe5e029f3..8576a7dff782 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13LaunchRequest.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/dto/Lti13LaunchRequest.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.lti; +package de.tum.cit.aet.artemis.lti.dto; import org.springframework.security.oauth2.core.oidc.IdTokenClaimNames; import org.springframework.security.oauth2.core.oidc.OidcIdToken; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13PlatformConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/lti/dto/Lti13PlatformConfiguration.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13PlatformConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/lti/dto/Lti13PlatformConfiguration.java index a16ddd07ee38..e1a54be22f60 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/lti/Lti13PlatformConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/dto/Lti13PlatformConfiguration.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.lti; +package de.tum.cit.aet.artemis.lti.dto; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/lti/LtiAuthenticationResponse.java b/src/main/java/de/tum/cit/aet/artemis/lti/dto/LtiAuthenticationResponse.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/domain/lti/LtiAuthenticationResponse.java rename to src/main/java/de/tum/cit/aet/artemis/lti/dto/LtiAuthenticationResponse.java index 2cee8557e7e2..49470f2fdc5b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/lti/LtiAuthenticationResponse.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/dto/LtiAuthenticationResponse.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.lti; +package de.tum.cit.aet.artemis.lti.dto; /** * Holds LTI authentication response details. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/lti/Scopes.java b/src/main/java/de/tum/cit/aet/artemis/lti/dto/Scopes.java similarity index 84% rename from src/main/java/de/tum/cit/aet/artemis/domain/lti/Scopes.java rename to src/main/java/de/tum/cit/aet/artemis/lti/dto/Scopes.java index 7c43fbeac69d..ff34ce2fc460 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/lti/Scopes.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/dto/Scopes.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.lti; +package de.tum.cit.aet.artemis.lti.dto; public class Scopes { diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/repository/Lti13ResourceLaunchRepository.java b/src/main/java/de/tum/cit/aet/artemis/lti/repository/Lti13ResourceLaunchRepository.java index a9a8b8b0ca98..93acca5aeebe 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/repository/Lti13ResourceLaunchRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/repository/Lti13ResourceLaunchRepository.java @@ -8,7 +8,7 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.lti.LtiResourceLaunch; +import de.tum.cit.aet.artemis.lti.domain.LtiResourceLaunch; public interface Lti13ResourceLaunchRepository extends ArtemisJpaRepository { diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/modeling/ApollonDiagram.java b/src/main/java/de/tum/cit/aet/artemis/modeling/domain/ApollonDiagram.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/modeling/ApollonDiagram.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/domain/ApollonDiagram.java index 4039ef662a28..a39d050a2948 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/modeling/ApollonDiagram.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/domain/ApollonDiagram.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.modeling; +package de.tum.cit.aet.artemis.modeling.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelCluster.java b/src/main/java/de/tum/cit/aet/artemis/modeling/domain/ModelCluster.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelCluster.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/domain/ModelCluster.java index 7af2d2ee258f..073ed43f7ac2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelCluster.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/domain/ModelCluster.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.modeling; +package de.tum.cit.aet.artemis.modeling.domain; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelElement.java b/src/main/java/de/tum/cit/aet/artemis/modeling/domain/ModelElement.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelElement.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/domain/ModelElement.java index 233892311e24..6d3a418cd15c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelElement.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/domain/ModelElement.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.modeling; +package de.tum.cit.aet.artemis.modeling.domain; import java.io.Serial; import java.io.Serializable; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelingExercise.java b/src/main/java/de/tum/cit/aet/artemis/modeling/domain/ModelingExercise.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelingExercise.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/domain/ModelingExercise.java index 255940091fb1..c7acbfc18e72 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelingExercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/domain/ModelingExercise.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.modeling; +package de.tum.cit.aet.artemis.modeling.domain; import static de.tum.cit.aet.artemis.domain.enumeration.ExerciseType.MODELING; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelingSubmission.java b/src/main/java/de/tum/cit/aet/artemis/modeling/domain/ModelingSubmission.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelingSubmission.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/domain/ModelingSubmission.java index 894d94306106..86f717d02a5d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/modeling/ModelingSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/domain/ModelingSubmission.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.modeling; +package de.tum.cit.aet.artemis.modeling.domain; import static de.tum.cit.aet.artemis.core.config.Constants.MAX_SUBMISSION_MODEL_LENGTH; import static de.tum.cit.aet.artemis.core.config.Constants.MAX_SUBMISSION_TEXT_LENGTH; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/modeling/SimilarElementCount.java b/src/main/java/de/tum/cit/aet/artemis/modeling/domain/SimilarElementCount.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/domain/modeling/SimilarElementCount.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/domain/SimilarElementCount.java index 5c86adfe5306..5ed6ca495195 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/modeling/SimilarElementCount.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/domain/SimilarElementCount.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.modeling; +package de.tum.cit.aet.artemis.modeling.domain; import de.tum.cit.aet.artemis.modeling.repository.ModelElementRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ApollonDiagramRepository.java b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ApollonDiagramRepository.java index dbdc54df91db..304eff6d8a6a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ApollonDiagramRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ApollonDiagramRepository.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.modeling.ApollonDiagram; +import de.tum.cit.aet.artemis.modeling.domain.ApollonDiagram; /** * Spring Data JPA repository for the ApollonDiagram entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelClusterRepository.java b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelClusterRepository.java index 4d583cb8f531..8e79595f723b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelClusterRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelClusterRepository.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.modeling.ModelCluster; +import de.tum.cit.aet.artemis.modeling.domain.ModelCluster; /** * Spring Data JPA repository for the ModelCluster entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelElementRepository.java b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelElementRepository.java index f56881641c8a..44ff1be2f895 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelElementRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelElementRepository.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.modeling.ModelElement; +import de.tum.cit.aet.artemis.modeling.domain.ModelElement; /** * Spring Data JPA repository for the ModelElement entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelingExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelingExerciseRepository.java index ee2b45de6e8e..c7f0e2d5c8ab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelingExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelingExerciseRepository.java @@ -17,7 +17,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; /** * Spring Data JPA repository for the ModelingExercise entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelingSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelingSubmissionRepository.java index 112ffcc7bad7..c5c2645d3b24 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelingSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelingSubmissionRepository.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; /** * Spring Data JPA repository for the ModelingSubmission entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismCase.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismCase.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismCase.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismCase.java index d92f0c50a04e..7d1bdf0efacc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismCase.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismCase.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.domain; import java.time.ZonedDateTime; import java.util.Collections; @@ -18,11 +18,11 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.domain.AbstractAuditingEntity; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.metis.Post; @Entity @Table(name = "plagiarism_case") diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismComparison.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismComparison.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismComparison.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismComparison.java index cb5f3c583b92..c4e6e888f58b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismComparison.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismComparison.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.domain; import java.io.File; import java.util.Set; @@ -20,7 +20,7 @@ import de.jplag.JPlagComparison; import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextSubmissionElement; /** * Pair of compared student submissions whose similarity is above a certain threshold. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismDetectionConfig.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismDetectionConfig.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismDetectionConfig.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismDetectionConfig.java index d29e315f6f42..96b2c766d994 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismDetectionConfig.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismDetectionConfig.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.domain; import java.util.Objects; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismMatch.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismMatch.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismMatch.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismMatch.java index c5ee856db69f..8305dddf38cf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismMatch.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismMatch.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.domain; import java.util.Objects; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismResult.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismResult.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismResult.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismResult.java index 338f329c7a04..ff14dbd15c12 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismResult.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismResult.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.domain; import static java.util.Comparator.comparingInt; import static java.util.Comparator.reverseOrder; @@ -34,8 +34,8 @@ import de.tum.cit.aet.artemis.domain.AbstractAuditingEntity; import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; -import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingPlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; /** * Base result of any automatic plagiarism detection. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismStatus.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismStatus.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismStatus.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismStatus.java index af862db37ac9..556bbc3c09f0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismStatus.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismStatus.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.domain; /** * After automatic detection, each plagiarism has to be reviewed and revalidated by an instructor. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismSubmission.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismSubmission.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismSubmission.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismSubmission.java index b607b89c40be..b9c4eb381373 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismSubmission.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.domain; import java.io.File; import java.util.ArrayList; @@ -24,10 +24,10 @@ import de.jplag.Submission; import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingSubmissionElement; -import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingSubmissionElement; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextSubmissionElement; @Entity @Table(name = "plagiarism_submission") diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismSubmissionElement.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismSubmissionElement.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismSubmissionElement.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismSubmissionElement.java index f4da831dc56d..fbb64f994325 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismSubmissionElement.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismSubmissionElement.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.domain; import jakarta.persistence.DiscriminatorColumn; import jakarta.persistence.DiscriminatorType; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismVerdict.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismVerdict.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismVerdict.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismVerdict.java index 14e1637398c8..9d58ae87cf41 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/PlagiarismVerdict.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismVerdict.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.domain; import java.util.Collection; import java.util.Comparator; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/modeling/ModelingPlagiarismResult.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/modeling/ModelingPlagiarismResult.java similarity index 64% rename from src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/modeling/ModelingPlagiarismResult.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/modeling/ModelingPlagiarismResult.java index b8a0f2f770ab..46dce59992ed 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/modeling/ModelingPlagiarismResult.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/modeling/ModelingPlagiarismResult.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.domain.plagiarism.modeling; +package de.tum.cit.aet.artemis.plagiarism.domain.modeling; import jakarta.persistence.Entity; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismResult; /** * Result of the automatic plagiarism detection for modeling exercises. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/modeling/ModelingSubmissionElement.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/modeling/ModelingSubmissionElement.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/modeling/ModelingSubmissionElement.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/modeling/ModelingSubmissionElement.java index 56aa1eaef2ba..70d3d987073a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/modeling/ModelingSubmissionElement.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/modeling/ModelingSubmissionElement.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.domain.plagiarism.modeling; +package de.tum.cit.aet.artemis.plagiarism.domain.modeling; import jakarta.persistence.Entity; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmissionElement; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmissionElement; import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; @Entity diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/text/TextPlagiarismResult.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/text/TextPlagiarismResult.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/text/TextPlagiarismResult.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/text/TextPlagiarismResult.java index af202b55703e..59d27c06c41d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/text/TextPlagiarismResult.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/text/TextPlagiarismResult.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.domain.plagiarism.text; +package de.tum.cit.aet.artemis.plagiarism.domain.text; import jakarta.persistence.Entity; import de.jplag.JPlagResult; import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismResult; /** * Result of the automatic plagiarism detection for text or programming exercises. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/text/TextSubmissionElement.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/text/TextSubmissionElement.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/text/TextSubmissionElement.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/text/TextSubmissionElement.java index c7b4238bb99e..3e3b7750cd63 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/plagiarism/text/TextSubmissionElement.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/text/TextSubmissionElement.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.plagiarism.text; +package de.tum.cit.aet.artemis.plagiarism.domain.text; import java.io.File; @@ -8,8 +8,8 @@ import de.jplag.Token; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmissionElement; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmission; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmissionElement; @Entity // TODO: use @DiscriminatorValue(value = "T") or even better use integers (because they use less space in the database) diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismCaseRepository.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismCaseRepository.java index 266f0a28d106..b999aa27bfb5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismCaseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismCaseRepository.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; /** * Spring Data JPA repository for the PlagiarismCase entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismComparisonRepository.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismComparisonRepository.java index 0f46b461048d..8ad0058fa678 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismComparisonRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismComparisonRepository.java @@ -15,8 +15,8 @@ import org.springframework.transaction.annotation.Transactional; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus; /** * Spring Data JPA repository for the PlagiarismComparison entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismResultRepository.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismResultRepository.java index 56a76f3eeb12..14cfbbf17543 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismResultRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismResultRepository.java @@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.Transactional; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismResult; /** * Spring Data JPA repository for the PlagiarismResult entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismSubmissionRepository.java index b205de23f418..ed9d4efc6bdb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismSubmissionRepository.java @@ -10,8 +10,8 @@ import org.springframework.transaction.annotation.Transactional; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmission; /** * Spring Data JPA repository for the PlagiarismCase entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/participation/AbstractBaseProgrammingExerciseParticipation.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/AbstractBaseProgrammingExerciseParticipation.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/domain/participation/AbstractBaseProgrammingExerciseParticipation.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/AbstractBaseProgrammingExerciseParticipation.java index 60c76d0998b4..f7692a85531f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/participation/AbstractBaseProgrammingExerciseParticipation.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/AbstractBaseProgrammingExerciseParticipation.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.participation; +package de.tum.cit.aet.artemis.programming.domain; import jakarta.persistence.Column; import jakarta.persistence.MappedSuperclass; @@ -9,7 +9,8 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.quiz.config.QuizView; @MappedSuperclass @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/statistics/BuildLogStatisticsEntry.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildLogStatisticsEntry.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/statistics/BuildLogStatisticsEntry.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildLogStatisticsEntry.java index 3af94d991d15..4623fd26d80a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/statistics/BuildLogStatisticsEntry.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildLogStatisticsEntry.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.statistics; +package de.tum.cit.aet.artemis.programming.domain; import java.time.ZonedDateTime; import java.time.temporal.ChronoUnit; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/participation/ParticipationVCSAccessToken.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ParticipationVCSAccessToken.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/domain/participation/ParticipationVCSAccessToken.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/ParticipationVCSAccessToken.java index f249e1186a7d..ae2b10e936cb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/participation/ParticipationVCSAccessToken.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ParticipationVCSAccessToken.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.participation; +package de.tum.cit.aet.artemis.programming.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -11,6 +11,7 @@ import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; /** * A ParticipationVcsAccessToken. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/participation/ProgrammingExerciseParticipation.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseParticipation.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/domain/participation/ProgrammingExerciseParticipation.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseParticipation.java index 331a2b685f19..9b4b5f5f7bec 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/participation/ProgrammingExerciseParticipation.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseParticipation.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.participation; +package de.tum.cit.aet.artemis.programming.domain; import java.net.URI; import java.net.URISyntaxException; @@ -15,6 +15,7 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.exercise.domain.participation.ParticipationInterface; public interface ProgrammingExerciseParticipation extends ParticipationInterface { diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/participation/ProgrammingExerciseStudentParticipation.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseStudentParticipation.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/domain/participation/ProgrammingExerciseStudentParticipation.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseStudentParticipation.java index f21dfee70bd9..4e455edea33e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/participation/ProgrammingExerciseStudentParticipation.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseStudentParticipation.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.participation; +package de.tum.cit.aet.artemis.programming.domain; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; @@ -10,7 +10,8 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.quiz.config.QuizView; import de.tum.cit.aet.artemis.service.connectors.vcs.AbstractVersionControlService; @Entity diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/participation/SolutionProgrammingExerciseParticipation.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/SolutionProgrammingExerciseParticipation.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/domain/participation/SolutionProgrammingExerciseParticipation.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/SolutionProgrammingExerciseParticipation.java index 7ae95bc8eb86..a290bbc7b64b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/participation/SolutionProgrammingExerciseParticipation.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/SolutionProgrammingExerciseParticipation.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.participation; +package de.tum.cit.aet.artemis.programming.domain; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/participation/TemplateProgrammingExerciseParticipation.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/TemplateProgrammingExerciseParticipation.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/domain/participation/TemplateProgrammingExerciseParticipation.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/TemplateProgrammingExerciseParticipation.java index 56b427071eff..874b4206b875 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/participation/TemplateProgrammingExerciseParticipation.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/TemplateProgrammingExerciseParticipation.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.participation; +package de.tum.cit.aet.artemis.programming.domain; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/hestia/CodeHint.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/CodeHint.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/hestia/CodeHint.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/CodeHint.java index 832b5d68d3f4..a43ba0ac9c3f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/hestia/CodeHint.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/CodeHint.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.hestia; +package de.tum.cit.aet.artemis.programming.domain.hestia; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/hestia/CoverageFileReport.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/CoverageFileReport.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/hestia/CoverageFileReport.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/CoverageFileReport.java index 438c41243cf2..ae89f9f0a464 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/hestia/CoverageFileReport.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/CoverageFileReport.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.hestia; +package de.tum.cit.aet.artemis.programming.domain.hestia; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/hestia/CoverageReport.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/CoverageReport.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/hestia/CoverageReport.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/CoverageReport.java index 6691abdbf73b..adf45f112ad7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/hestia/CoverageReport.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/CoverageReport.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.hestia; +package de.tum.cit.aet.artemis.programming.domain.hestia; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ExerciseHint.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ExerciseHint.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/hestia/ExerciseHint.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ExerciseHint.java index d8d97c79f3c3..6c53cf7c0e2d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ExerciseHint.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ExerciseHint.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.hestia; +package de.tum.cit.aet.artemis.programming.domain.hestia; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ExerciseHintActivation.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ExerciseHintActivation.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/hestia/ExerciseHintActivation.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ExerciseHintActivation.java index 631bfe7a64c9..b925d074001b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ExerciseHintActivation.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ExerciseHintActivation.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.hestia; +package de.tum.cit.aet.artemis.programming.domain.hestia; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseGitDiffEntry.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseGitDiffEntry.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseGitDiffEntry.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseGitDiffEntry.java index 0aa66a60ae1c..e846c7a00ecb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseGitDiffEntry.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseGitDiffEntry.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.hestia; +package de.tum.cit.aet.artemis.programming.domain.hestia; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseGitDiffReport.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseGitDiffReport.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseGitDiffReport.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseGitDiffReport.java index 682a440b7f45..60f2cd2088c6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseGitDiffReport.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseGitDiffReport.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.hestia; +package de.tum.cit.aet.artemis.programming.domain.hestia; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseSolutionEntry.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseSolutionEntry.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseSolutionEntry.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseSolutionEntry.java index d31115fe3ee1..a68967dac14f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseSolutionEntry.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseSolutionEntry.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.hestia; +package de.tum.cit.aet.artemis.programming.domain.hestia; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseTask.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseTask.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseTask.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseTask.java index 23b0fd3665d9..300a88f93ff8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseTask.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseTask.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.hestia; +package de.tum.cit.aet.artemis.programming.domain.hestia; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseTestCaseType.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseTestCaseType.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseTestCaseType.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseTestCaseType.java index 03cc29a5cd07..047a3ca73eda 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/hestia/ProgrammingExerciseTestCaseType.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseTestCaseType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.hestia; +package de.tum.cit.aet.artemis.programming.domain.hestia; /** * Used to define the type of a ProgrammingExerciseTestCase. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/hestia/TestwiseCoverageReportEntry.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/TestwiseCoverageReportEntry.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/hestia/TestwiseCoverageReportEntry.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/TestwiseCoverageReportEntry.java index 3d4cfc76b6fe..93c997abc622 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/hestia/TestwiseCoverageReportEntry.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/TestwiseCoverageReportEntry.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.hestia; +package de.tum.cit.aet.artemis.programming.domain.hestia; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/settings/ide/Ide.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ide/Ide.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/settings/ide/Ide.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/ide/Ide.java index bc6fe017f451..ed1ae2d317c6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/settings/ide/Ide.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ide/Ide.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.settings.ide; +package de.tum.cit.aet.artemis.programming.domain.ide; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/settings/ide/UserIdeMapping.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ide/UserIdeMapping.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/settings/ide/UserIdeMapping.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/ide/UserIdeMapping.java index a58662c327d5..67d127077693 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/settings/ide/UserIdeMapping.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ide/UserIdeMapping.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.settings.ide; +package de.tum.cit.aet.artemis.programming.domain.ide; import java.io.Serializable; import java.util.Objects; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/submissionpolicy/LockRepositoryPolicy.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/submissionpolicy/LockRepositoryPolicy.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/domain/submissionpolicy/LockRepositoryPolicy.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/submissionpolicy/LockRepositoryPolicy.java index daecd7e8e33a..a4f40a321c24 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/submissionpolicy/LockRepositoryPolicy.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/submissionpolicy/LockRepositoryPolicy.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.domain.submissionpolicy; +package de.tum.cit.aet.artemis.programming.domain.submissionpolicy; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.service.SubmissionPolicyService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/submissionpolicy/SubmissionPenaltyPolicy.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/submissionpolicy/SubmissionPenaltyPolicy.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/domain/submissionpolicy/SubmissionPenaltyPolicy.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/submissionpolicy/SubmissionPenaltyPolicy.java index edac4ed81e5e..bcde1fd30ad0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/submissionpolicy/SubmissionPenaltyPolicy.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/submissionpolicy/SubmissionPenaltyPolicy.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.submissionpolicy; +package de.tum.cit.aet.artemis.programming.domain.submissionpolicy; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.service.SubmissionPolicyService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/submissionpolicy/SubmissionPolicy.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/submissionpolicy/SubmissionPolicy.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/submissionpolicy/SubmissionPolicy.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/submissionpolicy/SubmissionPolicy.java index 83529cb4ed14..705d45be0f01 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/submissionpolicy/SubmissionPolicy.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/submissionpolicy/SubmissionPolicy.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.submissionpolicy; +package de.tum.cit.aet.artemis.programming.domain.submissionpolicy; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorColumn; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogStatisticsEntryRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogStatisticsEntryRepository.java index 3a928211eed3..0de400cf038c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogStatisticsEntryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogStatisticsEntryRepository.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.programming.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.domain.statistics.BuildLogStatisticsEntry.BuildJobPartDuration; +import static de.tum.cit.aet.artemis.programming.domain.BuildLogStatisticsEntry.BuildJobPartDuration; import org.springframework.context.annotation.Profile; import org.springframework.data.jpa.repository.Modifying; @@ -13,7 +13,7 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.statistics.BuildLogStatisticsEntry; +import de.tum.cit.aet.artemis.programming.domain.BuildLogStatisticsEntry; import de.tum.cit.aet.artemis.web.rest.dto.BuildLogStatisticsDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ParticipationVCSAccessTokenRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ParticipationVCSAccessTokenRepository.java index 747187b6151b..5c24261d2779 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ParticipationVCSAccessTokenRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ParticipationVCSAccessTokenRepository.java @@ -12,7 +12,7 @@ import org.springframework.transaction.annotation.Transactional; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.participation.ParticipationVCSAccessToken; +import de.tum.cit.aet.artemis.programming.domain.ParticipationVCSAccessToken; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java index 9a85f8e24d6c..058c2ed8cb92 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java @@ -22,17 +22,17 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntry; import de.tum.cit.aet.artemis.core.repository.base.DynamicSpecificationRepository; import de.tum.cit.aet.artemis.core.repository.base.FetchOptions; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise_; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise_; -import de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseMapEntry; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @@ -422,7 +422,7 @@ SELECT COUNT (DISTINCT p) * @return list of exercises with the count of distinct submissions belonging to the exercise id */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseMapEntry( + SELECT new de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntry( p.exercise.id, count(DISTINCT p) ) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseStudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseStudentParticipationRepository.java index edeba1cfd57a..fefa355c3c73 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseStudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseStudentParticipationRepository.java @@ -17,7 +17,7 @@ import org.springframework.transaction.annotation.Transactional; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; /** * Spring Data JPA repository for the Participation entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/SolutionProgrammingExerciseParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/SolutionProgrammingExerciseParticipationRepository.java index f008bc10fc9b..aa5ddeb9ef23 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/SolutionProgrammingExerciseParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/SolutionProgrammingExerciseParticipationRepository.java @@ -20,9 +20,9 @@ import de.tum.cit.aet.artemis.core.repository.base.FetchOptions; import de.tum.cit.aet.artemis.domain.DomainObject_; import de.tum.cit.aet.artemis.domain.Submission_; -import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation_; -import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation_; +import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation_; +import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation_; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/SubmissionPolicyRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/SubmissionPolicyRepository.java index 2fc810af4129..36089674bde1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/SubmissionPolicyRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/SubmissionPolicyRepository.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; /** * Spring Data repository for the SubmissionPolicy entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/TemplateProgrammingExerciseParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/TemplateProgrammingExerciseParticipationRepository.java index d3a72c08de50..6222a43ed3a4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/TemplateProgrammingExerciseParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/TemplateProgrammingExerciseParticipationRepository.java @@ -20,8 +20,8 @@ import de.tum.cit.aet.artemis.core.repository.base.FetchOptions; import de.tum.cit.aet.artemis.domain.DomainObject_; import de.tum.cit.aet.artemis.domain.Submission_; -import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation_; +import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation_; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CodeHintRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CodeHintRepository.java index f2a23860e87f..23fbba6db515 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CodeHintRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CodeHintRepository.java @@ -9,7 +9,7 @@ import org.springframework.data.repository.query.Param; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageFileReportRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageFileReportRepository.java index dd0962a999be..69bcac01e5ac 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageFileReportRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageFileReportRepository.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.hestia.CoverageFileReport; +import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageFileReport; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageReportRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageReportRepository.java index c1e0eced467c..e5b2ae757c08 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageReportRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageReportRepository.java @@ -18,7 +18,7 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.hestia.CoverageReport; +import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageReport; import de.tum.cit.aet.artemis.service.dto.CoverageReportAndSubmissionDateDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ExerciseHintActivationRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ExerciseHintActivationRepository.java index 88b9200d2b58..5a24463cdc7f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ExerciseHintActivationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ExerciseHintActivationRepository.java @@ -7,7 +7,7 @@ import org.springframework.data.repository.query.Param; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.hestia.ExerciseHintActivation; +import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHintActivation; public interface ExerciseHintActivationRepository extends ArtemisJpaRepository { diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ExerciseHintRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ExerciseHintRepository.java index 0f3b1ff2216b..884ea95babab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ExerciseHintRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ExerciseHintRepository.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.hestia.ExerciseHint; +import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseGitDiffReportRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseGitDiffReportRepository.java index 11bd7378366b..d1c5b9acf8d0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseGitDiffReportRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseGitDiffReportRepository.java @@ -10,7 +10,7 @@ import org.springframework.transaction.annotation.Transactional; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; /** * Spring Data JPA repository for the ProgrammingExerciseGitDiffReport entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseSolutionEntryRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseSolutionEntryRepository.java index dbd879a4ae96..354a6242a32a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseSolutionEntryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseSolutionEntryRepository.java @@ -9,7 +9,7 @@ import org.springframework.data.repository.query.Param; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseTaskRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseTaskRepository.java index 3abf53e82bb6..bf8ec01b63d5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseTaskRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseTaskRepository.java @@ -9,7 +9,7 @@ import org.springframework.data.repository.query.Param; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/TestwiseCoverageReportEntryRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/TestwiseCoverageReportEntryRepository.java index 5773ac4365d3..253adf77f45a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/TestwiseCoverageReportEntryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/TestwiseCoverageReportEntryRepository.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.hestia.TestwiseCoverageReportEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.TestwiseCoverageReportEntry; /** * Spring Data JPA repository for the TestwiseCoverageReportEntry entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/settings/IdeRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/settings/IdeRepository.java index 1c8b253e403d..e722a7fe0e09 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/settings/IdeRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/settings/IdeRepository.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.settings.ide.Ide; +import de.tum.cit.aet.artemis.programming.domain.ide.Ide; /** * Spring Data repository for the Ide entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/settings/UserIdeMappingRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/settings/UserIdeMappingRepository.java index 44fb094dc242..0edfb88b524e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/settings/UserIdeMappingRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/settings/UserIdeMappingRepository.java @@ -8,8 +8,8 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.settings.ide.Ide; -import de.tum.cit.aet.artemis.domain.settings.ide.UserIdeMapping; +import de.tum.cit.aet.artemis.programming.domain.ide.Ide; +import de.tum.cit.aet.artemis.programming.domain.ide.UserIdeMapping; /** * Spring Data repository for the UserIdeMapping entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/view/QuizView.java b/src/main/java/de/tum/cit/aet/artemis/quiz/config/QuizView.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/view/QuizView.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/config/QuizView.java index ea1ab31265d2..fdb6ff6648f2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/view/QuizView.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/config/QuizView.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.view; +package de.tum.cit.aet.artemis.quiz.config; /** * NOTE: This class provides inner classes for use with @JsonView @@ -13,6 +13,8 @@ * Object yourDomainObject = ...; Class view = QuizView.During.class; byte[] payload = objectMapper.writerWithView(view).writeValueAsBytes(yourDomainObject); * messagingTemplate.send("/topic/some/path/", MessageBuilder.withPayload(payload).build()); */ +@Deprecated +// Use DTOs instead public class QuizView { /** diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/AbstractQuizSubmission.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/AbstractQuizSubmission.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/AbstractQuizSubmission.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/AbstractQuizSubmission.java index 594d3c870c15..82c54a9a8eec 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/AbstractQuizSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/AbstractQuizSubmission.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import java.util.HashSet; import java.util.List; @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonView; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.quiz.config.QuizView; @Entity public abstract class AbstractQuizSubmission extends Submission { diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/AnswerCounter.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/AnswerCounter.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/AnswerCounter.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/AnswerCounter.java index 6398b8f578ab..428b4219cada 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/AnswerCounter.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/AnswerCounter.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import jakarta.persistence.CascadeType; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/AnswerOption.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/AnswerOption.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/AnswerOption.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/AnswerOption.java index 449d63d0d1fe..f2563568b1d9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/AnswerOption.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/AnswerOption.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonView; import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.quiz.config.QuizView; /** * A AnswerOption. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropMapping.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragAndDropMapping.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropMapping.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragAndDropMapping.java index d686e1fb2732..4be8afd16746 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropMapping.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragAndDropMapping.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonView; import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.quiz.config.QuizView; /** * A DragAndDropMapping. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropQuestion.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragAndDropQuestion.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropQuestion.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragAndDropQuestion.java index d87ac4521e0b..e01450a07254 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropQuestion.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragAndDropQuestion.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import java.net.URI; import java.util.ArrayList; @@ -30,11 +30,11 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; -import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategy; -import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategyDragAndDropAllOrNothing; -import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategyDragAndDropProportionalWithPenalty; -import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategyDragAndDropProportionalWithoutPenalty; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.quiz.config.QuizView; +import de.tum.cit.aet.artemis.quiz.domain.scoring.ScoringStrategy; +import de.tum.cit.aet.artemis.quiz.domain.scoring.ScoringStrategyDragAndDropAllOrNothing; +import de.tum.cit.aet.artemis.quiz.domain.scoring.ScoringStrategyDragAndDropProportionalWithPenalty; +import de.tum.cit.aet.artemis.quiz.domain.scoring.ScoringStrategyDragAndDropProportionalWithoutPenalty; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropQuestionStatistic.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragAndDropQuestionStatistic.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropQuestionStatistic.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragAndDropQuestionStatistic.java index e05537011fbd..c22407c2bae1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropQuestionStatistic.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragAndDropQuestionStatistic.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropSubmittedAnswer.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragAndDropSubmittedAnswer.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropSubmittedAnswer.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragAndDropSubmittedAnswer.java index facfeaa6e1dc..cfc17f0b42ee 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragAndDropSubmittedAnswer.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragAndDropSubmittedAnswer.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import java.util.HashSet; import java.util.Set; @@ -17,8 +17,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.domain.quiz.compare.DnDMapping; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.quiz.config.QuizView; +import de.tum.cit.aet.artemis.quiz.domain.compare.DnDMapping; /** * A DragAndDropSubmittedAnswer. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragItem.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragItem.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragItem.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragItem.java index 542a394314a5..2f4d37d7e471 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DragItem.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragItem.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import java.net.URI; import java.util.HashSet; @@ -27,7 +27,7 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; import de.tum.cit.aet.artemis.domain.TempIdObject; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.quiz.config.QuizView; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DropLocation.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DropLocation.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/DropLocation.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/DropLocation.java index f10c09020690..7ad38666c14b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DropLocation.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DropLocation.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import java.util.HashSet; import java.util.Set; @@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonView; import de.tum.cit.aet.artemis.domain.TempIdObject; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.quiz.config.QuizView; /** * A DropLocation. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DropLocationCounter.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DropLocationCounter.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/DropLocationCounter.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/DropLocationCounter.java index 87570ea463fd..25457112606b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/DropLocationCounter.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DropLocationCounter.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import jakarta.persistence.CascadeType; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/MultipleChoiceQuestion.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/MultipleChoiceQuestion.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/MultipleChoiceQuestion.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/MultipleChoiceQuestion.java index 385e79c15dce..60c944b17b94 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/MultipleChoiceQuestion.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/MultipleChoiceQuestion.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import java.util.ArrayList; import java.util.HashSet; @@ -22,11 +22,11 @@ import com.fasterxml.jackson.annotation.JsonView; import de.tum.cit.aet.artemis.domain.enumeration.ScoringType; -import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategy; -import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategyMultipleChoiceAllOrNothing; -import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategyMultipleChoiceProportionalWithPenalty; -import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategyMultipleChoiceProportionalWithoutPenalty; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.quiz.config.QuizView; +import de.tum.cit.aet.artemis.quiz.domain.scoring.ScoringStrategy; +import de.tum.cit.aet.artemis.quiz.domain.scoring.ScoringStrategyMultipleChoiceAllOrNothing; +import de.tum.cit.aet.artemis.quiz.domain.scoring.ScoringStrategyMultipleChoiceProportionalWithPenalty; +import de.tum.cit.aet.artemis.quiz.domain.scoring.ScoringStrategyMultipleChoiceProportionalWithoutPenalty; /** * A MultipleChoiceQuestion. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/MultipleChoiceQuestionStatistic.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/MultipleChoiceQuestionStatistic.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/MultipleChoiceQuestionStatistic.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/MultipleChoiceQuestionStatistic.java index 9285e67dd692..7b97a60081e3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/MultipleChoiceQuestionStatistic.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/MultipleChoiceQuestionStatistic.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/MultipleChoiceSubmittedAnswer.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/MultipleChoiceSubmittedAnswer.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/MultipleChoiceSubmittedAnswer.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/MultipleChoiceSubmittedAnswer.java index 2d2f8d963e18..a456c08bcbb2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/MultipleChoiceSubmittedAnswer.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/MultipleChoiceSubmittedAnswer.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import java.util.HashSet; import java.util.Objects; @@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonView; import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.quiz.config.QuizView; /** * A MultipleChoiceSubmittedAnswer. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/PointCounter.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/PointCounter.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/PointCounter.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/PointCounter.java index 157a8f11a719..411db1ee1355 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/PointCounter.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/PointCounter.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizBatch.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizBatch.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizBatch.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizBatch.java index aa45d10b98c5..f73cfd6a873c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizBatch.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizBatch.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import java.time.ZonedDateTime; import java.time.temporal.ChronoUnit; @@ -18,7 +18,7 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.quiz.config.QuizView; /** * A QuizBatch. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizConfiguration.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizConfiguration.java index afd56154aafc..ad806e6807a4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizConfiguration.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import java.util.Collection; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizExercise.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizExercise.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizExercise.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizExercise.java index b80a94351230..323978b2035c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizExercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizExercise.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import static de.tum.cit.aet.artemis.domain.enumeration.ExerciseType.QUIZ; @@ -39,9 +39,9 @@ import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.quiz.config.QuizView; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizGroup.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizGroup.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizGroup.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizGroup.java index 110c39b571c3..34974ce38f71 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizGroup.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizGroup.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizPointStatistic.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizPointStatistic.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizPointStatistic.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizPointStatistic.java index 668e3d4e20d5..541ee8e2840e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizPointStatistic.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizPointStatistic.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizPool.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizPool.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizPool.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizPool.java index b92dacf85145..eca2fe3506b9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizPool.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizPool.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import java.util.ArrayList; import java.util.List; @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonView; import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.quiz.config.QuizView; @Entity @Table(name = "quiz_pool") diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizQuestion.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizQuestion.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizQuestion.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizQuestion.java index ce7a89404590..822b08fee764 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizQuestion.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizQuestion.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; @@ -29,8 +29,8 @@ import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.domain.enumeration.ScoringType; -import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategy; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.quiz.config.QuizView; +import de.tum.cit.aet.artemis.quiz.domain.scoring.ScoringStrategy; /** * A QuizQuestion. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizQuestionComponent.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizQuestionComponent.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizQuestionComponent.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizQuestionComponent.java index 5c3b55d0dc64..34095cb63bb9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizQuestionComponent.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizQuestionComponent.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; public interface QuizQuestionComponent { diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizQuestionStatistic.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizQuestionStatistic.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizQuestionStatistic.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizQuestionStatistic.java index e12d8b4a820f..e2ca7c39832b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizQuestionStatistic.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizQuestionStatistic.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizQuestionStatisticComponent.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizQuestionStatisticComponent.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizQuestionStatisticComponent.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizQuestionStatisticComponent.java index dbbe68c17a6f..b5fd6999c811 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizQuestionStatisticComponent.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizQuestionStatisticComponent.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; public interface QuizQuestionStatisticComponent, Q extends QuizQuestion> { diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizStatistic.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizStatistic.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizStatistic.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizStatistic.java index 0e6da957c50d..ed517edb789c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizStatistic.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizStatistic.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorColumn; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizStatisticCounter.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizStatisticCounter.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizStatisticCounter.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizStatisticCounter.java index bb6c80f5e502..d9f1ce5d6798 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizStatisticCounter.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizStatisticCounter.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorColumn; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizSubmission.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizSubmission.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizSubmission.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizSubmission.java index 67f608235ac3..0a60ce0a747e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizSubmission.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizSubmittedAnswerCount.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizSubmittedAnswerCount.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizSubmittedAnswerCount.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizSubmittedAnswerCount.java index 849da0eeca0e..772ebececb7d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/QuizSubmittedAnswerCount.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizSubmittedAnswerCount.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerMapping.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerMapping.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerMapping.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerMapping.java index 74bebb20e322..f6e33a8779e1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerMapping.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerMapping.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonView; import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.quiz.config.QuizView; /** * A ShortAnswerMapping. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerQuestion.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerQuestion.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerQuestion.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerQuestion.java index aea2d3722a77..714441926fe9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerQuestion.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerQuestion.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import java.util.ArrayList; import java.util.HashSet; @@ -21,11 +21,11 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategy; -import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategyShortAnswerAllOrNothing; -import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategyShortAnswerProportionalWithPenalty; -import de.tum.cit.aet.artemis.domain.quiz.scoring.ScoringStrategyShortAnswerProportionalWithoutPenalty; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.quiz.config.QuizView; +import de.tum.cit.aet.artemis.quiz.domain.scoring.ScoringStrategy; +import de.tum.cit.aet.artemis.quiz.domain.scoring.ScoringStrategyShortAnswerAllOrNothing; +import de.tum.cit.aet.artemis.quiz.domain.scoring.ScoringStrategyShortAnswerProportionalWithPenalty; +import de.tum.cit.aet.artemis.quiz.domain.scoring.ScoringStrategyShortAnswerProportionalWithoutPenalty; /** * A ShortAnswerQuestion. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerQuestionStatistic.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerQuestionStatistic.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerQuestionStatistic.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerQuestionStatistic.java index 7acd96b8fee6..b0f1bc610e17 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerQuestionStatistic.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerQuestionStatistic.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSolution.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSolution.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSolution.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSolution.java index 432c800d3b97..5b30156d6f7a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSolution.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSolution.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import java.util.HashSet; import java.util.Set; @@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonView; import de.tum.cit.aet.artemis.domain.TempIdObject; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.quiz.config.QuizView; /** * A ShortAnswerSolution. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSpot.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSpot.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSpot.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSpot.java index f53b5578c598..05f8590def23 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSpot.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSpot.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import java.util.HashSet; import java.util.Set; @@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonView; import de.tum.cit.aet.artemis.domain.TempIdObject; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.quiz.config.QuizView; /** * A ShortAnswerSpot. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSpotCounter.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSpotCounter.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSpotCounter.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSpotCounter.java index 34c284f63200..402a8959770e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSpotCounter.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSpotCounter.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import jakarta.persistence.CascadeType; import jakarta.persistence.DiscriminatorValue; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSubmittedAnswer.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSubmittedAnswer.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSubmittedAnswer.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSubmittedAnswer.java index 601c33262296..0a8cef9d12cf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSubmittedAnswer.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSubmittedAnswer.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import java.util.HashSet; import java.util.Set; @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.domain.quiz.compare.SAMapping; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.quiz.config.QuizView; +import de.tum.cit.aet.artemis.quiz.domain.compare.SAMapping; /** * A ShortAnswerSubmittedAnswer. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSubmittedText.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSubmittedText.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSubmittedText.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSubmittedText.java index e81a7e73169a..6c269ef85033 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/ShortAnswerSubmittedText.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSubmittedText.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import static de.tum.cit.aet.artemis.core.config.Constants.MAX_QUIZ_SHORT_ANSWER_TEXT_LENGTH; @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonView; import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.quiz.config.QuizView; import me.xdrop.fuzzywuzzy.FuzzySearch; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/SubmittedAnswer.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/SubmittedAnswer.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/SubmittedAnswer.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/SubmittedAnswer.java index 2e842bea9e89..d81c473e35d8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/SubmittedAnswer.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/SubmittedAnswer.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz; +package de.tum.cit.aet.artemis.quiz.domain; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorColumn; @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonView; import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.view.QuizView; +import de.tum.cit.aet.artemis.quiz.config.QuizView; /** * A SubmittedAnswer. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/compare/DnDMapping.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/compare/DnDMapping.java similarity index 56% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/compare/DnDMapping.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/compare/DnDMapping.java index a4e899d15c78..a5d38e981f87 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/compare/DnDMapping.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/compare/DnDMapping.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz.compare; +package de.tum.cit.aet.artemis.quiz.domain.compare; public record DnDMapping(long dragItemId, long dropLocationId) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/compare/SAMapping.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/compare/SAMapping.java similarity index 54% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/compare/SAMapping.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/compare/SAMapping.java index b251ca6554d4..b5fcb77f4b07 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/compare/SAMapping.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/compare/SAMapping.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.quiz.compare; +package de.tum.cit.aet.artemis.quiz.domain.compare; public record SAMapping(long spotId, String answerText) { diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategy.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategy.java similarity index 71% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategy.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategy.java index a3ac0f6df449..f4b71b2cf3fc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategy.java @@ -1,7 +1,7 @@ -package de.tum.cit.aet.artemis.domain.quiz.scoring; +package de.tum.cit.aet.artemis.quiz.domain.scoring; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; -import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; +import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; public interface ScoringStrategy { diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropAllOrNothing.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyDragAndDropAllOrNothing.java similarity index 79% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropAllOrNothing.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyDragAndDropAllOrNothing.java index 2af415c71382..0f5138d8cc57 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropAllOrNothing.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyDragAndDropAllOrNothing.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.domain.quiz.scoring; +package de.tum.cit.aet.artemis.quiz.domain.scoring; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.DragItem; -import de.tum.cit.aet.artemis.domain.quiz.DropLocation; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; -import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.DragItem; +import de.tum.cit.aet.artemis.quiz.domain.DropLocation; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; +import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; /** * All or nothing means the full score is given if the answer is 100% correct, otherwise a score of 0 is given diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropProportionalWithPenalty.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyDragAndDropProportionalWithPenalty.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropProportionalWithPenalty.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyDragAndDropProportionalWithPenalty.java index 11ca6eebdb8e..d3373c4c8981 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropProportionalWithPenalty.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyDragAndDropProportionalWithPenalty.java @@ -1,13 +1,13 @@ -package de.tum.cit.aet.artemis.domain.quiz.scoring; +package de.tum.cit.aet.artemis.quiz.domain.scoring; import java.util.Set; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.DragItem; -import de.tum.cit.aet.artemis.domain.quiz.DropLocation; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; -import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.DragItem; +import de.tum.cit.aet.artemis.quiz.domain.DropLocation; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; +import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; /** * Proportional with penalty means that every correct mapping increases the score by x and every incorrect mapping decreases the score by x where x = maxScore / diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropProportionalWithoutPenalty.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyDragAndDropProportionalWithoutPenalty.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropProportionalWithoutPenalty.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyDragAndDropProportionalWithoutPenalty.java index aefd75e4e277..43c2fbae620b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyDragAndDropProportionalWithoutPenalty.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyDragAndDropProportionalWithoutPenalty.java @@ -1,13 +1,13 @@ -package de.tum.cit.aet.artemis.domain.quiz.scoring; +package de.tum.cit.aet.artemis.quiz.domain.scoring; import java.util.Set; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.DragItem; -import de.tum.cit.aet.artemis.domain.quiz.DropLocation; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; -import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.DragItem; +import de.tum.cit.aet.artemis.quiz.domain.DropLocation; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; +import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; /** * Proportional without penalty means that every correct mapping increases the score by maxScore / numberOfDropLocationsThatShouldHaveAMapping diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceAllOrNothing.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyMultipleChoiceAllOrNothing.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceAllOrNothing.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyMultipleChoiceAllOrNothing.java index b24d1315fab2..b42103f1b325 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceAllOrNothing.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyMultipleChoiceAllOrNothing.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.domain.quiz.scoring; +package de.tum.cit.aet.artemis.quiz.domain.scoring; -import de.tum.cit.aet.artemis.domain.quiz.AnswerOption; -import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; -import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.AnswerOption; +import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; +import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; /** * All or nothing means the full score is given if the answer is 100% correct, otherwise a score of 0 is given diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceProportionalWithPenalty.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyMultipleChoiceProportionalWithPenalty.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceProportionalWithPenalty.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyMultipleChoiceProportionalWithPenalty.java index 1585cbd5b3f3..a27fee405e19 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceProportionalWithPenalty.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyMultipleChoiceProportionalWithPenalty.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.domain.quiz.scoring; +package de.tum.cit.aet.artemis.quiz.domain.scoring; -import de.tum.cit.aet.artemis.domain.quiz.AnswerOption; -import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; -import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.AnswerOption; +import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; +import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; /** * Proportional with penalty means that every correctly selected/unselected answer increases the score by x and every incorrectly selected/unselected answer the score by x where x diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceProportionalWithoutPenalty.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyMultipleChoiceProportionalWithoutPenalty.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceProportionalWithoutPenalty.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyMultipleChoiceProportionalWithoutPenalty.java index a83e4e974a8e..06473b0ae565 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyMultipleChoiceProportionalWithoutPenalty.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyMultipleChoiceProportionalWithoutPenalty.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.domain.quiz.scoring; +package de.tum.cit.aet.artemis.quiz.domain.scoring; -import de.tum.cit.aet.artemis.domain.quiz.AnswerOption; -import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; -import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.AnswerOption; +import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; +import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; /** * Proportional without penalty means that every correctly selected/unselected answer increases the score by maxScore / numberOfAnswerOptions diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerAllOrNothing.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyShortAnswerAllOrNothing.java similarity index 79% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerAllOrNothing.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyShortAnswerAllOrNothing.java index 15a6e7281d03..9b40398afb84 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerAllOrNothing.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyShortAnswerAllOrNothing.java @@ -1,9 +1,9 @@ -package de.tum.cit.aet.artemis.domain.quiz.scoring; +package de.tum.cit.aet.artemis.quiz.domain.scoring; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; /** * All or nothing means the full score is given if the answer is 100% correct, otherwise a score of 0 is given diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerProportionalWithPenalty.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyShortAnswerProportionalWithPenalty.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerProportionalWithPenalty.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyShortAnswerProportionalWithPenalty.java index 54c31173d5ae..3924c96cf2ca 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerProportionalWithPenalty.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyShortAnswerProportionalWithPenalty.java @@ -1,9 +1,9 @@ -package de.tum.cit.aet.artemis.domain.quiz.scoring; +package de.tum.cit.aet.artemis.quiz.domain.scoring; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; /** * Proportional with Penalty means that every correct mapping increases the score by x and every incorrect mapping decreases the score by x where x = maxScore / diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerProportionalWithoutPenalty.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyShortAnswerProportionalWithoutPenalty.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerProportionalWithoutPenalty.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyShortAnswerProportionalWithoutPenalty.java index b661c0283b3a..f2ac2c1dbb98 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerProportionalWithoutPenalty.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyShortAnswerProportionalWithoutPenalty.java @@ -1,9 +1,9 @@ -package de.tum.cit.aet.artemis.domain.quiz.scoring; +package de.tum.cit.aet.artemis.quiz.domain.scoring; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; /** * Proportional without penalty means that every correct mapping increases the score by maxScore / numberOfSpotsThatShouldHaveAMapping diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerUtil.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyShortAnswerUtil.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerUtil.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyShortAnswerUtil.java index 9ad764211364..1a2b28b2aab8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/quiz/scoring/ScoringStrategyShortAnswerUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/scoring/ScoringStrategyShortAnswerUtil.java @@ -1,13 +1,13 @@ -package de.tum.cit.aet.artemis.domain.quiz.scoring; +package de.tum.cit.aet.artemis.quiz.domain.scoring; import java.util.HashSet; import java.util.Set; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSolution; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSpot; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedText; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSolution; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSpot; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedText; public class ScoringStrategyShortAnswerUtil { diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/repository/DragAndDropMappingRepository.java b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/DragAndDropMappingRepository.java index 8922297b86b8..9f13e4cd8ba5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/repository/DragAndDropMappingRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/DragAndDropMappingRepository.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropMapping; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropMapping; /** * Spring Data JPA repository for the DragAndDropMapping entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/repository/DragItemRepository.java b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/DragItemRepository.java index 5e1bb527d967..4753da6389e9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/repository/DragItemRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/DragItemRepository.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.quiz.DragItem; +import de.tum.cit.aet.artemis.quiz.domain.DragItem; /** * Spring Data JPA repository for the DragItem entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizBatchRepository.java b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizBatchRepository.java index 6e3d6c64e7c4..e6c9d9c392c5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizBatchRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizBatchRepository.java @@ -11,8 +11,8 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; /** * Spring Data JPA repository for the QuizBatch entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizExerciseRepository.java index cf2422cfbd25..db0380cf3d1e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizExerciseRepository.java @@ -18,7 +18,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; /** * Spring Data JPA repository for the QuizExercise entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizGroupRepository.java b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizGroupRepository.java index c8a1c6d7cc21..416b55c33522 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizGroupRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizGroupRepository.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.quiz.QuizGroup; +import de.tum.cit.aet.artemis.quiz.domain.QuizGroup; /** * Spring Data JPA repository for the QuizGroup entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizPointStatisticRepository.java b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizPointStatisticRepository.java index 0b0e6976b609..af7d0297ebce 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizPointStatisticRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizPointStatisticRepository.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.quiz.QuizPointStatistic; +import de.tum.cit.aet.artemis.quiz.domain.QuizPointStatistic; /** * Spring Data JPA repository for the QuizPointStatistic entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizPoolRepository.java b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizPoolRepository.java index 771b27ec6002..80cf5d11dbcf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizPoolRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizPoolRepository.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.quiz.QuizPool; +import de.tum.cit.aet.artemis.quiz.domain.QuizPool; /** * Spring Data JPA repository for the QuizPool entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizQuestionRepository.java b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizQuestionRepository.java index 8535f634c5c9..ef2167dad6ca 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizQuestionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizQuestionRepository.java @@ -11,8 +11,8 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; /** * Spring Data JPA repository for the QuizQuestion entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizQuestionStatisticRepository.java b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizQuestionStatisticRepository.java index e4bdb1082f66..97f65644cbe5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizQuestionStatisticRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizQuestionStatisticRepository.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestionStatistic; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestionStatistic; /** * Spring Data JPA repository for the QuizQuestionStatistic entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizSubmissionRepository.java index ecd482940269..6d0cfed3573f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/QuizSubmissionRepository.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; /** * Spring Data JPA repository for the QuizSubmission entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/repository/ShortAnswerMappingRepository.java b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/ShortAnswerMappingRepository.java index 51fe4ebe440c..6f91a6f83769 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/repository/ShortAnswerMappingRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/ShortAnswerMappingRepository.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerMapping; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerMapping; /** * Spring Data JPA repository for the ShortAnswerMapping entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/repository/SubmittedAnswerRepository.java b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/SubmittedAnswerRepository.java index 54e48ce278e4..46bd868a66da 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/repository/SubmittedAnswerRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/repository/SubmittedAnswerRepository.java @@ -9,10 +9,10 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; -import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; +import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; /** * Spring Data JPA repository for the SubmittedAnswer entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AbstractQuizSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/AbstractQuizSubmissionService.java index dbca98fbc092..8ed29118b893 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AbstractQuizSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AbstractQuizSubmissionService.java @@ -12,8 +12,8 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.quiz.AbstractQuizSubmission; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.AbstractQuizSubmission; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AssessmentDashboardService.java b/src/main/java/de/tum/cit/aet/artemis/service/AssessmentDashboardService.java index fa3eb386f31a..0b8ec4f327c4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AssessmentDashboardService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AssessmentDashboardService.java @@ -13,14 +13,14 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; +import de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntry; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.domain.ExampleSubmission; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseMapEntry; import de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus; -import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/service/AssessmentService.java index 16e425e8702e..e1fea13d7c50 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AssessmentService.java @@ -9,11 +9,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentNote; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.AssessmentNote; import de.tum.cit.aet.artemis.domain.ComplaintResponse; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Feedback; @@ -22,8 +22,8 @@ import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.service.connectors.lti.LtiNewResultService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java b/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java index a3c84aa7022e..d18d2c956834 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java @@ -15,12 +15,12 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.domain.Attachment; import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; -import de.tum.cit.aet.artemis.domain.lecture.Slide; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.Slide; import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.SlideRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AuthorizationCheckService.java b/src/main/java/de/tum/cit/aet/artemis/service/AuthorizationCheckService.java index d0b42fcbb591..9a51e56ff0b5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AuthorizationCheckService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AuthorizationCheckService.java @@ -31,10 +31,10 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.service.exam.ExamDateService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ComplaintResponseService.java b/src/main/java/de/tum/cit/aet/artemis/service/ComplaintResponseService.java index 24a31d0c906e..577cc74f70b7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ComplaintResponseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ComplaintResponseService.java @@ -19,7 +19,7 @@ import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ComplaintService.java b/src/main/java/de/tum/cit/aet/artemis/service/ComplaintService.java index bcb04930aa67..716b0a793d23 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ComplaintService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ComplaintService.java @@ -15,6 +15,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntry; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; @@ -26,13 +27,12 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseMapEntry; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.participation.Participant; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.service.dto.ComplaintRequestDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationService.java b/src/main/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationService.java index 2e13e845f2e8..1babb56fbfc3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationService.java @@ -32,12 +32,12 @@ import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.service.dto.MaxAndReachablePoints; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismCaseService.PlagiarismMapping; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java b/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java index 6bac9b7c96e8..0d33f03e3cf4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java @@ -52,9 +52,11 @@ import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; +import de.tum.cit.aet.artemis.communication.domain.notification.GroupNotification; import de.tum.cit.aet.artemis.communication.repository.GroupNotificationRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.dto.StatisticsEntry; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.StatisticsRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -69,17 +71,15 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.notification.GroupNotification; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.dto.StudentDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/DragAndDropQuizAnswerConversionService.java b/src/main/java/de/tum/cit/aet/artemis/service/DragAndDropQuizAnswerConversionService.java index 4075c8df0229..31428bc2516f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/DragAndDropQuizAnswerConversionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/DragAndDropQuizAnswerConversionService.java @@ -27,10 +27,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropMapping; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.DropLocation; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropMapping; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.DropLocation; /** * Service for converting a DragAndDropSubmittedAnswer to a PDF file displaying the submitted answer. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExampleSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExampleSubmissionService.java index 00c8fc516d07..9f32915ab8ad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExampleSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExampleSubmissionService.java @@ -17,12 +17,12 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.GradingInstruction; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDateService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDateService.java index 1be625d6ecb0..c446d5084e18 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDateService.java @@ -11,9 +11,9 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.participation.ParticipationInterface; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.ParticipationInterface; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.service.exam.ExamDateService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDeletionService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDeletionService.java index d76eb16b56c9..5e4696dee46f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDeletionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDeletionService.java @@ -14,26 +14,26 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; import de.tum.cit.aet.artemis.lecture.repository.ExerciseUnitRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseService; import de.tum.cit.aet.artemis.service.quiz.QuizExerciseService; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.text.domain.TextExercise; /** * Service Implementation for managing Exercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseImportService.java index 41fcc4f2f18f..452800b17e76 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseImportService.java @@ -15,8 +15,8 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismDetectionConfig; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismDetectionConfig; public abstract class ExerciseImportService { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleService.java index 73e079c440d1..a16419242792 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleService.java @@ -17,8 +17,8 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; -import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.util.Tuple; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseScoresChartService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseScoresChartService.java index c200d01d3dea..08143d072522 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseScoresChartService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseScoresChartService.java @@ -11,15 +11,15 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.ParticipantScore; +import de.tum.cit.aet.artemis.assessment.domain.StudentScore; +import de.tum.cit.aet.artemis.assessment.domain.TeamScore; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.TeamScoreRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.scores.ParticipantScore; -import de.tum.cit.aet.artemis.domain.scores.StudentScore; -import de.tum.cit.aet.artemis.domain.scores.TeamScore; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseScoresAggregatedInformation; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseScoresDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseService.java index a1543f3ea869..fbb17751f342 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseService.java @@ -27,6 +27,7 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.ParticipantScore; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; @@ -34,6 +35,7 @@ import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; @@ -47,19 +49,17 @@ import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.lti.LtiResourceLaunch; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.scores.ParticipantScore; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.lti.domain.LtiResourceLaunch; import de.tum.cit.aet.artemis.lti.repository.Lti13ResourceLaunchRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.exam.ExamLiveEventsService; import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.service.quiz.QuizBatchService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseSpecificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseSpecificationService.java index ebf0499eb5f0..f25bdb4e0aa0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseSpecificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseSpecificationService.java @@ -19,10 +19,10 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise_; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.Exam_; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup_; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.Exam_; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup_; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadSubmissionService.java index 56122f249859..48b2a13a391f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadSubmissionService.java @@ -31,7 +31,7 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java b/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java index 524dbed2ea25..03365a55f9b3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java @@ -15,10 +15,10 @@ import de.tum.cit.aet.artemis.domain.LearningObject; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnitCompletion; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnitCompletion; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationObjectDTO.LearningObjectType; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LectureImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/LectureImportService.java index a3adbe7f72e2..0bd5dca4fa61 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LectureImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LectureImportService.java @@ -19,13 +19,13 @@ import de.tum.cit.aet.artemis.domain.Attachment; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; -import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.domain.lecture.OnlineUnit; -import de.tum.cit.aet.artemis.domain.lecture.TextUnit; -import de.tum.cit.aet.artemis.domain.lecture.VideoUnit; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.OnlineUnit; +import de.tum.cit.aet.artemis.lecture.domain.TextUnit; +import de.tum.cit.aet.artemis.lecture.domain.VideoUnit; import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LectureService.java b/src/main/java/de/tum/cit/aet/artemis/service/LectureService.java index c4a131514cb7..33fb99ce0c1f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LectureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LectureService.java @@ -13,15 +13,15 @@ import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.domain.Attachment; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; -import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisWebhookService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitProcessingService.java index e78b55c2e58f..52510b9b4cd6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitProcessingService.java @@ -31,7 +31,7 @@ import de.tum.cit.aet.artemis.domain.Attachment; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; -import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.web.rest.dto.LectureUnitInformationDTO; import de.tum.cit.aet.artemis.web.rest.dto.LectureUnitSplitDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitService.java b/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitService.java index de6edd9acdfb..6ebec1a26fa0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitService.java @@ -21,17 +21,17 @@ import org.springframework.dao.DataIntegrityViolationException; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; -import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnitCompletion; -import de.tum.cit.aet.artemis.domain.lecture.Slide; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnitCompletion; +import de.tum.cit.aet.artemis.lecture.domain.Slide; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseImportService.java index e28bdb7b278b..fb1b1c678d35 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseImportService.java @@ -22,9 +22,9 @@ import de.tum.cit.aet.artemis.domain.GradingInstruction; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseService.java index 18484617c2c3..e0aeb27fba8f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseService.java @@ -11,8 +11,8 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.modeling.ModelCluster; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelCluster; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.repository.ModelClusterRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelElementRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ModelingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/ModelingSubmissionService.java index 6eff6e0e5793..5e457feabfd8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ModelingSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ModelingSubmissionService.java @@ -27,13 +27,13 @@ import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.modeling.SimilarElementCount; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.modeling.domain.SimilarElementCount; import de.tum.cit.aet.artemis.modeling.repository.ModelElementRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; import de.tum.cit.aet.artemis.service.compass.CompassService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipantScoreService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipantScoreService.java index fa38c2087839..94ff62fbc356 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipantScoreService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipantScoreService.java @@ -18,6 +18,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.ParticipantScore; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.TeamScoreRepository; @@ -28,9 +29,8 @@ import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.scores.ParticipantScore; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.web.rest.dto.score.ScoreDTO; import de.tum.cit.aet.artemis.web.rest.dto.score.StudentScoreSum; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java index 1b6d02427cde..f9cdf2a036d9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java @@ -14,11 +14,11 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.participation.ParticipationInterface; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.ParticipationInterface; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleService.java index c08cf9b3eaeb..0fb29d1c6d62 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleService.java @@ -15,7 +15,7 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.enumeration.ParticipationLifecycle; -import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java index 587b0f2f065a..5b05b0e81ce8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java @@ -35,19 +35,19 @@ import de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.participation.Participant; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageReportRepository; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationVcsAccessTokenService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationVcsAccessTokenService.java index 29f8416ab84b..cd6691cd9bed 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationVcsAccessTokenService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationVcsAccessTokenService.java @@ -8,8 +8,8 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.participation.ParticipationVCSAccessToken; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ParticipationVCSAccessToken; import de.tum.cit.aet.artemis.programming.repository.ParticipationVCSAccessTokenRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCPersonalAccessTokenManagementService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/RatingService.java b/src/main/java/de/tum/cit/aet/artemis/service/RatingService.java index ef520943ea06..fa6ae6becb97 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/RatingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/RatingService.java @@ -8,11 +8,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseRatingCount; import de.tum.cit.aet.artemis.assessment.repository.RatingRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.domain.Rating; import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseRatingCount; /** * Service Implementation for managing {@link de.tum.cit.aet.artemis.domain.Rating}. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/ResultService.java index 7c17b398754b..01fa370f1381 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ResultService.java @@ -42,14 +42,14 @@ import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SlideSplitterService.java b/src/main/java/de/tum/cit/aet/artemis/service/SlideSplitterService.java index 317bb2479daa..fdee4133fba4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SlideSplitterService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SlideSplitterService.java @@ -23,8 +23,8 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; -import de.tum.cit.aet.artemis.domain.lecture.Slide; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.Slide; import de.tum.cit.aet.artemis.lecture.repository.SlideRepository; import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java b/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java index 0704a7c037d3..62ac30d6b538 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java @@ -23,8 +23,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.dto.ScoreDistribution; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.core.dto.CourseStatisticsAverageScore; +import de.tum.cit.aet.artemis.core.dto.StatisticsEntry; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.StatisticsRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -35,9 +38,6 @@ import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; import de.tum.cit.aet.artemis.domain.enumeration.SpanType; import de.tum.cit.aet.artemis.domain.enumeration.StatisticsView; -import de.tum.cit.aet.artemis.domain.statistics.CourseStatisticsAverageScore; -import de.tum.cit.aet.artemis.domain.statistics.ScoreDistribution; -import de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionPolicyService.java b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionPolicyService.java index 8d7394293a52..c55c9f52e0e0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionPolicyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionPolicyService.java @@ -12,13 +12,13 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; -import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPenaltyPolicy; -import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; +import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPenaltyPolicy; +import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.repository.SubmissionPolicyRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java index e75f1faa6cac..9118fea8abe2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java @@ -20,12 +20,12 @@ import org.springframework.data.domain.PageImpl; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentNote; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.AssessmentNote; import de.tum.cit.aet.artemis.domain.Complaint; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Feedback; @@ -34,19 +34,19 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.service.connectors.athena.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.service.exam.ExamDateService; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionWithComplaintDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionVersionService.java b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionVersionService.java index cff1dfaa00c6..ad99ef8a2a03 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionVersionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionVersionService.java @@ -13,11 +13,11 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.SubmissionVersion; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; import de.tum.cit.aet.artemis.exercise.repository.SubmissionVersionRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SystemNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/SystemNotificationService.java index 931626ae9e37..48cf471c55fc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SystemNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SystemNotificationService.java @@ -8,9 +8,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.domain.notification.SystemNotification; import de.tum.cit.aet.artemis.communication.repository.SystemNotificationRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.notification.SystemNotification; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextAssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextAssessmentService.java index d9b30e792ca2..6f013f8aed0a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextAssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextAssessmentService.java @@ -18,13 +18,13 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.TextSubmission; -import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.service.connectors.lti.LtiNewResultService; import de.tum.cit.aet.artemis.service.exam.ExamDateService; import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextBlockService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextBlockService.java index f417fcc86cd9..6f98fc5e5f5f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextBlockService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextBlockService.java @@ -13,8 +13,8 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.repository.TextBlockRepository; -import de.tum.cit.aet.artemis.domain.TextBlock; -import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.text.domain.TextBlock; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseFeedbackService.java index 71c7c79cbbab..c9a2b7f24f44 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseFeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseFeedbackService.java @@ -15,13 +15,13 @@ import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.service.connectors.athena.AthenaFeedbackSuggestionsService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseImportService.java index 87552775d94c..78e9ec877be7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseImportService.java @@ -28,13 +28,13 @@ import de.tum.cit.aet.artemis.domain.GradingInstruction; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextBlock; -import de.tum.cit.aet.artemis.domain.TextBlockType; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; +import de.tum.cit.aet.artemis.text.domain.TextBlock; +import de.tum.cit.aet.artemis.text.domain.TextBlockType; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseService.java index 822d09a44f41..7c0343b63fc3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseService.java @@ -9,9 +9,9 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextSubmissionService.java index ecf5e7fd5d3c..6d75f21b1fc0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextSubmissionService.java @@ -18,17 +18,17 @@ import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.service.connectors.athena.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.service.exam.ExamDateService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionService.java b/src/main/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionService.java index 6ec646151b07..4b0725c9d615 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionService.java @@ -26,10 +26,10 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.Organization; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.hestia.ExerciseHint; -import de.tum.cit.aet.artemis.domain.modeling.ApollonDiagram; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.modeling.domain.ApollonDiagram; +import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; /** * Listens to Hibernate events and invalidates the cached titles of an entity if the title changed. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TutorEffortService.java b/src/main/java/de/tum/cit/aet/artemis/service/TutorEffortService.java index 87cfaa5ccf08..8d9b6fc39310 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TutorEffortService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TutorEffortService.java @@ -13,9 +13,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.dto.TutorEffort; import de.tum.cit.aet.artemis.assessment.repository.TextAssessmentEventRepository; -import de.tum.cit.aet.artemis.domain.analytics.TextAssessmentEvent; -import de.tum.cit.aet.artemis.domain.statistics.tutor.effort.TutorEffort; +import de.tum.cit.aet.artemis.text.domain.TextAssessmentEvent; /** * Contains business logic needed to calculate tutor efforts. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TutorLeaderboardService.java b/src/main/java/de/tum/cit/aet/artemis/service/TutorLeaderboardService.java index b85cf1591bcc..6355f3d5932d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TutorLeaderboardService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TutorLeaderboardService.java @@ -12,18 +12,18 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardAnsweredMoreFeedbackRequests; +import de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardAssessments; +import de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardComplaintResponses; +import de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardComplaints; +import de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardMoreFeedbackRequests; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardAnsweredMoreFeedbackRequests; -import de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardAssessments; -import de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardComplaintResponses; -import de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardComplaints; -import de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardMoreFeedbackRequests; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.web.rest.dto.TutorLeaderboardDTO; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TutorParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/service/TutorParticipationService.java index 9aef14ef6b9e..e00f5e5d6eb4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TutorParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TutorParticipationService.java @@ -24,13 +24,13 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.domain.ExampleSubmission; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/CompassService.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/CompassService.java index 0c52339ca3d5..2a60d396b8cb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/CompassService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/CompassService.java @@ -17,11 +17,11 @@ import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.modeling.ModelCluster; -import de.tum.cit.aet.artemis.domain.modeling.ModelElement; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.modeling.domain.ModelCluster; +import de.tum.cit.aet.artemis.modeling.domain.ModelElement; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelClusterRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelElementRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/controller/FeedbackSelector.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/controller/FeedbackSelector.java index 146825df3bf8..8e398d50f364 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/controller/FeedbackSelector.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/controller/FeedbackSelector.java @@ -14,7 +14,7 @@ import de.tum.cit.aet.artemis.domain.GradingInstruction; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.modeling.ModelElement; +import de.tum.cit.aet.artemis.modeling.domain.ModelElement; import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; public class FeedbackSelector { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/controller/ModelClusterFactory.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/controller/ModelClusterFactory.java index fc98c5ed9708..8bd190e2e94f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/controller/ModelClusterFactory.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/controller/ModelClusterFactory.java @@ -17,10 +17,10 @@ import com.google.gson.JsonObject; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.modeling.ModelCluster; -import de.tum.cit.aet.artemis.domain.modeling.ModelElement; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.modeling.domain.ModelCluster; +import de.tum.cit.aet.artemis.modeling.domain.ModelElement; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.service.compass.assessment.Context; import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyJolService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyJolService.java index b46baeb80a53..aa7eee90e4c3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyJolService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyJolService.java @@ -14,12 +14,12 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyJol; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.competency.CompetencyJolRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.competency.CompetencyJol; -import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; import de.tum.cit.aet.artemis.service.iris.session.IrisCourseChatSessionService; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolPairDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyProgressService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyProgressService.java index db9948573b2c..94034867eb61 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyProgressService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyProgressService.java @@ -19,6 +19,8 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -27,13 +29,11 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.LearningObject; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.domain.enumeration.CompetencyProgressConfidenceReason; import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; -import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.domain.participation.Participant; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; +import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.service.ParticipantScoreService; import de.tum.cit.aet.artemis.service.learningpath.LearningPathService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyRelationService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyRelationService.java index a2eb1f34db07..1df1f7e736b9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyRelationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyRelationService.java @@ -12,12 +12,12 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyRelation; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.domain.competency.RelationType; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.competency.CompetencyRelation; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.domain.competency.RelationType; /** * Service for managing CompetencyRelations. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyService.java index 25695e012afd..e788167f97e5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyService.java @@ -11,14 +11,14 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.competency.Competency; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/CourseCompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/CourseCompetencyService.java index fe4f7969b390..8ec7b7c8a299 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/CourseCompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/CourseCompetencyService.java @@ -19,6 +19,11 @@ import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyRelation; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; +import de.tum.cit.aet.artemis.atlas.domain.competency.StandardizedCompetency; import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; @@ -26,11 +31,6 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.Competency; -import de.tum.cit.aet.artemis.domain.competency.CompetencyRelation; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.domain.competency.Prerequisite; -import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/KnowledgeAreaService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/KnowledgeAreaService.java index f1e0a168ff5e..e700a0cc54ad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/KnowledgeAreaService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/KnowledgeAreaService.java @@ -7,8 +7,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.domain.competency.KnowledgeArea; import de.tum.cit.aet.artemis.atlas.repository.competency.KnowledgeAreaRepository; -import de.tum.cit.aet.artemis.domain.competency.KnowledgeArea; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaRequestDTO; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/PrerequisiteService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/PrerequisiteService.java index dd8e7f99e0c5..3f53bde441f6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/PrerequisiteService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/PrerequisiteService.java @@ -11,14 +11,14 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.domain.competency.Prerequisite; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/StandardizedCompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/StandardizedCompetencyService.java index baff6ffdea7c..f5f9356501ac 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/StandardizedCompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/StandardizedCompetencyService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.competency; +import static de.tum.cit.aet.artemis.atlas.domain.competency.StandardizedCompetency.FIRST_VERSION; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency.FIRST_VERSION; import java.util.ArrayList; import java.util.Collections; @@ -20,12 +20,12 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.atlas.domain.competency.KnowledgeArea; +import de.tum.cit.aet.artemis.atlas.domain.competency.Source; +import de.tum.cit.aet.artemis.atlas.domain.competency.StandardizedCompetency; import de.tum.cit.aet.artemis.atlas.repository.SourceRepository; import de.tum.cit.aet.artemis.atlas.repository.competency.KnowledgeAreaRepository; import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; -import de.tum.cit.aet.artemis.domain.competency.KnowledgeArea; -import de.tum.cit.aet.artemis.domain.competency.Source; -import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.SourceDTO; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO.KnowledgeAreaForCatalogDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/GitService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/GitService.java index f72df3c04914..6e570f5a3270 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/GitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/GitService.java @@ -80,9 +80,9 @@ import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.ZipFileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaDTOConverterService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaDTOConverterService.java index 1c2a030bc157..7395c6d3be79 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaDTOConverterService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaDTOConverterService.java @@ -12,10 +12,8 @@ import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextBlock; -import de.tum.cit.aet.artemis.domain.TextSubmission; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.dto.athena.ExerciseBaseDTO; import de.tum.cit.aet.artemis.service.dto.athena.FeedbackBaseDTO; @@ -29,6 +27,8 @@ import de.tum.cit.aet.artemis.service.dto.athena.TextExerciseDTO; import de.tum.cit.aet.artemis.service.dto.athena.TextFeedbackDTO; import de.tum.cit.aet.artemis.service.dto.athena.TextSubmissionDTO; +import de.tum.cit.aet.artemis.text.domain.TextBlock; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsService.java index 2e3cd9900bac..0bce59827677 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsService.java @@ -15,15 +15,15 @@ import de.tum.cit.aet.artemis.core.exception.NetworkingException; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.service.dto.athena.ExerciseBaseDTO; import de.tum.cit.aet.artemis.service.dto.athena.ModelingFeedbackDTO; import de.tum.cit.aet.artemis.service.dto.athena.ProgrammingFeedbackDTO; import de.tum.cit.aet.artemis.service.dto.athena.SubmissionBaseDTO; import de.tum.cit.aet.artemis.service.dto.athena.TextFeedbackDTO; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportService.java index 33f0fc6d927f..cfa4abda8009 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportService.java @@ -14,7 +14,7 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractContinuousIntegrationResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractContinuousIntegrationResultService.java index 54341b277bbf..2bb078e2cdda 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractContinuousIntegrationResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractContinuousIntegrationResultService.java @@ -9,8 +9,8 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationResultService.java index 047b2a1e826b..e7cb2ce24b76 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationResultService.java @@ -7,7 +7,7 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationService.java index a105bfe9dddc..23e1f10ecfc5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationService.java @@ -15,7 +15,7 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationTriggerService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationTriggerService.java index 4bb0ae71d621..f16521abbcb9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationTriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationTriggerService.java @@ -2,7 +2,7 @@ import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; /** * Abstract service for managing entities related to continuous integration. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabService.java index b79c06be2e43..273720885dda 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabService.java @@ -52,8 +52,8 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIResultService.java index 3c18d434e845..9e93080ffa27 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIResultService.java @@ -13,7 +13,7 @@ import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; -import de.tum.cit.aet.artemis.domain.statistics.BuildLogStatisticsEntry; +import de.tum.cit.aet.artemis.programming.domain.BuildLogStatisticsEntry; import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIService.java index 761713e7a12c..11b6cfcc574d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIService.java @@ -32,7 +32,7 @@ import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.UriService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCITriggerService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCITriggerService.java index d29707fa5a3e..f45e31664469 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCITriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCITriggerService.java @@ -10,7 +10,7 @@ import de.tum.cit.aet.artemis.core.exception.GitLabCIException; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.UriService; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsResultService.java index a38a2bcf7f16..f0df9b95fca5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsResultService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.connectors.jenkins; -import static de.tum.cit.aet.artemis.domain.statistics.BuildLogStatisticsEntry.BuildJobPartDuration; +import static de.tum.cit.aet.artemis.programming.domain.BuildLogStatisticsEntry.BuildJobPartDuration; import java.time.ZonedDateTime; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsService.java index a98f4dadb55d..e45b1181b722 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsService.java @@ -26,7 +26,7 @@ import de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsTriggerService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsTriggerService.java index 2da3d3d64bdd..97901927321b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsTriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsTriggerService.java @@ -3,7 +3,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; import de.tum.cit.aet.artemis.service.connectors.jenkins.build_plan.JenkinsBuildPlanService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java index 98b8536ed722..d09914ec3756 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java @@ -47,7 +47,7 @@ import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultProcessingService.java index 3eba5b81f008..8ea34827966b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultProcessingService.java @@ -29,9 +29,9 @@ import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.BuildLogEntryService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIService.java index 6d8205561ff6..b49470e5d6fc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIService.java @@ -21,7 +21,7 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.connectors.BuildScriptProviderService; import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCITriggerService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCITriggerService.java index b9ef8044c67e..c9a0fcd264e5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCITriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCITriggerService.java @@ -32,8 +32,8 @@ import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCService.java index 143ed97bb498..715b46b0350c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCService.java @@ -35,8 +35,8 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCServletService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCServletService.java index 0a7c51e83741..7fab83ac53bb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCServletService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCServletService.java @@ -49,9 +49,9 @@ import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.ParticipationVCSAccessTokenRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/Lti13Service.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/Lti13Service.java index 29f84934f708..934d00dcfa08 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/Lti13Service.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/Lti13Service.java @@ -43,13 +43,13 @@ import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.lti.Claims; -import de.tum.cit.aet.artemis.domain.lti.Lti13AgsClaim; -import de.tum.cit.aet.artemis.domain.lti.Lti13LaunchRequest; -import de.tum.cit.aet.artemis.domain.lti.LtiResourceLaunch; -import de.tum.cit.aet.artemis.domain.lti.Scopes; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.lti.domain.LtiResourceLaunch; +import de.tum.cit.aet.artemis.lti.dto.Claims; +import de.tum.cit.aet.artemis.lti.dto.Lti13AgsClaim; +import de.tum.cit.aet.artemis.lti.dto.Lti13LaunchRequest; +import de.tum.cit.aet.artemis.lti.dto.Scopes; import de.tum.cit.aet.artemis.lti.repository.Lti13ResourceLaunchRepository; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingService.java index abf184a94960..ee9a19f7fd6f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingService.java @@ -16,8 +16,8 @@ import de.tum.cit.aet.artemis.core.security.lti.Lti13TokenRetriever; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.cit.aet.artemis.domain.lti.Lti13DeepLinkingResponse; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.lti.dto.Lti13DeepLinkingResponse; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDynamicRegistrationService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDynamicRegistrationService.java index f07fdcafaac5..f560329f3a12 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDynamicRegistrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDynamicRegistrationService.java @@ -17,8 +17,8 @@ import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; -import de.tum.cit.aet.artemis.domain.lti.Lti13ClientRegistration; -import de.tum.cit.aet.artemis.domain.lti.Lti13PlatformConfiguration; +import de.tum.cit.aet.artemis.lti.dto.Lti13ClientRegistration; +import de.tum.cit.aet.artemis.lti.dto.Lti13PlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiNewResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiNewResultService.java index 29789ca74f7c..df95d64c6fe3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiNewResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiNewResultService.java @@ -3,7 +3,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @Service @Profile("lti") diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisDTOService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisDTOService.java index 686f47a121da..892c2261df17 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisDTOService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisDTOService.java @@ -18,8 +18,8 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisBuildLogEntryDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisPipelineService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisPipelineService.java index 74741c8e8a2d..e49b696a5464 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisPipelineService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisPipelineService.java @@ -15,15 +15,15 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyJol; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.competency.CompetencyJol; -import de.tum.cit.aet.artemis.domain.iris.session.IrisCourseChatSession; -import de.tum.cit.aet.artemis.domain.iris.session.IrisExerciseChatSession; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.iris.domain.session.IrisCourseChatSession; +import de.tum.cit.aet.artemis.iris.domain.session.IrisExerciseChatSession; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionDTO; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.course.PyrisCourseChatPipelineExecutionDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisWebhookService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisWebhookService.java index e9ebb64b622e..4292640f0f1b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisWebhookService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisWebhookService.java @@ -16,9 +16,9 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisCourseSettings; -import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisCourseSettings; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureUnitWebhookDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java index 7fa9cf00d911..b6508de0ef40 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java index abf285f1b14d..acfc5b3078eb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; /** * DTO for the Iris competency generation feature. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisCompetencyDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisCompetencyDTO.java index de966fbb5045..907fbbf71b04 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisCompetencyDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisCompetencyDTO.java @@ -6,8 +6,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.competency.Competency; -import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisCompetencyDTO(long id, String title, String description, CompetencyTaxonomy taxonomy, Instant softDueDate, boolean optional) { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExamDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExamDTO.java index 1606ac34eb93..0e7063438c16 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExamDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExamDTO.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.exam.domain.Exam; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisExamDTO(long id, String title, boolean isTextExam, Instant startDate, Instant endDate, Instant publishResultsDate, Instant examStudentReviewStart, diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisMessageDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisMessageDTO.java index 36d329d2c457..dd653253b1ad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisMessageDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisMessageDTO.java @@ -8,10 +8,10 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.iris.message.IrisJsonMessageContent; -import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; -import de.tum.cit.aet.artemis.domain.iris.message.IrisMessageSender; -import de.tum.cit.aet.artemis.domain.iris.message.IrisTextMessageContent; +import de.tum.cit.aet.artemis.iris.domain.message.IrisJsonMessageContent; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessageSender; +import de.tum.cit.aet.artemis.iris.domain.message.IrisTextMessageContent; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisMessageDTO(Instant sentAt, IrisMessageSender sender, List contents) { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/PyrisJob.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/PyrisJob.java index f023164d3275..fed983f0c3ae 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/PyrisJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/PyrisJob.java @@ -6,7 +6,7 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; /** * This interface represents a single job that is executed by the Pyris system. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/AbstractVersionControlService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/AbstractVersionControlService.java index 7e26cf89f78d..19329e363629 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/AbstractVersionControlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/AbstractVersionControlService.java @@ -17,8 +17,8 @@ import de.tum.cit.aet.artemis.domain.Repository; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlService.java index f0abaffbb132..4c7f22f5cef7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlService.java @@ -10,8 +10,8 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; public interface VersionControlService { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/CoverageReportAndSubmissionDateDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/CoverageReportAndSubmissionDateDTO.java index 20b41763b304..a152dd33d8f9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/CoverageReportAndSubmissionDateDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/CoverageReportAndSubmissionDateDTO.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.hestia.CoverageReport; +import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageReport; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record CoverageReportAndSubmissionDateDTO(CoverageReport coverageReport, ZonedDateTime submissionDate) { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/UserRoleDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/UserRoleDTO.java index 43f837545524..724a1ec02dbd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/UserRoleDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/UserRoleDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.metis.UserRole; +import de.tum.cit.aet.artemis.communication.domain.UserRole; /** * A Data Transfer Object (DTO) representing a user's role within a course. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingExerciseDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingExerciseDTO.java index f592e25f3e2d..275101725722 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingExerciseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingExerciseDTO.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.service.dto.GradingCriterionDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingSubmissionDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingSubmissionDTO.java index 624d57733b29..edd99e513251 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingSubmissionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingSubmissionDTO.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; /** * A DTO representing a ModelingSubmission, for transferring data to Athena diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextExerciseDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextExerciseDTO.java index 3dd302827ef1..474c29ba87c9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextExerciseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextExerciseDTO.java @@ -6,8 +6,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.service.dto.GradingCriterionDTO; +import de.tum.cit.aet.artemis.text.domain.TextExercise; /** * A DTO representing a TextExercise, for transferring data to Athena diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextFeedbackDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextFeedbackDTO.java index 9d79d03625f7..e201bf51696a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextFeedbackDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextFeedbackDTO.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.TextBlock; +import de.tum.cit.aet.artemis.text.domain.TextBlock; /** * A DTO representing a Feedback on a TextExercise, for transferring data to Athena and receiving suggestions from Athena diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextSubmissionDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextSubmissionDTO.java index a3bf8945babf..dfad0479731c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextSubmissionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextSubmissionDTO.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; /** * A DTO representing a TextSubmission, for transferring data to Athena diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamAccessService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamAccessService.java index 65c96f355899..02bd587b92aa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamAccessService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamAccessService.java @@ -14,9 +14,9 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDateService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDateService.java index f65b8bcfb3cf..e2651f16e278 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDateService.java @@ -15,11 +15,11 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDeletionService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDeletionService.java index 86bafa7408ee..36adf6f19850 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDeletionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDeletionService.java @@ -19,21 +19,21 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.GradingScale; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.quiz.QuizPool; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamLiveEventRepository; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.quiz.domain.QuizPool; import de.tum.cit.aet.artemis.quiz.repository.QuizPoolRepository; import de.tum.cit.aet.artemis.service.ExerciseDeletionService; import de.tum.cit.aet.artemis.service.ParticipationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamImportService.java index 81ca4001d2d9..9cda10833d0f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamImportService.java @@ -20,18 +20,17 @@ import de.tum.cit.aet.artemis.domain.FileUploadExercise; import de.tum.cit.aet.artemis.domain.GradingCriterion; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.service.FileUploadExerciseImportService; import de.tum.cit.aet.artemis.service.ModelingExerciseImportService; @@ -40,6 +39,7 @@ import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseImportService; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseService; import de.tum.cit.aet.artemis.service.quiz.QuizExerciseImportService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.web.rest.errors.ExamConfigurationException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamLiveEventsService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamLiveEventsService.java index cea416cbd3cb..ab826699cce0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamLiveEventsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamLiveEventsService.java @@ -9,13 +9,13 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.exam.event.ExamAttendanceCheckEvent; -import de.tum.cit.aet.artemis.domain.exam.event.ExamLiveEvent; -import de.tum.cit.aet.artemis.domain.exam.event.ExamWideAnnouncementEvent; -import de.tum.cit.aet.artemis.domain.exam.event.ProblemStatementUpdateEvent; -import de.tum.cit.aet.artemis.domain.exam.event.WorkingTimeUpdateEvent; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; +import de.tum.cit.aet.artemis.exam.domain.event.ExamAttendanceCheckEvent; +import de.tum.cit.aet.artemis.exam.domain.event.ExamLiveEvent; +import de.tum.cit.aet.artemis.exam.domain.event.ExamWideAnnouncementEvent; +import de.tum.cit.aet.artemis.exam.domain.event.ProblemStatementUpdateEvent; +import de.tum.cit.aet.artemis.exam.domain.event.WorkingTimeUpdateEvent; import de.tum.cit.aet.artemis.exam.repository.ExamLiveEventRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizQuestionsGenerator.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizQuestionsGenerator.java index d1fcef185195..d2ac32bfd321 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizQuestionsGenerator.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizQuestionsGenerator.java @@ -2,7 +2,7 @@ import java.util.List; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; /** * Service Interface for generating quiz questions for an exam diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizService.java index 09d47b786afa..9f80b31dd6b0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizService.java @@ -13,11 +13,11 @@ import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamRegistrationService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamRegistrationService.java index 87e6509fa27a..e99c461cfc9e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamRegistrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamRegistrationService.java @@ -23,13 +23,13 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExamUser; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExamUser; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamService.java index 03347252c32c..5209524d0a50 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamService.java @@ -57,34 +57,32 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizPool; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmittedAnswerCount; -import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizPool; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmittedAnswerCount; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; @@ -100,6 +98,8 @@ import de.tum.cit.aet.artemis.service.quiz.QuizPoolService; import de.tum.cit.aet.artemis.service.quiz.QuizResultService; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; import de.tum.cit.aet.artemis.web.rest.dto.BonusResultDTO; import de.tum.cit.aet.artemis.web.rest.dto.BonusSourceResultDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSessionService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSessionService.java index 48282bae7e2e..b2c75e67160e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSessionService.java @@ -18,11 +18,11 @@ import org.springframework.security.web.util.matcher.IpAddressMatcher; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.exam.ExamSession; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.exam.SuspiciousExamSessions; -import de.tum.cit.aet.artemis.domain.exam.SuspiciousSessionReason; -import de.tum.cit.aet.artemis.domain.exam.SuspiciousSessionsAnalysisOptions; +import de.tum.cit.aet.artemis.exam.domain.ExamSession; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; +import de.tum.cit.aet.artemis.exam.domain.SuspiciousExamSessions; +import de.tum.cit.aet.artemis.exam.domain.SuspiciousSessionReason; +import de.tum.cit.aet.artemis.exam.domain.SuspiciousSessionsAnalysisOptions; import de.tum.cit.aet.artemis.exam.repository.ExamSessionRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.web.rest.dto.CourseWithIdDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionService.java index 16e2f063fb54..66c9d571b860 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionService.java @@ -15,12 +15,12 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamUserService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamUserService.java index 919f57730956..ab69d094d780 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamUserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamUserService.java @@ -26,7 +26,7 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.exam.ExamUser; +import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessService.java index 0366656400ef..5d690f2eb8aa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessService.java @@ -11,8 +11,8 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamService.java index 6d9fb023deda..eac5e223e553 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamService.java @@ -39,30 +39,28 @@ import de.tum.cit.aet.artemis.domain.FileUploadExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.compare.DnDMapping; -import de.tum.cit.aet.artemis.domain.quiz.compare.SAMapping; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.compare.DnDMapping; +import de.tum.cit.aet.artemis.quiz.domain.compare.SAMapping; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.service.ParticipationService; @@ -73,6 +71,8 @@ import de.tum.cit.aet.artemis.service.programming.ProgrammingTriggerService; import de.tum.cit.aet.artemis.service.quiz.QuizPoolService; import de.tum.cit.aet.artemis.service.util.ExamExerciseStartPreparationStatus; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/CourseExamExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/CourseExamExportService.java index 4617908b1df2..3c3ddbb30fe2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/CourseExamExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/CourseExamExportService.java @@ -35,15 +35,15 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.FileUploadExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.ZipFileService; import de.tum.cit.aet.artemis.service.archival.ArchivalReportEntry; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCommunicationDataService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCommunicationDataService.java index aca3509902f3..10285178e85a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCommunicationDataService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCommunicationDataService.java @@ -17,13 +17,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.Reaction; import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.communication.repository.ReactionRepository; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.metis.AnswerPost; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.metis.Reaction; /** * A service to create the communication data export for users diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExamCreationService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExamCreationService.java index 7b65f4c87371..207c24045b65 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExamCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExamCreationService.java @@ -24,7 +24,7 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.GradingScale; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.service.exam.ExamService; import de.tum.cit.aet.artemis.web.rest.dto.ExamScoresDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExerciseCreationService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExerciseCreationService.java index c2f1a9380d43..5ec0159fae54 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExerciseCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExerciseCreationService.java @@ -27,29 +27,29 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.communication.domain.AnswerPost; import de.tum.cit.aet.artemis.domain.Complaint; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; -import de.tum.cit.aet.artemis.domain.metis.AnswerPost; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.service.connectors.apollon.ApollonConversionService; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryExportOptionsDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportQuizExerciseCreationService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportQuizExerciseCreationService.java index a3d9b92663b3..74836b4d8251 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportQuizExerciseCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportQuizExerciseCreationService.java @@ -20,18 +20,18 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.AnswerOption; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedText; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.quiz.domain.AnswerOption; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedText; import de.tum.cit.aet.artemis.quiz.repository.QuizQuestionRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.service.DragAndDropQuizAnswerConversionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportScienceEventService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportScienceEventService.java index e1d314c2718e..599244448201 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportScienceEventService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportScienceEventService.java @@ -13,8 +13,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.domain.science.ScienceEvent; import de.tum.cit.aet.artemis.atlas.repository.science.ScienceEventRepository; -import de.tum.cit.aet.artemis.domain.science.ScienceEvent; /** * A Service to create the science event export data for users. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingExerciseWithSubmissionsExportService.java index 4dc752d1d317..88c08eebd4d8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingExerciseWithSubmissionsExportService.java @@ -9,7 +9,7 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.archival.ArchivalReportEntry; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingSubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingSubmissionExportService.java index 14812bef4019..1b21e6036e70 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingSubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingSubmissionExportService.java @@ -13,8 +13,8 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ZipFileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/ProgrammingExerciseExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/ProgrammingExerciseExportService.java index bcfe7a105a03..3a29fca05876 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/ProgrammingExerciseExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/ProgrammingExerciseExportService.java @@ -62,9 +62,9 @@ import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/QuizExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/QuizExerciseWithSubmissionsExportService.java index c37362bdb9c5..acd45b7e9e2c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/QuizExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/QuizExerciseWithSubmissionsExportService.java @@ -15,8 +15,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/SubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/SubmissionExportService.java index 095630c04f98..eab1c35bb652 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/SubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/SubmissionExportService.java @@ -28,7 +28,7 @@ import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/TextExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/TextExerciseWithSubmissionsExportService.java index 88a41f4d177c..a554f8ea4a52 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/TextExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/TextExerciseWithSubmissionsExportService.java @@ -9,9 +9,9 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.archival.ArchivalReportEntry; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/TextSubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/TextSubmissionExportService.java index 2762c19244ce..d2b7161c9f8d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/TextSubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/TextSubmissionExportService.java @@ -13,10 +13,10 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ZipFileService; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/CodeHintService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/CodeHintService.java index 0c2ed2a6962b..4695a0270ed2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/CodeHintService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/CodeHintService.java @@ -13,10 +13,10 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.hestia.CodeHint; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.cit.aet.artemis.domain.iris.session.IrisHestiaSession; +import de.tum.cit.aet.artemis.iris.domain.session.IrisHestiaSession; +import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.repository.hestia.CodeHintRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ExerciseHintService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ExerciseHintService.java index 24e11e4390b7..3c395bfec3ed 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ExerciseHintService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ExerciseHintService.java @@ -24,10 +24,10 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.hestia.ExerciseHint; -import de.tum.cit.aet.artemis.domain.hestia.ExerciseHintActivation; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; +import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHintActivation; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintActivationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java index 58c5277b0f1a..3acef16c6b69 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java @@ -25,11 +25,11 @@ import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.Repository; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseTaskService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseTaskService.java index ee677af7c133..b3a81ea31b6c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseTaskService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseTaskService.java @@ -21,7 +21,7 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/TestwiseCoverageService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/TestwiseCoverageService.java index 00b4549cb913..6f8b1ca09e09 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/TestwiseCoverageService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/TestwiseCoverageService.java @@ -22,10 +22,10 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.hestia.CoverageFileReport; -import de.tum.cit.aet.artemis.domain.hestia.CoverageReport; -import de.tum.cit.aet.artemis.domain.hestia.TestwiseCoverageReportEntry; -import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageFileReport; +import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageReport; +import de.tum.cit.aet.artemis.programming.domain.hestia.TestwiseCoverageReportEntry; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageFileReportRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageReportRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralBlackboard.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralBlackboard.java index decb226cd953..c51761294bc2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralBlackboard.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralBlackboard.java @@ -3,9 +3,9 @@ import java.util.List; import java.util.Map; -import de.tum.cit.aet.artemis.domain.hestia.CoverageReport; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageReport; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; /** * The blackboard for creating SolutionEntries for behavioral test cases utilizing the git-diff and test-wise coverage report. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralTestCaseService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralTestCaseService.java index e08afcd4b34b..e388634be488 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralTestCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralTestCaseService.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/GroupedFile.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/GroupedFile.java index 9c2feb5808d1..75a2045baa96 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/GroupedFile.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/GroupedFile.java @@ -7,8 +7,8 @@ import java.util.TreeSet; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; -import de.tum.cit.aet.artemis.domain.hestia.TestwiseCoverageReportEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.TestwiseCoverageReportEntry; /** * One GroupedFile groups the {@link ProgrammingExerciseGitDiffEntry}s and {@link TestwiseCoverageReportEntry}s together diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/CreateSolutionEntries.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/CreateSolutionEntries.java index 19eb4f03e642..48a33ec87f7d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/CreateSolutionEntries.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/CreateSolutionEntries.java @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.stream.Collectors; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/DropRemovedGitDiffEntries.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/DropRemovedGitDiffEntries.java index 0827edf539cd..96ccd9fc8504 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/DropRemovedGitDiffEntries.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/DropRemovedGitDiffEntries.java @@ -3,11 +3,13 @@ import java.util.HashSet; import java.util.stream.Collectors; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; /** - * Remove all {@link de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry} from the - * {@link de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffReport} of the {@link BehavioralBlackboard} + * Remove all {@link ProgrammingExerciseGitDiffEntry} from the + * {@link ProgrammingExerciseGitDiffReport} of the {@link BehavioralBlackboard} * that represents consecutive blocks of removed code. * Entries cannot be generated for removed code, therefore we have to drop them from the git diff report of the blackboard. */ diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/ExtractChangedLines.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/ExtractChangedLines.java index 9e8bdb8ab9d4..3531cf19e9bc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/ExtractChangedLines.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/ExtractChangedLines.java @@ -3,13 +3,14 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; /** * For each {@link GroupedFile}: * Extracts the lines that were changed in the file (of the GroupedFile) from the - * {@link de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry}s + * {@link ProgrammingExerciseGitDiffEntry}s */ public class ExtractChangedLines extends BehavioralKnowledgeSource { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/ExtractCoveredLines.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/ExtractCoveredLines.java index 40d7df71c9b3..f53e6159a2e3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/ExtractCoveredLines.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/ExtractCoveredLines.java @@ -3,13 +3,14 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; +import de.tum.cit.aet.artemis.programming.domain.hestia.TestwiseCoverageReportEntry; import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; /** * For each {@link GroupedFile}: * Extracts the lines that were covered by the test case in the file (both of the GroupedFile) from the - * {@link de.tum.cit.aet.artemis.domain.hestia.TestwiseCoverageReportEntry}s + * {@link TestwiseCoverageReportEntry}s */ public class ExtractCoveredLines extends BehavioralKnowledgeSource { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/GroupGitDiffAndCoverageEntriesByFilePathAndTestCase.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/GroupGitDiffAndCoverageEntriesByFilePathAndTestCase.java index df8563dbff5e..b015e8016f4e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/GroupGitDiffAndCoverageEntriesByFilePathAndTestCase.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/GroupGitDiffAndCoverageEntriesByFilePathAndTestCase.java @@ -9,9 +9,9 @@ import java.util.TreeSet; import java.util.stream.Collectors; -import de.tum.cit.aet.artemis.domain.hestia.CoverageFileReport; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; -import de.tum.cit.aet.artemis.domain.hestia.TestwiseCoverageReportEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageFileReport; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.TestwiseCoverageReportEntry; import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralTestCaseService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralTestCaseService.java index f4399f678e8c..b83efd727102 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralTestCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralTestCaseService.java @@ -31,8 +31,8 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTestCaseType; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTestCaseType; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisCompetencyGenerationService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisCompetencyGenerationService.java index 0a32f05aee56..bd456715d9f5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisCompetencyGenerationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisCompetencyGenerationService.java @@ -3,9 +3,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisJobService; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisPipelineService; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionPipelineExecutionDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisDefaultTemplateService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisDefaultTemplateService.java index 11deb429d865..4804fd994b99 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisDefaultTemplateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisDefaultTemplateService.java @@ -14,7 +14,7 @@ import org.springframework.core.io.Resource; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.iris.IrisTemplate; +import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; import de.tum.cit.aet.artemis.service.ResourceLoaderService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisMessageService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisMessageService.java index 86b14a8653bd..16312bf21089 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisMessageService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisMessageService.java @@ -8,9 +8,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; -import de.tum.cit.aet.artemis.domain.iris.message.IrisMessageSender; -import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessageSender; +import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisSessionService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisSessionService.java index d1689246e70b..0f41683b6139 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisSessionService.java @@ -8,11 +8,11 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; -import de.tum.cit.aet.artemis.domain.iris.session.IrisCourseChatSession; -import de.tum.cit.aet.artemis.domain.iris.session.IrisExerciseChatSession; -import de.tum.cit.aet.artemis.domain.iris.session.IrisHestiaSession; -import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; +import de.tum.cit.aet.artemis.iris.domain.session.IrisCourseChatSession; +import de.tum.cit.aet.artemis.iris.domain.session.IrisExerciseChatSession; +import de.tum.cit.aet.artemis.iris.domain.session.IrisHestiaSession; +import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; import de.tum.cit.aet.artemis.service.iris.session.IrisChatBasedFeatureInterface; import de.tum.cit.aet.artemis.service.iris.session.IrisCourseChatSessionService; import de.tum.cit.aet.artemis.service.iris.session.IrisExerciseChatSessionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisChatWebsocketDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisChatWebsocketDTO.java index a5e0995bedce..eff447e2cedc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisChatWebsocketDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisChatWebsocketDTO.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedChatSubSettingsDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedChatSubSettingsDTO.java index 0fbdeb4f8948..d0b8dfb70adc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedChatSubSettingsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedChatSubSettingsDTO.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.iris.IrisTemplate; +import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record IrisCombinedChatSubSettingsDTO(boolean enabled, Integer rateLimit, Integer rateLimitTimeframeHours, @Nullable Set allowedModels, diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java index d0fffd9fc6a0..745e47c085d2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.iris.IrisTemplate; +import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record IrisCombinedCompetencyGenerationSubSettingsDTO(boolean enabled, @Nullable Set allowedModels, @Nullable String preferredModel, diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedHestiaSubSettingsDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedHestiaSubSettingsDTO.java index feb583fa0779..b2d73bcdc987 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedHestiaSubSettingsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedHestiaSubSettingsDTO.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.iris.IrisTemplate; +import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record IrisCombinedHestiaSubSettingsDTO(boolean enabled, @Nullable Set allowedModels, @Nullable String preferredModel, @Nullable IrisTemplate template) { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/AbstractIrisChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/AbstractIrisChatSessionService.java index 4f0416bc901d..23fb66cf2b6c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/AbstractIrisChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/AbstractIrisChatSessionService.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.domain.iris.session.IrisChatSession; +import de.tum.cit.aet.artemis.iris.domain.session.IrisChatSession; import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; public abstract class AbstractIrisChatSessionService implements IrisChatBasedFeatureInterface, IrisRateLimitedFeatureInterface { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisButtonBasedFeatureInterface.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisButtonBasedFeatureInterface.java index 029042705460..b1adf5d2f4b0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisButtonBasedFeatureInterface.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisButtonBasedFeatureInterface.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.iris.session; -import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; +import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; public interface IrisButtonBasedFeatureInterface extends IrisSubFeatureInterface { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisChatBasedFeatureInterface.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisChatBasedFeatureInterface.java index 4b6ede5ecce4..8ae3123cbe38 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisChatBasedFeatureInterface.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisChatBasedFeatureInterface.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.iris.session; -import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; -import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; +import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; public interface IrisChatBasedFeatureInterface extends IrisSubFeatureInterface { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisCourseChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisCourseChatSessionService.java index f92a0f05efa5..2fccc3aefa9f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisCourseChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisCourseChatSessionService.java @@ -11,15 +11,15 @@ import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyJol; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.CompetencyJol; -import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; -import de.tum.cit.aet.artemis.domain.iris.message.IrisMessageSender; -import de.tum.cit.aet.artemis.domain.iris.message.IrisTextMessageContent; -import de.tum.cit.aet.artemis.domain.iris.session.IrisCourseChatSession; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettingsType; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessageSender; +import de.tum.cit.aet.artemis.iris.domain.message.IrisTextMessageContent; +import de.tum.cit.aet.artemis.iris.domain.session.IrisCourseChatSession; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; import de.tum.cit.aet.artemis.iris.repository.IrisCourseChatSessionRepository; import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisExerciseChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisExerciseChatSessionService.java index 39c2210eec10..2d0dbd976329 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisExerciseChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisExerciseChatSessionService.java @@ -13,11 +13,11 @@ import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; -import de.tum.cit.aet.artemis.domain.iris.message.IrisMessageSender; -import de.tum.cit.aet.artemis.domain.iris.message.IrisTextMessageContent; -import de.tum.cit.aet.artemis.domain.iris.session.IrisExerciseChatSession; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettingsType; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessageSender; +import de.tum.cit.aet.artemis.iris.domain.message.IrisTextMessageContent; +import de.tum.cit.aet.artemis.iris.domain.session.IrisExerciseChatSession; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisHestiaSessionService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisHestiaSessionService.java index 352b5b1e83ac..5bb11f1114b6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisHestiaSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisHestiaSessionService.java @@ -12,11 +12,11 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.hestia.CodeHint; -import de.tum.cit.aet.artemis.domain.iris.session.IrisHestiaSession; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettingsType; +import de.tum.cit.aet.artemis.iris.domain.session.IrisHestiaSession; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; import de.tum.cit.aet.artemis.iris.repository.IrisHestiaSessionRepository; import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; +import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisConnectorService; import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisSubFeatureInterface.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisSubFeatureInterface.java index 4682d4096aaa..e0c6b8b23279 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisSubFeatureInterface.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisSubFeatureInterface.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.iris.session; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; +import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; public interface IrisSubFeatureInterface { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSettingsService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSettingsService.java index 6ea4dce19517..ea1e150dfd85 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSettingsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSettingsService.java @@ -1,9 +1,9 @@ package de.tum.cit.aet.artemis.service.iris.settings; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; -import static de.tum.cit.aet.artemis.domain.iris.settings.IrisSettingsType.COURSE; -import static de.tum.cit.aet.artemis.domain.iris.settings.IrisSettingsType.EXERCISE; -import static de.tum.cit.aet.artemis.domain.iris.settings.IrisSettingsType.GLOBAL; +import static de.tum.cit.aet.artemis.iris.domain.settings.IrisSettingsType.COURSE; +import static de.tum.cit.aet.artemis.iris.domain.settings.IrisSettingsType.EXERCISE; +import static de.tum.cit.aet.artemis.iris.domain.settings.IrisSettingsType.GLOBAL; import java.util.ArrayList; import java.util.Comparator; @@ -19,17 +19,17 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.iris.IrisTemplate; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisChatSubSettings; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisCompetencyGenerationSubSettings; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisCourseSettings; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisExerciseSettings; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisGlobalSettings; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisHestiaSubSettings; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisLectureIngestionSubSettings; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisSettings; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettings; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettingsType; +import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisChatSubSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisCompetencyGenerationSubSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisCourseSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisExerciseSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisGlobalSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisHestiaSubSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisLectureIngestionSubSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.iris.IrisDefaultTemplateService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSubSettingsService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSubSettingsService.java index ff7a6d755bd1..342bd134ca85 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSubSettingsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSubSettingsService.java @@ -12,15 +12,15 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.iris.IrisTemplate; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisChatSubSettings; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisCompetencyGenerationSubSettings; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisExerciseSettings; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisHestiaSubSettings; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisLectureIngestionSubSettings; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisSettings; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisSettingsType; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettings; +import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisChatSubSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisCompetencyGenerationSubSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisExerciseSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisHestiaSubSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisLectureIngestionSubSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisSettingsType; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettings; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedChatSubSettingsDTO; import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedCompetencyGenerationSubSettingsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/websocket/IrisChatWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/websocket/IrisChatWebsocketService.java index 4394a074912d..04f9883aeb37 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/websocket/IrisChatWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/websocket/IrisChatWebsocketService.java @@ -5,8 +5,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; -import de.tum.cit.aet.artemis.domain.iris.session.IrisChatSession; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; +import de.tum.cit.aet.artemis.iris.domain.session.IrisChatSession; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; import de.tum.cit.aet.artemis.service.iris.dto.IrisChatWebsocketDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNavigationService.java b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNavigationService.java index 289f00a267f0..0dc764086283 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNavigationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNavigationService.java @@ -9,10 +9,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; import de.tum.cit.aet.artemis.domain.LearningObject; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.domain.competency.LearningPath; import de.tum.cit.aet.artemis.service.LearningObjectService; import de.tum.cit.aet.artemis.service.learningpath.LearningPathRecommendationService.RecommendationState; import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNgxService.java b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNgxService.java index 3a527310fab0..f27e24e462ce 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNgxService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNgxService.java @@ -17,15 +17,15 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyRelation; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; +import de.tum.cit.aet.artemis.atlas.domain.competency.RelationType; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.LearningObject; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.CompetencyRelation; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.domain.competency.LearningPath; -import de.tum.cit.aet.artemis.domain.competency.RelationType; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.web.rest.dto.competency.NgxLearningPathDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathRecommendationService.java b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathRecommendationService.java index 743234e4de6c..f1782cc6d45b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathRecommendationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathRecommendationService.java @@ -22,6 +22,11 @@ import com.google.common.util.concurrent.AtomicDouble; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; +import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; +import de.tum.cit.aet.artemis.atlas.domain.competency.RelationType; import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; @@ -29,13 +34,8 @@ import de.tum.cit.aet.artemis.domain.LearningObject; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.domain.competency.LearningPath; -import de.tum.cit.aet.artemis.domain.competency.Prerequisite; -import de.tum.cit.aet.artemis.domain.competency.RelationType; import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.service.LearningObjectService; import de.tum.cit.aet.artemis.service.ParticipantScoreService; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathService.java b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathService.java index 8b299811d0c4..c2f1adffa1b4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathService.java @@ -18,6 +18,10 @@ import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyRelation; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; @@ -27,15 +31,11 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; -import de.tum.cit.aet.artemis.domain.competency.CompetencyRelation; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.domain.competency.LearningPath; -import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnitCompletion; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnitCompletion; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/listeners/ResultListener.java b/src/main/java/de/tum/cit/aet/artemis/service/listeners/ResultListener.java index c7d107533150..e551b3fd4864 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/listeners/ResultListener.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/listeners/ResultListener.java @@ -11,13 +11,14 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; +import de.tum.cit.aet.artemis.assessment.domain.ParticipantScore; import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; /** - * Listener for updates on {@link Result} entities to update the {@link de.tum.cit.aet.artemis.domain.scores.ParticipantScore}. + * Listener for updates on {@link Result} entities to update the {@link ParticipantScore}. * * @see ParticipantScoreScheduleService */ diff --git a/src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageReceiveService.java b/src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageReceiveService.java index 11b87f3e9385..7d89e6f25bc1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageReceiveService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageReceiveService.java @@ -19,8 +19,8 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.quiz.QuizScheduleService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/AnswerMessageService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/AnswerMessageService.java index 0543825ea87e..6f5670cb6863 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/AnswerMessageService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/AnswerMessageService.java @@ -10,6 +10,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; +import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotification; import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; @@ -20,11 +25,6 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.metis.AnswerPost; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; -import de.tum.cit.aet.artemis.domain.notification.SingleUserNotification; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/ConversationMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/ConversationMessagingService.java index 6f81103e3e1c..b50f28e184fc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/ConversationMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/ConversationMessagingService.java @@ -26,6 +26,16 @@ import com.google.common.collect.Lists; +import de.tum.cit.aet.artemis.communication.domain.CreatedConversationMessage; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; +import de.tum.cit.aet.artemis.communication.domain.conversation.GroupChat; +import de.tum.cit.aet.artemis.communication.domain.conversation.OneToOneChat; +import de.tum.cit.aet.artemis.communication.domain.notification.ConversationNotification; +import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; +import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotification; +import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotificationFactory; import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.SingleUserNotificationRepository; @@ -38,16 +48,6 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; -import de.tum.cit.aet.artemis.domain.metis.CreatedConversationMessage; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; -import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; -import de.tum.cit.aet.artemis.domain.metis.conversation.OneToOneChat; -import de.tum.cit.aet.artemis.domain.notification.ConversationNotification; -import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; -import de.tum.cit.aet.artemis.domain.notification.SingleUserNotification; -import de.tum.cit.aet.artemis.domain.notification.SingleUserNotificationFactory; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/PostingService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/PostingService.java index 1d5e6e09f050..91ca819b065c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/PostingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/PostingService.java @@ -17,6 +17,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.Posting; +import de.tum.cit.aet.artemis.communication.domain.UserRole; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; +import de.tum.cit.aet.artemis.communication.domain.notification.ConversationNotification; +import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -25,14 +33,6 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.cit.aet.artemis.domain.metis.AnswerPost; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.metis.Posting; -import de.tum.cit.aet.artemis.domain.metis.UserRole; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; -import de.tum.cit.aet.artemis.domain.notification.ConversationNotification; -import de.tum.cit.aet.artemis.domain.notification.Notification; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/ReactionService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/ReactionService.java index ad7c08090170..3d9611958333 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/ReactionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/ReactionService.java @@ -7,6 +7,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.Posting; +import de.tum.cit.aet.artemis.communication.domain.Reaction; import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.communication.repository.ReactionRepository; @@ -14,10 +18,6 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.metis.AnswerPost; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.metis.Posting; -import de.tum.cit.aet.artemis.domain.metis.Reaction; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismAnswerPostService; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismPostService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ChannelService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ChannelService.java index 97d711c3c548..569a4018fa50 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ChannelService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ChannelService.java @@ -16,6 +16,8 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; +import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -23,9 +25,7 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.service.metis.conversation.errors.ChannelNameDuplicateException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationDTOService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationDTOService.java index ca0d8b0fdffe..2874ad9f8e5e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationDTOService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationDTOService.java @@ -12,18 +12,18 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; +import de.tum.cit.aet.artemis.communication.domain.ConversationParticipantSettingsView; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; +import de.tum.cit.aet.artemis.communication.domain.conversation.GroupChat; +import de.tum.cit.aet.artemis.communication.domain.conversation.OneToOneChat; +import de.tum.cit.aet.artemis.communication.dto.ConversationSummary; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; -import de.tum.cit.aet.artemis.domain.metis.ConversationParticipantSettingsView; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; -import de.tum.cit.aet.artemis.domain.metis.conversation.ConversationSummary; -import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; -import de.tum.cit.aet.artemis.domain.metis.conversation.OneToOneChat; import de.tum.cit.aet.artemis.service.dto.UserPublicInfoDTO; import de.tum.cit.aet.artemis.service.metis.conversation.auth.ChannelAuthorizationService; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationService.java index 82945c0a86d3..bf6967781ba8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationService.java @@ -20,6 +20,13 @@ import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestBody; +import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; +import de.tum.cit.aet.artemis.communication.domain.conversation.GroupChat; +import de.tum.cit.aet.artemis.communication.dto.ConversationSummary; +import de.tum.cit.aet.artemis.communication.dto.GeneralConversationInfo; +import de.tum.cit.aet.artemis.communication.dto.UserConversationInfo; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; @@ -30,13 +37,6 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; -import de.tum.cit.aet.artemis.domain.metis.conversation.ConversationSummary; -import de.tum.cit.aet.artemis.domain.metis.conversation.GeneralConversationInfo; -import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; -import de.tum.cit.aet.artemis.domain.metis.conversation.UserConversationInfo; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/GroupChatService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/GroupChatService.java index 7dc44cc127b1..716c0db4dca5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/GroupChatService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/GroupChatService.java @@ -9,13 +9,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; +import de.tum.cit.aet.artemis.communication.domain.conversation.GroupChat; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.GroupChatRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; -import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.GroupChatDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/OneToOneChatService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/OneToOneChatService.java index 86290440e53d..66eb0178f706 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/OneToOneChatService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/OneToOneChatService.java @@ -7,13 +7,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; +import de.tum.cit.aet.artemis.communication.domain.conversation.OneToOneChat; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.OneToOneChatRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; -import de.tum.cit.aet.artemis.domain.metis.conversation.OneToOneChat; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ChannelAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ChannelAuthorizationService.java index 9d8dd276fe45..3a276b7c11d6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ChannelAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ChannelAuthorizationService.java @@ -13,14 +13,14 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.domain.ConversationParticipantSettingsView; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.metis.ConversationParticipantSettingsView; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/GroupChatAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/GroupChatAuthorizationService.java index 48d8516eed9e..3749dee58e3e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/GroupChatAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/GroupChatAuthorizationService.java @@ -1,20 +1,20 @@ package de.tum.cit.aet.artemis.service.metis.conversation.auth; +import static de.tum.cit.aet.artemis.communication.ConversationSettings.MAX_GROUP_CHATS_PER_USER_PER_COURSE; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.domain.metis.conversation.ConversationSettings.MAX_GROUP_CHATS_PER_USER_PER_COURSE; import jakarta.validation.constraints.NotNull; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.domain.conversation.GroupChat; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.GroupChatRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/OneToOneChatAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/OneToOneChatAuthorizationService.java index cdc3c243e8a5..d9f4fb4e6833 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/OneToOneChatAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/OneToOneChatAuthorizationService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.metis.conversation.auth; +import static de.tum.cit.aet.artemis.communication.ConversationSettings.MAX_ONE_TO_ONE_CHATS_PER_USER_PER_COURSE; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.domain.metis.conversation.ConversationSettings.MAX_ONE_TO_ONE_CHATS_PER_USER_PER_COURSE; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/similarity/PostSimilarityComparisonStrategy.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/similarity/PostSimilarityComparisonStrategy.java index c6e67c57bf6f..ac20deadd5d0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/similarity/PostSimilarityComparisonStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/similarity/PostSimilarityComparisonStrategy.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.metis.similarity; -import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.communication.domain.Post; /** * This interface offers a method that performs a similarity check on two posts that are compared to each other. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/similarity/TitleJaccardSimilarityCompareStrategy.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/similarity/TitleJaccardSimilarityCompareStrategy.java index 24a46d029b8e..cf957b3c4136 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/similarity/TitleJaccardSimilarityCompareStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/similarity/TitleJaccardSimilarityCompareStrategy.java @@ -7,7 +7,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.communication.domain.Post; /** * Implementation of a PostSimilarityComparisonStrategy to be used when searching for duplicates during post creation. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationService.java index 4eff24783bbb..068ea98e564e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationService.java @@ -1,11 +1,11 @@ package de.tum.cit.aet.artemis.service.notifications; +import static de.tum.cit.aet.artemis.communication.domain.notification.ConversationNotificationFactory.createConversationMessageNotification; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.NEW_MESSAGE_CHANNEL_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.NEW_MESSAGE_DIRECT_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.NEW_MESSAGE_GROUP_CHAT_TEXT; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_MESSAGE; -import static de.tum.cit.aet.artemis.domain.notification.ConversationNotificationFactory.createConversationMessageNotification; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_MESSAGE_CHANNEL_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_MESSAGE_DIRECT_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_MESSAGE_GROUP_CHAT_TEXT; import java.util.Set; import java.util.stream.Collectors; @@ -13,19 +13,19 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; +import de.tum.cit.aet.artemis.communication.domain.conversation.GroupChat; +import de.tum.cit.aet.artemis.communication.domain.notification.ConversationNotification; +import de.tum.cit.aet.artemis.communication.domain.notification.NotificationPlaceholderCreator; +import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotification; +import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotificationFactory; import de.tum.cit.aet.artemis.communication.repository.SingleUserNotificationRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationNotificationRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; -import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; -import de.tum.cit.aet.artemis.domain.notification.ConversationNotification; -import de.tum.cit.aet.artemis.domain.notification.NotificationPlaceholderCreator; -import de.tum.cit.aet.artemis.domain.notification.SingleUserNotification; -import de.tum.cit.aet.artemis.domain.notification.SingleUserNotificationFactory; /** * Service for sending notifications about new messages in conversations. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationService.java index 4e3b6c50e1d8..3a1e3fa4cea6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationService.java @@ -11,11 +11,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.notification.Notification; +import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.notification.Notification; -import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; import de.tum.cit.aet.artemis.service.notifications.push_notifications.ApplePushNotificationService; import de.tum.cit.aet.artemis.service.notifications.push_notifications.FirebasePushNotificationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationService.java index 96db7240d911..583ea701f556 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationService.java @@ -1,5 +1,8 @@ package de.tum.cit.aet.artemis.service.notifications; +import static de.tum.cit.aet.artemis.communication.domain.notification.GroupNotificationFactory.createAnnouncementNotification; +import static de.tum.cit.aet.artemis.communication.domain.notification.GroupNotificationFactory.createNotification; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.LIVE_EXAM_EXERCISE_UPDATE_NOTIFICATION_TITLE; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.EDITOR; import static de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.INSTRUCTOR; @@ -17,9 +20,6 @@ import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PROGRAMMING_REPOSITORY_LOCKS; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PROGRAMMING_TEST_CASES_CHANGED; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.QUIZ_EXERCISE_STARTED; -import static de.tum.cit.aet.artemis.domain.notification.GroupNotificationFactory.createAnnouncementNotification; -import static de.tum.cit.aet.artemis.domain.notification.GroupNotificationFactory.createNotification; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.LIVE_EXAM_EXERCISE_UPDATE_NOTIFICATION_TITLE; import java.time.ZonedDateTime; import java.util.Collections; @@ -31,6 +31,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.notification.GroupNotification; +import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; +import de.tum.cit.aet.artemis.communication.domain.notification.NotificationTarget; import de.tum.cit.aet.artemis.communication.repository.GroupNotificationRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Attachment; @@ -40,12 +44,8 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.notification.GroupNotification; -import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; -import de.tum.cit.aet.artemis.domain.notification.NotificationTarget; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/InstantNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/InstantNotificationService.java index c16da4c7526d..0007c62e8856 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/InstantNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/InstantNotificationService.java @@ -2,8 +2,8 @@ import java.util.Set; +import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.notification.Notification; /** * The Interface which should be used for InstantNotifications such as Mails and PushNotifications. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailService.java index 7cf0acbc9877..8b22930ab83b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailService.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.service.notifications; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.extractNotificationUrl; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_SUBMISSION_ASSESSED; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.extractNotificationUrl; import java.net.URL; import java.util.Locale; @@ -18,16 +18,16 @@ import org.thymeleaf.context.Context; import org.thymeleaf.spring6.SpringTemplateEngine; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.notification.Notification; +import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.DataExport; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.notification.Notification; -import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.service.TimeService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsService.java index cd0063520583..917fc2fd8498 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsService.java @@ -1,5 +1,6 @@ package de.tum.cit.aet.artemis.service.notifications; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.findCorrespondingNotificationType; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.ATTACHMENT_CHANGE; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_CHANNEL; @@ -42,7 +43,6 @@ import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_TUTOR; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UNASSIGNED; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UPDATED; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.findCorrespondingNotificationType; import java.util.Arrays; import java.util.HashMap; @@ -54,13 +54,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.domain.notification.Notification; +import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.domain.NotificationSetting; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; -import de.tum.cit.aet.artemis.domain.notification.Notification; -import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/SingleUserNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/SingleUserNotificationService.java index 535891ba8b7b..6007e1320fa5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/SingleUserNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/SingleUserNotificationService.java @@ -1,5 +1,20 @@ package de.tum.cit.aet.artemis.service.notifications; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_CHANNEL_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_GROUP_CHAT_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.CONVERSATION_CREATE_GROUP_CHAT_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.CONVERSATION_CREATE_ONE_TO_ONE_CHAT_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.CONVERSATION_DELETE_CHANNEL_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.CONVERSATION_REMOVE_USER_CHANNEL_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.CONVERSATION_REMOVE_USER_GROUP_CHAT_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.MENTIONED_IN_MESSAGE_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.MESSAGE_REPLY_IN_CONVERSATION_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.NEW_REPLY_FOR_COURSE_POST_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.NEW_REPLY_FOR_EXAM_POST_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.NEW_REPLY_FOR_EXERCISE_POST_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.NEW_REPLY_FOR_LECTURE_POST_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.findCorrespondingNotificationTitleOrThrow; +import static de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotificationFactory.createNotification; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_REPLY_MESSAGE; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_USER_MENTIONED; @@ -21,21 +36,6 @@ import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_STUDENT; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_TUTOR; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UNASSIGNED; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_CHANNEL_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_GROUP_CHAT_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_CREATE_GROUP_CHAT_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_CREATE_ONE_TO_ONE_CHAT_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_DELETE_CHANNEL_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_REMOVE_USER_CHANNEL_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_REMOVE_USER_GROUP_CHAT_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.MENTIONED_IN_MESSAGE_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.MESSAGE_REPLY_IN_CONVERSATION_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_REPLY_FOR_COURSE_POST_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_REPLY_FOR_EXAM_POST_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_REPLY_FOR_EXERCISE_POST_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_REPLY_FOR_LECTURE_POST_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.findCorrespondingNotificationTitleOrThrow; -import static de.tum.cit.aet.artemis.domain.notification.SingleUserNotificationFactory.createNotification; import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel.WEBAPP; import java.util.Objects; @@ -47,6 +47,12 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; +import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; +import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotification; import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; import de.tum.cit.aet.artemis.communication.repository.SingleUserNotificationRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -58,20 +64,14 @@ import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; -import de.tum.cit.aet.artemis.domain.metis.AnswerPost; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; -import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; -import de.tum.cit.aet.artemis.domain.notification.SingleUserNotification; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationService.java index 3bbb3e1fde2f..27160127824b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationService.java @@ -1,9 +1,9 @@ package de.tum.cit.aet.artemis.service.notifications; +import static de.tum.cit.aet.artemis.communication.domain.notification.TutorialGroupNotificationFactory.createTutorialGroupNotification; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DELETED; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UPDATED; -import static de.tum.cit.aet.artemis.domain.notification.TutorialGroupNotificationFactory.createTutorialGroupNotification; import java.util.Set; import java.util.stream.Collectors; @@ -13,12 +13,12 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; +import de.tum.cit.aet.artemis.communication.domain.notification.TutorialGroupNotification; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; -import de.tum.cit.aet.artemis.domain.notification.TutorialGroupNotification; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupRegistration; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupNotificationRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRegistrationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/ApplePushNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/ApplePushNotificationService.java index 52938e7b6389..38b764a1d9ca 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/ApplePushNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/ApplePushNotificationService.java @@ -13,8 +13,8 @@ import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; +import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceType; import de.tum.cit.aet.artemis.communication.repository.PushNotificationDeviceConfigurationRepository; -import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceType; /** * Handles the sending of iOS Notifications to the Relay Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/FirebasePushNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/FirebasePushNotificationService.java index f45dba746d78..cc4749213472 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/FirebasePushNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/FirebasePushNotificationService.java @@ -17,8 +17,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.google.common.collect.Lists; +import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceType; import de.tum.cit.aet.artemis.communication.repository.PushNotificationDeviceConfigurationRepository; -import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceType; /** * Handles the sending of Android Notifications to the Relay Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/PushNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/PushNotificationService.java index 61a7e647997d..e204c5f7b5f4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/PushNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/PushNotificationService.java @@ -37,14 +37,14 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.communication.domain.notification.Notification; +import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; +import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfiguration; +import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceType; import de.tum.cit.aet.artemis.communication.repository.PushNotificationDeviceConfigurationRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; -import de.tum.cit.aet.artemis.domain.notification.Notification; -import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; -import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfiguration; -import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceType; import de.tum.cit.aet.artemis.service.notifications.InstantNotificationService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlPostContentProvider.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlPostContentProvider.java index 48a70a9f6af8..64f9ca0661f1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlPostContentProvider.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlPostContentProvider.java @@ -2,7 +2,7 @@ import java.util.Locale; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; public class ContinuousPlagiarismControlPostContentProvider { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlService.java index 83fcd6df9249..fa7f27e2bda7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlService.java @@ -13,23 +13,23 @@ import org.springframework.stereotype.Service; import de.jplag.exceptions.ExitException; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.core.exception.ArtemisMailException; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismResult; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmissionElement; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmissionElement; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.text.domain.TextExercise; /** * Manages continuous plagiarism control. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ModelingPlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ModelingPlagiarismDetectionService.java index e9559d9b4b62..6289178fd352 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ModelingPlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ModelingPlagiarismDetectionService.java @@ -20,13 +20,13 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.domain.PlagiarismCheckState; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; -import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingSubmissionElement; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmission; +import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingPlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingSubmissionElement; import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; import de.tum.cit.aet.artemis.service.plagiarism.cache.PlagiarismCacheService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismAnswerPostService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismAnswerPostService.java index 9c904d0b20c9..3b4f99a5aca2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismAnswerPostService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismAnswerPostService.java @@ -8,6 +8,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; @@ -16,8 +18,6 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.metis.AnswerPost; -import de.tum.cit.aet.artemis.domain.metis.Post; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismCaseService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismCaseService.java index 3d03e8c0b3d3..54cd175d8b62 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismCaseService.java @@ -12,13 +12,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmission; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismSubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java index d1d518cf846d..2736ca3f9b2a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java @@ -5,7 +5,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismDetectionConfig; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismDetectionConfig; /** * A config class containing logic for filling missing PlagiarismDetectionConfig for exercises created before deployment of the cpc. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionService.java index ab42bdf762d5..5ca7adc35372 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionService.java @@ -14,13 +14,13 @@ import de.jplag.exceptions.ExitException; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismResult; -import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; -import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingPlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeatureService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; /** * Service for triggering plagiarism checks. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismPostService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismPostService.java index db698c6d5ddd..eb2b5ab010fc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismPostService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismPostService.java @@ -9,6 +9,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -17,10 +18,9 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismService.java index 1b36e7c65bcf..7d2569a9d3e0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismService.java @@ -17,14 +17,14 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmission; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java index c348d6a1b621..664ab61d64fc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java @@ -41,10 +41,10 @@ import de.tum.cit.aet.artemis.domain.PlagiarismCheckState; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.UriService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/TextPlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/TextPlagiarismDetectionService.java index 9da18d058f2a..ed9e7712296c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/TextPlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/TextPlagiarismDetectionService.java @@ -25,14 +25,14 @@ import de.jplag.options.JPlagOptions; import de.jplag.text.NaturalLanguage; import de.tum.cit.aet.artemis.domain.PlagiarismCheckState; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; import de.tum.cit.aet.artemis.service.export.TextSubmissionExportService; import de.tum.cit.aet.artemis.service.plagiarism.cache.PlagiarismCacheService; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/CommitHistoryService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/CommitHistoryService.java index 293b6af1d85d..ba86eef8714c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/CommitHistoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/CommitHistoryService.java @@ -20,8 +20,8 @@ import de.tum.cit.aet.artemis.domain.Repository; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.web.rest.GitDiffReportParserService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingAssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingAssessmentService.java index 0909229bb7cc..2e6f2a370060 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingAssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingAssessmentService.java @@ -9,22 +9,22 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentNote; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.AssessmentNote; import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.service.AssessmentService; import de.tum.cit.aet.artemis.service.ComplaintResponseService; import de.tum.cit.aet.artemis.service.ExerciseDateService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseCodeReviewFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseCodeReviewFeedbackService.java index ef9fc066dd39..1abdde409cc6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseCodeReviewFeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseCodeReviewFeedbackService.java @@ -21,7 +21,7 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.service.SubmissionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationService.java index 10bd0a7ff192..2a99e74f9c1e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationService.java @@ -40,7 +40,7 @@ import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; import de.tum.cit.aet.artemis.domain.enumeration.Visibility; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTestCaseType; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTestCaseType; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseGradingService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseGradingService.java index fcfb871a1274..fb4d4748e2f5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseGradingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseGradingService.java @@ -46,16 +46,16 @@ import de.tum.cit.aet.artemis.domain.enumeration.CategoryState; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; -import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPenaltyPolicy; -import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; +import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPenaltyPolicy; +import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportBasicService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportBasicService.java index 3f600ebd988a..779fcb99f8db 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportBasicService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportBasicService.java @@ -22,11 +22,11 @@ import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisCategory; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.hestia.CodeHint; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismDetectionConfig; -import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismDetectionConfig; +import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseParticipationService.java index 27c0e269dad2..91973561a274 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseParticipationService.java @@ -30,14 +30,14 @@ import de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseRepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseRepositoryService.java index afc018822568..2f5f7ac19a3d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseRepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseRepositoryService.java @@ -33,7 +33,7 @@ import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ResourceLoaderService; import de.tum.cit.aet.artemis.service.connectors.GitService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseService.java index c884c2bca19c..aa12e4028d12 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseService.java @@ -56,11 +56,11 @@ import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingMessagingService.java index e380a631f119..8eb025a010a7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingMessagingService.java @@ -20,11 +20,11 @@ import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.connectors.lti.LtiNewResultService; import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingSubmissionService.java index 9911a89119c0..89dd4ecc7c72 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingSubmissionService.java @@ -39,18 +39,18 @@ import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.participation.AbstractBaseProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; -import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.programming.domain.AbstractBaseProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; +import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingTriggerService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingTriggerService.java index a3a36efc223f..75d9286fe9ff 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingTriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingTriggerService.java @@ -28,10 +28,10 @@ import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryAccessService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryAccessService.java index 2b0b6c4ed047..ca2e4bb0caff 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryAccessService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryAccessService.java @@ -7,9 +7,9 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryParticipationService.java index d67f04542f53..e36b17fae169 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryParticipationService.java @@ -10,9 +10,9 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryService.java index af79b42a2896..6e6b283f511a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryService.java @@ -41,8 +41,8 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.connectors.GitService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizBatchService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizBatchService.java index 202e06139222..3837ef76a0ae 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizBatchService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizBatchService.java @@ -20,10 +20,10 @@ import de.tum.cit.aet.artemis.core.exception.QuizJoinException; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; -import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.quiz.repository.QuizBatchRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.service.ParticipationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseImportService.java index 9413c3156cd6..34721018f303 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseImportService.java @@ -22,20 +22,20 @@ import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; -import de.tum.cit.aet.artemis.domain.quiz.AnswerOption; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropMapping; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.cit.aet.artemis.domain.quiz.DragItem; -import de.tum.cit.aet.artemis.domain.quiz.DropLocation; -import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerMapping; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSolution; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSpot; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.quiz.domain.AnswerOption; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropMapping; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; +import de.tum.cit.aet.artemis.quiz.domain.DragItem; +import de.tum.cit.aet.artemis.quiz.domain.DropLocation; +import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerMapping; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSolution; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSpot; import de.tum.cit.aet.artemis.service.ExerciseImportService; import de.tum.cit.aet.artemis.service.FeedbackService; import de.tum.cit.aet.artemis.service.FilePathService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseService.java index 0efddf407fab..2122131b5b13 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseService.java @@ -37,15 +37,15 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.cit.aet.artemis.domain.quiz.DragItem; -import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizPointStatistic; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; -import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; +import de.tum.cit.aet.artemis.quiz.domain.DragItem; +import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizPointStatistic; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; +import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; import de.tum.cit.aet.artemis.quiz.repository.DragAndDropMappingRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizMessagingService.java index 6c985a1dba11..b2fdb8fc07c2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizMessagingService.java @@ -16,8 +16,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.domain.enumeration.QuizAction; -import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizPoolService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizPoolService.java index e34e654ed7af..08e17698cecd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizPoolService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizPoolService.java @@ -18,11 +18,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.quiz.QuizGroup; -import de.tum.cit.aet.artemis.domain.quiz.QuizPool; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.quiz.domain.QuizGroup; +import de.tum.cit.aet.artemis.quiz.domain.QuizPool; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; import de.tum.cit.aet.artemis.quiz.repository.DragAndDropMappingRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizGroupRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizPoolRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizResultService.java index 93723648461b..6dea13a76a53 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizResultService.java @@ -20,11 +20,11 @@ import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.service.ResultService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizScheduleService.java index ef04ed5fc2f3..d5be3ae2ef65 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizScheduleService.java @@ -21,8 +21,8 @@ import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; -import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.repository.QuizBatchRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.service.ProfileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizService.java index fca7d96c7489..9ad9de23308c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizService.java @@ -12,19 +12,19 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropMapping; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestionStatistic; -import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestionStatistic; -import de.tum.cit.aet.artemis.domain.quiz.QuizConfiguration; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestionComponent; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestionStatistic; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestionStatisticComponent; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerMapping; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestionStatistic; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropMapping; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestionStatistic; +import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceQuestionStatistic; +import de.tum.cit.aet.artemis.quiz.domain.QuizConfiguration; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestionComponent; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestionStatistic; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestionStatisticComponent; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerMapping; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestionStatistic; import de.tum.cit.aet.artemis.quiz.repository.DragAndDropMappingRepository; import de.tum.cit.aet.artemis.quiz.repository.ShortAnswerMappingRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizStatisticService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizStatisticService.java index 77e85ccad59e..1c3269d8cc6c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizStatisticService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizStatisticService.java @@ -14,12 +14,12 @@ import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizPointStatistic; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestionStatistic; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizPointStatistic; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestionStatistic; import de.tum.cit.aet.artemis.quiz.repository.QuizPointStatisticRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizQuestionStatisticRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizSubmissionService.java index b8663f94f219..d28dd6a38a2d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizSubmissionService.java @@ -19,14 +19,14 @@ import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.AbstractQuizSubmission; -import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; -import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.quiz.domain.AbstractQuizSubmission; +import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; +import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.service.AbstractQuizSubmissionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AutomaticProgrammingExerciseCleanupService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AutomaticProgrammingExerciseCleanupService.java index 77a728234e5f..91afc65b4468 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AutomaticProgrammingExerciseCleanupService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AutomaticProgrammingExerciseCleanupService.java @@ -22,7 +22,7 @@ import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.service.ParticipationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ModelingExerciseScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ModelingExerciseScheduleService.java index 3185d6d048ac..a325e94726d9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ModelingExerciseScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ModelingExerciseScheduleService.java @@ -27,7 +27,7 @@ import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.service.compass.CompassService; import de.tum.cit.aet.artemis.service.exam.ExamDateService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ParticipantScoreScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ParticipantScoreScheduleService.java index 8f755dce6768..1e5366e0f4d1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ParticipantScoreScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ParticipantScoreScheduleService.java @@ -28,6 +28,9 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.ParticipantScore; +import de.tum.cit.aet.artemis.assessment.domain.StudentScore; +import de.tum.cit.aet.artemis.assessment.domain.TeamScore; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; @@ -38,11 +41,8 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.participation.Participant; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.scores.ParticipantScore; -import de.tum.cit.aet.artemis.domain.scores.StudentScore; -import de.tum.cit.aet.artemis.domain.scores.TeamScore; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ProgrammingExerciseScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ProgrammingExerciseScheduleService.java index 5fa138a73acc..d41b786789c2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ProgrammingExerciseScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ProgrammingExerciseScheduleService.java @@ -42,13 +42,13 @@ import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; import de.tum.cit.aet.artemis.domain.enumeration.ParticipationLifecycle; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ScheduleService.java index 77afc69bf6dd..ab128b459780 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ScheduleService.java @@ -19,9 +19,9 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; import de.tum.cit.aet.artemis.domain.enumeration.ParticipationLifecycle; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.ExerciseLifecycleService; import de.tum.cit.aet.artemis.service.ParticipationLifecycleService; import de.tum.cit.aet.artemis.service.util.Tuple; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/science/ScienceEventService.java b/src/main/java/de/tum/cit/aet/artemis/service/science/ScienceEventService.java index f22f20a0ad67..72820723fff7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/science/ScienceEventService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/science/ScienceEventService.java @@ -9,8 +9,8 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.domain.science.ScienceEvent; import de.tum.cit.aet.artemis.atlas.repository.science.ScienceEventRepository; -import de.tum.cit.aet.artemis.domain.science.ScienceEvent; import de.tum.cit.aet.artemis.web.rest.dto.science.ScienceEventDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupChannelManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupChannelManagementService.java index 200f81bdaec6..9c23d4edd0e7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupChannelManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupChannelManagementService.java @@ -14,14 +14,14 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupRegistration; import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRegistrationRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupFreePeriodService.java b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupFreePeriodService.java index 7297f246f02e..8bd37a504fc9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupFreePeriodService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupFreePeriodService.java @@ -11,8 +11,8 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupFreePeriod; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupFreePeriodRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupSessionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupScheduleService.java index d3cc2d13d181..659e47ba1cb0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupScheduleService.java @@ -20,11 +20,11 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSchedule; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupFreePeriod; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSchedule; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupScheduleRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupSessionRepository; import de.tum.cit.aet.artemis.web.rest.tutorialgroups.errors.ScheduleOverlapsWithSessionException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupService.java b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupService.java index 1180510fd646..d89de4c8f8aa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupService.java @@ -39,13 +39,13 @@ import de.tum.cit.aet.artemis.domain.enumeration.Language; import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; import de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupRegistration; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationDTOService; import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRegistrationRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupSessionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupsConfigurationService.java b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupsConfigurationService.java index 2ff4bc462698..98b6f002c0ac 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupsConfigurationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupsConfigurationService.java @@ -10,10 +10,10 @@ import org.springframework.transaction.annotation.Transactional; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSchedule; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupFreePeriod; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSchedule; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupFreePeriodRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupScheduleRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupSessionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/user/UserService.java b/src/main/java/de/tum/cit/aet/artemis/service/user/UserService.java index bc525f67d511..7e2077456e93 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/user/UserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/user/UserService.java @@ -49,7 +49,7 @@ import de.tum.cit.aet.artemis.domain.Authority; import de.tum.cit.aet.artemis.domain.GuidedTourSetting; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.participation.ParticipationVCSAccessToken; +import de.tum.cit.aet.artemis.programming.domain.ParticipationVCSAccessToken; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ParticipationVcsAccessTokenService; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/analytics/TextAssessmentEvent.java b/src/main/java/de/tum/cit/aet/artemis/text/domain/TextAssessmentEvent.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/analytics/TextAssessmentEvent.java rename to src/main/java/de/tum/cit/aet/artemis/text/domain/TextAssessmentEvent.java index a233e58d327d..76930a406179 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/analytics/TextAssessmentEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/domain/TextAssessmentEvent.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.analytics; +package de.tum.cit.aet.artemis.text.domain; import java.time.Instant; @@ -15,7 +15,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.TextBlockType; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.enumeration.TextAssessmentEventType; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/TextBlock.java b/src/main/java/de/tum/cit/aet/artemis/text/domain/TextBlock.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/TextBlock.java rename to src/main/java/de/tum/cit/aet/artemis/text/domain/TextBlock.java index f392d3866903..f028a0c7437d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/TextBlock.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/domain/TextBlock.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.text.domain; import static org.apache.commons.codec.digest.DigestUtils.sha1Hex; @@ -22,6 +22,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.domain.Feedback; + /** * A TextBlock. */ diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/TextBlockType.java b/src/main/java/de/tum/cit/aet/artemis/text/domain/TextBlockType.java similarity index 54% rename from src/main/java/de/tum/cit/aet/artemis/domain/TextBlockType.java rename to src/main/java/de/tum/cit/aet/artemis/text/domain/TextBlockType.java index 1df68fea81c5..85c9dd8bc1af 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/TextBlockType.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/domain/TextBlockType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.text.domain; public enum TextBlockType { AUTOMATIC, MANUAL diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/TextEmbedding.java b/src/main/java/de/tum/cit/aet/artemis/text/domain/TextEmbedding.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/domain/TextEmbedding.java rename to src/main/java/de/tum/cit/aet/artemis/text/domain/TextEmbedding.java index e156f8c74b5e..643bf46fd2aa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/TextEmbedding.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/domain/TextEmbedding.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.text.domain; import java.util.Objects; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/TextExercise.java b/src/main/java/de/tum/cit/aet/artemis/text/domain/TextExercise.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/domain/TextExercise.java rename to src/main/java/de/tum/cit/aet/artemis/text/domain/TextExercise.java index e99965dac0c4..55cb664cb385 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/TextExercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/domain/TextExercise.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.text.domain; import static de.tum.cit.aet.artemis.domain.enumeration.ExerciseType.TEXT; @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/TextSubmission.java b/src/main/java/de/tum/cit/aet/artemis/text/domain/TextSubmission.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/TextSubmission.java rename to src/main/java/de/tum/cit/aet/artemis/text/domain/TextSubmission.java index 2905cef15d4c..cd186fef451b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/TextSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/domain/TextSubmission.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.text.domain; import static de.tum.cit.aet.artemis.core.config.Constants.MAX_SUBMISSION_TEXT_LENGTH; @@ -18,6 +18,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.enumeration.Language; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/text/repository/TextExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/text/repository/TextExerciseRepository.java index 5224204bb223..6ed0ef96f4a7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/repository/TextExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/repository/TextExerciseRepository.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextExercise; /** * Spring Data JPA repository for the TextExercise entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/text/repository/TextSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/text/repository/TextSubmissionRepository.java index 03340de8f3ba..a32a04a63d3c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/repository/TextSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/repository/TextSubmissionRepository.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; /** * Spring Data JPA repository for the TextSubmission entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroup.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroup.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroup.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroup.java index 524044af65a0..3a633bea1020 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroup.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroup.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup.domain; import java.util.HashSet; import java.util.Set; @@ -26,10 +26,10 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; @Entity diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupFreePeriod.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupFreePeriod.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupFreePeriod.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupFreePeriod.java index 6e5027fbaa66..2fcaada0af3c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupFreePeriod.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupFreePeriod.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup.domain; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupRegistration.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupRegistration.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupRegistration.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupRegistration.java index 2f6220a7326d..4c649bbba72d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupRegistration.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupRegistration.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupSchedule.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupSchedule.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupSchedule.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupSchedule.java index b543daf0b9f3..6a00d35b8232 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupSchedule.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupSchedule.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup.domain; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupSession.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupSession.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupSession.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupSession.java index 52846779a4d4..de848c0867dc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupSession.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupSession.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup.domain; import static jakarta.persistence.Persistence.getPersistenceUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupsConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupsConfiguration.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupsConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupsConfiguration.java index c8ab0dd7b086..e52654689b7d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/tutorialgroups/TutorialGroupsConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupsConfiguration.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup.domain; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupFreePeriodRepository.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupFreePeriodRepository.java index 3bf6ab48b3d6..6d8558a6a29f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupFreePeriodRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupFreePeriodRepository.java @@ -13,7 +13,7 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupFreePeriod; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupNotificationRepository.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupNotificationRepository.java index deae88679547..674b5f64c9c6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupNotificationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupNotificationRepository.java @@ -7,8 +7,8 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.communication.domain.notification.TutorialGroupNotification; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.notification.TutorialGroupNotification; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupRegistrationRepository.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupRegistrationRepository.java index 6dfb19a1cfe7..4411d4b569ca 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupRegistrationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupRegistrationRepository.java @@ -16,8 +16,8 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupRegistration; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupRepository.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupRepository.java index db9f13bf5a43..3bb9971326b8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupRepository.java @@ -12,10 +12,10 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupScheduleRepository.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupScheduleRepository.java index e1f13f1d98c5..aa92028fb9db 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupScheduleRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupScheduleRepository.java @@ -12,7 +12,7 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSchedule; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSchedule; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupSessionRepository.java index c0adae9259db..00a6dc96001f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupSessionRepository.java @@ -16,9 +16,9 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSchedule; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSchedule; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupsConfigurationRepository.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupsConfigurationRepository.java index c535fed7c234..34f16486bf4d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupsConfigurationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupsConfigurationRepository.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonDiagramResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonDiagramResource.java index d6d41a06c032..e773c4d19723 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonDiagramResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonDiagramResource.java @@ -26,7 +26,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.modeling.ApollonDiagram; +import de.tum.cit.aet.artemis.modeling.domain.ApollonDiagram; import de.tum.cit.aet.artemis.modeling.repository.ApollonDiagramRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AssessmentResource.java index 00148a6f0ab7..4b1ae169a433 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AssessmentResource.java @@ -18,8 +18,8 @@ import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.service.AssessmentService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResource.java index 3738354822d6..949e1acdb480 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResource.java @@ -39,17 +39,17 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ComplaintService; import de.tum.cit.aet.artemis.service.dto.ComplaintRequestDTO; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java index 32e26840473e..afabc2355c08 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java @@ -56,6 +56,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.core.config.Constants; @@ -74,9 +75,8 @@ import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.participation.Participant; -import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.service.AssessmentDashboardService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java index 477b439cf2a3..fb0cbbcc7ff5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java @@ -50,7 +50,9 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -66,12 +68,10 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.exam.SuspiciousSessionsAnalysisOptions; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; +import de.tum.cit.aet.artemis.exam.domain.SuspiciousSessionsAnalysisOptions; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.AssessmentDashboardService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java index ffe0ec5a0c69..0f30353f962e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java @@ -23,7 +23,7 @@ import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.exam.ExamUser; +import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java index 03f94bb1fd21..e3797d59890f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java @@ -28,13 +28,13 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.ExampleSubmission; import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExampleSubmissionService; import de.tum.cit.aet.artemis.service.TextBlockService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java index 44a766cea3b7..6d3a69c9ecb1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java @@ -31,8 +31,8 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; import de.tum.cit.aet.artemis.service.ExerciseDeletionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java index 70cce751414b..862a56621240 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java @@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -36,14 +37,13 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.hestia.ExerciseHint; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDeletionService; import de.tum.cit.aet.artemis.service.ExerciseService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java index 58add8445ec0..ffa12f8357ec 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java @@ -56,18 +56,18 @@ import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; -import de.tum.cit.aet.artemis.domain.exam.ExamUser; -import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; -import de.tum.cit.aet.artemis.domain.lecture.Slide; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.cit.aet.artemis.domain.quiz.DragItem; +import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadSubmissionRepository; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.Slide; import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.SlideRepository; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; +import de.tum.cit.aet.artemis.quiz.domain.DragItem; import de.tum.cit.aet.artemis.quiz.repository.DragItemRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizQuestionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java index a0e580ce66e3..a4994917bf58 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java @@ -28,7 +28,7 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java index b99ebaa985da..dc4616bdc103 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java @@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -39,7 +40,6 @@ import de.tum.cit.aet.artemis.domain.FileUploadExercise; import de.tum.cit.aet.artemis.domain.GradingCriterion; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java index db190cfc7750..950a0ef38ff5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java @@ -40,7 +40,7 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/GitDiffReportParserService.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/GitDiffReportParserService.java index 7d524bab96de..2cc4e52e4fa1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/GitDiffReportParserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/GitDiffReportParserService.java @@ -13,7 +13,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/GradeStepResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/GradeStepResource.java index 01b7c8604ed7..fb21ae336c4b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/GradeStepResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/GradeStepResource.java @@ -26,10 +26,10 @@ import de.tum.cit.aet.artemis.domain.GradeStep; import de.tum.cit.aet.artemis.domain.GradingScale; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.dto.GradeDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/GradingScaleResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/GradingScaleResource.java index 3497115509af..00a86676e840 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/GradingScaleResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/GradingScaleResource.java @@ -30,7 +30,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.GradingScaleService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java index 6a5382528862..f504a3e03174 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java @@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; import de.tum.cit.aet.artemis.atlas.repository.LearningPathRepository; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -32,7 +33,6 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.LearningPath; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.LearningObjectService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java index 72703fb89e08..d0c6639f871c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java @@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -37,10 +38,9 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; -import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java index f4edcaa9b5c3..d05be6c05516 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java @@ -16,7 +16,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.LongFeedbackText; import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java index 5a533d58b03a..e06f3c2bb910 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java @@ -30,11 +30,11 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; import de.tum.cit.aet.artemis.service.AssessmentService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java index cc392907a90d..e112e744164f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java @@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -39,11 +40,10 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.GradingCriterion; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java index 6bb1e248c221..7fcd5e0ce7c8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java @@ -35,12 +35,12 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationResource.java index 30f19f1eea01..6cba53be5a32 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationResource.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.web.rest; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.MESSAGE_REPLY_IN_CONVERSATION_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.NEW_MESSAGE_TITLE; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.MESSAGE_REPLY_IN_CONVERSATION_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_MESSAGE_TITLE; import java.time.ZonedDateTime; import java.util.List; @@ -21,12 +21,12 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.communication.repository.NotificationRepository; import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.notification.Notification; import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel; import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService; import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java index 7fd2e33f5245..d86a5691b842 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java @@ -17,7 +17,7 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipantScoreService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java index 70a0e98a9960..3d11678aabc2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java @@ -57,27 +57,26 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.participation.Participant; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; @@ -95,6 +94,7 @@ import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseParticipationService; import de.tum.cit.aet.artemis.service.quiz.QuizBatchService; import de.tum.cit.aet.artemis.service.quiz.QuizSubmissionService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java index 47b036b13c55..1ace759b4f7c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java @@ -38,6 +38,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; @@ -55,12 +56,11 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.QuizAction; import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.cit.aet.artemis.domain.quiz.DragItem; -import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; +import de.tum.cit.aet.artemis.quiz.domain.DragItem; +import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.repository.QuizBatchRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java index c180c6221b9c..a3e33b1545a2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java @@ -23,9 +23,9 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java index d78334c5f9cc..346e175ddeb8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java @@ -18,7 +18,7 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.quiz.QuizPool; +import de.tum.cit.aet.artemis.quiz.domain.QuizPool; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.exam.ExamAccessService; import de.tum.cit.aet.artemis.service.quiz.QuizPoolService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java index e8797803b964..7dea13314697 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java @@ -30,11 +30,11 @@ import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; -import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; +import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java index 76da1a10b72a..c0f5e5ae9f54 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java @@ -29,7 +29,7 @@ import de.tum.cit.aet.artemis.domain.Rating; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.RatingService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java index f3a314b3e297..7bbcc042f71d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java @@ -39,13 +39,13 @@ import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java index 9029090a8a45..84b82dbb9b19 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java @@ -43,14 +43,14 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExamSession; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.exam.event.ExamLiveEvent; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExamSession; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; +import de.tum.cit.aet.artemis.exam.domain.event.ExamLiveEvent; import de.tum.cit.aet.artemis.exam.repository.ExamLiveEventRepository; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.SubmissionPolicyRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java index 408917a07ff7..b7a3fd460b4f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java @@ -26,7 +26,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java index a541a5a2a864..55f166a8713e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java @@ -29,7 +29,7 @@ import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.SubmissionVersion; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/SystemNotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/SystemNotificationResource.java index 3854f4769841..51d76817ce2e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/SystemNotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/SystemNotificationResource.java @@ -19,10 +19,10 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import de.tum.cit.aet.artemis.communication.domain.notification.SystemNotification; import de.tum.cit.aet.artemis.communication.repository.SystemNotificationRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.notification.SystemNotification; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.PaginationUtil; import tech.jhipster.web.util.ResponseUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java index af726439786b..a71682b3946a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java @@ -49,7 +49,7 @@ import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.TeamImportStrategyType; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentEventResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentEventResource.java index 3d8aa7a3e635..78b2f44045d2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentEventResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentEventResource.java @@ -26,10 +26,10 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.analytics.TextAssessmentEvent; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.text.domain.TextAssessmentEvent; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java index 7a24708a48a0..6e9b9556c285 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java @@ -43,13 +43,10 @@ import de.tum.cit.aet.artemis.domain.GradingCriterion; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextBlock; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; @@ -58,6 +55,9 @@ import de.tum.cit.aet.artemis.service.TextBlockService; import de.tum.cit.aet.artemis.service.TextSubmissionService; import de.tum.cit.aet.artemis.service.connectors.athena.AthenaFeedbackSendingService; +import de.tum.cit.aet.artemis.text.domain.TextBlock; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.web.rest.dto.TextAssessmentDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java index 2ceea0a203c3..b18c079b1695 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java @@ -34,6 +34,7 @@ import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.repository.TextBlockRepository; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -49,15 +50,12 @@ import de.tum.cit.aet.artemis.domain.GradingCriterion; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; @@ -77,6 +75,8 @@ import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionConfigHelper; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionService; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java index f3deb9996a4f..4233b796c446 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java @@ -30,9 +30,7 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.GradingCriterion; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; @@ -42,6 +40,8 @@ import de.tum.cit.aet.artemis.service.TextSubmissionService; import de.tum.cit.aet.artemis.service.exam.ExamSubmissionService; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorEffortResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorEffortResource.java index 06ae8e1d075f..f38b0830559b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorEffortResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorEffortResource.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.dto.TutorEffort; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -20,7 +21,6 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.statistics.tutor.effort.TutorEffort; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.TutorEffortService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java index db208f07bea4..c3d03595f115 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.core.config.GuidedTourConfiguration; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -25,7 +26,6 @@ import de.tum.cit.aet.artemis.domain.ExampleSubmission; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.TutorParticipationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java index ef806379d7c1..da5daa9374be 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java @@ -25,6 +25,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -35,8 +37,6 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.Competency; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.LectureUnitService; import de.tum.cit.aet.artemis.service.competency.CompetencyService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java index 234816c45e37..d65a8b247583 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java @@ -26,6 +26,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; @@ -39,8 +41,6 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.competency.CompetencyJolService; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java index 18d7131dcf99..88f5b9357de3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java @@ -25,6 +25,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -35,8 +37,6 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.domain.competency.Prerequisite; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.LectureUnitService; import de.tum.cit.aet.artemis.service.competency.CourseCompetencyService; @@ -47,7 +47,7 @@ import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** - * REST controller for managing {@link de.tum.cit.aet.artemis.domain.competency.Prerequisite Prerequisite} entities. + * REST controller for managing {@link Prerequisite Prerequisite} entities. */ @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/StandardizedCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/StandardizedCompetencyResource.java index 4d1be76f1e52..2627d8d8d79b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/StandardizedCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/StandardizedCompetencyResource.java @@ -13,12 +13,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.atlas.domain.competency.KnowledgeArea; +import de.tum.cit.aet.artemis.atlas.domain.competency.StandardizedCompetency; import de.tum.cit.aet.artemis.atlas.repository.SourceRepository; import de.tum.cit.aet.artemis.atlas.repository.competency.KnowledgeAreaRepository; import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.domain.competency.KnowledgeArea; -import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; import de.tum.cit.aet.artemis.service.competency.StandardizedCompetencyService; import de.tum.cit.aet.artemis.service.feature.Feature; import de.tum.cit.aet.artemis.service.feature.FeatureToggle; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusResultDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusResultDTO.java index 3e68e7c0982a..1186a04c204d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusResultDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusResultDTO.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.domain.BonusStrategy; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; /** * Represents a bonus grade result with the relevant parameters from bonusFrom and bonusTo grading scales. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusSourceResultDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusSourceResultDTO.java index 53bdf781222e..ceb73f3eb6df 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusSourceResultDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusSourceResultDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; /** * Represents a grade result from a bonus source course or exam with plagiarism verdict. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementStatisticsDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementStatisticsDTO.java index 1e8f9a371473..f20e50e57bb2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementStatisticsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementStatisticsDTO.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.statistics.CourseStatisticsAverageScore; +import de.tum.cit.aet.artemis.core.dto.CourseStatisticsAverageScore; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record CourseManagementStatisticsDTO(Double averageScoreOfCourse, List averageScoresOfExercises) { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CoursesForDashboardDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CoursesForDashboardDTO.java index 54d5c8898f08..b1452a24c5c3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CoursesForDashboardDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CoursesForDashboardDTO.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.exam.domain.Exam; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record CoursesForDashboardDTO(Set courses, Set activeExams) { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamScoresDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamScoresDTO.java index 5169e5bc9673..637ec022eeae 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamScoresDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamScoresDTO.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ExamScoresDTO(Long examId, String title, Integer maxPoints, Double averagePointsAchieved, Boolean hasSecondCorrectionAndStarted, List exerciseGroups, diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamSessionDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamSessionDTO.java index 7131f8f19b4a..8b43febbe5ee 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamSessionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamSessionDTO.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.exam.SuspiciousSessionReason; +import de.tum.cit.aet.artemis.exam.domain.SuspiciousSessionReason; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ExamSessionDTO(long id, String browserFingerprintHash, String ipAddress, Set suspiciousReasons, Instant createdDate, diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDetailsDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDetailsDTO.java index ac85c113358d..07157ef467b4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDetailsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDetailsDTO.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.hestia.ExerciseHint; +import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedSettingsDTO; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationDTO.java index f8d0426a271b..213fa06243b6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationDTO.java @@ -12,7 +12,7 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; -import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ParticipationDTO(Long id, boolean testRun, String type, Integer submissionCount, ParticipationExerciseDTO exercise) implements Serializable { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationWithExerciseDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationWithExerciseDTO.java index c2c4a7d591dc..656d81877d52 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationWithExerciseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationWithExerciseDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; /** * A DTO representing a participation. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/PostContextFilterDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/PostContextFilterDTO.java index 3fa3cf8242b5..7fa807cfb44b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/PostContextFilterDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/PostContextFilterDTO.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.communication.domain.PostSortCriterion; import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; -import de.tum.cit.aet.artemis.domain.metis.PostSortCriterion; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PostContextFilterDTO(@NotBlank Long courseId, long[] courseWideChannelIds, Long plagiarismCaseId, Long conversationId, String searchText, Boolean filterToUnresolved, diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseGitDiffEntryDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseGitDiffEntryDTO.java index 768d136c9503..2db3e150b4f0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseGitDiffEntryDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseGitDiffEntryDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; /** * DTO for a git diff report entry. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseGitDiffReportDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseGitDiffReportDTO.java index 318cfde7f8af..ade73944ce28 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseGitDiffReportDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseGitDiffReportDTO.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; /** * DTO for a git diff report. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StudentExamWithGradeDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StudentExamWithGradeDTO.java index cf2088236fb8..75b721cd6916 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StudentExamWithGradeDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StudentExamWithGradeDTO.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.domain.GradeType; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; /** * DTO that wraps the {@link StudentExam} and contains related assessment result and grading information if available. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentDTO.java index a099875fab38..75cf4c32266b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentDTO.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.TextBlock; +import de.tum.cit.aet.artemis.text.domain.TextBlock; @JsonInclude(JsonInclude.Include.NON_EMPTY) public class TextAssessmentDTO { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentUpdateDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentUpdateDTO.java index adcd0a1167f2..87d49eedf256 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentUpdateDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentUpdateDTO.java @@ -7,7 +7,7 @@ import de.tum.cit.aet.artemis.domain.ComplaintResponse; import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.TextBlock; +import de.tum.cit.aet.artemis.text.domain.TextBlock; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record TextAssessmentUpdateDTO(List feedbacks, ComplaintResponse complaintResponse, String assessmentNote, Set textBlocks) diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyGraphEdgeDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyGraphEdgeDTO.java index dfcff58de92e..d963fb03d32d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyGraphEdgeDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyGraphEdgeDTO.java @@ -2,8 +2,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.competency.CompetencyRelation; -import de.tum.cit.aet.artemis.domain.competency.RelationType; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyRelation; +import de.tum.cit.aet.artemis.atlas.domain.competency.RelationType; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record CompetencyGraphEdgeDTO(String id, String source, String target, RelationType relationType) { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyGraphNodeDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyGraphNodeDTO.java index 48138704d133..1e30979692bf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyGraphNodeDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyGraphNodeDTO.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record CompetencyGraphNodeDTO(String id, String label, ZonedDateTime softDueDate, Double value, CompetencyNodeValueType valueType) { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyImportResponseDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyImportResponseDTO.java index 07a39eb0ab06..34712f7b8c60 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyImportResponseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyImportResponseDTO.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record CompetencyImportResponseDTO(long id, String title, String description, CompetencyTaxonomy taxonomy, ZonedDateTime softDueDate, Integer masteryThreshold, diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyJolDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyJolDTO.java index fcafcd428624..2c4d3b357827 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyJolDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyJolDTO.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.competency.CompetencyJol; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyJol; /** * A DTO for the CompetencyJol entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyJolPairDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyJolPairDTO.java index 5b2c503d3f41..189bc123aac3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyJolPairDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyJolPairDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.competency.CompetencyJol; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyJol; /** * This DTO is used to represent a pair of CompetencyJolDTOs, where the first one is the current judgement of learning value and the second one is the judgement of learning value diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyNameDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyNameDTO.java index ea7ac99c6434..f331a0e6dec2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyNameDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyNameDTO.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyRelationDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyRelationDTO.java index 7637f61f0d78..a6ba326890e0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyRelationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyRelationDTO.java @@ -2,8 +2,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.competency.CompetencyRelation; -import de.tum.cit.aet.artemis.domain.competency.RelationType; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyRelation; +import de.tum.cit.aet.artemis.atlas.domain.competency.RelationType; /** * DTO containing {@link CompetencyRelation} data. It only contains ids of the linked competencies to reduce data sent. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyWithTailRelationDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyWithTailRelationDTO.java index cb51f954b0ab..8fbbf2ccd3d5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyWithTailRelationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyWithTailRelationDTO.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.competency.Competency; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; /** * DTO containing a {@link Competency} and list of {@link CompetencyRelationDTO CompetencyRelation(DTO)s} for which it is the tail competency. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathInformationDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathInformationDTO.java index 11d8cc9b6276..a598bc183ea9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathInformationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathInformationDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.competency.LearningPath; +import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; import de.tum.cit.aet.artemis.web.rest.dto.user.UserNameAndLoginDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathNavigationObjectDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathNavigationObjectDTO.java index afe9fd24fa7a..f029a67734d8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathNavigationObjectDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathNavigationObjectDTO.java @@ -4,7 +4,7 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.LearningObject; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; /** * DTO for a learning navigation object. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LinkedCourseCompetencyDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LinkedCourseCompetencyDTO.java index 11971e365314..872c5ab5ddff 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LinkedCourseCompetencyDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LinkedCourseCompetencyDTO.java @@ -2,9 +2,11 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; + /** * A DTO containing the information of the linkedCourseCompetency field of a - * {@link de.tum.cit.aet.artemis.domain.competency.CourseCompetency CourseCompetency} + * {@link CourseCompetency CourseCompetency} */ @JsonInclude(JsonInclude.Include.NON_EMPTY) record LinkedCourseCompetencyDTO(long id, long courseId, String courseTitle, String semester) { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamAttendanceCheckEventDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamAttendanceCheckEventDTO.java index fea8dbbb6b63..98d88a959450 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamAttendanceCheckEventDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamAttendanceCheckEventDTO.java @@ -4,10 +4,10 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.exam.event.ExamAttendanceCheckEvent; +import de.tum.cit.aet.artemis.exam.domain.event.ExamAttendanceCheckEvent; /** - * A DTO for the {@link de.tum.cit.aet.artemis.domain.exam.event.ExamAttendanceCheckEvent} entity. + * A DTO for the {@link de.tum.cit.aet.artemis.exam.domain.event.ExamAttendanceCheckEvent} entity. */ @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ExamAttendanceCheckEventDTO(Long id, String createdBy, Instant createdDate, String text) implements ExamLiveEventBaseDTO { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamLiveEventBaseDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamLiveEventBaseDTO.java index 39829e42d3d8..bd2b9430926a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamLiveEventBaseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamLiveEventBaseDTO.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; /** - * A DTO for the {@link de.tum.cit.aet.artemis.domain.exam.event.ExamLiveEvent} entity. + * A DTO for the {@link de.tum.cit.aet.artemis.exam.domain.event.ExamLiveEvent} entity. */ @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "eventType") diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamWideAnnouncementEventDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamWideAnnouncementEventDTO.java index 8a57bceba1ae..7d7414094844 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamWideAnnouncementEventDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamWideAnnouncementEventDTO.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; /** - * A DTO for the {@link de.tum.cit.aet.artemis.domain.exam.event.ExamWideAnnouncementEvent} entity. + * A DTO for the {@link de.tum.cit.aet.artemis.exam.domain.event.ExamWideAnnouncementEvent} entity. */ @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ExamWideAnnouncementEventDTO(Long id, String createdBy, Instant createdDate, String text) implements ExamLiveEventBaseDTO { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ProblemStatementUpdateEventDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ProblemStatementUpdateEventDTO.java index d6a1b530928f..510ee84c14b9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ProblemStatementUpdateEventDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ProblemStatementUpdateEventDTO.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; /** - * A DTO for the {@link de.tum.cit.aet.artemis.domain.exam.event.ProblemStatementUpdateEvent} entity. + * A DTO for the {@link de.tum.cit.aet.artemis.exam.domain.event.ProblemStatementUpdateEvent} entity. */ @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ProblemStatementUpdateEventDTO(Long id, String createdBy, Instant createdDate, String text, String problemStatement, long exerciseId, String exerciseName) diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/WorkingTimeUpdateEventDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/WorkingTimeUpdateEventDTO.java index 71208775321e..a8efe37de0a8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/WorkingTimeUpdateEventDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/WorkingTimeUpdateEventDTO.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; /** - * A DTO for the {@link de.tum.cit.aet.artemis.domain.exam.event.WorkingTimeUpdateEvent} entity. + * A DTO for the {@link de.tum.cit.aet.artemis.exam.domain.event.WorkingTimeUpdateEvent} entity. */ @JsonInclude(JsonInclude.Include.NON_EMPTY) public record WorkingTimeUpdateEventDTO(Long id, String createdBy, Instant createdDate, int newWorkingTime, int oldWorkingTime, boolean courseWide) diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/lectureunit/LectureUnitForLearningPathNodeDetailsDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/lectureunit/LectureUnitForLearningPathNodeDetailsDTO.java index cf852e92ed2a..b4bf5f1c2e47 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/lectureunit/LectureUnitForLearningPathNodeDetailsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/lectureunit/LectureUnitForLearningPathNodeDetailsDTO.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record LectureUnitForLearningPathNodeDetailsDTO(long id, @NotNull String name, @NotNull String type) { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyInformationDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyInformationDTO.java index addec264241b..da9e3c5afa5e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyInformationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyInformationDTO.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; /** * A DTO for the CompetencyInformation entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/LectureUnitInformationDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/LectureUnitInformationDTO.java index a04db9083a03..bd2b53b37345 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/LectureUnitInformationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/LectureUnitInformationDTO.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; /** * DTO for lecture unit information. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismCaseInfoDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismCaseInfoDTO.java index bcb123bf0d03..7b84e9831bab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismCaseInfoDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismCaseInfoDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; /** * A DTO with a subset of Plagiarism Case fields for displaying relevant info to a student. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismComparisonStatusDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismComparisonStatusDTO.java index 5bd9e7703842..3eb2e82891f0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismComparisonStatusDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismComparisonStatusDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PlagiarismComparisonStatusDTO(PlagiarismStatus status) { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismResultDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismResultDTO.java index ab2eb31a7fde..3413f3571342 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismResultDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismResultDTO.java @@ -2,8 +2,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismResult; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmissionElement; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmissionElement; import de.tum.cit.aet.artemis.web.rest.plagiarism.PlagiarismResultStats; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismVerdictDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismVerdictDTO.java index 8f5ed9d5aa69..508e81dc50cf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismVerdictDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismVerdictDTO.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PlagiarismVerdictDTO(@NotNull PlagiarismVerdict verdict, String verdictMessage, int verdictPointDeduction) { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/science/ScienceEventDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/science/ScienceEventDTO.java index 9eed4de5569c..ab4942416f28 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/science/ScienceEventDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/science/ScienceEventDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.science.ScienceEventType; +import de.tum.cit.aet.artemis.atlas.domain.science.ScienceEventType; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ScienceEventDTO(ScienceEventType type, Long resourceId) { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/settings/ide/IdeDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/settings/ide/IdeDTO.java index 2c17e2cf1c49..8ec6d2b8ad5a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/settings/ide/IdeDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/settings/ide/IdeDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.settings.ide.Ide; +import de.tum.cit.aet.artemis.programming.domain.ide.Ide; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record IdeDTO(String name, String deepLink) { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/settings/ide/IdeMappingDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/settings/ide/IdeMappingDTO.java index 67b277a7b1b7..505f8257b481 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/settings/ide/IdeMappingDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/settings/ide/IdeMappingDTO.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.settings.ide.Ide; +import de.tum.cit.aet.artemis.programming.domain.ide.Ide; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record IdeMappingDTO(ProgrammingLanguage programmingLanguage, IdeDTO ide) { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaRequestDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaRequestDTO.java index c5d2c6eadc54..9de293aacaf1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaRequestDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaRequestDTO.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.competency.KnowledgeArea; +import de.tum.cit.aet.artemis.atlas.domain.competency.KnowledgeArea; /** * DTO used to send requests regarding {@link KnowledgeArea} objects. It has no id and only contains the id (not object) of its parent diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaResultDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaResultDTO.java index e0d274acd2e1..15a5ed6d66b2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaResultDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaResultDTO.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.competency.KnowledgeArea; +import de.tum.cit.aet.artemis.atlas.domain.competency.KnowledgeArea; /** * DTO containing {@link KnowledgeArea} data. It only contains the id of the knowledge area and source. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/SourceDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/SourceDTO.java index 3085440d018f..d1428c58c852 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/SourceDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/SourceDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.competency.Source; +import de.tum.cit.aet.artemis.atlas.domain.competency.Source; /** * DTO containing source information diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyCatalogDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyCatalogDTO.java index 6b9d6fb61336..e50b97905c2a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyCatalogDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyCatalogDTO.java @@ -10,10 +10,10 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; -import de.tum.cit.aet.artemis.domain.competency.KnowledgeArea; -import de.tum.cit.aet.artemis.domain.competency.Source; -import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.atlas.domain.competency.KnowledgeArea; +import de.tum.cit.aet.artemis.atlas.domain.competency.Source; +import de.tum.cit.aet.artemis.atlas.domain.competency.StandardizedCompetency; /** * DTO including a nested structure of knowledge areas (including their descendants and competencies), as well as a list of sources diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyRequestDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyRequestDTO.java index 5046fd969172..3a8e92dd2977 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyRequestDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyRequestDTO.java @@ -5,8 +5,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; -import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.atlas.domain.competency.StandardizedCompetency; /** * DTO used to send requests regarding {@link StandardizedCompetency} objects. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyResultDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyResultDTO.java index d1132092d9b1..9d4a6b7c82b2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyResultDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyResultDTO.java @@ -2,8 +2,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; -import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.atlas.domain.competency.StandardizedCompetency; /** * DTO containing {@link StandardizedCompetency} data. It only contains the id of the knowledge area and source. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ExamConfigurationException.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ExamConfigurationException.java index e9689e090732..e9056774966f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ExamConfigurationException.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ExamConfigurationException.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; /** * Exception that will be thrown if the user tries to import an exam that contains programming exercises with an invalid shortName. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CodeHintResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CodeHintResource.java index 3dd8371c1c44..b5696e9b4245 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CodeHintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CodeHintResource.java @@ -21,8 +21,8 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.hestia.CodeHint; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettingsType; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; +import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CodeHintRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CoverageReportResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CoverageReportResource.java index f284bcf1331a..390a4db20a0f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CoverageReportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CoverageReportResource.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; -import de.tum.cit.aet.artemis.domain.hestia.CoverageReport; +import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageReport; import de.tum.cit.aet.artemis.service.hestia.TestwiseCoverageService; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ExerciseHintResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ExerciseHintResource.java index c78e83fdbd8f..4e52f95f3a35 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ExerciseHintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ExerciseHintResource.java @@ -27,9 +27,9 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.hestia.CodeHint; -import de.tum.cit.aet.artemis.domain.hestia.ExerciseHint; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintRepository; import de.tum.cit.aet.artemis.service.hestia.CodeHintService; @@ -39,7 +39,7 @@ import tech.jhipster.web.util.HeaderUtil; /** - * REST controller for managing {@link de.tum.cit.aet.artemis.domain.hestia.ExerciseHint}. + * REST controller for managing {@link ExerciseHint}. */ @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java index 946a8b1dac84..8f4fea172353 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java @@ -22,9 +22,9 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; -import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java index d6c293b9be93..b38704689ef9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java @@ -27,8 +27,8 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.hestia.CodeHint; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CodeHintRepository; @@ -43,7 +43,7 @@ import tech.jhipster.web.util.HeaderUtil; /** - * REST controller for managing {@link de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry}. + * REST controller for managing {@link ProgrammingExerciseSolutionEntry}. */ @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java index f1b3836ad22a..07ecdf655670 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java @@ -16,13 +16,13 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; /** - * REST controller for managing {@link de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask}. + * REST controller for managing {@link ProgrammingExerciseTask}. */ @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisCourseChatSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisCourseChatSessionResource.java index caa2a391ac87..80709c867c0d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisCourseChatSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisCourseChatSessionResource.java @@ -15,8 +15,8 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; -import de.tum.cit.aet.artemis.domain.iris.session.IrisCourseChatSession; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettingsType; +import de.tum.cit.aet.artemis.iris.domain.session.IrisCourseChatSession; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; import de.tum.cit.aet.artemis.iris.repository.IrisCourseChatSessionRepository; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisHealthIndicator; import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisExerciseChatSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisExerciseChatSessionResource.java index 2cc5b7fbc434..5aaf97bc0bbe 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisExerciseChatSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisExerciseChatSessionResource.java @@ -17,9 +17,9 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.iris.session.IrisExerciseChatSession; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettingsType; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.iris.domain.session.IrisExerciseChatSession; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; import de.tum.cit.aet.artemis.iris.repository.IrisExerciseChatSessionRepository; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisHealthIndicator; import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisMessageResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisMessageResource.java index b3286c3cff93..d02eb1d6913f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisMessageResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisMessageResource.java @@ -19,9 +19,9 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; -import de.tum.cit.aet.artemis.domain.iris.message.IrisMessageSender; -import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessageSender; +import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; import de.tum.cit.aet.artemis.iris.repository.IrisMessageRepository; import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; import de.tum.cit.aet.artemis.service.iris.IrisMessageService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisSettingsResource.java index 723c5fb3223d..d292b71bd88f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisSettingsResource.java @@ -15,9 +15,9 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisCourseSettings; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisExerciseSettings; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisCourseSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisExerciseSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisSettings; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedSettingsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java index cc1f2f352411..0b0aac412f84 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java @@ -33,7 +33,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.domain.Attachment; import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.AttachmentUnitService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/ExerciseUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/ExerciseUnitResource.java index d4d507884f65..137673b57db7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/ExerciseUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/ExerciseUnitResource.java @@ -22,7 +22,7 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; import de.tum.cit.aet.artemis.lecture.repository.ExerciseUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java index 5fc7eeb73989..2794f99c95af 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java @@ -29,7 +29,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java index 85dcbd96f017..3b66a8adde1c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java @@ -31,7 +31,7 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.lecture.OnlineUnit; +import de.tum.cit.aet.artemis.lecture.domain.OnlineUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.OnlineUnitRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java index 981ee2b142ad..479590bf8f27 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java @@ -21,7 +21,7 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.lecture.TextUnit; +import de.tum.cit.aet.artemis.lecture.domain.TextUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java index 54d4444b2897..34105e82a67d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java @@ -23,7 +23,7 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.lecture.VideoUnit; +import de.tum.cit.aet.artemis.lecture.domain.VideoUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.VideoUnitRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/AnswerMessageResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/AnswerMessageResource.java index 174f2acf6f15..aed15bcc36bc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/AnswerMessageResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/AnswerMessageResource.java @@ -18,8 +18,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.communication.domain.AnswerPost; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.metis.AnswerPost; import de.tum.cit.aet.artemis.service.metis.AnswerMessageService; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java index 19774d951749..03411243b1c8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java @@ -28,13 +28,13 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import de.tum.cit.aet.artemis.communication.domain.CreatedConversationMessage; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; -import de.tum.cit.aet.artemis.domain.metis.CreatedConversationMessage; -import de.tum.cit.aet.artemis.domain.metis.Post; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.metis.ConversationMessagingService; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ReactionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ReactionResource.java index c9591eddc188..6af9d56cfb3f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ReactionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ReactionResource.java @@ -19,8 +19,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.communication.domain.Reaction; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.metis.Reaction; import de.tum.cit.aet.artemis.service.metis.ReactionService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java index 5c64b8cde7c2..4c93d065cda3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java @@ -30,6 +30,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -38,8 +40,6 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; -import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationDTOService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java index f4ee5d543d45..ce36d9b311f3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java @@ -25,13 +25,13 @@ import org.springframework.web.server.ResponseStatusException; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ConductAgreementService; import de.tum.cit.aet.artemis.service.dto.ResponsibleUserDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/GroupChatResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/GroupChatResource.java index bffaf545560c..35ed252d03c6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/GroupChatResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/GroupChatResource.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.web.rest.metis.conversation; +import static de.tum.cit.aet.artemis.communication.ConversationSettings.MAX_GROUP_CHAT_PARTICIPANTS; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.domain.metis.conversation.ConversationSettings.MAX_GROUP_CHAT_PARTICIPANTS; import static de.tum.cit.aet.artemis.service.metis.conversation.GroupChatService.GROUP_CHAT_ENTITY_NAME; import java.net.URI; @@ -21,12 +21,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.communication.domain.conversation.GroupChat; import de.tum.cit.aet.artemis.communication.repository.conversation.GroupChatRepository; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; -import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationDTOService; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; import de.tum.cit.aet.artemis.service.metis.conversation.GroupChatService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ChannelDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ChannelDTO.java index be151a3cbd5b..2f360a626d00 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ChannelDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ChannelDTO.java @@ -2,8 +2,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.metis.conversation.ChannelSubType; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.domain.conversation.ChannelSubType; @JsonInclude(JsonInclude.Include.NON_EMPTY) public class ChannelDTO extends ConversationDTO { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ConversationDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ConversationDTO.java index ea8fd7b0d4ec..4bf055a3c0f9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ConversationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ConversationDTO.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; +import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type") diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/GroupChatDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/GroupChatDTO.java index bceb9bad02d3..98e3f46514ca 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/GroupChatDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/GroupChatDTO.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; +import de.tum.cit.aet.artemis.communication.domain.conversation.GroupChat; @JsonInclude(JsonInclude.Include.NON_EMPTY) public class GroupChatDTO extends ConversationDTO { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/OneToOneChatDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/OneToOneChatDTO.java index 54185b5e3c71..caf9c589f603 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/OneToOneChatDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/OneToOneChatDTO.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; +import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; @JsonInclude(JsonInclude.Include.NON_EMPTY) public class OneToOneChatDTO extends ConversationDTO { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicProgrammingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicProgrammingSubmissionResource.java index 423c438a78c5..6f394572a28b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicProgrammingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicProgrammingSubmissionResource.java @@ -21,10 +21,10 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.domain.Commit; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.service.programming.ProgrammingMessagingService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicResultResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicResultResource.java index e805ed9cab1d..8f4ed691f87e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicResultResource.java @@ -21,7 +21,7 @@ import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.service.hestia.TestwiseCoverageService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicSystemNotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicSystemNotificationResource.java index 938ae49f05ea..b2be95c07582 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicSystemNotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicSystemNotificationResource.java @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.communication.domain.notification.SystemNotification; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; -import de.tum.cit.aet.artemis.domain.notification.SystemNotification; import de.tum.cit.aet.artemis.service.SystemNotificationService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismAnswerPostResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismAnswerPostResource.java index 481f7afe4069..971114a8201a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismAnswerPostResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismAnswerPostResource.java @@ -18,8 +18,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.communication.domain.AnswerPost; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.metis.AnswerPost; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismAnswerPostService; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java index 108703f73023..3da0024a0e65 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java @@ -27,8 +27,8 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismDetectionConfig; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismDetectionConfig; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismCaseService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismPostResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismPostResource.java index 39e68de5f103..6fcb09a8d3a8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismPostResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismPostResource.java @@ -27,9 +27,9 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.metis.Post; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismPostService; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java index 70e65482aa41..3c420758c2a6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java @@ -26,9 +26,9 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilder.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilder.java index 81249ea04dbb..2813927205be 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilder.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilder.java @@ -8,9 +8,9 @@ import org.springframework.http.ResponseEntity; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismResult; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmissionElement; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmissionElement; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java index f9dbddaf94f4..371bd6bb396b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java @@ -29,7 +29,7 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java index c0c509909360..fa06e9db8753 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java @@ -53,8 +53,8 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.domain.enumeration.Visibility; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java index a24c7dc36358..4a37d9a9b071 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java @@ -31,11 +31,11 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java index f2e062ab88e1..676c0919f146 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java @@ -23,7 +23,7 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java index b400cfd7bba1..ecab3e936337 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java @@ -39,6 +39,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -56,8 +57,7 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java index d45d437c79a3..1a5488000300 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java @@ -35,13 +35,13 @@ import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationRegisterBody.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationRegisterBody.java index 0fdbe523d30b..b44d90d74cf6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationRegisterBody.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationRegisterBody.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.push_notification; -import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceType; +import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceType; public record PushNotificationRegisterBody(String token, PushNotificationDeviceType deviceType) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationResource.java index 2a6ceff579d4..cb172e4eeecd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationResource.java @@ -24,14 +24,14 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfiguration; +import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfigurationId; import de.tum.cit.aet.artemis.communication.repository.PushNotificationDeviceConfigurationRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.jwt.TokenProvider; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfiguration; -import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfigurationId; import io.jsonwebtoken.ExpiredJwtException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationUnregisterRequest.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationUnregisterRequest.java index 4146a3db7c90..d61c35fac182 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationUnregisterRequest.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationUnregisterRequest.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.web.rest.push_notification; -import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceType; +import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceType; public record PushNotificationUnregisterRequest(String token, PushNotificationDeviceType deviceType) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java index 1e0a1935ad34..feb900c65025 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java @@ -40,10 +40,10 @@ import de.tum.cit.aet.artemis.domain.Repository; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.repository.SubmissionPolicyRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceSettingsResource.java index 6ccfae44ff87..dd9d9e30db74 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceSettingsResource.java @@ -20,11 +20,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.atlas.domain.science.ScienceSetting; import de.tum.cit.aet.artemis.atlas.repository.science.ScienceSettingRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.science.ScienceSetting; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/settings/ide/IdeSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/settings/ide/IdeSettingsResource.java index 6ecbaba058e4..0468316e619f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/settings/ide/IdeSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/settings/ide/IdeSettingsResource.java @@ -21,8 +21,8 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.settings.ide.Ide; -import de.tum.cit.aet.artemis.domain.settings.ide.UserIdeMapping; +import de.tum.cit.aet.artemis.programming.domain.ide.Ide; +import de.tum.cit.aet.artemis.programming.domain.ide.UserIdeMapping; import de.tum.cit.aet.artemis.programming.repository.settings.IdeRepository; import de.tum.cit.aet.artemis.programming.repository.settings.UserIdeMappingRepository; import de.tum.cit.aet.artemis.web.rest.dto.settings.ide.IdeDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java index afa3ca4c5233..34a1efcf5afa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java @@ -25,12 +25,12 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.feature.Feature; import de.tum.cit.aet.artemis.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupFreePeriodService; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupFreePeriod; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupFreePeriodRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupsConfigurationRepository; import de.tum.cit.aet.artemis.web.rest.dto.TutorialGroupFreePeriodDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java index dc6d0e0a85bd..ab4c089dba3e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java @@ -52,9 +52,6 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSchedule; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.feature.Feature; @@ -64,6 +61,9 @@ import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupChannelManagementService; import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupScheduleService; import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupService; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSchedule; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupNotificationRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupsConfigurationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java index 70dd4eb52341..2979280d6987 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java @@ -40,13 +40,13 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.feature.Feature; import de.tum.cit.aet.artemis.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupService; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupFreePeriod; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupFreePeriodRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupScheduleRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java index 9dc680fe193b..0c4b03582cfc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java @@ -27,11 +27,11 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.feature.Feature; import de.tum.cit.aet.artemis.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupChannelManagementService; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupsConfigurationRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/errors/ScheduleOverlapsWithSessionException.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/errors/ScheduleOverlapsWithSessionException.java index 5894fc439b20..6f2d69dfa82b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/errors/ScheduleOverlapsWithSessionException.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/errors/ScheduleOverlapsWithSessionException.java @@ -8,7 +8,7 @@ import java.util.Map; import java.util.Set; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; import de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupResource; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/errors/SessionOverlapsWithSessionException.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/errors/SessionOverlapsWithSessionException.java index 4dad3f1c5628..1620de3e0551 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/errors/SessionOverlapsWithSessionException.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/errors/SessionOverlapsWithSessionException.java @@ -8,7 +8,7 @@ import java.util.Map; import java.util.Set; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; import de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupResource; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java index 24ba2ee98ca9..ea8f5d7a5d0f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java @@ -17,8 +17,8 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/SubmissionPatch.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/SubmissionPatch.java index 9d10156e3191..563924eae593 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/SubmissionPatch.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/SubmissionPatch.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.JsonNode; -import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; /** * DTO for a submission patch. Represents changes conducted by a peer while collaborating diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/TeamAssignmentPayload.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/TeamAssignmentPayload.java index 9f46a8446ffd..3c557050d00a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/TeamAssignmentPayload.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/TeamAssignmentPayload.java @@ -9,7 +9,7 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record TeamAssignmentPayload(@NotNull Exercise exercise, @Nullable Team team, @NotNull List studentParticipations) { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/metis/PostDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/metis/PostDTO.java index 48d64f4f2cd8..ba17445c0414 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/metis/PostDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/metis/PostDTO.java @@ -2,8 +2,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.notification.Notification; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.notification.Notification; /** * DTO that is included as payload for post related websocket messages diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/ParticipationTeamWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/ParticipationTeamWebsocketService.java index 8ef071a91069..57088c1bbfb4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/ParticipationTeamWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/ParticipationTeamWebsocketService.java @@ -36,17 +36,17 @@ import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.service.ModelingSubmissionService; import de.tum.cit.aet.artemis.service.TextSubmissionService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.web.websocket.dto.OnlineTeamStudentDTO; import de.tum.cit.aet.artemis.web.websocket.dto.SubmissionPatch; import de.tum.cit.aet.artemis.web.websocket.dto.SubmissionPatchPayload; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/TeamWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/TeamWebsocketService.java index b02527a24fca..9243e850dafc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/TeamWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/TeamWebsocketService.java @@ -15,7 +15,7 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.web.websocket.dto.TeamAssignmentPayload; diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java index f7721fe50c17..fc19cf1b57d4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java @@ -36,9 +36,9 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.participation.AbstractBaseProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.AbstractBaseProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabService; import de.tum.cit.aet.artemis.service.connectors.gitlabci.GitLabCIService; import de.tum.cit.aet.artemis.service.connectors.gitlabci.GitLabCITriggerService; diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java index 9493c0667966..bdccc69d7911 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java @@ -23,10 +23,10 @@ import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.participation.AbstractBaseProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; +import de.tum.cit.aet.artemis.programming.domain.AbstractBaseProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.service.exam.ExamLiveEventsService; import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java index fbc4d83c5227..ab0bc9d07186 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java @@ -39,9 +39,9 @@ import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.enumeration.AeolusTarget; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.participation.AbstractBaseProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.AbstractBaseProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabService; import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsService; import de.tum.cit.aet.artemis.service.exam.ExamLiveEventsService; diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java index 12f58a360e0b..ff2ca5522a12 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java @@ -31,11 +31,11 @@ import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.participation.AbstractBaseProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.localvcci.LocalVCLocalCITestService; import de.tum.cit.aet.artemis.localvcci.TestBuildAgentConfiguration; +import de.tum.cit.aet.artemis.programming.domain.AbstractBaseProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/DatabaseQueryCountTest.java b/src/test/java/de/tum/cit/aet/artemis/DatabaseQueryCountTest.java index 41cc3691ff00..c870ccc76e74 100644 --- a/src/test/java/de/tum/cit/aet/artemis/DatabaseQueryCountTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/DatabaseQueryCountTest.java @@ -12,8 +12,8 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.lecture.LectureUtilService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.dto.CoursesForDashboardDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/FileIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/FileIntegrationTest.java index 986de9109b10..0e7eb1eccab2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/FileIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/FileIntegrationTest.java @@ -29,12 +29,12 @@ import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; -import de.tum.cit.aet.artemis.domain.exam.ExamUser; -import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.lecture.LectureFactory; import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/LtiDeepLinkingIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/LtiDeepLinkingIntegrationTest.java index a8e57fd1274b..1791bbda26d0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/LtiDeepLinkingIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/LtiDeepLinkingIntegrationTest.java @@ -29,9 +29,9 @@ import com.nimbusds.jose.jwk.RSAKey; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.lti.Claims; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer; +import de.tum.cit.aet.artemis.lti.dto.Claims; import io.jsonwebtoken.Jwts; class LtiDeepLinkingIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/LtiQuizIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/LtiQuizIntegrationTest.java index 2114441b415e..f3a937e4bdd5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/LtiQuizIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/LtiQuizIntegrationTest.java @@ -31,13 +31,13 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.service.quiz.QuizExerciseService; import de.tum.cit.aet.artemis.service.quiz.QuizSubmissionService; diff --git a/src/test/java/de/tum/cit/aet/artemis/StatisticsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/StatisticsIntegrationTest.java index 166fe336ae1a..82a6d8942a1a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/StatisticsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/StatisticsIntegrationTest.java @@ -22,24 +22,24 @@ import de.tum.cit.aet.artemis.assessment.GradingScaleFactory; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.GraphType; import de.tum.cit.aet.artemis.domain.enumeration.SpanType; import de.tum.cit.aet.artemis.domain.enumeration.StatisticsView; -import de.tum.cit.aet.artemis.domain.metis.AnswerPost; -import de.tum.cit.aet.artemis.domain.metis.Post; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementStatisticsDTO; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseManagementStatisticsDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/StudentScoreUtilService.java b/src/test/java/de/tum/cit/aet/artemis/StudentScoreUtilService.java index c0bde7a6f546..14cf92300d42 100644 --- a/src/test/java/de/tum/cit/aet/artemis/StudentScoreUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/StudentScoreUtilService.java @@ -3,11 +3,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.StudentScore; import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.scores.StudentScore; /** * Service responsible for initializing the database with specific testdata related to student scores for use in integration tests. diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentComplaintIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentComplaintIntegrationTest.java index d65cf9f41243..1f0a662519f3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentComplaintIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentComplaintIntegrationTest.java @@ -27,29 +27,29 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.ExamFactory; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.service.dto.ComplaintAction; import de.tum.cit.aet.artemis.service.dto.ComplaintRequestDTO; import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.util.TestResourceUtils; import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionWithComplaintDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java index 30918920d4fb..68a4ef5b44be 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java @@ -26,11 +26,11 @@ import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.service.dto.ComplaintAction; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintResponseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintResponseIntegrationTest.java index 3e47834d1416..2ed88bad5de4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintResponseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintResponseIntegrationTest.java @@ -22,18 +22,18 @@ import de.tum.cit.aet.artemis.domain.ComplaintResponse; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.dto.ComplaintAction; import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; class ComplaintResponseIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintUtilService.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintUtilService.java index 3bb4974c0ecb..e7ac76418794 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintUtilService.java @@ -14,7 +14,7 @@ import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; -import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ExampleSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ExampleSubmissionIntegrationTest.java index cc8be039a165..b7ac16cae77a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ExampleSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ExampleSubmissionIntegrationTest.java @@ -20,6 +20,7 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.domain.Course; @@ -29,19 +30,18 @@ import de.tum.cit.aet.artemis.domain.GradingCriterion; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextBlock; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.text.domain.TextBlock; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.util.TestResourceUtils; import de.tum.cit.aet.artemis.web.rest.dto.TextAssessmentDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java index acca6951a9e4..10ee02d49bd0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java @@ -22,13 +22,13 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.team.TeamUtilService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseScoresDTO; class ExerciseScoresChartIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/GradeStepIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/GradeStepIntegrationTest.java index 6dcbbe709606..c8847b48c440 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/GradeStepIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/GradeStepIntegrationTest.java @@ -18,16 +18,16 @@ import de.tum.cit.aet.artemis.domain.GradeStep; import de.tum.cit.aet.artemis.domain.GradeType; import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.web.rest.dto.GradeDTO; import de.tum.cit.aet.artemis.web.rest.dto.GradeStepsDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleFactory.java b/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleFactory.java index 1f484be2b20c..c940b8d2823d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleFactory.java @@ -3,7 +3,7 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.GradeType; import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.exam.domain.Exam; /** * Factory for creating GradingScales and related objects. diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleIntegrationTest.java index 28b3087e5aeb..0b5381f9f0e7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleIntegrationTest.java @@ -19,8 +19,8 @@ import de.tum.cit.aet.artemis.domain.GradeType; import de.tum.cit.aet.artemis.domain.GradingScale; import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; -import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleUtilService.java b/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleUtilService.java index 37d1f86f7b10..ab104d09dd6c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleUtilService.java @@ -23,7 +23,7 @@ import de.tum.cit.aet.artemis.domain.GradeStep; import de.tum.cit.aet.artemis.domain.GradeType; import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.exam.domain.Exam; /** * Service responsible for initializing the database with specific testdata related to grading for use in integration tests. diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java index 35117cc918b9..0dc8a2260456 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java @@ -26,20 +26,20 @@ import de.tum.cit.aet.artemis.domain.GradingScale; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.team.TeamUtilService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.web.rest.dto.score.ScoreDTO; class ParticipantScoreIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/RatingResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/RatingResourceIntegrationTest.java index dc06bbad06db..42f0a2d855e5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/RatingResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/RatingResourceIntegrationTest.java @@ -16,14 +16,14 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Rating; import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.Language; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.service.RatingService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; class RatingResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java index 2b3457a89039..70420de0afe6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java @@ -39,22 +39,16 @@ import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseFactory; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; @@ -64,13 +58,19 @@ import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.web.rest.dto.ResultWithPointsPerGradingCriterionDTO; import de.tum.cit.aet.artemis.web.rest.dto.feedback.FeedbackDetailDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorEffortIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorEffortIntegrationTest.java index 7957ece0e0a2..b6dc542fd774 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorEffortIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorEffortIntegrationTest.java @@ -14,15 +14,15 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.dto.TutorEffort; import de.tum.cit.aet.artemis.assessment.repository.TextAssessmentEventRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; -import de.tum.cit.aet.artemis.domain.analytics.TextAssessmentEvent; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.statistics.tutor.effort.TutorEffort; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.text.domain.TextAssessmentEvent; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; class TutorEffortIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java index 709491c25606..74eb7f0da430 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java @@ -16,8 +16,8 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.service.TutorLeaderboardService; import de.tum.cit.aet.artemis.web.rest.dto.TutorLeaderboardDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationIntegrationTest.java index d6a5aa5cea36..ca579a2c3f73 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationIntegrationTest.java @@ -17,27 +17,27 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingInstructionRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ExampleSubmission; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextBlock; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; import de.tum.cit.aet.artemis.exercise.ExerciseFactory; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.service.ExampleSubmissionService; import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.service.TutorParticipationService; +import de.tum.cit.aet.artemis.text.domain.TextBlock; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.util.TestResourceUtils; class TutorParticipationIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationResourceIntegrationTest.java index 752eda0ff51b..29c41f89b096 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationResourceIntegrationTest.java @@ -11,13 +11,13 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ExampleSubmission; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; class TutorParticipationResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/bonus/BonusIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/bonus/BonusIntegrationTest.java index 35bcf0b9df5c..43b1397d29e6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/bonus/BonusIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/bonus/BonusIntegrationTest.java @@ -29,8 +29,8 @@ import de.tum.cit.aet.artemis.domain.GradeType; import de.tum.cit.aet.artemis.domain.GradingScale; import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/AbstractCompetencyPrerequisiteIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/AbstractCompetencyPrerequisiteIntegrationTest.java index 9a809cd9a858..0ef75f0e2475 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/AbstractCompetencyPrerequisiteIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/AbstractCompetencyPrerequisiteIntegrationTest.java @@ -17,32 +17,32 @@ import org.springframework.http.HttpStatus; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyRelation; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; +import de.tum.cit.aet.artemis.atlas.domain.competency.RelationType; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.CompetencyRelation; -import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.domain.competency.Prerequisite; -import de.tum.cit.aet.artemis.domain.competency.RelationType; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; -import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.domain.lecture.TextUnit; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.TextUnit; import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.ExerciseUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyIntegrationTest.java index a2d904b32566..984298ea988d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyIntegrationTest.java @@ -13,8 +13,8 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.domain.competency.Competency; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyJolIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyJolIntegrationTest.java index 02f6a415fd32..edb0adb15c99 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyJolIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyJolIntegrationTest.java @@ -14,10 +14,10 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; import de.tum.cit.aet.artemis.atlas.repository.competency.CompetencyJolRepository; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.Competency; -import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolPairDTO; class CompetencyJolIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyProgressUtilService.java b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyProgressUtilService.java index faea1a3937ef..26704e294cad 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyProgressUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyProgressUtilService.java @@ -3,10 +3,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; /** * Service responsible for initializing the database with specific testdata related to competency progress for use in integration tests. diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyUtilService.java b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyUtilService.java index 1a8bf61dfc32..4df841e5c1ac 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyUtilService.java @@ -7,19 +7,19 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyJol; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyRelation; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.atlas.domain.competency.RelationType; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.competency.CompetencyJolRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.Competency; -import de.tum.cit.aet.artemis.domain.competency.CompetencyJol; -import de.tum.cit.aet.artemis.domain.competency.CompetencyRelation; -import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; -import de.tum.cit.aet.artemis.domain.competency.RelationType; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/CourseCompetencyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/CourseCompetencyIntegrationTest.java index 843e734512ad..19ef67399bfa 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/CourseCompetencyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/CourseCompetencyIntegrationTest.java @@ -21,6 +21,13 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; import de.tum.cit.aet.artemis.StudentScoreUtilService; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyRelation; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; +import de.tum.cit.aet.artemis.atlas.domain.competency.RelationType; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; @@ -33,30 +40,21 @@ import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.Competency; -import de.tum.cit.aet.artemis.domain.competency.CompetencyProgress; -import de.tum.cit.aet.artemis.domain.competency.CompetencyRelation; -import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.domain.competency.Prerequisite; -import de.tum.cit.aet.artemis.domain.competency.RelationType; import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; -import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.domain.lecture.TextUnit; -import de.tum.cit.aet.artemis.domain.participation.Participant; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.TextUnit; import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.ExerciseUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; @@ -66,6 +64,8 @@ import de.tum.cit.aet.artemis.service.LectureUnitService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.team.TeamUtilService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; import de.tum.cit.aet.artemis.web.rest.dto.CourseCompetencyProgressDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java index edc7d1993e9c..334d2d50ef4e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java @@ -26,6 +26,10 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.StudentScoreUtilService; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyRelation; +import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; +import de.tum.cit.aet.artemis.atlas.domain.competency.RelationType; import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.LearningPathRepository; @@ -34,20 +38,16 @@ import de.tum.cit.aet.artemis.domain.GradingCriterion; import de.tum.cit.aet.artemis.domain.LearningObject; import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.Competency; -import de.tum.cit.aet.artemis.domain.competency.CompetencyRelation; -import de.tum.cit.aet.artemis.domain.competency.LearningPath; -import de.tum.cit.aet.artemis.domain.competency.RelationType; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.domain.lecture.TextUnit; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.TextUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.service.LectureUnitService; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; import de.tum.cit.aet.artemis.web.rest.LearningPathResource; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyGraphNodeDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathUtilService.java b/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathUtilService.java index a788f6378b78..1eca58fe62e4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathUtilService.java @@ -5,14 +5,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.LearningPathRepository; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.domain.competency.LearningPath; import de.tum.cit.aet.artemis.service.learningpath.LearningPathService; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteIntegrationTest.java index e71131f14795..910802afa3b1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteIntegrationTest.java @@ -13,8 +13,8 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.domain.competency.Prerequisite; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteUtilService.java b/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteUtilService.java index 91bdd4a11712..1964d35db3e0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteUtilService.java @@ -6,9 +6,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.competency.Prerequisite; /** * Service responsible for initializing the database with specific test data related to prerequisites for use in integration tests. diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyIntegrationTest.java index 962a15b27700..2c7b011380a6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyIntegrationTest.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.competency; -import static de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency.FIRST_VERSION; +import static de.tum.cit.aet.artemis.atlas.domain.competency.StandardizedCompetency.FIRST_VERSION; import static org.assertj.core.api.Assertions.assertThat; import java.util.List; @@ -18,15 +18,15 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.atlas.domain.competency.KnowledgeArea; +import de.tum.cit.aet.artemis.atlas.domain.competency.Source; +import de.tum.cit.aet.artemis.atlas.domain.competency.StandardizedCompetency; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.SourceRepository; import de.tum.cit.aet.artemis.atlas.repository.competency.KnowledgeAreaRepository; import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; -import de.tum.cit.aet.artemis.domain.competency.Competency; -import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; -import de.tum.cit.aet.artemis.domain.competency.KnowledgeArea; -import de.tum.cit.aet.artemis.domain.competency.Source; -import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaRequestDTO; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaResultDTO; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.SourceDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyUtilService.java b/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyUtilService.java index 786cbfdac4b4..9dac1b1d223e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyUtilService.java @@ -9,12 +9,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; +import de.tum.cit.aet.artemis.atlas.domain.competency.KnowledgeArea; +import de.tum.cit.aet.artemis.atlas.domain.competency.Source; +import de.tum.cit.aet.artemis.atlas.domain.competency.StandardizedCompetency; import de.tum.cit.aet.artemis.atlas.repository.competency.KnowledgeAreaRepository; import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; -import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; -import de.tum.cit.aet.artemis.domain.competency.KnowledgeArea; -import de.tum.cit.aet.artemis.domain.competency.Source; -import de.tum.cit.aet.artemis.domain.competency.StandardizedCompetency; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaRequestDTO; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyRequestDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/config/MetricsBeanTest.java b/src/test/java/de/tum/cit/aet/artemis/config/MetricsBeanTest.java index 86e90aace49e..4d79aafcb253 100644 --- a/src/test/java/de/tum/cit/aet/artemis/config/MetricsBeanTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/config/MetricsBeanTest.java @@ -18,12 +18,10 @@ import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; -import de.tum.cit.aet.artemis.domain.exam.ExamUser; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; @@ -34,6 +32,8 @@ import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.user.UserUtilService; import io.micrometer.core.instrument.MeterRegistry; diff --git a/src/test/java/de/tum/cit/aet/artemis/connector/GitlabRequestMockProvider.java b/src/test/java/de/tum/cit/aet/artemis/connector/GitlabRequestMockProvider.java index 70655c305864..7f73a357f31c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connector/GitlabRequestMockProvider.java +++ b/src/test/java/de/tum/cit/aet/artemis/connector/GitlabRequestMockProvider.java @@ -94,8 +94,8 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.UriService; import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabException; diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java index d5be43a38c51..eb49a167427e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java @@ -55,17 +55,17 @@ import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.lti.LtiResourceLaunch; -import de.tum.cit.aet.artemis.domain.lti.Scopes; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.lti.domain.LtiResourceLaunch; +import de.tum.cit.aet.artemis.lti.dto.Scopes; import de.tum.cit.aet.artemis.lti.repository.Lti13ResourceLaunchRepository; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; import de.tum.cit.aet.artemis.service.connectors.lti.Lti13Service; import de.tum.cit.aet.artemis.service.connectors.lti.LtiService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; import uk.ac.ox.ctl.lti13.lti.Claims; diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java index a4cc4347614c..41461482e1e2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java @@ -22,8 +22,8 @@ import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; -import de.tum.cit.aet.artemis.domain.lti.Lti13ClientRegistration; -import de.tum.cit.aet.artemis.domain.lti.Lti13PlatformConfiguration; +import de.tum.cit.aet.artemis.lti.dto.Lti13ClientRegistration; +import de.tum.cit.aet.artemis.lti.dto.Lti13PlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.service.connectors.lti.LtiDynamicRegistrationService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiNewResultServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiNewResultServiceTest.java index 9984f14fcec6..97ca63625fae 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiNewResultServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiNewResultServiceTest.java @@ -13,10 +13,10 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.service.connectors.lti.Lti13Service; import de.tum.cit.aet.artemis.service.connectors.lti.LtiNewResultService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; class LtiNewResultServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiServiceTest.java index ff0a64e9f2bf..936be5ead6ac 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiServiceTest.java @@ -35,12 +35,12 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; import de.tum.cit.aet.artemis.service.connectors.lti.LtiService; import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; import de.tum.cit.aet.artemis.service.user.UserCreationService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; class LtiServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java b/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java index 4b151044a88b..1ccdbf3f5d6d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java @@ -61,10 +61,14 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; +import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; +import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; import de.tum.cit.aet.artemis.atlas.repository.LearningPathRepository; +import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; @@ -88,11 +92,7 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.Competency; -import de.tum.cit.aet.artemis.domain.competency.Prerequisite; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; @@ -103,22 +103,15 @@ import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExamUser; -import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; import de.tum.cit.aet.artemis.exam.ExamFactory; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.MockDelegate; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; @@ -133,10 +126,15 @@ import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.lti.repository.OnlineCourseConfigurationRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; @@ -147,6 +145,8 @@ import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.team.TeamUtilService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/course/CourseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/course/CourseUtilService.java index 9b6a84521ff3..926eca02f27b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/course/CourseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/course/CourseUtilService.java @@ -20,6 +20,7 @@ import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; import de.tum.cit.aet.artemis.assessment.GradingScaleUtilService; +import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; @@ -38,8 +39,6 @@ import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; @@ -49,18 +48,13 @@ import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; import de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseFactory; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; @@ -77,14 +71,20 @@ import de.tum.cit.aet.artemis.lecture.LectureUtilService; import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; import de.tum.cit.aet.artemis.organization.OrganizationUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.ModelingSubmissionService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.TestResourceUtils; diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/ExerciseTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/ExerciseTest.java index a39df1b2c5ce..3c68880f34ad 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/ExerciseTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/ExerciseTest.java @@ -16,15 +16,16 @@ import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.ExamFactory; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.service.ExerciseService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; class ExerciseTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTest.java index dd58e9b55686..69963d61d707 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTest.java @@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.settings.ide.UserIdeMapping; +import de.tum.cit.aet.artemis.programming.domain.ide.UserIdeMapping; import de.tum.cit.aet.artemis.util.classpath.ClassNode; import de.tum.cit.aet.artemis.util.classpath.ClassPathNode; import de.tum.cit.aet.artemis.util.classpath.ClassPathUtil; diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTestExclusions.java b/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTestExclusions.java index 0a7d42a8e93d..6697a77f9820 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTestExclusions.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTestExclusions.java @@ -5,8 +5,8 @@ import java.util.Map; import java.util.Map.Entry; +import de.tum.cit.aet.artemis.communication.ConversationSettings; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.metis.conversation.ConversationSettings; /** * Exclusions of domain classes for specific tests. diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/ResultTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/ResultTest.java index 7e8e1f001545..f3ab6f44d84d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/ResultTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/ResultTest.java @@ -11,13 +11,15 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentNote; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.enumeration.Visibility; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.text.domain.TextExercise; class ResultTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/ShortAnswerQuestionTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/ShortAnswerQuestionTest.java index 2f490711e63a..faa696137306 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/ShortAnswerQuestionTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/ShortAnswerQuestionTest.java @@ -4,9 +4,9 @@ import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedText; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedText; class ShortAnswerQuestionTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/ShortAnswerSubmittedTextTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/ShortAnswerSubmittedTextTest.java index d958741d845a..9368b6b0e1cb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/ShortAnswerSubmittedTextTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/ShortAnswerSubmittedTextTest.java @@ -5,9 +5,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedText; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedText; class ShortAnswerSubmittedTextTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseTypeTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseTypeTest.java index d07581a0c4f3..fcea9a723e18 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseTypeTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseTypeTest.java @@ -8,9 +8,9 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.FileUploadExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.text.domain.TextExercise; class ExerciseTypeTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/notification/GroupNotificationFactoryTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/notification/GroupNotificationFactoryTest.java index 53d881a4b364..982d5b0b0811 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/notification/GroupNotificationFactoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/notification/GroupNotificationFactoryTest.java @@ -1,5 +1,46 @@ package de.tum.cit.aet.artemis.domain.notification; +import static de.tum.cit.aet.artemis.communication.domain.notification.GroupNotificationFactory.createAnnouncementNotification; +import static de.tum.cit.aet.artemis.communication.domain.notification.GroupNotificationFactory.createNotification; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.ATTACHMENT_CHANGE_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.ATTACHMENT_CHANGE_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.COURSE_ARCHIVE_FAILED_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.COURSE_ARCHIVE_FAILED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.COURSE_ARCHIVE_FINISHED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.COURSE_ARCHIVE_FINISHED_WITH_ERRORS_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.COURSE_ARCHIVE_STARTED_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.COURSE_ARCHIVE_STARTED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.DUPLICATE_TEST_CASE_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.EXAM_ARCHIVE_FAILED_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.EXAM_ARCHIVE_FAILED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.EXAM_ARCHIVE_FINISHED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.EXAM_ARCHIVE_FINISHED_WITH_ERRORS_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.EXAM_ARCHIVE_STARTED_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.EXAM_ARCHIVE_STARTED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.EXERCISE_PRACTICE_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.EXERCISE_PRACTICE_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.EXERCISE_RELEASED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.EXERCISE_UPDATED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.LIVE_EXAM_EXERCISE_UPDATE_NOTIFICATION_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.LIVE_EXAM_EXERCISE_UPDATE_NOTIFICATION_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.NEW_ANNOUNCEMENT_POST_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.NEW_ANNOUNCEMENT_POST_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.PROGRAMMING_TEST_CASES_CHANGED_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.PROGRAMMING_TEST_CASES_CHANGED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.QUIZ_EXERCISE_STARTED_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.QUIZ_EXERCISE_STARTED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.ATTACHMENT_UPDATED_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.COURSES_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.COURSE_ARCHIVE_UPDATED_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.EXAMS_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.EXAM_ARCHIVE_UPDATED_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.EXERCISE_RELEASED_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.EXERCISE_UPDATED_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createCoursePostTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createCourseTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createDuplicateTestCaseTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createExerciseTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createLectureTarget; import static de.tum.cit.aet.artemis.core.config.Constants.TEST_CASES_DUPLICATE_NOTIFICATION; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority.HIGH; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority.MEDIUM; @@ -17,47 +58,6 @@ import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_ANNOUNCEMENT_POST; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PROGRAMMING_TEST_CASES_CHANGED; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.QUIZ_EXERCISE_STARTED; -import static de.tum.cit.aet.artemis.domain.notification.GroupNotificationFactory.createAnnouncementNotification; -import static de.tum.cit.aet.artemis.domain.notification.GroupNotificationFactory.createNotification; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.ATTACHMENT_CHANGE_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.ATTACHMENT_CHANGE_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.COURSE_ARCHIVE_FAILED_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.COURSE_ARCHIVE_FAILED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.COURSE_ARCHIVE_FINISHED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.COURSE_ARCHIVE_FINISHED_WITH_ERRORS_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.COURSE_ARCHIVE_STARTED_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.COURSE_ARCHIVE_STARTED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.DUPLICATE_TEST_CASE_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXAM_ARCHIVE_FAILED_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXAM_ARCHIVE_FAILED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXAM_ARCHIVE_FINISHED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXAM_ARCHIVE_FINISHED_WITH_ERRORS_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXAM_ARCHIVE_STARTED_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXAM_ARCHIVE_STARTED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXERCISE_PRACTICE_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXERCISE_PRACTICE_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXERCISE_RELEASED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXERCISE_UPDATED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.LIVE_EXAM_EXERCISE_UPDATE_NOTIFICATION_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.LIVE_EXAM_EXERCISE_UPDATE_NOTIFICATION_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_ANNOUNCEMENT_POST_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_ANNOUNCEMENT_POST_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.PROGRAMMING_TEST_CASES_CHANGED_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.PROGRAMMING_TEST_CASES_CHANGED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.QUIZ_EXERCISE_STARTED_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.QUIZ_EXERCISE_STARTED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.ATTACHMENT_UPDATED_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.COURSES_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.COURSE_ARCHIVE_UPDATED_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.EXAMS_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.EXAM_ARCHIVE_UPDATED_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.EXERCISE_RELEASED_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.EXERCISE_UPDATED_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createCoursePostTarget; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createCourseTarget; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createDuplicateTestCaseTarget; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createExerciseTarget; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createLectureTarget; import static org.assertj.core.api.Assertions.assertThat; import java.util.List; @@ -66,21 +66,24 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.domain.notification.GroupNotification; +import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; +import de.tum.cit.aet.artemis.communication.domain.notification.NotificationTarget; import de.tum.cit.aet.artemis.domain.Attachment; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType; import de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.metis.AnswerPost; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.text.domain.TextExercise; class GroupNotificationFactoryTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderArchitectureTest.java index 120adc974c35..8454190ed5af 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderArchitectureTest.java @@ -19,6 +19,7 @@ import com.tngtech.archunit.lang.ConditionEvents; import de.tum.cit.aet.artemis.architecture.AbstractArchitectureTest; +import de.tum.cit.aet.artemis.communication.domain.notification.NotificationPlaceholderCreator; class NotificationPlaceholderArchitectureTest extends AbstractArchitectureTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderSignatureTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderSignatureTest.java index 6c8de6835ab7..dfdc43aaf4e2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderSignatureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/notification/NotificationPlaceholderSignatureTest.java @@ -16,6 +16,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.domain.notification.NotificationPlaceholderCreator; import de.tum.cit.aet.artemis.core.config.Constants; import io.github.classgraph.AnnotationEnumValue; import io.github.classgraph.ClassGraph; diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/notification/SingleUserNotificationFactoryTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/notification/SingleUserNotificationFactoryTest.java index f59d7d360b51..25500d25801b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/notification/SingleUserNotificationFactoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/notification/SingleUserNotificationFactoryTest.java @@ -1,5 +1,37 @@ package de.tum.cit.aet.artemis.domain.notification; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.DATA_EXPORT_CREATED_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.DATA_EXPORT_CREATED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.DATA_EXPORT_FAILED_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.DATA_EXPORT_FAILED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.EXERCISE_SUBMISSION_ASSESSED_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.EXERCISE_SUBMISSION_ASSESSED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.FILE_SUBMISSION_SUCCESSFUL_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.FILE_SUBMISSION_SUCCESSFUL_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.NEW_PLAGIARISM_CASE_STUDENT_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.NEW_PLAGIARISM_CASE_STUDENT_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.PLAGIARISM_CASE_VERDICT_STUDENT_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.PLAGIARISM_CASE_VERDICT_STUDENT_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_ASSIGNED_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_ASSIGNED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_STUDENT_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_STUDENT_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_TUTOR_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_TUTOR_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_MULTIPLE_TUTOR_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_MULTIPLE_TUTOR_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_STUDENT_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_STUDENT_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_TUTOR_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_TUTOR_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_UNASSIGNED_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_UNASSIGNED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createDataExportCreatedTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createDataExportFailedTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createExerciseTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createPlagiarismCaseTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createTutorialGroupTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotificationFactory.createNotification; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority.HIGH; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority.MEDIUM; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DATA_EXPORT_CREATED; @@ -15,38 +47,6 @@ import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_STUDENT; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_TUTOR; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UNASSIGNED; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.DATA_EXPORT_CREATED_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.DATA_EXPORT_CREATED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.DATA_EXPORT_FAILED_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.DATA_EXPORT_FAILED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXERCISE_SUBMISSION_ASSESSED_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXERCISE_SUBMISSION_ASSESSED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.FILE_SUBMISSION_SUCCESSFUL_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.FILE_SUBMISSION_SUCCESSFUL_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_PLAGIARISM_CASE_STUDENT_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_PLAGIARISM_CASE_STUDENT_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.PLAGIARISM_CASE_VERDICT_STUDENT_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.PLAGIARISM_CASE_VERDICT_STUDENT_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_ASSIGNED_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_ASSIGNED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_STUDENT_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_STUDENT_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_TUTOR_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_TUTOR_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_MULTIPLE_TUTOR_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_MULTIPLE_TUTOR_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_STUDENT_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_STUDENT_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_TUTOR_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_TUTOR_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_UNASSIGNED_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_UNASSIGNED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createDataExportCreatedTarget; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createDataExportFailedTarget; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createExerciseTarget; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createPlagiarismCaseTarget; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createTutorialGroupTarget; -import static de.tum.cit.aet.artemis.domain.notification.SingleUserNotificationFactory.createNotification; import static org.assertj.core.api.Assertions.assertThat; import java.time.ZonedDateTime; @@ -60,23 +60,25 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.domain.notification.NotificationTarget; +import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotification; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.DataExport; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; -import de.tum.cit.aet.artemis.domain.metis.AnswerPost; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismResult; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmission; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; class SingleUserNotificationFactoryTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/notification/TutorialGroupNotificationFactoryTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/notification/TutorialGroupNotificationFactoryTest.java index 1a687b03e8cd..2cc972c69d49 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/notification/TutorialGroupNotificationFactoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/notification/TutorialGroupNotificationFactoryTest.java @@ -1,19 +1,22 @@ package de.tum.cit.aet.artemis.domain.notification; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DELETED_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DELETED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_UPDATED_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_UPDATED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createTutorialGroupTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_DELETED_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_DELETED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_UPDATED_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_UPDATED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createTutorialGroupTarget; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import de.tum.cit.aet.artemis.communication.domain.notification.NotificationTarget; +import de.tum.cit.aet.artemis.communication.domain.notification.TutorialGroupNotification; +import de.tum.cit.aet.artemis.communication.domain.notification.TutorialGroupNotificationFactory; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; class TutorialGroupNotificationFactoryTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/entitylistener/ResultListenerIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/entitylistener/ResultListenerIntegrationTest.java index 2f6d63c1af09..21e3d0424adb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/entitylistener/ResultListenerIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/entitylistener/ResultListenerIntegrationTest.java @@ -20,19 +20,18 @@ import org.springframework.test.util.ReflectionTestUtils; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.assessment.domain.ParticipantScore; +import de.tum.cit.aet.artemis.assessment.domain.StudentScore; +import de.tum.cit.aet.artemis.assessment.domain.TeamScore; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.participation.Participant; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.scores.ParticipantScore; -import de.tum.cit.aet.artemis.domain.scores.StudentScore; -import de.tum.cit.aet.artemis.domain.scores.TeamScore; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; @@ -40,6 +39,7 @@ import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.team.TeamUtilService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; class ResultListenerIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamFactory.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamFactory.java index 75c75a91cc87..9f0ca2f7a9c2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamFactory.java @@ -7,10 +7,10 @@ import java.util.Set; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExamSession; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExamSession; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.web.rest.dto.CourseWithIdDTO; import de.tum.cit.aet.artemis.web.rest.dto.ExamSessionDTO; import de.tum.cit.aet.artemis.web.rest.dto.ExamWithIdAndCourseDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java index e9f586938353..f8cd1cf3b81d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java @@ -41,38 +41,36 @@ import org.springframework.util.MultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExamUser; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.exam.SuspiciousSessionReason; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizGroup; -import de.tum.cit.aet.artemis.domain.quiz.QuizPool; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExamUser; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; +import de.tum.cit.aet.artemis.exam.domain.SuspiciousSessionReason; import de.tum.cit.aet.artemis.exam.repository.ExamLiveEventRepository; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizGroup; +import de.tum.cit.aet.artemis.quiz.domain.QuizPool; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizPoolRepository; import de.tum.cit.aet.artemis.service.dto.StudentDTO; @@ -81,6 +79,8 @@ import de.tum.cit.aet.artemis.service.quiz.QuizPoolService; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.service.user.PasswordService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; import de.tum.cit.aet.artemis.util.ZipFileTestUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java index a282865bf10f..c0e705164da7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java @@ -49,22 +49,18 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExamUser; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExamUser; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseTestService; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; @@ -73,7 +69,10 @@ import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.repository.ParticipationTestRepository; @@ -82,6 +81,7 @@ import de.tum.cit.aet.artemis.service.quiz.QuizSubmissionService; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.team.TeamUtilService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.util.ExamPrepareExercisesTestUtil; import de.tum.cit.aet.artemis.util.LocalRepository; import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java index 2d808a86f64c..fa4b84a9bc6e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java @@ -19,12 +19,12 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExamUser; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.service.dto.StudentDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamSessionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamSessionIntegrationTest.java index 8136b37d1448..6d348e0d4eaa 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamSessionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamSessionIntegrationTest.java @@ -9,8 +9,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamSessionRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.service.exam.ExamSessionService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java index c0c7a61328f0..e87b8aa827de 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java @@ -31,31 +31,31 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseTestService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.repository.ParticipationTestRepository; import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlRepositoryPermission; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.ExamPrepareExercisesTestUtil; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamUserIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamUserIntegrationTest.java index 17454bff4c41..4114accf1b4f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamUserIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamUserIntegrationTest.java @@ -34,9 +34,9 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExamUser; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExamUser; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseTestService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamUtilService.java index 08a9a5e4b09c..b00aa33b4c75 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamUtilService.java @@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -26,28 +27,23 @@ import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.Language; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExamSession; -import de.tum.cit.aet.artemis.domain.exam.ExamUser; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizPool; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExamSession; +import de.tum.cit.aet.artemis.exam.domain.ExamUser; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExamSessionRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseFactory; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; @@ -61,11 +57,15 @@ import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.post.ConversationFactory; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizPool; import de.tum.cit.aet.artemis.service.quiz.QuizPoolService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.user.UserUtilService; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExerciseGroupIntegrationJenkinsGitlabTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExerciseGroupIntegrationJenkinsGitlabTest.java index ca40fe411251..c308ccfa71af 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExerciseGroupIntegrationJenkinsGitlabTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExerciseGroupIntegrationJenkinsGitlabTest.java @@ -25,16 +25,16 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ProgrammingExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ProgrammingExamIntegrationTest.java index dee9c9b7f8ff..16ef48faf968 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ProgrammingExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ProgrammingExamIntegrationTest.java @@ -32,9 +32,9 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/QuizPoolIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/QuizPoolIntegrationTest.java index 85f0d82bae60..8495e7637767 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/QuizPoolIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/QuizPoolIntegrationTest.java @@ -15,14 +15,14 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.cit.aet.artemis.domain.quiz.QuizGroup; -import de.tum.cit.aet.artemis.domain.quiz.QuizPool; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; +import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.quiz.domain.QuizGroup; +import de.tum.cit.aet.artemis.quiz.domain.QuizPool; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestion; import de.tum.cit.aet.artemis.service.quiz.QuizPoolService; class QuizPoolIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java index 81fe066f3786..5bcff8cc8bf6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java @@ -75,56 +75,56 @@ import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExamUser; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; -import de.tum.cit.aet.artemis.domain.quiz.AnswerOption; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropMapping; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedText; -import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; -import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; -import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExamUser; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExamSessionRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseTestService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionVersionRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; +import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.quiz.domain.AnswerOption; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropMapping; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedText; +import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.exam.ExamQuizService; import de.tum.cit.aet.artemis.service.exam.StudentExamService; import de.tum.cit.aet.artemis.service.util.RoundingUtil; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.util.ExamPrepareExercisesTestUtil; import de.tum.cit.aet.artemis.util.LocalRepository; import de.tum.cit.aet.artemis.web.rest.dto.StudentExamWithGradeDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/TestExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/TestExamIntegrationTest.java index fdd73c71b443..645bcd8180c5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/TestExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/TestExamIntegrationTest.java @@ -14,13 +14,13 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExamUser; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExamUser; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaExerciseIntegrationTest.java index 5ea3f494d084..3f6c5e8537de 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaExerciseIntegrationTest.java @@ -23,13 +23,13 @@ import de.tum.cit.aet.artemis.course.CourseTestService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; class AthenaExerciseIntegrationTest extends AbstractAthenaTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaResourceIntegrationTest.java index 67c1d01264c7..966f07153880 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaResourceIntegrationTest.java @@ -29,23 +29,23 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseFactory.java b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseFactory.java index f0f90f4497c7..e9b717667ee5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseFactory.java @@ -12,9 +12,9 @@ import de.tum.cit.aet.artemis.domain.GradingInstruction; import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismDetectionConfig; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismDetectionConfig; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; /** * Factory for creating Exercises and related objects. diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java index b7aa41c48c80..6ee208959ebe 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java @@ -22,6 +22,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -29,30 +30,29 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; import de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizPointStatistic; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizPointStatistic; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; import de.tum.cit.aet.artemis.service.ExerciseService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.util.TestResourceUtils; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseDetailsDTO; import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseUtilService.java index 2fab48d88f62..b686a58a717b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseUtilService.java @@ -15,6 +15,8 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; @@ -28,21 +30,13 @@ import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.metis.AnswerPost; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; @@ -50,12 +44,18 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.post.ConversationFactory; import de.tum.cit.aet.artemis.post.ConversationUtilService; import de.tum.cit.aet.artemis.service.ModelingSubmissionService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserUtilService; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java index ab825b46a8e3..d1f1ab5448aa 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java @@ -39,12 +39,12 @@ import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseFactory.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseFactory.java index e5e21f127e3c..40ed6ddc92e2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseFactory.java @@ -4,7 +4,7 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.ExerciseFactory; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java index b7fea778841a..95b65f792ad6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java @@ -32,6 +32,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.domain.Course; @@ -42,13 +44,11 @@ import de.tum.cit.aet.artemis.domain.GradingCriterion; import de.tum.cit.aet.artemis.domain.GradingInstruction; import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.competency.Competency; import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseUtilService.java index 73c02d62f765..617e7aad422b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseUtilService.java @@ -22,9 +22,9 @@ import de.tum.cit.aet.artemis.domain.FileUploadExercise; import de.tum.cit.aet.artemis.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java index 9775aba4b9cc..0f1b33b55376 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java @@ -36,13 +36,13 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadSubmissionRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.service.FilePathService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonDiagramResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonDiagramResourceIntegrationTest.java index 452c120e2dc5..53ed53b86f13 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonDiagramResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonDiagramResourceIntegrationTest.java @@ -17,7 +17,7 @@ import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; -import de.tum.cit.aet.artemis.domain.modeling.ApollonDiagram; +import de.tum.cit.aet.artemis.modeling.domain.ApollonDiagram; import de.tum.cit.aet.artemis.modeling.repository.ApollonDiagramRepository; class ApollonDiagramResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java index 130f4fed73c5..cff49de91e15 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java @@ -46,25 +46,25 @@ import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus; -import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingSubmissionElement; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelClusterRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelElementRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.plagiarism.PlagiarismUtilService; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus; +import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingSubmissionElement; import de.tum.cit.aet.artemis.service.AssessmentService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.compass.CompassService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingComparisonTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingComparisonTest.java index 98ae4f077b5b..23d502bed57f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingComparisonTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingComparisonTest.java @@ -10,8 +10,8 @@ import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.service.exam.StudentExamService; class ModelingComparisonTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseFactory.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseFactory.java index 8a2140f285b0..96519836cec7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseFactory.java @@ -6,12 +6,12 @@ import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.modeling.ApollonDiagram; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.ExerciseFactory; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.modeling.domain.ApollonDiagram; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; /** * Factory for creating ModelingExercises and related objects. diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java index 0a7c627381d1..79cebb34c079 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java @@ -30,9 +30,12 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.domain.Course; @@ -43,27 +46,24 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.TeamAssignmentConfig; -import de.tum.cit.aet.artemis.domain.competency.Competency; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; import de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.TutorParticipation; -import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingPlagiarismResult; import de.tum.cit.aet.artemis.util.ExerciseIntegrationTestService; import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider; import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider.InvalidExamExerciseDateConfiguration; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseUtilService.java index c84061cbbd27..e1f6c9168546 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseUtilService.java @@ -29,18 +29,18 @@ import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.service.AssessmentService; import de.tum.cit.aet.artemis.service.ModelingSubmissionService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java index 09fc8a36f3e4..281520e82b6c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java @@ -21,41 +21,41 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.SubmissionVersion; import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingSubmissionElement; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionVersionRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmission; +import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingSubmissionElement; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.service.compass.CompassService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.util.TestResourceUtils; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/FeedbackSelectorTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/FeedbackSelectorTest.java index cf0ad0f73eb1..55eedf59d762 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/FeedbackSelectorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/FeedbackSelectorTest.java @@ -8,7 +8,7 @@ import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.modeling.ModelElement; +import de.tum.cit.aet.artemis.modeling.domain.ModelElement; import de.tum.cit.aet.artemis.service.compass.controller.FeedbackSelector; class FeedbackSelectorTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/ModelClusterFactoryTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/ModelClusterFactoryTest.java index 2b372ab8216f..cdb82312d082 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/ModelClusterFactoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/ModelClusterFactoryTest.java @@ -8,10 +8,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.domain.modeling.ModelCluster; -import de.tum.cit.aet.artemis.domain.modeling.ModelElement; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; +import de.tum.cit.aet.artemis.modeling.domain.ModelCluster; +import de.tum.cit.aet.artemis.modeling.domain.ModelElement; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.service.compass.controller.ModelClusterFactory; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/AbstractUMLDiagramTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/AbstractUMLDiagramTest.java index b27039d30da7..9f7e7b004187 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/AbstractUMLDiagramTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/AbstractUMLDiagramTest.java @@ -9,8 +9,8 @@ import org.assertj.core.data.Offset; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponent; import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentDiagram; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ContinuousIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ContinuousIntegrationTestService.java index a9985f6c7835..fff8a5920d47 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ContinuousIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ContinuousIntegrationTestService.java @@ -19,8 +19,8 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/MockDelegate.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/MockDelegate.java index 5d776f36ae18..dbf2dea5e7a7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/MockDelegate.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/MockDelegate.java @@ -15,9 +15,9 @@ import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.participation.AbstractBaseProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.AbstractBaseProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; public interface MockDelegate { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java index f5a7d4d51c7e..78fd3ea34d80 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java @@ -27,9 +27,9 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentNote; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.domain.AssessmentNote; import de.tum.cit.aet.artemis.domain.Complaint; import de.tum.cit.aet.artemis.domain.ComplaintResponse; import de.tum.cit.aet.artemis.domain.Course; @@ -46,16 +46,16 @@ import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseFactory.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseFactory.java index f11c5cea6dfb..566772f71ef7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseFactory.java @@ -25,7 +25,7 @@ import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.ExerciseFactory; import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.CommitDTO; import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestCaseDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java index d86494b35a7e..9122e4b22675 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java @@ -44,18 +44,18 @@ import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.Visibility; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java index cfacc35a10d5..6972c8810bb0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java @@ -65,6 +65,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -85,19 +86,18 @@ import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.domain.enumeration.Visibility; -import de.tum.cit.aet.artemis.domain.notification.Notification; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus; -import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; -import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.plagiarism.PlagiarismUtilService; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextSubmissionElement; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java index e6c28846bc40..7e99c4e4a78c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java @@ -31,17 +31,17 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.connector.AeolusRequestMockProvider; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.competency.Competency; import de.tum.cit.aet.artemis.domain.enumeration.AeolusTarget; import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.util.LocalRepository; import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java index 71f31458e3c4..d3ee033e518c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java @@ -32,14 +32,14 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.web.rest.dto.CommitInfoDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseRepositoryServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseRepositoryServiceTest.java index 2d3e385545b7..259eddb6b284 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseRepositoryServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseRepositoryServiceTest.java @@ -14,9 +14,9 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseRepositoryService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java index abdba50879a0..411b38122a2a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java @@ -44,14 +44,14 @@ import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; import de.tum.cit.aet.artemis.domain.enumeration.Visibility; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTestCaseType; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.hestia.TestwiseCoverageTestUtil; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTestCaseType; import de.tum.cit.aet.artemis.programming.repository.ParticipationVCSAccessTokenRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java index cb1d0aa9cf30..8ae6aeb75eb1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java @@ -37,16 +37,16 @@ import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; import de.tum.cit.aet.artemis.domain.enumeration.ParticipationLifecycle; import de.tum.cit.aet.artemis.domain.enumeration.Visibility; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceIntegrationTest.java index a1eddae32bbe..5a6fa59f0c4c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceIntegrationTest.java @@ -21,11 +21,11 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisCategory; -import de.tum.cit.aet.artemis.domain.hestia.CodeHint; -import de.tum.cit.aet.artemis.domain.hestia.ExerciseHint; -import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; -import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPenaltyPolicy; -import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; +import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; +import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPenaltyPolicy; +import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseImportBasicService; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTest.java index 3faece2732d8..f1e334bd5951 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTest.java @@ -24,6 +24,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; @@ -34,12 +35,11 @@ import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java index 34785247f034..736c6bde1379 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java @@ -27,7 +27,7 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.Visibility; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java index 636933f0151f..db89681c6a1d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java @@ -96,27 +96,27 @@ import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExamUser; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.hestia.ExerciseHint; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.cit.aet.artemis.domain.participation.Participant; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismDetectionConfig; -import de.tum.cit.aet.artemis.domain.statistics.BuildLogStatisticsEntry; -import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.cit.aet.artemis.exam.ExamFactory; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExamUser; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismDetectionConfig; +import de.tum.cit.aet.artemis.programming.domain.BuildLogStatisticsEntry; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java index 9a02a568a774..904a69c6765a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java @@ -44,24 +44,24 @@ import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; import de.tum.cit.aet.artemis.domain.enumeration.Visibility; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.hestia.CodeHint; -import de.tum.cit.aet.artemis.domain.hestia.ExerciseHint; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java index 6400e7e566e6..4663ff42d357 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java @@ -18,9 +18,9 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.util.RequestUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java index e17368014544..5d56c9a29db1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java @@ -47,16 +47,16 @@ import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java index f3dcf1ce7f54..4cbe56d04810 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java @@ -53,6 +53,7 @@ import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.read.ListAppender; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.domain.BuildLogEntry; import de.tum.cit.aet.artemis.domain.Course; @@ -63,23 +64,22 @@ import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmission; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextSubmissionElement; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.service.BuildLogEntryService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java index 42826c0226d1..ed1100c0f608 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java @@ -25,12 +25,12 @@ import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; -import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPenaltyPolicy; -import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; +import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPenaltyPolicy; +import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.CommitDTO; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseGradingService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizComparisonTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizComparisonTest.java index e9809f01f848..c1d5c3a16c03 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizComparisonTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizComparisonTest.java @@ -16,26 +16,26 @@ import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.quiz.AnswerOption; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropMapping; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.DragItem; -import de.tum.cit.aet.artemis.domain.quiz.DropLocation; -import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSpot; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedText; -import de.tum.cit.aet.artemis.domain.quiz.compare.DnDMapping; -import de.tum.cit.aet.artemis.domain.quiz.compare.SAMapping; import de.tum.cit.aet.artemis.exam.ExamFactory; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.quiz.domain.AnswerOption; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropMapping; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.DragItem; +import de.tum.cit.aet.artemis.quiz.domain.DropLocation; +import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSpot; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedText; +import de.tum.cit.aet.artemis.quiz.domain.compare.DnDMapping; +import de.tum.cit.aet.artemis.quiz.domain.compare.SAMapping; class QuizComparisonTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseFactory.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseFactory.java index f07438c4fd91..3393b30e5855 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseFactory.java @@ -17,30 +17,30 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; import de.tum.cit.aet.artemis.domain.enumeration.ScoringType; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.quiz.AnswerOption; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropMapping; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.DragItem; -import de.tum.cit.aet.artemis.domain.quiz.DropLocation; -import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizGroup; -import de.tum.cit.aet.artemis.domain.quiz.QuizPointStatistic; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerMapping; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSolution; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSpot; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedText; -import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.ExerciseFactory; import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.quiz.domain.AnswerOption; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropMapping; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.DragItem; +import de.tum.cit.aet.artemis.quiz.domain.DropLocation; +import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizGroup; +import de.tum.cit.aet.artemis.quiz.domain.QuizPointStatistic; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerMapping; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSolution; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSpot; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedText; +import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; import de.tum.cit.aet.artemis.service.FilePathService; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java index aa166abef428..8f6bc18e1d7e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java @@ -42,6 +42,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Course; @@ -53,30 +54,29 @@ import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; import de.tum.cit.aet.artemis.domain.enumeration.ScoringType; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.AnswerOption; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestionStatistic; -import de.tum.cit.aet.artemis.domain.quiz.DragItem; -import de.tum.cit.aet.artemis.domain.quiz.DropLocation; -import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestionStatistic; -import de.tum.cit.aet.artemis.domain.quiz.PointCounter; -import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerMapping; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestionStatistic; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSolution; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSpot; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.quiz.domain.AnswerOption; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestionStatistic; +import de.tum.cit.aet.artemis.quiz.domain.DragItem; +import de.tum.cit.aet.artemis.quiz.domain.DropLocation; +import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceQuestionStatistic; +import de.tum.cit.aet.artemis.quiz.domain.PointCounter; +import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerMapping; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestionStatistic; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSolution; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSpot; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseUtilService.java index ed2b2567f368..1643874af96e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseUtilService.java @@ -24,26 +24,26 @@ import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropMapping; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedText; import de.tum.cit.aet.artemis.exam.ExamFactory; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropMapping; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedText; import de.tum.cit.aet.artemis.quiz.repository.DragAndDropMappingRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizBatchRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java index f8396649bf35..e74aeaf13405 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java @@ -40,29 +40,29 @@ import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; import de.tum.cit.aet.artemis.domain.enumeration.ScoringType; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.AnswerOption; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropMapping; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.DragItem; -import de.tum.cit.aet.artemis.domain.quiz.DropLocation; -import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSpot; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedText; -import de.tum.cit.aet.artemis.domain.quiz.SubmittedAnswer; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.quiz.domain.AnswerOption; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropMapping; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.DragItem; +import de.tum.cit.aet.artemis.quiz.domain.DropLocation; +import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSpot; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedText; +import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.service.quiz.QuizBatchService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextComparisonTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextComparisonTest.java index d38c85db6b67..7996f037fb78 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextComparisonTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextComparisonTest.java @@ -9,9 +9,9 @@ import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.service.exam.StudentExamService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; class TextComparisonTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextExerciseFactory.java b/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextExerciseFactory.java index 737f6fa1199c..d41de2149ec1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextExerciseFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextExerciseFactory.java @@ -7,16 +7,16 @@ import java.util.Set; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.TextBlock; -import de.tum.cit.aet.artemis.domain.TextBlockType; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; -import de.tum.cit.aet.artemis.domain.analytics.TextAssessmentEvent; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.enumeration.TextAssessmentEventType; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.ExerciseFactory; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.text.domain.TextAssessmentEvent; +import de.tum.cit.aet.artemis.text.domain.TextBlock; +import de.tum.cit.aet.artemis.text.domain.TextBlockType; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; /** * Factory for creating TextExercises and related objects. diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextExerciseUtilService.java index 844e28a657b3..1bae24361ace 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextExerciseUtilService.java @@ -22,29 +22,29 @@ import de.tum.cit.aet.artemis.domain.Feedback; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.TextBlock; -import de.tum.cit.aet.artemis.domain.TextBlockType; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.analytics.TextAssessmentEvent; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.Language; import de.tum.cit.aet.artemis.domain.enumeration.TextAssessmentEventType; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.participation.Participant; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.text.domain.TextAssessmentEvent; +import de.tum.cit.aet.artemis.text.domain.TextBlock; +import de.tum.cit.aet.artemis.text.domain.TextBlockType; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintIntegrationTest.java index 3e6f511cf20e..402ea95a49a1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintIntegrationTest.java @@ -17,9 +17,9 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.hestia.CodeHint; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CodeHintRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintServiceTest.java index 733281a48150..e63f0a3d8e42 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintServiceTest.java @@ -20,12 +20,12 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.domain.enumeration.Visibility; -import de.tum.cit.aet.artemis.domain.hestia.CodeHint; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTestCaseType; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTestCaseType; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CodeHintRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java index 713a157dc1f2..01ed0e1aa190 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java @@ -24,13 +24,13 @@ import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.enumeration.Visibility; -import de.tum.cit.aet.artemis.domain.hestia.CodeHint; -import de.tum.cit.aet.artemis.domain.hestia.ExerciseHint; -import de.tum.cit.aet.artemis.domain.hestia.ExerciseHintActivation; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; +import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHintActivation; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintActivationRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java index 9caf48e398af..18d17a5ae3a1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java @@ -24,13 +24,13 @@ import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.enumeration.Visibility; -import de.tum.cit.aet.artemis.domain.hestia.ExerciseHint; -import de.tum.cit.aet.artemis.domain.hestia.ExerciseHintActivation; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; +import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHintActivation; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintActivationRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/HestiaDatabaseTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/HestiaDatabaseTest.java index 967581156aaa..6b72a913348d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/HestiaDatabaseTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/HestiaDatabaseTest.java @@ -14,11 +14,11 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.hestia.CodeHint; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CodeHintRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java index 1a1844d53481..6b7e36754b91 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java @@ -13,10 +13,10 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseGitDiffReportService; import de.tum.cit.aet.artemis.util.HestiaUtilTestService; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java index 15413c9f9127..fff20ba90065 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java @@ -14,11 +14,11 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseGitDiffReportRepository; import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseGitDiffReportService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseSolutionEntryIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseSolutionEntryIntegrationTest.java index 70aed126212e..cad6c63b67ff 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseSolutionEntryIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseSolutionEntryIntegrationTest.java @@ -15,10 +15,10 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.hestia.CodeHint; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CodeHintRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskIntegrationTest.java index 9cd9d6a94be8..b05bb90aeddd 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskIntegrationTest.java @@ -19,9 +19,9 @@ import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskServiceTest.java index 3e9c0cfa3e09..f2203449932d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskServiceTest.java @@ -17,10 +17,10 @@ import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.hestia.CodeHint; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CodeHintRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/StructuralTestCaseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/StructuralTestCaseServiceTest.java index 454da4e6f982..cc21985becde 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/StructuralTestCaseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/StructuralTestCaseServiceTest.java @@ -17,9 +17,9 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.domain.enumeration.Visibility; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTestCaseType; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTestCaseType; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.service.hestia.structural.StructuralSolutionEntryGenerationException; import de.tum.cit.aet.artemis.service.hestia.structural.StructuralTestCaseService; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageIntegrationTest.java index 51ffd5f580f0..b281d0063921 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageIntegrationTest.java @@ -17,10 +17,10 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.hestia.CoverageFileReport; -import de.tum.cit.aet.artemis.domain.hestia.CoverageReport; -import de.tum.cit.aet.artemis.domain.hestia.TestwiseCoverageReportEntry; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageFileReport; +import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageReport; +import de.tum.cit.aet.artemis.programming.domain.hestia.TestwiseCoverageReportEntry; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageFileReportRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageReportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageReportServiceTest.java index 0ae50f81109d..b2ace76bc3c6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageReportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageReportServiceTest.java @@ -18,10 +18,10 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.hestia.TestwiseCoverageReportEntry; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest; +import de.tum.cit.aet.artemis.programming.domain.hestia.TestwiseCoverageReportEntry; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageTestUtil.java b/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageTestUtil.java index 164836093682..f10823de8a2e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageTestUtil.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageTestUtil.java @@ -4,8 +4,8 @@ import java.util.Set; import java.util.stream.Collectors; -import de.tum.cit.aet.artemis.domain.hestia.CoverageFileReport; -import de.tum.cit.aet.artemis.domain.hestia.TestwiseCoverageReportEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageFileReport; +import de.tum.cit.aet.artemis.programming.domain.hestia.TestwiseCoverageReportEntry; public class TestwiseCoverageTestUtil { diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java index b29ca7e389a4..746ee4aa5190 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java @@ -16,16 +16,16 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.Visibility; -import de.tum.cit.aet.artemis.domain.hestia.CoverageFileReport; -import de.tum.cit.aet.artemis.domain.hestia.CoverageReport; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTestCaseType; -import de.tum.cit.aet.artemis.domain.hestia.TestwiseCoverageReportEntry; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest; +import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageFileReport; +import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageReport; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTestCaseType; +import de.tum.cit.aet.artemis.programming.domain.hestia.TestwiseCoverageReportEntry; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageFileReportRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CreateSolutionEntriesTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CreateSolutionEntriesTest.java index da8d1b34a93b..8cd031644b96 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CreateSolutionEntriesTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CreateSolutionEntriesTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.CreateSolutionEntries; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/DropRemovedGitDiffEntriesTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/DropRemovedGitDiffEntriesTest.java index cb81a6aaf9bd..bdb462fbb709 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/DropRemovedGitDiffEntriesTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/DropRemovedGitDiffEntriesTest.java @@ -8,8 +8,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralSolutionEntryGenerationException; import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.DropRemovedGitDiffEntries; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/ExtractChangedLinesTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/ExtractChangedLinesTest.java index 28aa677a20cf..9c0ddf095a21 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/ExtractChangedLinesTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/ExtractChangedLinesTest.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.ExtractChangedLines; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/ExtractCoveredLinesTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/ExtractCoveredLinesTest.java index 0aa2c5cdf95d..74acaeef87a6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/ExtractCoveredLinesTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/ExtractCoveredLinesTest.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.domain.hestia.TestwiseCoverageReportEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.TestwiseCoverageReportEntry; import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.ExtractCoveredLines; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/GroupGitDiffAndCoverageEntriesByFilePathAndTestCaseTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/GroupGitDiffAndCoverageEntriesByFilePathAndTestCaseTest.java index 56aaf8d39f21..c0ff270d9841 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/GroupGitDiffAndCoverageEntriesByFilePathAndTestCaseTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/GroupGitDiffAndCoverageEntriesByFilePathAndTestCaseTest.java @@ -10,11 +10,11 @@ import org.junit.jupiter.api.Test; import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.hestia.CoverageFileReport; -import de.tum.cit.aet.artemis.domain.hestia.CoverageReport; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; -import de.tum.cit.aet.artemis.domain.hestia.TestwiseCoverageReportEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageFileReport; +import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageReport; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; +import de.tum.cit.aet.artemis.programming.domain.hestia.TestwiseCoverageReportEntry; import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.GroupGitDiffAndCoverageEntriesByFilePathAndTestCase; diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java index fbee64fc0fda..041557e53e00 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java @@ -20,9 +20,9 @@ import de.tum.cit.aet.artemis.connector.IrisRequestMockProvider; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.iris.IrisTemplate; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisSubSettings; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettings; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; import de.tum.cit.aet.artemis.iris.repository.IrisTemplateRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatMessageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatMessageIntegrationTest.java index 374c51d15141..b7d96ac74611 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatMessageIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatMessageIntegrationTest.java @@ -33,17 +33,17 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; -import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; -import de.tum.cit.aet.artemis.domain.iris.message.IrisMessageContent; -import de.tum.cit.aet.artemis.domain.iris.message.IrisMessageSender; -import de.tum.cit.aet.artemis.domain.iris.message.IrisTextMessageContent; -import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessageContent; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessageSender; +import de.tum.cit.aet.artemis.iris.domain.message.IrisTextMessageContent; +import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; import de.tum.cit.aet.artemis.iris.repository.IrisMessageRepository; import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageState; diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatWebsocketTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatWebsocketTest.java index 787c941eef2b..2a10ef924ac1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatWebsocketTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatWebsocketTest.java @@ -15,7 +15,7 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.iris.message.IrisTextMessageContent; +import de.tum.cit.aet.artemis.iris.domain.message.IrisTextMessageContent; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; import de.tum.cit.aet.artemis.service.iris.dto.IrisChatWebsocketDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/IrisCompetencyGenerationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisCompetencyGenerationIntegrationTest.java index bf6cfc9f24df..39f11e970dd6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/IrisCompetencyGenerationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisCompetencyGenerationIntegrationTest.java @@ -14,8 +14,8 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.competency.CompetencyTaxonomy; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionInputDTO; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyRecommendationDTO; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/IrisExerciseChatSessionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisExerciseChatSessionIntegrationTest.java index 206346321a33..20f001ba7ba6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/IrisExerciseChatSessionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisExerciseChatSessionIntegrationTest.java @@ -12,8 +12,8 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.iris.session.IrisExerciseChatSession; -import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; +import de.tum.cit.aet.artemis.iris.domain.session.IrisExerciseChatSession; +import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; import de.tum.cit.aet.artemis.iris.repository.IrisExerciseChatSessionRepository; import de.tum.cit.aet.artemis.web.rest.iris.IrisStatusDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/IrisSessionActivationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisSessionActivationIntegrationTest.java index 599e556f33c9..0f3884134234 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/IrisSessionActivationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisSessionActivationIntegrationTest.java @@ -10,10 +10,10 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.iris.message.IrisMessage; -import de.tum.cit.aet.artemis.domain.iris.message.IrisMessageSender; -import de.tum.cit.aet.artemis.domain.iris.message.IrisTextMessageContent; -import de.tum.cit.aet.artemis.domain.iris.session.IrisSession; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; +import de.tum.cit.aet.artemis.iris.domain.message.IrisMessageSender; +import de.tum.cit.aet.artemis.iris.domain.message.IrisTextMessageContent; +import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; import de.tum.cit.aet.artemis.service.iris.IrisMessageService; import de.tum.cit.aet.artemis.service.iris.session.IrisExerciseChatSessionService; diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/PyrisLectureIngestionTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/PyrisLectureIngestionTest.java index 4121b4784b52..b37d7638ac78 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/PyrisLectureIngestionTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/PyrisLectureIngestionTest.java @@ -18,10 +18,10 @@ import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisCourseSettings; -import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisCourseSettings; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisJobService; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisStatusUpdateService; diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/settings/IrisSettingsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/settings/IrisSettingsIntegrationTest.java index 45d0ca6f935d..4b09f1c21d7d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/settings/IrisSettingsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/settings/IrisSettingsIntegrationTest.java @@ -13,14 +13,14 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisChatSubSettings; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisCompetencyGenerationSubSettings; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisCourseSettings; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisExerciseSettings; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisHestiaSubSettings; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisLectureIngestionSubSettings; -import de.tum.cit.aet.artemis.domain.iris.settings.IrisSettings; import de.tum.cit.aet.artemis.iris.AbstractIrisIntegrationTest; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisChatSubSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisCompetencyGenerationSubSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisCourseSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisExerciseSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisHestiaSubSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisLectureIngestionSubSettings; +import de.tum.cit.aet.artemis.iris.domain.settings.IrisSettings; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; import de.tum.cit.aet.artemis.iris.repository.IrisSubSettingsRepository; import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedSettingsDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentResourceIntegrationTest.java index 5c9894f67c60..c134bfdda7c9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentResourceIntegrationTest.java @@ -22,10 +22,10 @@ import de.tum.cit.aet.artemis.domain.Attachment; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.text.domain.TextExercise; class AttachmentResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitIntegrationTest.java index 6150d117af1d..e06591eaedd9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitIntegrationTest.java @@ -36,14 +36,14 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Attachment; import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.competency.Competency; -import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.domain.lecture.Slide; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.Slide; import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java index 17a9cdddbf8f..9e2d3919ceeb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java @@ -30,7 +30,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.SlideRepository; import de.tum.cit.aet.artemis.service.LectureUnitProcessingService; diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/ExerciseUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/ExerciseUnitIntegrationTest.java index 2d0ef2a08408..665edd19e4fe 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/ExerciseUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/ExerciseUnitIntegrationTest.java @@ -22,14 +22,14 @@ import de.tum.cit.aet.artemis.domain.FileUploadExercise; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; +import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; class ExerciseUnitIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureFactory.java b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureFactory.java index fae48f254309..56fe2e7049d3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureFactory.java @@ -14,7 +14,7 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; -import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.service.FilePathService; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureIntegrationTest.java index d98a8a17bc27..b69c9a1205cf 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureIntegrationTest.java @@ -22,24 +22,24 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.domain.Attachment; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.competency.Competency; -import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; -import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.domain.lecture.OnlineUnit; -import de.tum.cit.aet.artemis.domain.lecture.TextUnit; -import de.tum.cit.aet.artemis.domain.lecture.VideoUnit; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.OnlineUnit; +import de.tum.cit.aet.artemis.lecture.domain.TextUnit; +import de.tum.cit.aet.artemis.lecture.domain.VideoUnit; import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.post.ConversationUtilService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitIntegrationTest.java index 021f5d58519b..5a97dfb359d5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitIntegrationTest.java @@ -21,11 +21,11 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnitCompletion; -import de.tum.cit.aet.artemis.domain.lecture.OnlineUnit; -import de.tum.cit.aet.artemis.domain.lecture.TextUnit; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnitCompletion; +import de.tum.cit.aet.artemis.lecture.domain.OnlineUnit; +import de.tum.cit.aet.artemis.lecture.domain.TextUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitServiceTest.java index 055796add0e7..dea20f86081e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitServiceTest.java @@ -12,8 +12,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnitCompletion; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnitCompletion; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.service.LectureUnitService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUtilService.java b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUtilService.java index 33889d2d3e3a..f42e2f8a100a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUtilService.java @@ -15,6 +15,8 @@ import org.springframework.stereotype.Service; import org.springframework.util.ResourceUtils; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.course.CourseFactory; @@ -23,18 +25,15 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.domain.lecture.AttachmentUnit; -import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnitCompletion; -import de.tum.cit.aet.artemis.domain.lecture.OnlineUnit; -import de.tum.cit.aet.artemis.domain.lecture.Slide; -import de.tum.cit.aet.artemis.domain.lecture.TextUnit; -import de.tum.cit.aet.artemis.domain.lecture.VideoUnit; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnitCompletion; +import de.tum.cit.aet.artemis.lecture.domain.OnlineUnit; +import de.tum.cit.aet.artemis.lecture.domain.Slide; +import de.tum.cit.aet.artemis.lecture.domain.TextUnit; +import de.tum.cit.aet.artemis.lecture.domain.VideoUnit; import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.ExerciseUnitRepository; @@ -47,6 +46,7 @@ import de.tum.cit.aet.artemis.lecture.repository.VideoUnitRepository; import de.tum.cit.aet.artemis.post.ConversationFactory; import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/OnlineUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/OnlineUnitIntegrationTest.java index 60298948b8d8..f34f0d9d34f6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/OnlineUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/OnlineUnitIntegrationTest.java @@ -29,11 +29,11 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.competency.Competency; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.domain.lecture.OnlineUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.OnlineUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.OnlineUnitRepository; import de.tum.cit.aet.artemis.web.rest.dto.OnlineResourceDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/TextUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/TextUnitIntegrationTest.java index 5ff2b0d463c6..6935ac1353d0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/TextUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/TextUnitIntegrationTest.java @@ -16,11 +16,11 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.competency.Competency; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.domain.lecture.TextUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.TextUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/VideoUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/VideoUnitIntegrationTest.java index 2b65e4e89fc0..3fe9d876f8f3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/VideoUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/VideoUnitIntegrationTest.java @@ -16,11 +16,11 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.competency.Competency; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; -import de.tum.cit.aet.artemis.domain.lecture.VideoUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; +import de.tum.cit.aet.artemis.lecture.domain.VideoUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.VideoUnitRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java index 609f74fcdde7..03b4609e1b94 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java @@ -18,13 +18,13 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; -import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java index 960a4a6e0a87..9785d7ab333c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java @@ -58,7 +58,7 @@ import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.service.ParticipationVcsAccessTokenService; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIServiceTest.java index 01cd78bc393f..ddb1808ad367 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIServiceTest.java @@ -29,10 +29,10 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.service.connectors.BuildScriptProviderService; import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIIntegrationTest.java index bed3714e9870..cd69f4a291b1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIIntegrationTest.java @@ -47,13 +47,13 @@ import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; -import de.tum.cit.aet.artemis.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; +import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java index cb77d9dfe756..0cea66a358e0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java @@ -13,9 +13,9 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java index 12f1791e5cce..23d29747a8ad 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java @@ -59,9 +59,9 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.Visibility; -import de.tum.cit.aet.artemis.domain.participation.ParticipationVCSAccessToken; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ParticipationVCSAccessToken; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCServiceTest.java index e2b3173674ca..d5c3519e54db 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCServiceTest.java @@ -11,8 +11,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java index e1beff22aa65..28cdddf3fee7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java @@ -19,6 +19,8 @@ import org.springframework.http.HttpStatus; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; @@ -32,8 +34,6 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; -import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; -import de.tum.cit.aet.artemis.domain.metis.Post; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/AnswerMessageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/AnswerMessageIntegrationTest.java index a062bc9b0c95..faeaa63c572d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/AnswerMessageIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/AnswerMessageIntegrationTest.java @@ -25,6 +25,10 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotification; import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; import de.tum.cit.aet.artemis.domain.Course; @@ -33,12 +37,8 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.metis.AnswerPost; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.notification.SingleUserNotification; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.lecture.LectureUtilService; import de.tum.cit.aet.artemis.post.ConversationUtilService; import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java index f1b2d5cf5abd..271146b84c38 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java @@ -19,18 +19,18 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.lecture.LectureUtilService; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.post.ConversationUtilService; import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupChannelManagementService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; import de.tum.cit.aet.artemis.tutorialgroups.TutorialGroupUtilService; import de.tum.cit.aet.artemis.user.UserFactory; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/ConversationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/ConversationIntegrationTest.java index 67ff8629f307..599f62ed2950 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/ConversationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/ConversationIntegrationTest.java @@ -17,20 +17,20 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; +import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.lecture.LectureUtilService; import de.tum.cit.aet.artemis.post.ConversationUtilService; import de.tum.cit.aet.artemis.service.dto.ResponsibleUserDTO; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ConversationDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/MessageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/MessageIntegrationTest.java index 497901efe540..761d2c123a0c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/MessageIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/MessageIntegrationTest.java @@ -45,6 +45,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.PostSortCriterion; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.domain.conversation.OneToOneChat; +import de.tum.cit.aet.artemis.communication.domain.notification.ConversationNotification; +import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationNotificationRepository; @@ -56,14 +63,7 @@ import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; -import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.metis.PostSortCriterion; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.metis.conversation.OneToOneChat; -import de.tum.cit.aet.artemis.domain.notification.ConversationNotification; -import de.tum.cit.aet.artemis.domain.notification.Notification; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.post.ConversationUtilService; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/ReactionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/ReactionIntegrationTest.java index b95c01616481..faddd9c71f6d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/ReactionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/ReactionIntegrationTest.java @@ -24,6 +24,10 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.PostSortCriterion; +import de.tum.cit.aet.artemis.communication.domain.Reaction; import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.communication.repository.ReactionRepository; @@ -31,10 +35,6 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; -import de.tum.cit.aet.artemis.domain.metis.AnswerPost; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.metis.PostSortCriterion; -import de.tum.cit.aet.artemis.domain.metis.Reaction; import de.tum.cit.aet.artemis.post.ConversationUtilService; class ReactionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/similarity/TitleJaccardSimilarityCompareStrategyTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/similarity/TitleJaccardSimilarityCompareStrategyTest.java index 61ad3e937a6a..2447504c3eeb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/similarity/TitleJaccardSimilarityCompareStrategyTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/similarity/TitleJaccardSimilarityCompareStrategyTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.domain.metis.Post; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.service.metis.similarity.TitleJaccardSimilarityCompareStrategy; class TitleJaccardSimilarityCompareStrategyTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/GroupNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/GroupNotificationServiceTest.java index ec78ed1ce440..a51dc8e88e2d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/GroupNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/GroupNotificationServiceTest.java @@ -1,25 +1,25 @@ package de.tum.cit.aet.artemis.notification; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.ATTACHMENT_CHANGE_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.COURSE_ARCHIVE_FAILED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.COURSE_ARCHIVE_FINISHED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.COURSE_ARCHIVE_STARTED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.DUPLICATE_TEST_CASE_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.EXAM_ARCHIVE_FAILED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.EXAM_ARCHIVE_FINISHED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.EXAM_ARCHIVE_STARTED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.EXERCISE_PRACTICE_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.EXERCISE_RELEASED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.EXERCISE_UPDATED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.ILLEGAL_SUBMISSION_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.PROGRAMMING_TEST_CASES_CHANGED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.QUIZ_EXERCISE_STARTED_TITLE; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_FAILED; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_FINISHED; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_STARTED; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_FAILED; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_FINISHED; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_STARTED; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.ATTACHMENT_CHANGE_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.COURSE_ARCHIVE_FAILED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.COURSE_ARCHIVE_FINISHED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.COURSE_ARCHIVE_STARTED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.DUPLICATE_TEST_CASE_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXAM_ARCHIVE_FAILED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXAM_ARCHIVE_FINISHED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXAM_ARCHIVE_STARTED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXERCISE_PRACTICE_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXERCISE_RELEASED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXERCISE_UPDATED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.ILLEGAL_SUBMISSION_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.PROGRAMMING_TEST_CASES_CHANGED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.QUIZ_EXERCISE_STARTED_TITLE; import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EDITOR_NOTIFICATION__PROGRAMMING_TEST_CASES_CHANGED; import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_OPEN_FOR_PRACTICE; import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_RELEASED; @@ -44,6 +44,10 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.communication.repository.NotificationRepository; import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -54,22 +58,18 @@ import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.NotificationSetting; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.metis.AnswerPost; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.notification.Notification; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.user.UserUtilService; class GroupNotificationServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationFactory.java b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationFactory.java index 28b91db9b491..7b6514e1c683 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationFactory.java @@ -2,12 +2,12 @@ import java.time.ZonedDateTime; +import de.tum.cit.aet.artemis.communication.domain.notification.GroupNotification; +import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotification; +import de.tum.cit.aet.artemis.communication.domain.notification.SystemNotification; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType; -import de.tum.cit.aet.artemis.domain.notification.GroupNotification; -import de.tum.cit.aet.artemis.domain.notification.SingleUserNotification; -import de.tum.cit.aet.artemis.domain.notification.SystemNotification; /** * Factory for creating Notifications and related objects. diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationResourceIntegrationTest.java index 4643150e069b..46fe4b348adf 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationResourceIntegrationTest.java @@ -13,6 +13,10 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.domain.notification.GroupNotification; +import de.tum.cit.aet.artemis.communication.domain.notification.Notification; +import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; +import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotification; import de.tum.cit.aet.artemis.communication.repository.NotificationRepository; import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; import de.tum.cit.aet.artemis.domain.Course; @@ -20,10 +24,6 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; -import de.tum.cit.aet.artemis.domain.notification.GroupNotification; -import de.tum.cit.aet.artemis.domain.notification.Notification; -import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; -import de.tum.cit.aet.artemis.domain.notification.SingleUserNotification; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; class NotificationResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationScheduleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationScheduleServiceTest.java index 8cd311a2dd9b..6f7fcbf24ffc 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationScheduleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationScheduleServiceTest.java @@ -28,13 +28,13 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.NotificationSetting; import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.service.messaging.InstanceMessageReceiveService; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserUtilService; class NotificationScheduleServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsResourceIntegrationTest.java index c06275c2afc9..f0265f32bdeb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsResourceIntegrationTest.java @@ -13,11 +13,11 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.NotificationSetting; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; import de.tum.cit.aet.artemis.post.ConversationUtilService; class NotificationSettingsResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsServiceTest.java index acba493f13a1..1e13cfed15ec 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsServiceTest.java @@ -24,14 +24,14 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.domain.notification.GroupNotification; +import de.tum.cit.aet.artemis.communication.domain.notification.Notification; +import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.NotificationSetting; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; -import de.tum.cit.aet.artemis.domain.notification.GroupNotification; -import de.tum.cit.aet.artemis.domain.notification.Notification; -import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel; import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationTargetFactoryTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationTargetFactoryTest.java index 55176ea80a6f..69244fd025af 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationTargetFactoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationTargetFactoryTest.java @@ -1,34 +1,34 @@ package de.tum.cit.aet.artemis.notification; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.FILE_SUBMISSION_SUCCESSFUL_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.COURSES_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.COURSE_MANAGEMENT_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.DUPLICATE_TEST_CASE_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.EXAMS_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.EXERCISES_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.LECTURES_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.PROGRAMMING_EXERCISES_TEXT; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createAttachmentUpdatedTarget; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createExamProgrammingExerciseOrTestCaseTarget; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createExerciseReleasedTarget; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createExerciseTarget; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.createExerciseUpdatedTarget; -import static de.tum.cit.aet.artemis.domain.notification.NotificationTargetFactory.extractNotificationUrl; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.FILE_SUBMISSION_SUCCESSFUL_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.COURSES_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.COURSE_MANAGEMENT_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.DUPLICATE_TEST_CASE_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.EXAMS_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.EXERCISES_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.LECTURES_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.PROGRAMMING_EXERCISES_TEXT; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createAttachmentUpdatedTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createExamProgrammingExerciseOrTestCaseTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createExerciseReleasedTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createExerciseTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createExerciseUpdatedTarget; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.extractNotificationUrl; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.domain.notification.GroupNotification; +import de.tum.cit.aet.artemis.communication.domain.notification.Notification; +import de.tum.cit.aet.artemis.communication.domain.notification.NotificationTarget; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.notification.GroupNotification; -import de.tum.cit.aet.artemis.domain.notification.Notification; -import de.tum.cit.aet.artemis.domain.notification.NotificationTarget; +import de.tum.cit.aet.artemis.text.domain.TextExercise; class NotificationTargetFactoryTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/PushNotificationResourceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/PushNotificationResourceTest.java index f56617055d9b..adf70e5761a6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/PushNotificationResourceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/PushNotificationResourceTest.java @@ -14,11 +14,11 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfiguration; +import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceType; import de.tum.cit.aet.artemis.communication.repository.PushNotificationDeviceConfigurationRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfiguration; -import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceType; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.push_notification.PushNotificationRegisterBody; import de.tum.cit.aet.artemis.web.rest.push_notification.PushNotificationRegisterDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/SingleUserNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/SingleUserNotificationServiceTest.java index 9ad07ef36787..1476dff2fb02 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/SingleUserNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/SingleUserNotificationServiceTest.java @@ -1,5 +1,25 @@ package de.tum.cit.aet.artemis.notification; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_CHANNEL_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_GROUP_CHAT_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.CONVERSATION_CREATE_GROUP_CHAT_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.CONVERSATION_DELETE_CHANNEL_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.CONVERSATION_REMOVE_USER_CHANNEL_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.CONVERSATION_REMOVE_USER_GROUP_CHAT_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.DATA_EXPORT_CREATED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.DATA_EXPORT_FAILED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.EXERCISE_SUBMISSION_ASSESSED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.FILE_SUBMISSION_SUCCESSFUL_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.MESSAGE_REPLY_IN_CONVERSATION_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.NEW_PLAGIARISM_CASE_STUDENT_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.PLAGIARISM_CASE_VERDICT_STUDENT_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_ASSIGNED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_STUDENT_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_TUTOR_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_MULTIPLE_TUTOR_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_STUDENT_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_TUTOR_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_UNASSIGNED_TITLE; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_CHANNEL; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_GROUP_CHAT; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_CREATE_GROUP_CHAT; @@ -9,26 +29,6 @@ import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_REMOVE_USER_CHANNEL; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_REMOVE_USER_GROUP_CHAT; import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_EXERCISE_POST; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_CHANNEL_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_GROUP_CHAT_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_CREATE_GROUP_CHAT_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_DELETE_CHANNEL_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_REMOVE_USER_CHANNEL_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.CONVERSATION_REMOVE_USER_GROUP_CHAT_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.DATA_EXPORT_CREATED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.DATA_EXPORT_FAILED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.EXERCISE_SUBMISSION_ASSESSED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.FILE_SUBMISSION_SUCCESSFUL_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.MESSAGE_REPLY_IN_CONVERSATION_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_PLAGIARISM_CASE_STUDENT_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.PLAGIARISM_CASE_VERDICT_STUDENT_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_ASSIGNED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_STUDENT_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DEREGISTRATION_TUTOR_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_MULTIPLE_TUTOR_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_STUDENT_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_TUTOR_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_UNASSIGNED_TITLE; import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION_USER_NOTIFICATION_DATA_EXPORT_CREATED; import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION_USER_NOTIFICATION_DATA_EXPORT_FAILED; import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_SUBMISSION_ASSESSED; @@ -67,6 +67,14 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.domain.conversation.GroupChat; +import de.tum.cit.aet.artemis.communication.domain.conversation.OneToOneChat; +import de.tum.cit.aet.artemis.communication.domain.notification.Notification; +import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotification; import de.tum.cit.aet.artemis.communication.repository.NotificationRepository; import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; @@ -79,30 +87,22 @@ import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.NotificationSetting; import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; -import de.tum.cit.aet.artemis.domain.metis.AnswerPost; -import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; -import de.tum.cit.aet.artemis.domain.metis.conversation.OneToOneChat; -import de.tum.cit.aet.artemis.domain.notification.Notification; -import de.tum.cit.aet.artemis.domain.notification.SingleUserNotification; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; -import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; -import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmission; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextSubmissionElement; import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.user.UserUtilService; class SingleUserNotificationServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/SystemNotificationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/SystemNotificationIntegrationTest.java index e7d2d4146d48..b142a17ff108 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/SystemNotificationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/SystemNotificationIntegrationTest.java @@ -14,8 +14,8 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.domain.notification.SystemNotification; import de.tum.cit.aet.artemis.communication.repository.SystemNotificationRepository; -import de.tum.cit.aet.artemis.domain.notification.SystemNotification; class SystemNotificationIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationFactory.java b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationFactory.java index 97b7cfdcdf89..7eaee89eef64 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationFactory.java @@ -21,17 +21,17 @@ import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.SubmissionVersion; import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.Language; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.util.GitUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java index 9a6b950dd3af..d252422c7efb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java @@ -50,30 +50,17 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.Language; import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.QuizBatch; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizPointStatistic; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerQuestion; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSpot; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedAnswer; -import de.tum.cit.aet.artemis.domain.quiz.ShortAnswerSubmittedText; import de.tum.cit.aet.artemis.exam.ExamFactory; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseTestService; @@ -85,13 +72,26 @@ import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizPointStatistic; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestion; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSpot; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedText; import de.tum.cit.aet.artemis.service.GradingScaleService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.feature.Feature; import de.tum.cit.aet.artemis.service.feature.FeatureToggleService; import de.tum.cit.aet.artemis.service.quiz.QuizBatchService; import de.tum.cit.aet.artemis.service.quiz.QuizScheduleService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.util.LocalRepository; import de.tum.cit.aet.artemis.web.rest.dto.QuizBatchJoinDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationSubmissionIntegrationTest.java index f0409635d02e..0eab9b1a6468 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationSubmissionIntegrationTest.java @@ -13,10 +13,10 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; class ParticipationSubmissionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java index 7b540b16c630..e55bf716b3d7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java @@ -38,8 +38,6 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; @@ -48,27 +46,29 @@ import de.tum.cit.aet.artemis.domain.enumeration.Language; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; import de.tum.cit.aet.artemis.domain.enumeration.Visibility; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.Participant; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.ParticipationVcsAccessTokenService; import de.tum.cit.aet.artemis.service.UriService; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.TestResourceUtils; diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionExportIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionExportIntegrationTest.java index ed9d8322b10b..0df738895d9c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionExportIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionExportIntegrationTest.java @@ -24,15 +24,15 @@ import de.tum.cit.aet.artemis.domain.FileUploadExercise; import de.tum.cit.aet.artemis.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; class SubmissionExportIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionIntegrationTest.java index 281ecd67eb22..b8f82534b738 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionIntegrationTest.java @@ -16,14 +16,14 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.SubmissionVersion; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.Language; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionVersionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionVersionDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java index c1bd6bb08e06..12df346c6bed 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java @@ -25,29 +25,29 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.FileUploadExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismDetectionConfig; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; -import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; -import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismDetectionConfig; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmission; +import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingPlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextSubmissionElement; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.plagiarism.ContinuousPlagiarismControlService; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismCaseService; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionService; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismPostService; import de.tum.cit.aet.artemis.service.plagiarism.ProgrammingLanguageNotSupportedForPlagiarismDetectionException; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; class ContinuousPlagiarismControlServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismAnswerPostIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismAnswerPostIntegrationTest.java index affeeae83a82..58af4ebf9ee5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismAnswerPostIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismAnswerPostIntegrationTest.java @@ -16,12 +16,12 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.cit.aet.artemis.domain.metis.AnswerPost; -import de.tum.cit.aet.artemis.domain.metis.Post; import de.tum.cit.aet.artemis.post.ConversationUtilService; class PlagiarismAnswerPostIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCaseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCaseIntegrationTest.java index 9a7eef6e5c73..eda2a4413799 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCaseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCaseIntegrationTest.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.plagiarism; -import static de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict.NO_PLAGIARISM; -import static de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict.POINT_DEDUCTION; -import static de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict.WARNING; +import static de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict.NO_PLAGIARISM; +import static de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict.POINT_DEDUCTION; +import static de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict.WARNING; import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; @@ -16,23 +16,23 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismResult; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; -import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmission; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextSubmissionElement; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismVerdictDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionConfigHelperTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionConfigHelperTest.java index ffbe5dde3891..81198c40e656 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionConfigHelperTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionConfigHelperTest.java @@ -8,10 +8,10 @@ import org.junit.jupiter.api.Test; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismDetectionConfig; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismDetectionConfig; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionConfigHelper; class PlagiarismDetectionConfigHelperTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionServiceTest.java index 6e9657ccb553..8e4052a3b144 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionServiceTest.java @@ -16,11 +16,10 @@ import de.jplag.exceptions.ExitException; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismDetectionConfig; -import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; -import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismDetectionConfig; +import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingPlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.service.plagiarism.ModelingPlagiarismDetectionService; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionService; @@ -29,6 +28,7 @@ import de.tum.cit.aet.artemis.service.plagiarism.TextPlagiarismDetectionService; import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeature; import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeatureService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; class PlagiarismDetectionServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismIntegrationTest.java index 2733399f513e..56fbad41e789 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismIntegrationTest.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.plagiarism; -import static de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus.CONFIRMED; -import static de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus.DENIED; -import static de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus.NONE; +import static de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus.CONFIRMED; +import static de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus.DENIED; +import static de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus.NONE; import static org.assertj.core.api.Assertions.assertThat; import java.util.Optional; @@ -15,20 +15,20 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; -import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmission; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextSubmissionElement; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismComparisonStatusDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismPostIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismPostIntegrationTest.java index 733549087411..bc5b57c11541 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismPostIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismPostIntegrationTest.java @@ -25,16 +25,16 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.UserRole; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.metis.UserRole; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.post.ConversationUtilService; import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismUtilService.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismUtilService.java index 450b370cc317..75ed107ad643 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismUtilService.java @@ -14,21 +14,21 @@ import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.team.TeamUtilService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.user.UserUtilService; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/post/ConversationFactory.java b/src/test/java/de/tum/cit/aet/artemis/post/ConversationFactory.java index 25e9ff6e9181..b2ec3c4539a8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/post/ConversationFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/post/ConversationFactory.java @@ -5,12 +5,12 @@ import java.util.HashSet; import java.util.Set; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.Reaction; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.metis.Reaction; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; /** * Factory for creating objects related to Conversations. diff --git a/src/test/java/de/tum/cit/aet/artemis/post/ConversationUtilService.java b/src/test/java/de/tum/cit/aet/artemis/post/ConversationUtilService.java index c645c960ac21..7e6e0e1d6ac2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/post/ConversationUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/post/ConversationUtilService.java @@ -14,6 +14,15 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.Posting; +import de.tum.cit.aet.artemis.communication.domain.Reaction; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; +import de.tum.cit.aet.artemis.communication.domain.conversation.GroupChat; +import de.tum.cit.aet.artemis.communication.domain.conversation.OneToOneChat; import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; @@ -25,27 +34,18 @@ import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; -import de.tum.cit.aet.artemis.domain.metis.AnswerPost; -import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.metis.Posting; -import de.tum.cit.aet.artemis.domain.metis.Reaction; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.metis.conversation.Conversation; -import de.tum.cit.aet.artemis.domain.metis.conversation.GroupChat; -import de.tum.cit.aet.artemis.domain.metis.conversation.OneToOneChat; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.lecture.LectureFactory; import de.tum.cit.aet.artemis.lecture.LectureUtilService; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.user.UserUtilService; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/repository/ParticipationTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/repository/ParticipationTestRepository.java index 6b6061f9fa76..7447bd3e3885 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repository/ParticipationTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/repository/ParticipationTestRepository.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; @Repository public interface ParticipationTestRepository extends ArtemisJpaRepository { diff --git a/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseStudentParticipationTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseStudentParticipationTestRepository.java index f631d299f2be..1dfe149091f1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseStudentParticipationTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseStudentParticipationTestRepository.java @@ -7,7 +7,7 @@ import org.springframework.transaction.annotation.Transactional; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; /** * Spring Data JPA testing repository for the ProgrammingExerciseStudentParticipation entity. diff --git a/src/test/java/de/tum/cit/aet/artemis/repository/StatisticsRepositoryTest.java b/src/test/java/de/tum/cit/aet/artemis/repository/StatisticsRepositoryTest.java index 6615e753c83e..e9b1a931f5e9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repository/StatisticsRepositoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/repository/StatisticsRepositoryTest.java @@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.dto.StatisticsEntry; import de.tum.cit.aet.artemis.core.repository.PersistenceAuditEventRepository; import de.tum.cit.aet.artemis.core.repository.StatisticsRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; @@ -23,7 +24,6 @@ import de.tum.cit.aet.artemis.domain.enumeration.GraphType; import de.tum.cit.aet.artemis.domain.enumeration.SpanType; import de.tum.cit.aet.artemis.domain.enumeration.StatisticsView; -import de.tum.cit.aet.artemis.domain.statistics.StatisticsEntry; import de.tum.cit.aet.artemis.user.UserUtilService; class StatisticsRepositoryTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/science/ScienceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/science/ScienceIntegrationTest.java index 21076fa3a785..7b4d7d72db28 100644 --- a/src/test/java/de/tum/cit/aet/artemis/science/ScienceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/science/ScienceIntegrationTest.java @@ -12,8 +12,8 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.atlas.domain.science.ScienceEventType; import de.tum.cit.aet.artemis.atlas.repository.science.ScienceEventRepository; -import de.tum.cit.aet.artemis.domain.science.ScienceEventType; import de.tum.cit.aet.artemis.service.feature.Feature; import de.tum.cit.aet.artemis.service.feature.FeatureToggleService; import de.tum.cit.aet.artemis.web.rest.dto.science.ScienceEventDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/science/ScienceSettingsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/science/ScienceSettingsIntegrationTest.java index 30399915c854..d0af805080fc 100644 --- a/src/test/java/de/tum/cit/aet/artemis/science/ScienceSettingsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/science/ScienceSettingsIntegrationTest.java @@ -12,9 +12,9 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.atlas.domain.science.ScienceSetting; import de.tum.cit.aet.artemis.atlas.repository.science.ScienceSettingRepository; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.science.ScienceSetting; class ScienceSettingsIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/science/ScienceUtilService.java b/src/test/java/de/tum/cit/aet/artemis/science/ScienceUtilService.java index 1ff5cdc968e2..044952bcedab 100644 --- a/src/test/java/de/tum/cit/aet/artemis/science/ScienceUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/science/ScienceUtilService.java @@ -7,9 +7,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.domain.science.ScienceEvent; +import de.tum.cit.aet.artemis.atlas.domain.science.ScienceEventType; import de.tum.cit.aet.artemis.atlas.repository.science.ScienceEventRepository; -import de.tum.cit.aet.artemis.domain.science.ScienceEvent; -import de.tum.cit.aet.artemis.domain.science.ScienceEventType; @Service public class ScienceUtilService { diff --git a/src/test/java/de/tum/cit/aet/artemis/security/lti/Lti13TokenRetrieverTest.java b/src/test/java/de/tum/cit/aet/artemis/security/lti/Lti13TokenRetrieverTest.java index 744f8eef7ead..3a8df35fbc9b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/security/lti/Lti13TokenRetrieverTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/security/lti/Lti13TokenRetrieverTest.java @@ -49,7 +49,7 @@ import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; import de.tum.cit.aet.artemis.core.security.lti.Lti13TokenRetriever; -import de.tum.cit.aet.artemis.domain.lti.Scopes; +import de.tum.cit.aet.artemis.lti.dto.Scopes; class Lti13TokenRetrieverTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/AssessmentServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/AssessmentServiceTest.java index 0fc8aef0428a..b56289cb8fa0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/AssessmentServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/AssessmentServiceTest.java @@ -25,23 +25,23 @@ import de.tum.cit.aet.artemis.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseFactory; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserUtilService; class AssessmentServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/AuthorizationCheckServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/AuthorizationCheckServiceTest.java index a6bbd4410c54..1daaee43e8c8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/AuthorizationCheckServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/AuthorizationCheckServiceTest.java @@ -20,8 +20,8 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ComplaintResponseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ComplaintResponseServiceTest.java index 0f83d01ce88b..959ac0432075 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ComplaintResponseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ComplaintResponseServiceTest.java @@ -21,12 +21,12 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.team.TeamUtilService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.user.UserUtilService; class ComplaintResponseServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationServiceTest.java index 596823f17673..b95b5fdfd637 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationServiceTest.java @@ -28,12 +28,12 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.dto.MaxAndReachablePoints; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.dto.BonusSourceResultDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java index 463616a10705..dce11216d0ba 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java @@ -25,15 +25,15 @@ import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserUtilService; class CourseServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/DataExportCreationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/DataExportCreationServiceTest.java index 0189b4cfea4b..f4dfa7333b0d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/DataExportCreationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/DataExportCreationServiceTest.java @@ -41,6 +41,8 @@ import org.springframework.web.client.RestTemplate; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.atlas.domain.science.ScienceEvent; +import de.tum.cit.aet.artemis.atlas.domain.science.ScienceEventType; import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.connector.apollon.ApollonRequestMockProvider; @@ -56,13 +58,9 @@ import de.tum.cit.aet.artemis.domain.enumeration.DataExportState; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.enumeration.Visibility; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismVerdict; -import de.tum.cit.aet.artemis.domain.science.ScienceEvent; -import de.tum.cit.aet.artemis.domain.science.ScienceEventType; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; @@ -70,7 +68,9 @@ import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.post.ConversationUtilService; import de.tum.cit.aet.artemis.science.ScienceUtilService; import de.tum.cit.aet.artemis.service.connectors.apollon.ApollonConversionService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ExerciseDateServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ExerciseDateServiceTest.java index 228ca147e0a8..2406684f3752 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ExerciseDateServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ExerciseDateServiceTest.java @@ -16,17 +16,17 @@ import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.participation.Participation; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleServiceTest.java index f09a37ff054c..e963d61ee969 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleServiceTest.java @@ -14,8 +14,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; +import de.tum.cit.aet.artemis.text.domain.TextExercise; class ExerciseLifecycleServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java index a1e9ab9a8913..e7525e7539c5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java @@ -34,13 +34,13 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java index 434e388b5878..2278e84f9ce4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java @@ -24,8 +24,8 @@ import de.tum.cit.aet.artemis.domain.GradeStep; import de.tum.cit.aet.artemis.domain.GradeType; import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.exam.Exam; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/LearningObjectServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/LearningObjectServiceTest.java index f7386b74513a..8b1af2372efb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/LearningObjectServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/LearningObjectServiceTest.java @@ -16,12 +16,12 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.StudentScoreUtilService; +import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.LearningObject; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.lecture.LectureFactory; import de.tum.cit.aet.artemis.lecture.LectureUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java index a6515bd4f6a2..53795fcb37a7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java @@ -20,6 +20,9 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.StudentScoreUtilService; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; +import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; +import de.tum.cit.aet.artemis.atlas.domain.competency.RelationType; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.competency.CompetencyProgressUtilService; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; @@ -32,14 +35,11 @@ import de.tum.cit.aet.artemis.domain.LearningObject; import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.competency.Competency; -import de.tum.cit.aet.artemis.domain.competency.LearningPath; -import de.tum.cit.aet.artemis.domain.competency.RelationType; import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.service.learningpath.LearningPathNgxService; import de.tum.cit.aet.artemis.service.learningpath.LearningPathRecommendationService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/LectureImportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/LectureImportServiceTest.java index d4fe6ecec92f..40c2fce0f0e2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/LectureImportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/LectureImportServiceTest.java @@ -15,9 +15,9 @@ import de.tum.cit.aet.artemis.domain.Attachment; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.lecture.ExerciseUnit; -import de.tum.cit.aet.artemis.domain.lecture.LectureUnit; import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckServiceTest.java index 48dea12d1234..c006839554fe 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckServiceTest.java @@ -13,14 +13,14 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.participation.ParticipationInterface; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.domain.participation.ParticipationInterface; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleServiceTest.java index f41dd8142dbf..1d7181302316 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleServiceTest.java @@ -17,10 +17,10 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.enumeration.ParticipationLifecycle; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.user.UserUtilService; class ParticipationLifecycleServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java index 15d61bf80cfb..509c5427725f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java @@ -29,9 +29,9 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.participation.Participant; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationTeamWebsocketServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationTeamWebsocketServiceTest.java index 71626528ef02..dd7ca8777645 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationTeamWebsocketServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationTeamWebsocketServiceTest.java @@ -21,16 +21,16 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.websocket.dto.SubmissionPatch; import de.tum.cit.aet.artemis.web.websocket.team.ParticipationTeamWebsocketService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationServiceTest.java index 2bad9722c4dd..513f4728f632 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationServiceTest.java @@ -15,7 +15,7 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/RepositoryAccessServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/RepositoryAccessServiceTest.java index 6b632346110c..dd6563d010b6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/RepositoryAccessServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/RepositoryAccessServiceTest.java @@ -23,11 +23,11 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseGradingService; import de.tum.cit.aet.artemis.service.programming.RepositoryAccessService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ResultServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ResultServiceTest.java index 797297b06786..c9242749bc8d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ResultServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ResultServiceTest.java @@ -19,14 +19,14 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java index 4feaef8a9fc0..511fa947b74a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java @@ -31,19 +31,19 @@ import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionWithComplaintDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/TeamWebsocketServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/TeamWebsocketServiceTest.java index 35126278f0a3..fc3d47b6e9be 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/TeamWebsocketServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/TeamWebsocketServiceTest.java @@ -20,14 +20,14 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; import de.tum.cit.aet.artemis.domain.enumeration.TeamImportStrategyType; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.team.TeamUtilService; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.websocket.dto.TeamAssignmentPayload; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/TextBlockServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/TextBlockServiceTest.java index bfc22de26139..09382d75be21 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/TextBlockServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/TextBlockServiceTest.java @@ -9,8 +9,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.domain.TextBlock; -import de.tum.cit.aet.artemis.domain.TextSubmission; +import de.tum.cit.aet.artemis.text.domain.TextBlock; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; class TextBlockServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/UriServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/UriServiceTest.java index df3e0c26c5d0..e30f1d2d8240 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/UriServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/UriServiceTest.java @@ -11,9 +11,9 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.domain.participation.SolutionProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.domain.participation.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; class UriServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java index 228565defca7..8d685cace3e8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java @@ -24,17 +24,17 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.TextBlock; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingSubmission; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.text.domain.TextBlock; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; class AthenaFeedbackSendingServiceTest extends AbstractAthenaTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java index 77ff6403d49f..70df1a8a08b5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java @@ -17,13 +17,13 @@ import de.tum.cit.aet.artemis.core.exception.NetworkingException; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.service.dto.athena.ProgrammingFeedbackDTO; import de.tum.cit.aet.artemis.service.dto.athena.TextFeedbackDTO; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; class AthenaFeedbackSuggestionsServiceTest extends AbstractAthenaTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java index 1819978923b8..1821f9b3f5a2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java @@ -21,8 +21,8 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java index afcb76a2a802..3bcbb4835461 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java @@ -19,11 +19,11 @@ import de.tum.cit.aet.artemis.domain.GradingCriterion; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; class AthenaSubmissionSelectionServiceTest extends AbstractAthenaTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java index d5921432102c..08830d1b199e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java @@ -13,8 +13,6 @@ import de.tum.cit.aet.artemis.AbstractAthenaTest; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.Language; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; @@ -22,6 +20,8 @@ import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserUtilService; class AthenaSubmissionSendingServiceTest extends AbstractAthenaTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java index e1dc2bbea388..31e009e59e52 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java @@ -36,8 +36,8 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import uk.ac.ox.ctl.lti13.lti.Claims; @@ -125,7 +125,7 @@ void testEmptyReturnUrlBuildLtiDeepLinkResponse() throws JsonProcessingException """; Map deepLinkingSettingsAsMap = mapper.readValue(deepLinkingSettingsAsJsonString, new TypeReference<>() { }); - when(oidcIdToken.getClaim(de.tum.cit.aet.artemis.domain.lti.Claims.DEEP_LINKING_SETTINGS)).thenReturn(deepLinkingSettingsAsMap); + when(oidcIdToken.getClaim(de.tum.cit.aet.artemis.lti.dto.Claims.DEEP_LINKING_SETTINGS)).thenReturn(deepLinkingSettingsAsMap); DeepLinkCourseExercises result = createTestExercisesForDeepLinking(); assertThatExceptionOfType(BadRequestAlertException.class) @@ -138,7 +138,7 @@ void testEmptyReturnUrlBuildLtiDeepLinkResponse() throws JsonProcessingException void testEmptyDeploymentIdBuildLtiDeepLinkResponse() throws MalformedURLException, URISyntaxException { createMockOidcIdToken(); when(tokenRetriever.createDeepLinkingJWT(anyString(), anyMap())).thenReturn("test_jwt"); - when(oidcIdToken.getClaim(de.tum.cit.aet.artemis.domain.lti.Claims.LTI_DEPLOYMENT_ID)).thenReturn(null); + when(oidcIdToken.getClaim(de.tum.cit.aet.artemis.lti.dto.Claims.LTI_DEPLOYMENT_ID)).thenReturn(null); DeepLinkCourseExercises result = createTestExercisesForDeepLinking(); assertThatExceptionOfType(IllegalArgumentException.class) diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java index fbcd594ba30a..13e259861bc6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java @@ -20,11 +20,11 @@ import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExamUser; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExamUser; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamQuizServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamQuizServiceTest.java index 519f464e0487..bdb4bcfdf85d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamQuizServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamQuizServiceTest.java @@ -18,21 +18,21 @@ import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.DragAndDropQuestion; -import de.tum.cit.aet.artemis.domain.quiz.MultipleChoiceQuestion; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; -import de.tum.cit.aet.artemis.domain.quiz.QuizQuestion; -import de.tum.cit.aet.artemis.domain.quiz.QuizSubmission; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; +import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceQuestion; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; +import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.service.quiz.QuizExerciseService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java index 5618ecc21c98..7b3a7e810899 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java @@ -17,18 +17,18 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.quiz.QuizExercise; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.dto.ExamChecklistDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionServiceTest.java index b6a656fd9a18..294aec2326f9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionServiceTest.java @@ -18,12 +18,12 @@ import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessServiceTest.java index 5d7781cceddc..a9cc716759aa 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessServiceTest.java @@ -14,9 +14,9 @@ import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.StudentExam; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationServiceTest.java index 325feb7981bd..bdc7bf1fa148 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationServiceTest.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.notifications; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.NEW_MESSAGE_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.NEW_MESSAGE_TITLE; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; @@ -15,6 +15,11 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.conversation.OneToOneChat; +import de.tum.cit.aet.artemis.communication.domain.notification.ConversationNotification; +import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.NotificationRepository; @@ -25,11 +30,6 @@ import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.metis.conversation.OneToOneChat; -import de.tum.cit.aet.artemis.domain.notification.ConversationNotification; -import de.tum.cit.aet.artemis.domain.notification.Notification; import de.tum.cit.aet.artemis.user.UserUtilService; class ConversationNotificationServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationServiceTest.java index 953e62bec1b6..977fbda66583 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationServiceTest.java @@ -14,12 +14,12 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import de.tum.cit.aet.artemis.communication.domain.notification.GroupNotification; +import de.tum.cit.aet.artemis.communication.domain.notification.Notification; +import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType; import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; -import de.tum.cit.aet.artemis.domain.notification.GroupNotification; -import de.tum.cit.aet.artemis.domain.notification.Notification; -import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; import de.tum.cit.aet.artemis.service.notifications.push_notifications.ApplePushNotificationService; import de.tum.cit.aet.artemis.service.notifications.push_notifications.FirebasePushNotificationService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/notifications/MailServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/notifications/MailServiceTest.java index d39a6a5bdead..71a08da0ce2d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/notifications/MailServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/notifications/MailServiceTest.java @@ -24,13 +24,13 @@ import org.springframework.test.util.ReflectionTestUtils; import org.thymeleaf.spring6.SpringTemplateEngine; +import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.domain.notification.GroupNotification; +import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.notification.GroupNotification; -import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; import de.tum.cit.aet.artemis.service.TimeService; import tech.jhipster.config.JHipsterProperties; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationServiceTest.java index 95715d45718f..d99f1f9e9429 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationServiceTest.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.notifications; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_DELETED_TITLE; -import static de.tum.cit.aet.artemis.domain.notification.NotificationConstants.TUTORIAL_GROUP_UPDATED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_DELETED_TITLE; +import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_UPDATED_TITLE; import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__TUTORIAL_GROUP_NOTIFICATION__TUTORIAL_GROUP_DELETE_UPDATE; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.any; @@ -26,6 +26,8 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.domain.notification.Notification; +import de.tum.cit.aet.artemis.communication.domain.notification.TutorialGroupNotification; import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; @@ -34,10 +36,8 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.Language; import de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; -import de.tum.cit.aet.artemis.domain.notification.Notification; -import de.tum.cit.aet.artemis.domain.notification.TutorialGroupNotification; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupRegistration; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupNotificationRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRegistrationRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/AppleFirebasePushNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/AppleFirebasePushNotificationServiceTest.java index 0f8406797473..6d0611eb1b9f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/AppleFirebasePushNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/AppleFirebasePushNotificationServiceTest.java @@ -24,14 +24,14 @@ import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; +import de.tum.cit.aet.artemis.communication.domain.notification.GroupNotification; +import de.tum.cit.aet.artemis.communication.domain.notification.Notification; +import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; +import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfiguration; +import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceType; import de.tum.cit.aet.artemis.communication.repository.PushNotificationDeviceConfigurationRepository; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType; -import de.tum.cit.aet.artemis.domain.notification.GroupNotification; -import de.tum.cit.aet.artemis.domain.notification.Notification; -import de.tum.cit.aet.artemis.domain.notification.NotificationConstants; -import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfiguration; -import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceType; class AppleFirebasePushNotificationServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java index 94e791ab0aa9..711b7689784a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java @@ -22,11 +22,11 @@ import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; import de.tum.cit.aet.artemis.domain.enumeration.Visibility; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.hestia.ProgrammingExerciseTestCaseType; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTestCaseType; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupServiceTest.java index ca4411763fd9..17b26757ae44 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupServiceTest.java @@ -14,10 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfiguration; +import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceType; import de.tum.cit.aet.artemis.communication.repository.PushNotificationDeviceConfigurationRepository; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceConfiguration; -import de.tum.cit.aet.artemis.domain.push_notification.PushNotificationDeviceType; import de.tum.cit.aet.artemis.user.UserUtilService; class PushNotificationDeviceConfigurationCleanupServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/settings/ide/IdePreferencesIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/settings/ide/IdePreferencesIntegrationTest.java index 4fc41b1566b2..7defe2fd31ca 100644 --- a/src/test/java/de/tum/cit/aet/artemis/settings/ide/IdePreferencesIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/settings/ide/IdePreferencesIntegrationTest.java @@ -16,8 +16,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.settings.ide.Ide; -import de.tum.cit.aet.artemis.domain.settings.ide.UserIdeMapping; +import de.tum.cit.aet.artemis.programming.domain.ide.Ide; +import de.tum.cit.aet.artemis.programming.domain.ide.UserIdeMapping; import de.tum.cit.aet.artemis.programming.repository.settings.IdeRepository; import de.tum.cit.aet.artemis.programming.repository.settings.UserIdeMappingRepository; import de.tum.cit.aet.artemis.web.rest.dto.settings.ide.IdeDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/team/TeamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/team/TeamIntegrationTest.java index abad3d39e396..039986a39e52 100644 --- a/src/test/java/de/tum/cit/aet/artemis/team/TeamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/team/TeamIntegrationTest.java @@ -22,19 +22,19 @@ import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.TeamAssignmentConfig; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.service.dto.TeamSearchUserDTO; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.web.rest.dto.CoursesForDashboardDTO; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseDetailsDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/text/AssessmentEventIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/AssessmentEventIntegrationTest.java index 9b28d744c2df..932ee8b4b94d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/text/AssessmentEventIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/AssessmentEventIntegrationTest.java @@ -14,13 +14,13 @@ import de.tum.cit.aet.artemis.assessment.repository.TextAssessmentEventRepository; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.analytics.TextAssessmentEvent; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.text.domain.TextAssessmentEvent; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; class AssessmentEventIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java index 1e4ab3c3980d..d358b1b69805 100644 --- a/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java @@ -50,21 +50,18 @@ import de.tum.cit.aet.artemis.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.TextBlock; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.exam.Exam; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseFactory; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; @@ -74,6 +71,9 @@ import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.service.TextAssessmentService; +import de.tum.cit.aet.artemis.text.domain.TextBlock; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/text/TextEmbeddingIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/TextEmbeddingIntegrationTest.java index 6e4a5173c146..721341d30da8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/text/TextEmbeddingIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/TextEmbeddingIntegrationTest.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.domain.TextEmbedding; +import de.tum.cit.aet.artemis.text.domain.TextEmbedding; class TextEmbeddingIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/text/TextExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/TextExerciseIntegrationTest.java index 4492a22a9152..562e050da012 100644 --- a/src/test/java/de/tum/cit/aet/artemis/text/TextExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/TextExerciseIntegrationTest.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.text; -import static de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus.CONFIRMED; -import static de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus.DENIED; -import static de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus.NONE; +import static de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus.CONFIRMED; +import static de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus.DENIED; +import static de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus.NONE; import static de.tum.cit.aet.artemis.util.TestResourceUtils.HalfSecond; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -38,6 +38,8 @@ import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.domain.Course; @@ -48,24 +50,15 @@ import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.domain.Team; import de.tum.cit.aet.artemis.domain.TeamAssignmentConfig; -import de.tum.cit.aet.artemis.domain.TextBlock; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; -import de.tum.cit.aet.artemis.domain.competency.Competency; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.exam.ExerciseGroup; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.participation.Participation; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismStatus; -import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; -import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; import de.tum.cit.aet.artemis.exam.ExamUtilService; +import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; @@ -73,7 +66,14 @@ import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.plagiarism.PlagiarismUtilService; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextSubmissionElement; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.text.domain.TextBlock; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.util.ExerciseIntegrationTestService; diff --git a/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java index 1803c9766d1c..b7f86fdbc566 100644 --- a/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java @@ -19,25 +19,18 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.SubmissionVersion; import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.TextSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.cit.aet.artemis.domain.plagiarism.modeling.ModelingSubmissionElement; -import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; +import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionVersionRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; @@ -45,8 +38,15 @@ import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmission; +import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingSubmissionElement; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextSubmissionElement; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseDetailsDTO; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/AbstractTutorialGroupIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/AbstractTutorialGroupIntegrationTest.java index 286c48c184cc..696012c82c6f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/AbstractTutorialGroupIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/AbstractTutorialGroupIntegrationTest.java @@ -22,6 +22,8 @@ import org.springframework.http.HttpStatus; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; +import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -31,15 +33,13 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.Language; import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; -import de.tum.cit.aet.artemis.domain.metis.ConversationParticipant; -import de.tum.cit.aet.artemis.domain.metis.conversation.Channel; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupRegistration; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSchedule; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupChannelManagementService; import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupService; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSchedule; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupFreePeriodRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupNotificationRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRegistrationRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFactory.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFactory.java index 2d7e996bbcce..b412b240c78d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFactory.java @@ -3,8 +3,8 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; /** * Factory for creating TutorialGroups and related objects. diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFreePeriodIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFreePeriodIntegrationTest.java index cc8f17a69399..6252ee7c51e3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFreePeriodIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFreePeriodIntegrationTest.java @@ -17,9 +17,9 @@ import org.springframework.web.client.HttpClientErrorException; import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupFreePeriod; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.web.rest.dto.TutorialGroupFreePeriodDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java index 1659b5a56dbb..9a694d5afd4e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java @@ -30,17 +30,17 @@ import com.google.common.collect.ImmutableSet; +import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; import de.tum.cit.aet.artemis.domain.enumeration.Language; import de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; -import de.tum.cit.aet.artemis.domain.metis.Post; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupRegistration; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; import de.tum.cit.aet.artemis.post.ConversationUtilService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupResource; import de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupResource.TutorialGroupRegistrationImportDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupScheduleIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupScheduleIntegrationTest.java index 9c91307bba1f..6e8f8da9746a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupScheduleIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupScheduleIntegrationTest.java @@ -11,7 +11,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupResource; class TutorialGroupScheduleIntegrationTest extends AbstractTutorialGroupIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupSessionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupSessionIntegrationTest.java index 6f676ac0d85c..dd942b526127 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupSessionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupSessionIntegrationTest.java @@ -16,8 +16,8 @@ import de.tum.cit.aet.artemis.domain.enumeration.Language; import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; import de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupSessionResource; class TutorialGroupSessionIntegrationTest extends AbstractTutorialGroupIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupUtilService.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupUtilService.java index 5b8f96affd85..7ed8c01115dd 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupUtilService.java @@ -20,11 +20,11 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; import de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroup; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupFreePeriod; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupRegistration; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupSession; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupFreePeriod; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupFreePeriodRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRegistrationRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupsConfigurationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupsConfigurationIntegrationTest.java index b4c5860a59e3..22a08c865919 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupsConfigurationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupsConfigurationIntegrationTest.java @@ -16,11 +16,11 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.TextExercise; import de.tum.cit.aet.artemis.domain.enumeration.Language; import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; -import de.tum.cit.aet.artemis.domain.tutorialgroups.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.user.UserFactory; class TutorialGroupsConfigurationIntegrationTest extends AbstractTutorialGroupIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java b/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java index 35c96f27ee88..94f4937e3995 100644 --- a/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java @@ -27,6 +27,8 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.springframework.util.LinkedMultiValueMap; +import de.tum.cit.aet.artemis.atlas.domain.science.ScienceEvent; +import de.tum.cit.aet.artemis.atlas.domain.science.ScienceEventType; import de.tum.cit.aet.artemis.atlas.repository.science.ScienceEventRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.repository.AuthorityRepository; @@ -39,8 +41,6 @@ import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.science.ScienceEvent; -import de.tum.cit.aet.artemis.domain.science.ScienceEventType; import de.tum.cit.aet.artemis.exercise.programming.MockDelegate; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/util/ExamPrepareExercisesTestUtil.java b/src/test/java/de/tum/cit/aet/artemis/util/ExamPrepareExercisesTestUtil.java index e375d877e485..8fdd915b543c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/util/ExamPrepareExercisesTestUtil.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/ExamPrepareExercisesTestUtil.java @@ -7,7 +7,7 @@ import org.springframework.http.HttpStatus; import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.exam.Exam; +import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.service.util.ExamExerciseStartPreparationStatus; public class ExamPrepareExercisesTestUtil { diff --git a/src/test/java/de/tum/cit/aet/artemis/util/GitUtilService.java b/src/test/java/de/tum/cit/aet/artemis/util/GitUtilService.java index eccbc6670cfc..a943db5ffe8b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/util/GitUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/GitUtilService.java @@ -29,9 +29,9 @@ import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.participation.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.service.connectors.GitService; @Service diff --git a/src/test/java/de/tum/cit/aet/artemis/util/SensitiveInformationUtil.java b/src/test/java/de/tum/cit/aet/artemis/util/SensitiveInformationUtil.java index 836f4dcb8e04..05ba212b00cd 100644 --- a/src/test/java/de/tum/cit/aet/artemis/util/SensitiveInformationUtil.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/SensitiveInformationUtil.java @@ -5,8 +5,8 @@ import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.FileUploadExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.TextExercise; -import de.tum.cit.aet.artemis.domain.modeling.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.text.domain.TextExercise; public class SensitiveInformationUtil { diff --git a/src/test/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilderTest.java b/src/test/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilderTest.java index 3bd46383a02a..dd5f9dbbc30e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilderTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilderTest.java @@ -7,10 +7,10 @@ import org.junit.jupiter.api.Test; import org.springframework.http.HttpStatus; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.cit.aet.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.cit.aet.artemis.domain.plagiarism.text.TextPlagiarismResult; -import de.tum.cit.aet.artemis.domain.plagiarism.text.TextSubmissionElement; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmission; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextSubmissionElement; class PlagiarismResultResponseBuilderTest { From c35d8fb0963ff3b68e2bdaa4af8e4ed8ccdef428 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Wed, 11 Sep 2024 16:15:27 +0200 Subject: [PATCH 07/43] move domain classes into modules (part 2) WORK IN PROGRESS --- .../assessment/domain/AssessmentNote.java | 4 +- .../domain}/AssessmentType.java | 2 +- .../{ => assessment}/domain/Bonus.java | 4 +- .../domain/BonusStrategy.java | 2 +- .../domain}/CategoryState.java | 2 +- .../{ => assessment}/domain/Complaint.java | 6 +- .../domain/ComplaintResponse.java | 5 +- .../domain}/ComplaintType.java | 2 +- .../domain/ExampleSubmission.java | 6 +- .../{ => assessment}/domain/Feedback.java | 6 +- .../domain}/FeedbackType.java | 4 +- .../{ => assessment}/domain/GradeStep.java | 4 +- .../{ => assessment}/domain/GradeType.java | 2 +- .../domain/GradingCriterion.java | 5 +- .../domain/GradingInstruction.java | 4 +- .../{ => assessment}/domain/GradingScale.java | 4 +- .../domain/IBonusStrategy.java | 2 +- .../domain/LongFeedbackText.java | 3 +- .../assessment/domain/ParticipantScore.java | 5 +- .../{ => assessment}/domain/Rating.java | 4 +- .../{ => assessment}/domain/Result.java | 13 ++- .../assessment/domain/StudentScore.java | 2 +- .../artemis/assessment/domain/TeamScore.java | 2 +- .../assessment/domain/TutorParticipation.java | 9 +- .../domain}/Visibility.java | 10 +- .../repository/BonusRepository.java | 2 +- .../repository/ComplaintRepository.java | 4 +- .../ComplaintResponseRepository.java | 4 +- .../ExampleSubmissionRepository.java | 6 +- .../repository/FeedbackRepository.java | 10 +- .../repository/GradeStepRepository.java | 2 +- .../GradingCriterionRepository.java | 2 +- .../GradingInstructionRepository.java | 2 +- .../repository/GradingScaleRepository.java | 4 +- .../LongFeedbackTextRepository.java | 2 +- .../ParticipantScoreRepository.java | 2 +- .../repository/RatingRepository.java | 2 +- .../repository/ResultRepository.java | 22 ++-- .../repository/StudentScoreRepository.java | 4 +- .../repository/TeamScoreRepository.java | 6 +- .../TutorParticipationRepository.java | 6 +- .../CompetencyProgressConfidenceReason.java | 2 +- .../{ => atlas}/domain/LearningObject.java | 3 +- .../domain/competency/BaseCompetency.java | 2 +- .../domain/competency/CompetencyJol.java | 4 +- .../domain/competency/CompetencyProgress.java | 4 +- .../domain/competency/CompetencyRelation.java | 2 +- .../domain/competency/CourseCompetency.java | 4 +- .../domain/competency/KnowledgeArea.java | 2 +- .../atlas/domain/competency/LearningPath.java | 6 +- .../atlas/domain/competency/Source.java | 2 +- .../atlas/domain/science/ScienceEvent.java | 2 +- .../atlas/domain/science/ScienceSetting.java | 4 +- .../CompetencyProgressRepository.java | 2 +- .../repository/CompetencyRepository.java | 2 +- .../CourseCompetencyRepository.java | 6 +- .../repository/PrerequisiteRepository.java | 2 +- .../communication/domain/AnswerPost.java | 2 +- .../domain/ConductAgreement.java | 5 +- .../domain/ConductAgreementId.java | 2 +- ...versationNotificationRecipientSummary.java | 4 +- .../domain/ConversationParticipant.java | 4 +- .../domain/CreatedConversationMessage.java | 2 +- .../domain}/DefaultChannelType.java | 2 +- .../domain}/DisplayPriority.java | 2 +- .../domain}/GroupNotificationType.java | 2 +- .../domain}/NotificationPriority.java | 2 +- .../domain/NotificationSetting.java | 5 +- .../domain}/NotificationType.java | 2 +- .../artemis/communication/domain/Post.java | 7 +- .../artemis/communication/domain/Posting.java | 6 +- .../communication/domain/Reaction.java | 4 +- .../domain}/SystemNotificationType.java | 2 +- .../domain/conversation/Channel.java | 8 +- .../domain/conversation/Conversation.java | 6 +- .../domain/conversation/GroupChat.java | 4 +- .../domain/conversation/OneToOneChat.java | 4 +- .../ConversationNotification.java | 2 +- .../ConversationNotificationFactory.java | 2 +- .../notification/GroupNotification.java | 8 +- .../GroupNotificationFactory.java | 58 +++++----- .../domain/notification/Notification.java | 6 +- .../notification/NotificationConstants.java | 106 +++++++++--------- .../NotificationPlaceholderCreator.java | 2 +- .../NotificationTargetFactory.java | 10 +- .../notification/SingleUserNotification.java | 2 +- .../SingleUserNotificationFactory.java | 64 +++++------ .../notification/SystemNotification.java | 2 +- .../TutorialGroupNotification.java | 6 +- .../TutorialGroupNotificationFactory.java | 6 +- .../PushNotificationDeviceConfiguration.java | 2 +- ...PushNotificationDeviceConfigurationId.java | 2 +- .../ConductAgreementRepository.java | 4 +- .../ConversationMessageRepository.java | 2 +- .../repository/MessageSpecs.java | 2 +- .../NotificationSettingRepository.java | 4 +- ...ficationDeviceConfigurationRepository.java | 2 +- .../aet/artemis/core/config/Constants.java | 4 +- .../core/config/GuidedTourConfiguration.java | 4 +- .../aet/artemis/core/config/MetricsBean.java | 4 +- .../ProgrammingLanguageConfiguration.java | 4 +- .../config/StaticCodeAnalysisConfigurer.java | 8 +- .../core/config/TheiaConfiguration.java | 2 +- .../config/audit/AuditEventConverter.java | 2 +- .../config/migration/MigrationService.java | 2 +- .../MigrationEntry20240614_140000.java | 2 +- .../websocket/WebsocketConfiguration.java | 2 +- .../domain/AbstractAuditingEntity.java | 2 +- .../artemis/{ => core}/domain/Authority.java | 2 +- .../aet/artemis/{ => core}/domain/Course.java | 9 +- .../domain/CourseExamExportErrorCause.java | 2 +- .../domain/CourseExamExportState.java | 2 +- ...CourseInformationSharingConfiguration.java | 2 +- .../artemis/{ => core}/domain/DataExport.java | 4 +- .../domain}/DataExportState.java | 2 +- .../{ => core}/domain/DomainObject.java | 2 +- .../domain}/GraphType.java | 2 +- .../{ => core}/domain/GuidedTourSetting.java | 2 +- .../enumeration => core/domain}/Language.java | 2 +- .../domain}/LegalDocumentType.java | 2 +- .../{ => core}/domain/MigrationChangelog.java | 2 +- .../{ => core}/domain/Organization.java | 2 +- .../domain/PersistentAuditEvent.java | 2 +- .../enumeration => core/domain}/SpanType.java | 2 +- .../domain}/StatisticsView.java | 2 +- .../aet/artemis/{ => core}/domain/User.java | 2 +- .../artemis/{ => core}/domain/UserGroup.java | 2 +- .../dto/CourseStatisticsAverageScore.java | 2 +- .../dto}/SortingOrder.java | 2 +- .../core/repository/AuthorityRepository.java | 2 +- .../core/repository/CourseRepository.java | 16 +-- .../CustomAuditEventRepository.java | 2 +- .../core/repository/DataExportRepository.java | 2 +- .../GuidedTourSettingsRepository.java | 2 +- .../repository/MigrationChangeRepository.java | 2 +- .../repository/OrganizationRepository.java | 2 +- .../PersistenceAuditEventRepository.java | 2 +- .../core/repository/StatisticsRepository.java | 10 +- .../core/repository/UserRepository.java | 12 +- .../artemis/core/repository/UserSpecs.java | 4 +- .../security/DomainUserDetailsService.java | 2 +- .../TeamAssignmentConfigValidator.java | 2 +- .../web/admin/AdminBuildJobQueueResource.java | 2 +- .../core/web/admin/AdminCourseResource.java | 6 +- .../core/web/admin/AdminExerciseResource.java | 2 +- .../core/web/admin/AdminImprintResource.java | 2 +- .../admin/AdminLtiConfigurationResource.java | 2 +- .../web/admin/AdminOrganizationResource.java | 4 +- .../admin/AdminPrivacyStatementResource.java | 2 +- .../web/admin/AdminStatisticsResource.java | 6 +- .../core/web/admin/AdminUserResource.java | 2 +- .../tum/cit/aet/artemis/domain/FileType.java | 5 - .../cit/aet/artemis/domain/package-info.java | 4 - .../tum/cit/aet/artemis/exam/domain/Exam.java | 6 +- .../aet/artemis/exam/domain/ExamSession.java | 2 +- .../cit/aet/artemis/exam/domain/ExamUser.java | 4 +- .../artemis/exam/domain/ExerciseGroup.java | 4 +- .../aet/artemis/exam/domain/StudentExam.java | 6 +- .../exam/domain/event/ExamLiveEvent.java | 2 +- .../exam/repository/ExamRepository.java | 2 +- .../repository/StudentExamRepository.java | 4 +- .../{ => exercise}/domain/BaseExercise.java | 8 +- .../domain}/DifficultyLevel.java | 2 +- .../{ => exercise}/domain/Exercise.java | 17 ++- .../domain}/ExerciseLifecycle.java | 5 +- .../domain}/ExerciseMode.java | 2 +- .../domain}/ExerciseType.java | 7 +- .../domain}/IExerciseLifecycle.java | 3 +- .../domain}/IncludedInOverallScore.java | 2 +- .../domain}/InitializationState.java | 2 +- .../{ => exercise}/domain/Submission.java | 7 +- .../domain}/SubmissionType.java | 2 +- .../domain/SubmissionVersion.java | 5 +- .../artemis/{ => exercise}/domain/Team.java | 4 +- .../domain/TeamAssignmentConfig.java | 3 +- .../domain/participation/Participant.java | 2 +- .../domain/participation/Participation.java | 12 +- .../participation/ParticipationInterface.java | 8 +- .../participation/StudentParticipation.java | 6 +- .../dto/ExerciseTypeMetricsEntry.java | 2 +- .../dto}/TeamImportStrategyType.java | 2 +- .../repository/ExerciseMetricsRepository.java | 2 +- .../repository/ExerciseRepository.java | 2 +- .../repository/ParticipationRepository.java | 2 +- .../StudentParticipationRepository.java | 15 +-- .../repository/SubmissionRepository.java | 16 +-- .../SubmissionVersionRepository.java | 2 +- .../exercise/repository/TeamRepository.java | 6 +- .../domain/FileUploadExercise.java | 7 +- .../domain/FileUploadSubmission.java | 3 +- .../FileUploadExerciseRepository.java | 2 +- .../FileUploadSubmissionRepository.java | 2 +- .../aet/artemis/iris/domain/IrisTemplate.java | 2 +- .../iris/domain/message/IrisMessage.java | 2 +- .../domain/message/IrisMessageContent.java | 2 +- .../iris/domain/session/IrisChatSession.java | 2 +- .../domain/session/IrisCourseChatSession.java | 4 +- .../session/IrisExerciseChatSession.java | 4 +- .../iris/domain/session/IrisSession.java | 2 +- .../domain/settings/IrisCourseSettings.java | 2 +- .../domain/settings/IrisExerciseSettings.java | 2 +- .../iris/domain/settings/IrisSettings.java | 2 +- .../iris/domain/settings/IrisSubSettings.java | 2 +- .../IrisCourseChatSessionRepository.java | 2 +- .../IrisExerciseChatSessionRepository.java | 2 +- .../{ => lecture}/domain/Attachment.java | 6 +- .../domain}/AttachmentType.java | 2 +- .../lecture/domain/AttachmentUnit.java | 2 - .../artemis/lecture/domain/ExerciseUnit.java | 2 +- .../artemis/{ => lecture}/domain/Lecture.java | 5 +- .../artemis/lecture/domain/LectureUnit.java | 7 +- .../lecture/domain/LectureUnitCompletion.java | 2 +- .../cit/aet/artemis/lecture/domain/Slide.java | 2 +- .../repository/AttachmentRepository.java | 2 +- .../repository/AttachmentUnitRepository.java | 2 +- .../lecture/repository/LectureRepository.java | 2 +- .../LectureUnitCompletionRepository.java | 2 +- .../domain/LtiPlatformConfiguration.java | 4 +- .../artemis/lti/domain/LtiResourceLaunch.java | 7 +- .../domain/OnlineCourseConfiguration.java | 5 +- .../Lti13ResourceLaunchRepository.java | 4 +- .../LtiPlatformConfigurationRepository.java | 2 +- .../OnlineCourseConfigurationRepository.java | 2 +- .../modeling/domain/ApollonDiagram.java | 3 +- .../domain}/DiagramType.java | 2 +- .../artemis/modeling/domain/ModelCluster.java | 2 +- .../modeling/domain/ModelingExercise.java | 7 +- .../modeling/domain/ModelingSubmission.java | 2 +- .../plagiarism/domain/PlagiarismCase.java | 8 +- .../domain/PlagiarismCheckState.java | 2 +- .../domain/PlagiarismComparison.java | 4 +- .../domain/PlagiarismDetectionConfig.java | 2 +- .../plagiarism/domain/PlagiarismMatch.java | 5 +- .../plagiarism/domain/PlagiarismResult.java | 4 +- .../domain/PlagiarismSubmission.java | 4 +- .../domain/PlagiarismSubmissionElement.java | 2 +- .../domain/text/TextPlagiarismResult.java | 2 +- .../domain/text/TextSubmissionElement.java | 4 +- ...tBaseProgrammingExerciseParticipation.java | 3 +- .../domain}/AeolusTarget.java | 2 +- .../domain/AuxiliaryRepository.java | 4 +- .../{ => programming}/domain/BuildJob.java | 6 +- .../domain/BuildLogEntry.java | 4 +- .../domain/BuildLogStatisticsEntry.java | 3 +- .../{ => programming}/domain/BuildPlan.java | 4 +- .../domain}/BuildPlanType.java | 2 +- .../domain/BuildRunState.java | 2 +- .../domain}/BuildStatus.java | 2 +- .../{ => programming}/domain/Commit.java | 2 +- .../{ => programming}/domain/File.java | 2 +- .../artemis/programming/domain/FileType.java | 5 + .../domain}/ParticipationLifecycle.java | 4 +- .../domain/ParticipationVCSAccessToken.java | 4 +- .../domain/ProgrammingExercise.java | 22 ++-- .../ProgrammingExerciseBuildConfig.java | 3 +- .../ProgrammingExerciseParticipation.java | 4 +- ...ogrammingExerciseStudentParticipation.java | 3 +- .../domain/ProgrammingExerciseTestCase.java | 9 +- .../domain}/ProgrammingLanguage.java | 2 +- .../domain/ProgrammingSubmission.java | 6 +- .../domain}/ProjectType.java | 2 +- .../{ => programming}/domain/Repository.java | 3 +- .../domain}/RepositoryType.java | 2 +- ...utionProgrammingExerciseParticipation.java | 2 - .../domain/StaticCodeAnalysisCategory.java | 5 +- .../StaticCodeAnalysisDefaultCategory.java | 5 +- .../domain}/StaticCodeAnalysisTool.java | 2 +- ...plateProgrammingExerciseParticipation.java | 2 - .../domain/VcsRepositoryUri.java | 2 +- .../domain/hestia/CoverageFileReport.java | 2 +- .../domain/hestia/CoverageReport.java | 4 +- .../domain/hestia/ExerciseHint.java | 4 +- .../domain/hestia/ExerciseHintActivation.java | 4 +- .../ProgrammingExerciseGitDiffEntry.java | 2 +- .../ProgrammingExerciseGitDiffReport.java | 4 +- .../ProgrammingExerciseSolutionEntry.java | 4 +- .../hestia/ProgrammingExerciseTask.java | 6 +- .../hestia/TestwiseCoverageReportEntry.java | 4 +- .../artemis/programming/domain/ide/Ide.java | 2 +- .../domain/ide/UserIdeMapping.java | 4 +- .../submissionpolicy/SubmissionPolicy.java | 4 +- .../programming/icl/ssh/SshConstants.java | 2 +- .../programming/icl/ssh/SshGitCommand.java | 2 +- .../AuxiliaryRepositoryRepository.java | 2 +- .../repository/BuildJobRepository.java | 6 +- .../repository/BuildLogEntryRepository.java | 2 +- .../BuildLogStatisticsEntryRepository.java | 4 +- .../repository/BuildPlanRepository.java | 4 +- ...grammingExerciseBuildConfigRepository.java | 4 +- .../ProgrammingExerciseRepository.java | 7 +- ...ProgrammingExerciseTestCaseRepository.java | 7 +- .../ProgrammingSubmissionRepository.java | 2 +- .../StaticCodeAnalysisCategoryRepository.java | 2 +- .../hestia/CoverageReportRepository.java | 2 +- .../quiz/domain/AbstractQuizSubmission.java | 2 +- .../aet/artemis/quiz/domain/AnswerOption.java | 2 +- .../quiz/domain/DragAndDropMapping.java | 2 +- .../cit/aet/artemis/quiz/domain/DragItem.java | 1 - .../aet/artemis/quiz/domain/DropLocation.java | 1 - .../quiz/domain/MultipleChoiceQuestion.java | 1 - .../domain/MultipleChoiceSubmittedAnswer.java | 2 +- .../domain}/QuizAction.java | 2 +- .../aet/artemis/quiz/domain/QuizBatch.java | 2 +- .../aet/artemis/quiz/domain/QuizExercise.java | 11 +- .../aet/artemis/quiz/domain/QuizGroup.java | 2 +- .../enumeration => quiz/domain}/QuizMode.java | 2 +- .../cit/aet/artemis/quiz/domain/QuizPool.java | 2 +- .../aet/artemis/quiz/domain/QuizQuestion.java | 3 +- .../artemis/quiz/domain/QuizStatistic.java | 2 +- .../quiz/domain/QuizStatisticCounter.java | 2 +- .../domain}/ScoringType.java | 2 +- .../quiz/domain/ShortAnswerMapping.java | 2 +- .../quiz/domain/ShortAnswerSolution.java | 1 - .../artemis/quiz/domain/ShortAnswerSpot.java | 1 - .../quiz/domain/ShortAnswerSubmittedText.java | 2 +- .../artemis/quiz/domain/SubmittedAnswer.java | 2 +- .../{ => quiz}/domain/TempIdObject.java | 4 +- .../AbstractQuizSubmissionService.java | 4 +- .../service/AssessmentDashboardService.java | 8 +- .../artemis/service/AssessmentService.java | 16 +-- .../service/AttachmentUnitService.java | 4 +- .../service/AuthorizationCheckService.java | 16 +-- .../cit/aet/artemis/service/BonusService.java | 10 +- .../artemis/service/BuildLogEntryService.java | 6 +- .../service/ComplaintResponseService.java | 14 +-- .../aet/artemis/service/ComplaintService.java | 18 +-- .../service/ConductAgreementService.java | 6 +- .../service/ConsistencyCheckService.java | 2 +- .../CourseScoreCalculationService.java | 18 +-- .../aet/artemis/service/CourseService.java | 22 ++-- .../artemis/service/EmailSummaryService.java | 6 +- .../service/ExampleSubmissionService.java | 8 +- .../artemis/service/ExerciseDateService.java | 2 +- .../service/ExerciseDeletionService.java | 4 +- .../service/ExerciseImportService.java | 12 +- .../service/ExerciseLifecycleService.java | 6 +- .../service/ExerciseScoresChartService.java | 6 +- .../aet/artemis/service/ExerciseService.java | 26 ++--- .../service/ExerciseSpecificationService.java | 10 +- .../aet/artemis/service/FeedbackService.java | 4 +- .../aet/artemis/service/FilePathService.java | 2 +- .../FileUploadExerciseImportService.java | 2 +- .../service/FileUploadExerciseService.java | 4 +- .../service/FileUploadSubmissionService.java | 12 +- .../artemis/service/GradingScaleService.java | 6 +- .../artemis/service/InternalUrlService.java | 2 +- .../service/LearningObjectService.java | 8 +- .../artemis/service/LectureImportService.java | 6 +- .../aet/artemis/service/LectureService.java | 8 +- .../service/LectureUnitProcessingService.java | 6 +- .../artemis/service/LectureUnitService.java | 6 +- .../artemis/service/LegalDocumentService.java | 4 +- .../ModelingExerciseImportService.java | 10 +- .../service/ModelingExerciseService.java | 2 +- .../service/ModelingSubmissionService.java | 10 +- .../OnlineCourseConfigurationService.java | 8 +- .../artemis/service/OrganizationService.java | 2 +- .../service/ParticipantScoreService.java | 12 +- ...articipationAuthorizationCheckService.java | 8 +- .../ParticipationLifecycleService.java | 4 +- .../artemis/service/ParticipationService.java | 24 ++-- .../ParticipationVcsAccessTokenService.java | 2 +- .../PresentationPointsCalculationService.java | 4 +- .../aet/artemis/service/RatingService.java | 6 +- .../aet/artemis/service/ResultService.java | 20 ++-- .../service/StaticCodeAnalysisService.java | 6 +- .../artemis/service/StatisticsService.java | 14 +-- .../service/SubmissionPolicyService.java | 12 +- .../artemis/service/SubmissionService.java | 26 ++--- .../service/SubmissionVersionService.java | 6 +- .../cit/aet/artemis/service/TeamService.java | 10 +- .../service/TextAssessmentService.java | 4 +- .../service/TextExerciseFeedbackService.java | 8 +- .../service/TextExerciseImportService.java | 12 +- .../artemis/service/TextExerciseService.java | 2 +- .../service/TextSubmissionService.java | 6 +- .../service/TitleCacheEvictionService.java | 8 +- .../service/TutorLeaderboardService.java | 6 +- .../service/TutorParticipationService.java | 16 +-- .../cit/aet/artemis/service/UriService.java | 2 +- .../service/archival/ArchivalReportEntry.java | 2 +- .../service/compass/CompassService.java | 6 +- .../compass/controller/FeedbackSelector.java | 8 +- .../controller/ModelClusterFactory.java | 2 +- .../umlmodel/parsers/v2/UMLModelV2Parser.java | 2 +- .../umlmodel/parsers/v3/UMLModelV3Parser.java | 2 +- .../competency/CompetencyProgressService.java | 12 +- .../competency/CompetencyRelationService.java | 2 +- .../service/competency/CompetencyService.java | 2 +- .../competency/CourseCompetencyService.java | 6 +- .../competency/PrerequisiteService.java | 2 +- .../connectors/AbstractGitService.java | 4 +- .../BuildScriptGenerationService.java | 2 +- .../BuildScriptProviderService.java | 8 +- .../GenericBuildScriptGenerationService.java | 4 +- .../service/connectors/GitService.java | 16 +-- .../service/connectors/SAML2Service.java | 4 +- .../aeolus/AeolusBuildPlanService.java | 10 +- .../AeolusBuildScriptGenerationService.java | 4 +- .../aeolus/AeolusTemplateService.java | 8 +- .../athena/AthenaDTOConverterService.java | 8 +- .../athena/AthenaFeedbackSendingService.java | 6 +- .../AthenaFeedbackSuggestionsService.java | 4 +- .../athena/AthenaModuleService.java | 6 +- .../athena/AthenaRepositoryExportService.java | 4 +- .../AthenaSubmissionSelectionService.java | 2 +- .../AthenaSubmissionSendingService.java | 4 +- .../ci/AbstractBuildPlanCreator.java | 2 +- ...actContinuousIntegrationResultService.java | 10 +- .../ci/CIUserManagementService.java | 4 +- .../ContinuousIntegrationResultService.java | 10 +- .../ci/ContinuousIntegrationService.java | 6 +- .../ContinuousIntegrationTriggerService.java | 2 +- .../ci/notification/BuildLogParseUtils.java | 2 +- .../ci/notification/dto/TestCaseDTO.java | 2 +- .../ci/notification/dto/TestResultsDTO.java | 4 +- ...bPersonalAccessTokenManagementService.java | 2 +- .../connectors/gitlab/GitLabService.java | 10 +- .../gitlab/GitLabUserManagementService.java | 6 +- .../gitlabci/GitLabCIBuildPlanService.java | 4 +- ...abCIProgrammingLanguageFeatureService.java | 10 +- .../gitlabci/GitLabCIResultService.java | 8 +- .../connectors/gitlabci/GitLabCIService.java | 12 +- .../gitlabci/GitLabCITriggerService.java | 4 +- .../GitLabCIUserManagementService.java | 4 +- ...kinsProgrammingLanguageFeatureService.java | 32 +++--- .../jenkins/JenkinsResultService.java | 8 +- .../connectors/jenkins/JenkinsService.java | 10 +- .../jenkins/JenkinsUserManagementService.java | 6 +- .../jenkins/JenkinsXmlConfigBuilder.java | 6 +- .../build_plan/JenkinsBuildPlanCreator.java | 4 +- .../build_plan/JenkinsBuildPlanService.java | 18 +-- .../JenkinsPipelineScriptCreator.java | 6 +- .../ldap/LdapAuthenticationProvider.java | 2 +- .../LocalCIBuildConfigurationService.java | 4 +- ...alCIProgrammingLanguageFeatureService.java | 34 +++--- .../LocalCIResultProcessingService.java | 12 +- .../localci/LocalCIResultService.java | 8 +- .../connectors/localci/LocalCIService.java | 8 +- .../localci/LocalCITriggerService.java | 14 +-- .../localci/SharedQueueManagementService.java | 4 +- .../buildagent/BuildJobContainerService.java | 4 +- .../buildagent/BuildJobExecutionService.java | 8 +- .../buildagent/BuildJobGitService.java | 4 +- .../buildagent/BuildJobManagementService.java | 2 +- .../localci/buildagent/BuildLogsMap.java | 2 +- .../SharedQueueProcessingService.java | 4 +- .../connectors/localci/dto/BuildConfig.java | 4 +- .../localci/dto/BuildJobQueueItem.java | 2 +- .../connectors/localci/dto/BuildResult.java | 2 +- .../localci/dto/RepositoryInfo.java | 2 +- .../localci/dto/ResultQueueItem.java | 2 +- .../scaparser/strategy/CheckstyleParser.java | 2 +- .../scaparser/strategy/PMDCPDParser.java | 2 +- .../localci/scaparser/strategy/PMDParser.java | 2 +- .../scaparser/strategy/ParserPolicy.java | 2 +- .../scaparser/strategy/SpotbugsParser.java | 2 +- .../localci/scaparser/utils/ReportUtils.java | 2 +- .../localvc/LocalVCPrePushHook.java | 2 +- .../localvc/LocalVCRepositoryUri.java | 2 +- .../connectors/localvc/LocalVCService.java | 10 +- .../localvc/LocalVCServletService.java | 10 +- .../service/connectors/lti/Lti13Service.java | 14 +-- .../connectors/lti/LtiDeepLinkingService.java | 4 +- .../lti/LtiDynamicRegistrationService.java | 2 +- .../service/connectors/lti/LtiService.java | 6 +- .../connectors/pyris/PyrisDTOService.java | 6 +- .../pyris/PyrisPipelineService.java | 6 +- .../connectors/pyris/PyrisWebhookService.java | 4 +- .../pyris/dto/data/PyrisCourseDTO.java | 2 +- ...yrisExerciseWithStudentSubmissionsDTO.java | 12 +- .../dto/data/PyrisExtendedCourseDTO.java | 4 +- .../dto/data/PyrisProgrammingExerciseDTO.java | 2 +- .../pyris/dto/data/PyrisUserDTO.java | 2 +- .../pyris/job/CompetencyExtractionJob.java | 2 +- .../connectors/pyris/job/CourseChatJob.java | 2 +- .../connectors/pyris/job/ExerciseChatJob.java | 4 +- .../pyris/job/IngestionWebhookJob.java | 4 +- .../connectors/pyris/job/PyrisJob.java | 4 +- .../vcs/AbstractVersionControlService.java | 8 +- .../vcs/VcsTokenManagementService.java | 2 +- .../vcs/VcsTokenRenewalService.java | 2 +- .../vcs/VcsUserManagementService.java | 4 +- .../connectors/vcs/VersionControlService.java | 8 +- .../AbstractBuildResultNotificationDTO.java | 4 +- .../service/dto/BuildJobResultCountDTO.java | 2 +- .../service/dto/BuildJobsStatisticsDTO.java | 2 +- .../service/dto/ComplaintRequestDTO.java | 2 +- .../service/dto/ConsistencyErrorDTO.java | 2 +- .../service/dto/FinishedBuildJobDTO.java | 11 +- .../service/dto/GradingCriterionDTO.java | 2 +- .../service/dto/GradingInstructionDTO.java | 2 +- .../dto/StaticCodeAnalysisReportDTO.java | 2 +- .../aet/artemis/service/dto/StudentDTO.java | 2 +- .../service/dto/TeamSearchUserDTO.java | 2 +- .../cit/aet/artemis/service/dto/UserDTO.java | 8 +- .../service/dto/UserPublicInfoDTO.java | 4 +- .../dto/athena/ModelingFeedbackDTO.java | 4 +- .../dto/athena/ProgrammingExerciseDTO.java | 2 +- .../dto/athena/ProgrammingFeedbackDTO.java | 4 +- .../dto/athena/ProgrammingSubmissionDTO.java | 2 +- .../service/dto/athena/TextFeedbackDTO.java | 3 +- .../service/exam/ExamAccessService.java | 6 +- .../artemis/service/exam/ExamDateService.java | 4 +- .../service/exam/ExamDeletionService.java | 6 +- .../service/exam/ExamImportService.java | 14 +-- .../service/exam/ExamLiveEventsService.java | 4 +- .../artemis/service/exam/ExamQuizService.java | 4 +- .../service/exam/ExamRegistrationService.java | 4 +- .../aet/artemis/service/exam/ExamService.java | 32 +++--- .../service/exam/ExamSubmissionService.java | 8 +- .../artemis/service/exam/ExamUserService.java | 2 +- .../exam/StudentExamAccessService.java | 4 +- .../service/exam/StudentExamService.java | 12 +- .../export/CourseExamExportService.java | 14 +-- .../DataExportCommunicationDataService.java | 2 +- .../export/DataExportCreationService.java | 6 +- .../export/DataExportExamCreationService.java | 6 +- .../DataExportExerciseCreationService.java | 18 +-- .../service/export/DataExportService.java | 6 +- .../service/export/DataExportUtil.java | 2 +- .../ExerciseWithSubmissionsExportService.java | 2 +- ...dExerciseWithSubmissionsExportService.java | 2 +- .../FileUploadSubmissionExportService.java | 6 +- .../ModelingSubmissionExportService.java | 4 +- .../ProgrammingExerciseExportService.java | 18 +-- .../export/SubmissionExportService.java | 8 +- .../export/TextSubmissionExportService.java | 4 +- .../service/hestia/CodeHintService.java | 2 +- .../service/hestia/ExerciseHintService.java | 10 +- ...ogrammingExerciseGitDiffReportService.java | 10 +- .../ProgrammingExerciseTaskService.java | 4 +- .../hestia/TestwiseCoverageService.java | 4 +- .../behavioral/BehavioralTestCaseService.java | 2 +- .../hestia/behavioral/GroupedFile.java | 2 +- .../structural/StructuralTestCaseService.java | 6 +- .../service/icl/ArtemisGitServletService.java | 2 +- .../icl/SshGitLocationResolverService.java | 2 +- .../iris/IrisCompetencyGenerationService.java | 4 +- .../service/iris/IrisRateLimitService.java | 2 +- .../service/iris/IrisSessionService.java | 2 +- .../session/IrisCourseChatSessionService.java | 4 +- .../IrisExerciseChatSessionService.java | 8 +- .../session/IrisHestiaSessionService.java | 4 +- .../IrisRateLimitedFeatureInterface.java | 2 +- .../iris/session/IrisSubFeatureInterface.java | 2 +- .../iris/settings/IrisSettingsService.java | 6 +- .../artemis/service/ldap/LdapUserService.java | 2 +- .../LearningPathNavigationService.java | 4 +- .../learningpath/LearningPathNgxService.java | 6 +- .../LearningPathRecommendationService.java | 10 +- .../learningpath/LearningPathService.java | 6 +- .../service/listeners/ResultListener.java | 2 +- .../InstanceMessageReceiveService.java | 6 +- .../service/metis/AnswerMessageService.java | 4 +- .../metis/ConversationMessagingService.java | 10 +- .../artemis/service/metis/PostingService.java | 8 +- .../service/metis/ReactionService.java | 4 +- .../metis/conversation/ChannelService.java | 8 +- .../conversation/ConversationDTOService.java | 4 +- .../conversation/ConversationService.java | 4 +- .../metis/conversation/GroupChatService.java | 4 +- .../conversation/OneToOneChatService.java | 4 +- .../auth/ChannelAuthorizationService.java | 4 +- .../ConversationAuthorizationService.java | 2 +- .../auth/GroupChatAuthorizationService.java | 4 +- .../OneToOneChatAuthorizationService.java | 4 +- .../ConversationNotificationService.java | 8 +- .../GeneralInstantNotificationService.java | 4 +- .../GroupNotificationScheduleService.java | 2 +- .../GroupNotificationService.java | 46 ++++---- .../InstantNotificationService.java | 2 +- .../notifications/MailSendingService.java | 2 +- .../service/notifications/MailService.java | 12 +- .../NotificationSettingsService.java | 90 +++++++-------- .../SingleUserNotificationService.java | 54 ++++----- .../TutorialGroupNotificationService.java | 8 +- .../PushNotificationService.java | 4 +- .../ContinuousPlagiarismControlService.java | 6 +- .../ModelingPlagiarismDetectionService.java | 2 +- .../PlagiarismAnswerPostService.java | 4 +- .../plagiarism/PlagiarismCaseService.java | 2 +- .../PlagiarismDetectionConfigHelper.java | 2 +- .../PlagiarismDetectionService.java | 2 +- .../plagiarism/PlagiarismPostService.java | 6 +- .../service/plagiarism/PlagiarismService.java | 2 +- .../PlagiarismWebsocketService.java | 2 +- ...portedForPlagiarismDetectionException.java | 2 +- ...ProgrammingPlagiarismDetectionService.java | 6 +- .../TextPlagiarismDetectionService.java | 2 +- .../AuxiliaryRepositoryService.java | 8 +- .../programming/CommitHistoryService.java | 4 +- .../DefaultTemplateUpgradeService.java | 2 +- .../JavaTemplateUpgradeService.java | 8 +- .../ProgrammingAssessmentService.java | 12 +- ...mingExerciseCodeReviewFeedbackService.java | 12 +- ...ammingExerciseFeedbackCreationService.java | 22 ++-- .../ProgrammingExerciseGradingService.java | 26 ++--- ...ProgrammingExerciseImportBasicService.java | 14 +-- ...grammingExerciseImportFromFileService.java | 12 +- .../ProgrammingExerciseImportService.java | 18 +-- ...ogrammingExerciseParticipationService.java | 18 +-- .../ProgrammingExerciseRepositoryService.java | 18 +-- .../ProgrammingExerciseService.java | 28 ++--- .../ProgrammingExerciseTestCaseService.java | 8 +- .../ProgrammingLanguageFeature.java | 4 +- .../ProgrammingLanguageFeatureService.java | 2 +- .../ProgrammingMessagingService.java | 10 +- .../ProgrammingSubmissionService.java | 20 ++-- .../ProgrammingTriggerService.java | 16 +-- .../programming/RepositoryAccessService.java | 4 +- .../RepositoryParticipationService.java | 2 +- .../programming/RepositoryService.java | 14 +-- .../TemplateUpgradePolicyService.java | 2 +- .../programming/TemplateUpgradeService.java | 2 +- .../service/quiz/QuizBatchService.java | 4 +- .../service/quiz/QuizExerciseService.java | 6 +- .../service/quiz/QuizMessagingService.java | 4 +- .../service/quiz/QuizResultService.java | 8 +- .../service/quiz/QuizScheduleService.java | 6 +- .../service/quiz/QuizStatisticService.java | 2 +- .../service/quiz/QuizSubmissionService.java | 12 +- .../scheduled/AthenaScheduleService.java | 4 +- ...aticProgrammingExerciseCleanupService.java | 4 +- .../scheduled/DataExportScheduleService.java | 4 +- .../scheduled/IExerciseScheduleService.java | 2 +- .../ModelingExerciseScheduleService.java | 4 +- .../NotificationScheduleService.java | 4 +- .../ParticipantScoreScheduleService.java | 8 +- .../ProgrammingExerciseScheduleService.java | 13 ++- .../service/scheduled/ScheduleService.java | 6 +- .../scheduled/UserScheduleService.java | 2 +- .../service/team/TeamImportStrategy.java | 4 +- .../team/strategies/CreateOnlyStrategy.java | 6 +- .../strategies/PurgeExistingStrategy.java | 4 +- ...TutorialGroupChannelManagementService.java | 4 +- .../TutorialGroupFreePeriodService.java | 4 +- .../TutorialGroupScheduleService.java | 4 +- .../tutorialgroups/TutorialGroupService.java | 10 +- .../TutorialGroupsConfigurationService.java | 2 +- .../service/user/AuthorityService.java | 6 +- .../service/user/UserCreationService.java | 6 +- .../aet/artemis/service/user/UserService.java | 8 +- .../artemis/service/util/RoundingUtil.java | 2 +- .../text/domain/TextAssessmentEvent.java | 6 +- .../aet/artemis/text/domain/TextBlock.java | 2 +- .../aet/artemis/text/domain/TextExercise.java | 6 +- .../artemis/text/domain/TextSubmission.java | 4 +- .../dto}/TextAssessmentEventType.java | 2 +- .../domain}/TutorParticipationStatus.java | 2 +- .../tutorialgroup/domain/TutorialGroup.java | 6 +- .../domain/TutorialGroupFreePeriod.java | 2 +- .../domain/TutorialGroupRegistration.java | 5 +- .../TutorialGroupRegistrationType.java | 2 +- .../domain/TutorialGroupSchedule.java | 2 +- .../domain/TutorialGroupSession.java | 3 +- .../domain}/TutorialGroupSessionStatus.java | 4 +- .../domain/TutorialGroupsConfiguration.java | 4 +- .../domain}/Weekday.java | 2 +- .../TutorialGroupFreePeriodRepository.java | 2 +- .../TutorialGroupRegistrationRepository.java | 6 +- .../repository/TutorialGroupRepository.java | 2 +- .../TutorialGroupScheduleRepository.java | 2 +- .../TutorialGroupSessionRepository.java | 4 +- .../web/rest/AbstractSubmissionResource.java | 6 +- .../aet/artemis/web/rest/AccountResource.java | 2 +- .../web/rest/AeolusTemplateResource.java | 4 +- .../web/rest/ApollonDiagramResource.java | 2 +- .../artemis/web/rest/AssessmentResource.java | 14 +-- .../aet/artemis/web/rest/AthenaResource.java | 10 +- .../artemis/web/rest/AttachmentResource.java | 8 +- .../aet/artemis/web/rest/BonusResource.java | 8 +- .../artemis/web/rest/ComplaintResource.java | 24 ++-- .../web/rest/ComplaintResponseResource.java | 6 +- .../web/rest/ConsistencyCheckResource.java | 2 +- .../aet/artemis/web/rest/CourseResource.java | 16 +-- .../artemis/web/rest/DataExportResource.java | 4 +- .../aet/artemis/web/rest/ExamResource.java | 10 +- .../web/rest/ExampleSubmissionResource.java | 6 +- .../web/rest/ExerciseGroupResource.java | 4 +- .../artemis/web/rest/ExerciseResource.java | 16 +-- .../web/rest/ExerciseScoresChartResource.java | 6 +- .../aet/artemis/web/rest/FileResource.java | 18 +-- .../rest/FileUploadAssessmentResource.java | 10 +- .../web/rest/FileUploadExerciseResource.java | 10 +- .../rest/FileUploadSubmissionResource.java | 14 +-- .../artemis/web/rest/GradeStepResource.java | 8 +- .../web/rest/GradingScaleResource.java | 4 +- .../web/rest/GuidedTourSettingsResource.java | 4 +- .../web/rest/LearningPathResource.java | 4 +- .../aet/artemis/web/rest/LectureResource.java | 8 +- .../web/rest/LongFeedbackTextResource.java | 4 +- .../cit/aet/artemis/web/rest/LtiResource.java | 4 +- .../web/rest/ModelingAssessmentResource.java | 8 +- .../web/rest/ModelingExerciseResource.java | 8 +- .../web/rest/ModelingSubmissionResource.java | 8 +- .../web/rest/NotificationResource.java | 2 +- .../rest/NotificationSettingsResource.java | 4 +- .../web/rest/OrganizationResource.java | 2 +- .../web/rest/ParticipantScoreResource.java | 2 +- .../web/rest/ParticipationResource.java | 22 ++-- .../web/rest/QuizExerciseResource.java | 8 +- .../web/rest/QuizParticipationResource.java | 4 +- .../artemis/web/rest/QuizPoolResource.java | 2 +- .../web/rest/QuizSubmissionResource.java | 10 +- .../aet/artemis/web/rest/RatingResource.java | 8 +- .../aet/artemis/web/rest/ResultResource.java | 14 +-- .../web/rest/StaticCodeAnalysisResource.java | 4 +- .../artemis/web/rest/StatisticsResource.java | 10 +- .../artemis/web/rest/StudentExamResource.java | 8 +- .../web/rest/SubmissionPolicyResource.java | 2 +- .../artemis/web/rest/SubmissionResource.java | 14 +-- .../aet/artemis/web/rest/TeamResource.java | 12 +- .../web/rest/TextAssessmentEventResource.java | 6 +- .../web/rest/TextAssessmentResource.java | 16 +-- .../web/rest/TextExerciseResource.java | 18 +-- .../web/rest/TextSubmissionResource.java | 6 +- .../artemis/web/rest/TutorEffortResource.java | 6 +- .../web/rest/TutorParticipationResource.java | 6 +- .../aet/artemis/web/rest/UserResource.java | 2 +- .../rest/competency/CompetencyResource.java | 4 +- .../competency/CourseCompetencyResource.java | 4 +- .../rest/competency/PrerequisiteResource.java | 4 +- .../web/rest/dto/AssessmentUpdateBaseDTO.java | 4 +- .../web/rest/dto/AssessmentUpdateDTO.java | 4 +- .../artemis/web/rest/dto/BonusResultDTO.java | 2 +- .../web/rest/dto/CourseForDashboardDTO.java | 2 +- .../web/rest/dto/CourseForImportDTO.java | 2 +- .../artemis/web/rest/dto/DataExportDTO.java | 2 +- .../aet/artemis/web/rest/dto/ExerciseDTO.java | 4 +- .../web/rest/dto/ExerciseDetailsDTO.java | 2 +- .../web/rest/dto/ExerciseScoresDTO.java | 4 +- .../web/rest/dto/FileUploadAssessmentDTO.java | 2 +- .../aet/artemis/web/rest/dto/GradeDTO.java | 2 +- .../artemis/web/rest/dto/GradeStepsDTO.java | 4 +- .../aet/artemis/web/rest/dto/ImprintDTO.java | 4 +- .../artemis/web/rest/dto/LegalDocument.java | 4 +- .../web/rest/dto/ModelingAssessmentDTO.java | 2 +- .../web/rest/dto/ParticipationDTO.java | 8 +- .../web/rest/dto/PostContextFilterDTO.java | 2 +- .../web/rest/dto/PrivacyStatementDTO.java | 4 +- ...ogrammingExerciseGradingStatisticsDTO.java | 2 +- .../dto/ProgrammingExerciseTestCaseDTO.java | 2 +- .../web/rest/dto/RequestDataExportDTO.java | 2 +- .../aet/artemis/web/rest/dto/ResultDTO.java | 12 +- ...esultWithPointsPerGradingCriterionDTO.java | 4 +- .../web/rest/dto/StudentExamWithGradeDTO.java | 5 +- .../artemis/web/rest/dto/SubmissionDTO.java | 6 +- .../web/rest/dto/SubmissionVersionDTO.java | 2 +- .../rest/dto/SubmissionWithComplaintDTO.java | 4 +- .../dto/SubmissionWithParticipationDTO.java | 2 +- .../web/rest/dto/TextAssessmentDTO.java | 2 +- .../web/rest/dto/TextAssessmentUpdateDTO.java | 4 +- .../LearningPathNavigationObjectDTO.java | 4 +- ...mpetencyExerciseMasteryCalculationDTO.java | 2 +- .../dto/metrics/ExerciseInformationDTO.java | 10 +- .../FinishedBuildJobPageableSearchDTO.java | 2 +- .../dto/pageablesearch/PageableSearchDTO.java | 2 +- .../artemis/web/rest/dto/score/ScoreDTO.java | 2 +- .../rest/dto/settings/ide/IdeMappingDTO.java | 2 +- .../rest/dto/user/UserNameAndLoginDTO.java | 2 +- .../ComplaintResponseLockedException.java | 2 +- .../StudentsAlreadyAssignedException.java | 4 +- .../StudentsAppearMultipleTimesException.java | 2 +- .../web/rest/hestia/CodeHintResource.java | 2 +- .../web/rest/hestia/ExerciseHintResource.java | 4 +- ...grammingExerciseGitDiffReportResource.java | 6 +- ...grammingExerciseSolutionEntryResource.java | 4 +- .../ProgrammingExerciseTaskResource.java | 2 +- .../iris/IrisExerciseChatSessionResource.java | 4 +- .../rest/lecture/AttachmentUnitResource.java | 4 +- .../rest/lecture/ExerciseUnitResource.java | 2 +- .../web/rest/lecture/LectureUnitResource.java | 4 +- .../web/rest/lecture/OnlineUnitResource.java | 2 +- .../web/rest/lecture/TextUnitResource.java | 2 +- .../web/rest/lecture/VideoUnitResource.java | 2 +- .../rest/localci/BuildJobQueueResource.java | 4 +- .../web/rest/localci/BuildPlanResource.java | 4 +- .../metis/ConversationMessageResource.java | 2 +- .../metis/conversation/ChannelResource.java | 4 +- .../ConversationManagementResource.java | 4 +- .../conversation/ConversationResource.java | 2 +- .../metis/conversation/GroupChatResource.java | 2 +- .../conversation/OneToOneChatResource.java | 2 +- .../dtos/ConversationUserDTO.java | 2 +- .../web/rest/open/PublicAccountResource.java | 2 +- .../rest/open/PublicBuildPlanResource.java | 4 +- .../web/rest/open/PublicImprintResource.java | 2 +- .../open/PublicPrivacyStatementResource.java | 2 +- .../PublicProgrammingSubmissionResource.java | 4 +- .../web/rest/open/PublicResultResource.java | 6 +- .../plagiarism/PlagiarismCaseResource.java | 4 +- .../rest/plagiarism/PlagiarismResource.java | 6 +- .../ProgrammingAssessmentResource.java | 10 +- ...ogrammingExerciseExportImportResource.java | 12 +- .../ProgrammingExerciseGradingResource.java | 8 +- ...grammingExerciseParticipationResource.java | 12 +- ...ProgrammingExercisePlagiarismResource.java | 2 +- .../ProgrammingExerciseResource.java | 16 +-- .../ProgrammingExerciseTestCaseResource.java | 6 +- .../ProgrammingSubmissionResource.java | 16 +-- .../PushNotificationResource.java | 2 +- ...grammingExerciseParticipationResource.java | 14 +-- .../rest/repository/RepositoryResource.java | 10 +- .../repository/TestRepositoryResource.java | 10 +- .../rest/science/ScienceSettingsResource.java | 2 +- .../settings/ide/IdeSettingsResource.java | 4 +- .../theia/TheiaConfigurationResource.java | 2 +- .../tutorialgroups/TutorialGroupResource.java | 4 +- .../TutorialGroupSessionResource.java | 2 +- .../aet/artemis/web/rest/util/PageUtil.java | 2 +- .../artemis/web/rest/vm/ManagedUserVM.java | 2 +- .../web/websocket/ResultWebsocketService.java | 8 +- .../websocket/dto/SubmissionSyncPayload.java | 4 +- .../websocket/dto/TeamAssignmentPayload.java | 4 +- .../ParticipationTeamWebsocketService.java | 6 +- .../websocket/team/TeamWebsocketService.java | 6 +- .../AbstractArtemisIntegrationTest.java | 4 +- ...ringIntegrationGitlabCIGitlabSamlTest.java | 12 +- ...tractSpringIntegrationIndependentTest.java | 10 +- ...actSpringIntegrationJenkinsGitlabTest.java | 18 +-- ...ctSpringIntegrationLocalCILocalVCTest.java | 10 +- .../aet/artemis/BuildPlanIntegrationTest.java | 10 +- .../aet/artemis/DatabaseQueryCountTest.java | 4 +- .../cit/aet/artemis/FileIntegrationTest.java | 8 +- .../GuidedTourSettingResourceTest.java | 4 +- .../ImprintResourceIntegrationTest.java | 2 +- .../LongFeedbackResourceIntegrationTest.java | 8 +- .../LtiDeepLinkingIntegrationTest.java | 2 +- .../cit/aet/artemis/LtiIntegrationTest.java | 2 +- .../aet/artemis/LtiQuizIntegrationTest.java | 6 +- .../ManagementResourceIntegrationTest.java | 6 +- .../aet/artemis/MetricsIntegrationTest.java | 8 +- .../artemis/OAuth2JWKSIntegrationTest.java | 6 +- ...ivacyStatementResourceIntegrationTest.java | 2 +- .../artemis/StatisticsIntegrationTest.java | 14 +-- .../aet/artemis/StudentScoreUtilService.java | 6 +- .../FeedbackArchitectureTest.java | 2 +- .../AbstractEnforceRoleInResourceTest.java | 2 +- .../aspects/EnforceRoleInExerciseTest.java | 2 +- .../AssessmentComplaintIntegrationTest.java | 26 ++--- ...ssessmentTeamComplaintIntegrationTest.java | 20 ++-- .../ComplaintResponseIntegrationTest.java | 14 +-- .../assessment/ComplaintUtilService.java | 14 +-- .../ExampleSubmissionIntegrationTest.java | 20 ++-- .../ExerciseScoresChartIntegrationTest.java | 8 +- .../assessment/GradeStepIntegrationTest.java | 10 +- .../assessment/GradingScaleFactory.java | 6 +- .../GradingScaleIntegrationTest.java | 10 +- .../assessment/GradingScaleUtilService.java | 8 +- .../ParticipantScoreIntegrationTest.java | 12 +- .../RatingResourceIntegrationTest.java | 10 +- .../ResultServiceIntegrationTest.java | 32 +++--- .../TutorEffortIntegrationTest.java | 4 +- ...utorLeaderboardServiceIntegrationTest.java | 6 +- .../TutorParticipationIntegrationTest.java | 12 +- ...rParticipationResourceIntegrationTest.java | 8 +- ...InternalAuthenticationIntegrationTest.java | 16 +-- .../LdapAuthenticationIntegrationTest.java | 8 +- .../UserJenkinsGitlabIntegrationTest.java | 6 +- .../UserSaml2IntegrationTest.java | 2 +- .../cit/aet/artemis/bonus/BonusFactory.java | 6 +- .../artemis/bonus/BonusIntegrationTest.java | 16 +-- ...CompetencyPrerequisiteIntegrationTest.java | 12 +- .../competency/CompetencyIntegrationTest.java | 2 +- .../CompetencyJolIntegrationTest.java | 2 +- .../CompetencyProgressUtilService.java | 2 +- .../competency/CompetencyUtilService.java | 6 +- .../CourseCompetencyIntegrationTest.java | 22 ++-- .../LearningPathIntegrationTest.java | 12 +- .../competency/LearningPathUtilService.java | 4 +- .../PrerequisiteIntegrationTest.java | 2 +- .../competency/PrerequisiteUtilService.java | 2 +- .../aet/artemis/config/MetricsBeanTest.java | 6 +- .../ProgrammingLanguageConfigurationTest.java | 4 +- .../config/TheiaConfigurationTest.java | 2 +- .../connector/AeolusRequestMockProvider.java | 2 +- .../connector/GitlabRequestMockProvider.java | 42 +++---- .../connector/JenkinsRequestMockProvider.java | 6 +- ...eolusBuildScriptGenerationServiceTest.java | 10 +- .../artemis/connectors/AeolusServiceTest.java | 14 +-- .../artemis/connectors/Lti13ServiceTest.java | 16 +-- .../LtiDynamicRegistrationServiceTest.java | 4 +- .../connectors/LtiNewResultServiceTest.java | 4 +- .../artemis/connectors/LtiServiceTest.java | 8 +- .../cit/aet/artemis/course/CourseFactory.java | 10 +- .../aet/artemis/course/CourseTestService.java | 48 ++++---- .../aet/artemis/course/CourseUtilService.java | 42 +++---- .../DataExportResourceIntegrationTest.java | 4 +- .../cit/aet/artemis/domain/CourseTest.java | 1 + .../cit/aet/artemis/domain/ExerciseTest.java | 12 +- .../cit/aet/artemis/domain/FeedbackTest.java | 2 + .../artemis/domain/GuidedTourSettingTest.java | 2 + .../aet/artemis/domain/ObjectMethodTest.java | 2 +- .../domain/ObjectMethodTestExclusions.java | 2 +- .../cit/aet/artemis/domain/ResultTest.java | 9 +- .../domain/enumeration/ExerciseTypeTest.java | 7 +- .../GroupNotificationFactoryTest.java | 50 ++++----- .../SingleUserNotificationFactoryTest.java | 44 ++++---- .../TutorialGroupNotificationFactoryTest.java | 6 +- .../ResultListenerIntegrationTest.java | 8 +- .../tum/cit/aet/artemis/exam/ExamFactory.java | 2 +- .../aet/artemis/exam/ExamIntegrationTest.java | 14 +-- .../ExamParticipationIntegrationTest.java | 28 ++--- .../exam/ExamRegistrationIntegrationTest.java | 4 +- .../exam/ExamSessionIntegrationTest.java | 2 +- .../cit/aet/artemis/exam/ExamStartTest.java | 10 +- .../artemis/exam/ExamUserIntegrationTest.java | 4 +- .../cit/aet/artemis/exam/ExamUtilService.java | 26 ++--- ...ciseGroupIntegrationJenkinsGitlabTest.java | 8 +- .../exam/ProgrammingExamIntegrationTest.java | 8 +- .../artemis/exam/QuizPoolIntegrationTest.java | 4 +- .../exam/StudentExamIntegrationTest.java | 30 ++--- .../artemis/exam/TestExamIntegrationTest.java | 4 +- .../AthenaExerciseIntegrationTest.java | 4 +- .../AthenaResourceIntegrationTest.java | 14 +-- .../aet/artemis/exercise/ExerciseFactory.java | 14 +-- .../exercise/ExerciseIntegrationTest.java | 22 ++-- .../artemis/exercise/ExerciseUtilService.java | 26 ++--- .../exercise/GradingCriterionUtil.java | 6 +- .../FileUploadAssessmentIntegrationTest.java | 26 ++--- .../fileupload/FileUploadExerciseFactory.java | 4 +- .../FileUploadExerciseIntegrationTest.java | 18 +-- .../FileUploadExerciseUtilService.java | 12 +- .../FileUploadSubmissionIntegrationTest.java | 14 +-- ...ApollonDiagramResourceIntegrationTest.java | 4 +- .../ModelingAssessmentIntegrationTest.java | 30 ++--- .../modeling/ModelingComparisonTest.java | 4 +- .../modeling/ModelingExerciseFactory.java | 4 +- .../ModelingExerciseIntegrationTest.java | 28 ++--- .../modeling/ModelingExerciseUtilService.java | 16 +-- .../ModelingSubmissionIntegrationTest.java | 16 +-- .../controller/FeedbackSelectorTest.java | 4 +- .../umlmodel/AbstractUMLDiagramTest.java | 2 +- .../exercise/programming/ArgumentSources.java | 8 +- .../AuxiliaryRepositoryServiceTest.java | 4 +- .../ContinuousIntegrationTestService.java | 4 +- .../CourseGitlabJenkinsIntegrationTest.java | 4 +- .../exercise/programming/GitServiceTest.java | 6 +- .../programming/GitlabServiceTest.java | 8 +- .../exercise/programming/MockDelegate.java | 10 +- .../ProgrammingAssessmentIntegrationTest.java | 32 +++--- .../ProgrammingExerciseBuildPlanTest.java | 2 +- .../ProgrammingExerciseFactory.java | 30 ++--- ...ProgrammingExerciseGitIntegrationTest.java | 4 +- ...gExerciseGitlabJenkinsIntegrationTest.java | 22 ++-- ...ProgrammingExerciseGradingServiceTest.java | 24 ++-- ...gExerciseIntegrationJenkinsGitlabTest.java | 6 +- ...rammingExerciseIntegrationTestService.java | 36 +++--- ...ExerciseLocalVCLocalCIIntegrationTest.java | 8 +- ...gExerciseParticipationIntegrationTest.java | 12 +- ...grammingExerciseRepositoryServiceTest.java | 2 +- ...gExerciseResultJenkinsIntegrationTest.java | 4 +- .../ProgrammingExerciseResultTestService.java | 18 +-- ...rogrammingExerciseScheduleServiceTest.java | 14 +-- ...rammingExerciseServiceIntegrationTest.java | 8 +- .../ProgrammingExerciseServiceTest.java | 2 +- ...ammingExerciseTemplateIntegrationTest.java | 8 +- .../programming/ProgrammingExerciseTest.java | 18 +-- ...rogrammingExerciseTestCaseServiceTest.java | 8 +- .../ProgrammingExerciseTestService.java | 48 ++++---- .../ProgrammingExerciseUtilService.java | 30 ++--- ...AndResultGitlabJenkinsIntegrationTest.java | 16 +-- ...issionAndResultIntegrationTestService.java | 10 +- .../ProgrammingSubmissionIntegrationTest.java | 20 ++-- .../RepositoryIntegrationTest.java | 22 ++-- ...seParticipationJenkinsIntegrationTest.java | 8 +- .../StaticCodeAnalysisIntegrationTest.java | 18 +-- .../SubmissionPolicyIntegrationTest.java | 14 +-- ...TestRepositoryResourceIntegrationTest.java | 10 +- .../exercise/quiz/QuizComparisonTest.java | 4 +- .../exercise/quiz/QuizExerciseFactory.java | 6 +- .../quiz/QuizExerciseIntegrationTest.java | 18 +-- .../quiz/QuizExerciseUtilService.java | 12 +- .../quiz/QuizSubmissionIntegrationTest.java | 10 +- .../exercise/text/TextComparisonTest.java | 2 +- .../exercise/text/TextExerciseFactory.java | 6 +- .../text/TextExerciseUtilService.java | 22 ++-- .../hestia/CodeHintIntegrationTest.java | 6 +- .../artemis/hestia/CodeHintServiceTest.java | 8 +- .../hestia/ExerciseHintIntegrationTest.java | 16 +-- .../hestia/ExerciseHintServiceTest.java | 18 +-- .../artemis/hestia/HestiaDatabaseTest.java | 6 +- ...gExerciseGitDiffReportIntegrationTest.java | 4 +- ...mmingExerciseGitDiffReportServiceTest.java | 4 +- ...gExerciseSolutionEntryIntegrationTest.java | 4 +- ...rogrammingExerciseTaskIntegrationTest.java | 8 +- .../ProgrammingExerciseTaskServiceTest.java | 8 +- .../hestia/StructuralTestCaseServiceTest.java | 8 +- .../TestwiseCoverageIntegrationTest.java | 10 +- .../TestwiseCoverageReportServiceTest.java | 10 +- .../BehavioralTestCaseServiceTest.java | 10 +- .../behavioral/CreateSolutionEntriesTest.java | 2 +- ...erageEntriesByFilePathAndTestCaseTest.java | 2 +- .../iris/AbstractIrisIntegrationTest.java | 4 +- .../iris/IrisChatMessageIntegrationTest.java | 6 +- .../artemis/iris/IrisChatWebsocketTest.java | 4 +- ...isCompetencyGenerationIntegrationTest.java | 2 +- ...risExerciseChatSessionIntegrationTest.java | 4 +- .../IrisSessionActivationIntegrationTest.java | 4 +- .../iris/PyrisLectureIngestionTest.java | 4 +- .../settings/IrisSettingsIntegrationTest.java | 4 +- ...udentLearningAnalyticsIntegrationTest.java | 2 +- .../AttachmentResourceIntegrationTest.java | 6 +- .../AttachmentUnitIntegrationTest.java | 4 +- .../AttachmentUnitsIntegrationTest.java | 2 +- .../lecture/ExerciseUnitIntegrationTest.java | 10 +- .../aet/artemis/lecture/LectureFactory.java | 8 +- .../lecture/LectureIntegrationTest.java | 6 +- .../lecture/LectureUnitIntegrationTest.java | 6 +- .../lecture/LectureUnitServiceTest.java | 4 +- .../artemis/lecture/LectureUtilService.java | 10 +- .../lecture/OnlineUnitIntegrationTest.java | 2 +- .../lecture/TextUnitIntegrationTest.java | 2 +- .../lecture/VideoUnitIntegrationTest.java | 2 +- ...AbstractLocalCILocalVCIntegrationTest.java | 8 +- .../BuildAgentDockerServiceTest.java | 4 +- .../localvcci/LocalCIIntegrationTest.java | 14 +-- .../LocalCIResourceIntegrationTest.java | 14 +-- .../artemis/localvcci/LocalCIServiceTest.java | 14 +-- .../LocalVCLocalCIIntegrationTest.java | 12 +- ...VCLocalCIParticipationIntegrationTest.java | 6 +- .../localvcci/LocalVCLocalCITestService.java | 12 +- .../artemis/localvcci/LocalVCServiceTest.java | 4 +- .../localvcci/LocalVCSshIntegrationTest.java | 2 +- .../SharedQueueManagementServiceTest.java | 2 +- .../metis/AbstractConversationTest.java | 8 +- .../metis/AnswerMessageIntegrationTest.java | 12 +- .../artemis/metis/ChannelIntegrationTest.java | 10 +- .../metis/ConversationIntegrationTest.java | 8 +- .../metis/GroupChatIntegrationTest.java | 2 +- .../artemis/metis/MessageIntegrationTest.java | 12 +- .../metis/OneToOneChatIntegrationTest.java | 2 +- .../artemis/metis/PostingServiceUnitTest.java | 4 +- .../metis/ReactionIntegrationTest.java | 8 +- .../migration/MigrationServiceTest.java | 2 +- .../GroupNotificationServiceTest.java | 28 ++--- .../notification/NotificationFactory.java | 6 +- .../NotificationResourceIntegrationTest.java | 10 +- .../NotificationScheduleServiceTest.java | 12 +- ...cationSettingsResourceIntegrationTest.java | 6 +- .../NotificationSettingsServiceTest.java | 18 +-- .../NotificationTargetFactoryTest.java | 8 +- .../PushNotificationResourceTest.java | 2 +- .../SingleUserNotificationServiceTest.java | 40 +++---- .../organization/OrganizationFactory.java | 2 +- .../OrganizationIntegrationTest.java | 6 +- .../organization/OrganizationUtilService.java | 2 +- .../participation/ParticipationFactory.java | 32 +++--- .../ParticipationIntegrationTest.java | 28 ++--- ...articipationSubmissionIntegrationTest.java | 4 +- .../ParticipationUtilService.java | 42 +++---- .../SubmissionExportIntegrationTest.java | 12 +- .../SubmissionIntegrationTest.java | 14 +-- ...ontinuousPlagiarismControlServiceTest.java | 10 +- .../PlagiarismAnswerPostIntegrationTest.java | 4 +- .../PlagiarismCaseIntegrationTest.java | 8 +- .../PlagiarismDetectionConfigHelperTest.java | 2 +- .../PlagiarismDetectionServiceTest.java | 2 +- .../plagiarism/PlagiarismIntegrationTest.java | 6 +- .../PlagiarismPostIntegrationTest.java | 8 +- .../plagiarism/PlagiarismUtilService.java | 12 +- .../aet/artemis/post/ConversationFactory.java | 6 +- .../artemis/post/ConversationUtilService.java | 10 +- .../ProgrammingExerciseTestRepository.java | 2 +- .../ProgrammingSubmissionTestRepository.java | 4 +- .../repository/StatisticsRepositoryTest.java | 8 +- .../repository/UserRepositoryTest.java | 4 +- .../repository/UserTestRepository.java | 2 +- .../ScienceSettingsIntegrationTest.java | 2 +- .../security/Lti13LaunchFilterTest.java | 2 +- .../service/AssessmentServiceTest.java | 16 +-- .../AuthorizationCheckServiceTest.java | 6 +- .../service/BuildLogEntryServiceTest.java | 4 +- .../service/ComplaintResponseServiceTest.java | 14 +-- .../service/ConsistencyCheckTestService.java | 6 +- .../CourseScoreCalculationServiceTest.java | 12 +- .../artemis/service/CourseServiceTest.java | 4 +- .../DataExportCreationServiceTest.java | 20 ++-- .../service/EmailSummaryServiceTest.java | 10 +- .../service/ExerciseDateServiceTest.java | 4 +- .../service/ExerciseLifecycleServiceTest.java | 4 +- .../artemis/service/FeedbackServiceTest.java | 4 +- .../artemis/service/GitlabCIServiceTest.java | 10 +- .../service/GradingScaleServiceTest.java | 8 +- .../JenkinsInternalUriServiceTest.java | 2 +- .../artemis/service/JenkinsServiceTest.java | 12 +- .../service/LearningObjectServiceTest.java | 8 +- .../service/LearningPathServiceTest.java | 12 +- .../service/LectureImportServiceTest.java | 6 +- .../artemis/service/LectureServiceTest.java | 10 +- .../OnlineCourseConfigurationServiceTest.java | 4 +- ...cipationAuthorizationCheckServiceTest.java | 2 +- .../ParticipationLifecycleServiceTest.java | 6 +- .../service/ParticipationServiceTest.java | 18 +-- ...ParticipationTeamWebsocketServiceTest.java | 2 +- ...sentationPointsCalculationServiceTest.java | 10 +- .../service/RepositoryAccessServiceTest.java | 6 +- .../artemis/service/ResultServiceTest.java | 12 +- .../service/SubmissionServiceTest.java | 28 ++--- .../service/TeamWebsocketServiceTest.java | 12 +- .../TitleCacheEvictionServiceTest.java | 4 +- .../aet/artemis/service/UriServiceTest.java | 2 +- .../AthenaFeedbackSendingServiceTest.java | 14 +-- .../AthenaFeedbackSuggestionsServiceTest.java | 4 +- .../AthenaRepositoryExportServiceTest.java | 8 +- .../AthenaSubmissionSelectionServiceTest.java | 6 +- .../AthenaSubmissionSendingServiceTest.java | 6 +- ...sonalAccessTokenManagementServiceTest.java | 2 +- .../JenkinsPipelineScriptCreatorTest.java | 10 +- .../lti/LtiDeepLinkingServiceTest.java | 6 +- .../vcs/VcsTokenRenewalServiceTest.java | 2 +- .../service/exam/ExamAccessServiceTest.java | 4 +- .../service/exam/ExamQuizServiceTest.java | 4 +- .../artemis/service/exam/ExamServiceTest.java | 6 +- .../exam/ExamSubmissionServiceTest.java | 10 +- .../exam/StudentExamAccessServiceTest.java | 4 +- .../export/CourseExamExportServiceTest.java | 2 +- .../ConversationNotificationServiceTest.java | 6 +- ...GeneralInstantNotificationServiceTest.java | 6 +- .../notifications/MailServiceTest.java | 6 +- .../TutorialGroupNotificationServiceTest.java | 10 +- ...leFirebasePushNotificationServiceTest.java | 4 +- ...ngExerciseFeedbackCreationServiceTest.java | 16 +-- .../DataExportScheduleServiceTest.java | 6 +- ...DeviceConfigurationCleanupServiceTest.java | 2 +- .../ide/IdePreferencesIntegrationTest.java | 4 +- .../tum/cit/aet/artemis/team/TeamFactory.java | 8 +- .../team/TeamImportIntegrationTest.java | 12 +- .../aet/artemis/team/TeamIntegrationTest.java | 16 +-- .../cit/aet/artemis/team/TeamUtilService.java | 8 +- .../text/AssessmentEventIntegrationTest.java | 6 +- .../text/TextAssessmentIntegrationTest.java | 28 ++--- .../text/TextExerciseIntegrationTest.java | 26 ++--- .../text/TextSubmissionIntegrationTest.java | 16 +-- .../AbstractTutorialGroupIntegrationTest.java | 6 +- ...utorialGroupFreePeriodIntegrationTest.java | 2 +- .../TutorialGroupIntegrationTest.java | 10 +- .../TutorialGroupScheduleIntegrationTest.java | 2 +- .../TutorialGroupSessionIntegrationTest.java | 4 +- .../TutorialGroupUtilService.java | 8 +- ...ialGroupsConfigurationIntegrationTest.java | 6 +- .../aet/artemis/uri/RepositoryUriTest.java | 2 +- .../user/AccountResourceIntegrationTest.java | 2 +- ...ountResourceWithGitLabIntegrationTest.java | 2 +- .../tum/cit/aet/artemis/user/UserFactory.java | 4 +- .../cit/aet/artemis/user/UserTestService.java | 10 +- .../cit/aet/artemis/user/UserUtilService.java | 4 +- .../util/ExamPrepareExercisesTestUtil.java | 2 +- .../util/ExerciseIntegrationTestService.java | 6 +- .../cit/aet/artemis/util/GitUtilService.java | 12 +- .../artemis/util/HestiaUtilTestService.java | 8 +- ...alidExamExerciseDatesArgumentProvider.java | 2 +- .../util/InvalidExerciseConfiguration.java | 2 +- .../util/PageableSearchUtilService.java | 2 +- .../util/SensitiveInformationUtil.java | 6 +- 1156 files changed, 3947 insertions(+), 3889 deletions(-) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => assessment/domain}/AssessmentType.java (71%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/domain/Bonus.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/domain/BonusStrategy.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => assessment/domain}/CategoryState.java (73%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/domain/Complaint.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/domain/ComplaintResponse.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => assessment/domain}/ComplaintType.java (54%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/domain/ExampleSubmission.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/domain/Feedback.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => assessment/domain}/FeedbackType.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/domain/GradeStep.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/domain/GradeType.java (50%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/domain/GradingCriterion.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/domain/GradingInstruction.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/domain/GradingScale.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/domain/IBonusStrategy.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/domain/LongFeedbackText.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/domain/Rating.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/domain/Result.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => assessment/domain}/Visibility.java (75%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => atlas/domain}/CompetencyProgressConfidenceReason.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/domain/LearningObject.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/domain/ConductAgreement.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/domain/ConductAgreementId.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/domain/ConversationNotificationRecipientSummary.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => communication/domain}/DefaultChannelType.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => communication/domain}/DisplayPriority.java (78%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => communication/domain}/GroupNotificationType.java (70%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => communication/domain}/NotificationPriority.java (67%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/domain/NotificationSetting.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => communication/domain}/NotificationType.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => communication/domain}/SystemNotificationType.java (67%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/domain/AbstractAuditingEntity.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/domain/Authority.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/domain/Course.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/domain/CourseExamExportErrorCause.java (78%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/domain/CourseExamExportState.java (71%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => core/domain}/CourseInformationSharingConfiguration.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/domain/DataExport.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => core/domain}/DataExportState.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/domain/DomainObject.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => core/domain}/GraphType.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/domain/GuidedTourSetting.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => core/domain}/Language.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => core/domain}/LegalDocumentType.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/domain/MigrationChangelog.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/domain/Organization.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/domain/PersistentAuditEvent.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => core/domain}/SpanType.java (54%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => core/domain}/StatisticsView.java (54%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/domain/User.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/domain/UserGroup.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => core/dto}/SortingOrder.java (52%) delete mode 100644 src/main/java/de/tum/cit/aet/artemis/domain/FileType.java delete mode 100644 src/main/java/de/tum/cit/aet/artemis/domain/package-info.java rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/domain/BaseExercise.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => exercise/domain}/DifficultyLevel.java (66%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/domain/Exercise.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => exercise/domain}/ExerciseLifecycle.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => exercise/domain}/ExerciseMode.java (64%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => exercise/domain}/ExerciseType.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => exercise/domain}/IExerciseLifecycle.java (77%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => exercise/domain}/IncludedInOverallScore.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => exercise/domain}/InitializationState.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/domain/Submission.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => exercise/domain}/SubmissionType.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/domain/SubmissionVersion.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/domain/Team.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/domain/TeamAssignmentConfig.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => exercise/dto}/TeamImportStrategyType.java (70%) rename src/main/java/de/tum/cit/aet/artemis/{ => fileupload}/domain/FileUploadExercise.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{ => fileupload}/domain/FileUploadSubmission.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => lecture}/domain/Attachment.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => lecture/domain}/AttachmentType.java (63%) rename src/main/java/de/tum/cit/aet/artemis/{ => lecture}/domain/Lecture.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => lti}/domain/LtiPlatformConfiguration.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => lti}/domain/OnlineCourseConfiguration.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => modeling/domain}/DiagramType.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{ => plagiarism}/domain/PlagiarismCheckState.java (54%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => programming/domain}/AeolusTarget.java (84%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/AuxiliaryRepository.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/BuildJob.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/BuildLogEntry.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/BuildPlan.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => programming/domain}/BuildPlanType.java (81%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/BuildRunState.java (51%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => programming/domain}/BuildStatus.java (81%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/Commit.java (79%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/File.java (95%) create mode 100644 src/main/java/de/tum/cit/aet/artemis/programming/domain/FileType.java rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => programming/domain}/ParticipationLifecycle.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/ProgrammingExercise.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/ProgrammingExerciseBuildConfig.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/ProgrammingExerciseTestCase.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => programming/domain}/ProgrammingLanguage.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/ProgrammingSubmission.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => programming/domain}/ProjectType.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/Repository.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => programming/domain}/RepositoryType.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/StaticCodeAnalysisCategory.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/StaticCodeAnalysisDefaultCategory.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => programming/domain}/StaticCodeAnalysisTool.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/domain/VcsRepositoryUri.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => quiz/domain}/QuizAction.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => quiz/domain}/QuizMode.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => quiz/domain}/ScoringType.java (73%) rename src/main/java/de/tum/cit/aet/artemis/{ => quiz}/domain/TempIdObject.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => text/dto}/TextAssessmentEventType.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => tutorialgroup/domain}/TutorParticipationStatus.java (75%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration/tutorialgroups => tutorialgroup/domain}/TutorialGroupRegistrationType.java (59%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => tutorialgroup/domain}/TutorialGroupSessionStatus.java (68%) rename src/main/java/de/tum/cit/aet/artemis/{domain/enumeration => tutorialgroup/domain}/Weekday.java (67%) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/AssessmentNote.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/AssessmentNote.java index e501cd5e4ecb..7f36f641b2eb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/AssessmentNote.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/AssessmentNote.java @@ -16,8 +16,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; /** * Represents an internal assessment note. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/AssessmentType.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/AssessmentType.java similarity index 71% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/AssessmentType.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/domain/AssessmentType.java index c1e9a530d898..9cc638451764 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/AssessmentType.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/AssessmentType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.assessment.domain; /** * The AssessmentType enumeration. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/Bonus.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Bonus.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/Bonus.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/domain/Bonus.java index b48648d1d228..384ad0e941e7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/Bonus.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Bonus.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.assessment.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -13,6 +13,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +import de.tum.cit.aet.artemis.core.domain.DomainObject; + /** * A bonus source for an exam that maps bonus from another course or exam to the target exam */ diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/BonusStrategy.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/BonusStrategy.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/domain/BonusStrategy.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/domain/BonusStrategy.java index 7178041ee768..7c2846426677 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/BonusStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/BonusStrategy.java @@ -1,5 +1,5 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.assessment.domain; import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/CategoryState.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/CategoryState.java similarity index 73% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/CategoryState.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/domain/CategoryState.java index a3c5ae5d3a1c..9cd0b439d118 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/CategoryState.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/CategoryState.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.assessment.domain; /** * Enumeration for category states used by StaticCodeAnalysisCategory diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/Complaint.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Complaint.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/Complaint.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/domain/Complaint.java index 5b96bba57e09..a35720e364e7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/Complaint.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Complaint.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.assessment.domain; import static de.tum.cit.aet.artemis.core.config.Constants.COMPLAINT_TEXT_LIMIT; @@ -22,7 +22,9 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/ComplaintResponse.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/ComplaintResponse.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/ComplaintResponse.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/domain/ComplaintResponse.java index 32831a5fb14d..ec9a71b68bed 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/ComplaintResponse.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/ComplaintResponse.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.assessment.domain; import static de.tum.cit.aet.artemis.core.config.Constants.COMPLAINT_LOCK_DURATION_IN_MINUTES; import static de.tum.cit.aet.artemis.core.config.Constants.COMPLAINT_RESPONSE_TEXT_LIMIT; @@ -21,6 +21,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +import de.tum.cit.aet.artemis.core.domain.AbstractAuditingEntity; +import de.tum.cit.aet.artemis.core.domain.User; + /** * A ComplaintResponse. *

diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ComplaintType.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/ComplaintType.java similarity index 54% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ComplaintType.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/domain/ComplaintType.java index bb77207f92ac..7d2eba233e1e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ComplaintType.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/ComplaintType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.assessment.domain; public enum ComplaintType { COMPLAINT, MORE_FEEDBACK diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/ExampleSubmission.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/ExampleSubmission.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/domain/ExampleSubmission.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/domain/ExampleSubmission.java index 192a287ce5f5..dfb42f56c0ed 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/ExampleSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/ExampleSubmission.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.assessment.domain; import java.util.HashSet; import java.util.Set; @@ -18,7 +18,9 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; /** * A ExampleSubmission. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/Feedback.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Feedback.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/Feedback.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/domain/Feedback.java index ec4b12436c4f..de095b019216 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/Feedback.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Feedback.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.assessment.domain; import static de.tum.cit.aet.artemis.core.config.Constants.FEEDBACK_DETAIL_TEXT_DATABASE_MAX_LENGTH; import static de.tum.cit.aet.artemis.core.config.Constants.FEEDBACK_DETAIL_TEXT_SOFT_MAX_LENGTH; @@ -32,8 +32,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; /** * A Feedback. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/FeedbackType.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/FeedbackType.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/FeedbackType.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/domain/FeedbackType.java index 132b40aaf313..45caf6abd12f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/FeedbackType.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/FeedbackType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.assessment.domain; /** * The FeedbackType enumeration. @@ -6,7 +6,7 @@ * The order in which they are declared is important, as we use the enums default implementation of * compareTo() *

- * Note: The order is used as part of an {@link jakarta.persistence.EnumType#ORDINAL} mapping in {@link de.tum.cit.aet.artemis.domain.Feedback}. + * Note: The order is used as part of an {@link jakarta.persistence.EnumType#ORDINAL} mapping in {@link Feedback}. * Do NOT change the order of existing values. */ public enum FeedbackType { diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/GradeStep.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/GradeStep.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/GradeStep.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/domain/GradeStep.java index 67a08b373495..081599d8aa84 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/GradeStep.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/GradeStep.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.assessment.domain; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -17,6 +17,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.domain.DomainObject; + /** * The grade step of a grading scale */ diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/GradeType.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/GradeType.java similarity index 50% rename from src/main/java/de/tum/cit/aet/artemis/domain/GradeType.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/domain/GradeType.java index c3d9aa759b5e..fdd905374544 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/GradeType.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/GradeType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.assessment.domain; public enum GradeType { NONE, BONUS, GRADE diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/GradingCriterion.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/GradingCriterion.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/domain/GradingCriterion.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/domain/GradingCriterion.java index ba1ccbc07067..4a75c17d28bc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/GradingCriterion.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/GradingCriterion.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.assessment.domain; import java.util.HashSet; import java.util.Set; @@ -17,6 +17,9 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; + /** * A Grading Criterion that consists of structured grading instructions. */ diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/GradingInstruction.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/GradingInstruction.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/GradingInstruction.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/domain/GradingInstruction.java index 6e08880d8b0c..f4471f000604 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/GradingInstruction.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/GradingInstruction.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.assessment.domain; import java.util.HashSet; import java.util.Set; @@ -17,6 +17,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.domain.DomainObject; + /** * A Structured Grading Instruction. */ diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/GradingScale.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/GradingScale.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/GradingScale.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/domain/GradingScale.java index 6d3d33365d93..1b168589313f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/GradingScale.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/GradingScale.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.assessment.domain; import java.util.HashSet; import java.util.Objects; @@ -25,6 +25,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.exam.domain.Exam; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/IBonusStrategy.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/IBonusStrategy.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/domain/IBonusStrategy.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/domain/IBonusStrategy.java index 2abd4d69ca42..9ab1e4520bde 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/IBonusStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/IBonusStrategy.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.assessment.domain; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/LongFeedbackText.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/LongFeedbackText.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/domain/LongFeedbackText.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/domain/LongFeedbackText.java index d618cfc51852..694d04c7f67e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/LongFeedbackText.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/LongFeedbackText.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.assessment.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -14,6 +14,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.domain.DomainObject; @Entity @Table(name = "long_feedback_text") diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/ParticipantScore.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/ParticipantScore.java index faacac5932f2..0c7072f686ef 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/ParticipantScore.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/ParticipantScore.java @@ -26,9 +26,8 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/Rating.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Rating.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/domain/Rating.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/domain/Rating.java index 75ffbdda5343..8550566efee8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/Rating.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Rating.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.assessment.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -11,6 +11,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.domain.DomainObject; + /** * A Rating. */ diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/Result.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/Result.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java index 60d170ddfcde..bc8f5491d292 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/Result.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.assessment.domain; import static de.tum.cit.aet.artemis.core.config.Constants.PROGRAMMING_GRACE_PERIOD_SECONDS; import static de.tum.cit.aet.artemis.core.config.Constants.SIZE_OF_UNSIGNED_TINYINT; @@ -43,11 +43,14 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.assessment.domain.AssessmentNote; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageFileReport; import de.tum.cit.aet.artemis.quiz.config.QuizView; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/StudentScore.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/StudentScore.java index 63469ac2ed5e..f70f6cbd857f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/StudentScore.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/StudentScore.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; @Entity diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/TeamScore.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/TeamScore.java index cb0ec0cdb40f..11e6a784a44e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/TeamScore.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/TeamScore.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; @Entity diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/TutorParticipation.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/TutorParticipation.java index 283fa7c71bb0..31e723df05b8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/TutorParticipation.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/TutorParticipation.java @@ -19,11 +19,10 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.ExampleSubmission; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorParticipationStatus; /** * A TutorParticipation. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/Visibility.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Visibility.java similarity index 75% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/Visibility.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/domain/Visibility.java index 86d6bff9f304..f976e771f9fa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/Visibility.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Visibility.java @@ -1,13 +1,15 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.assessment.domain; + +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; /** - * Used to define when students are able to see a {@link de.tum.cit.aet.artemis.domain.Feedback}. + * Used to define when students are able to see a {@link Feedback}. *

- * Currently, this is only used for Feedbacks linked to a {@link de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase}. + * Currently, this is only used for Feedbacks linked to a {@link ProgrammingExerciseTestCase}. *

* Tutors/Instructors/Admins should always see all levels of visibility. *

- * Note: The order is used as part of an {@link jakarta.persistence.EnumType#ORDINAL} mapping in {@link de.tum.cit.aet.artemis.domain.Feedback}. + * Note: The order is used as part of an {@link jakarta.persistence.EnumType#ORDINAL} mapping in {@link Feedback}. * Do NOT change the order of existing values. */ public enum Visibility { diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/BonusRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/BonusRepository.java index 5c3e76dab87a..0073c2d2f943 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/BonusRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/BonusRepository.java @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.assessment.domain.Bonus; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Bonus; /** * Spring Data JPA repository for the Bonus entity diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintRepository.java index 2217cb3eb1cd..83a296bb040a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintRepository.java @@ -15,14 +15,14 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.assessment.domain.Complaint; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintType; import de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntry; import de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardAnsweredMoreFeedbackRequests; import de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardComplaintResponses; import de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardComplaints; import de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardMoreFeedbackRequests; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Complaint; -import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; /** * Spring Data JPA repository for the Complaint entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintResponseRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintResponseRepository.java index 1cbd7ea6164c..a90ad4801f53 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintResponseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintResponseRepository.java @@ -13,10 +13,10 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintType; import de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntry; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.ComplaintResponse; -import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; /** * Spring Data JPA repository for the ComplaintResponse entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ExampleSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ExampleSubmissionRepository.java index baf0b2d43e5a..c3d85e893be8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ExampleSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ExampleSubmissionRepository.java @@ -13,10 +13,10 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.assessment.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.ExampleSubmission; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.Result; /** * Spring Data JPA repository for the ExampleSubmission entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/FeedbackRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/FeedbackRepository.java index c7c71b5874e7..99e6a15652cc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/FeedbackRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/FeedbackRepository.java @@ -12,12 +12,12 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; +import de.tum.cit.aet.artemis.assessment.domain.GradingInstruction; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.GradingInstruction; -import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; /** * Spring Data JPA repository for the Feedback entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradeStepRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradeStepRepository.java index 751c4809ae33..20b890519c66 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradeStepRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradeStepRepository.java @@ -5,8 +5,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.assessment.domain.GradeStep; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.GradeStep; /** * Spring Data JPA Repository for the GradeStep entity diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingCriterionRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingCriterionRepository.java index 586e4a5fa718..26eebd307ed2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingCriterionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingCriterionRepository.java @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.GradingCriterion; /** * Spring Data JPA repository for the GradingCriteria entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingInstructionRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingInstructionRepository.java index b2ea1b872ab1..f64670cd16c4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingInstructionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingInstructionRepository.java @@ -5,8 +5,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.assessment.domain.GradingInstruction; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.GradingInstruction; /** * Spring Data JPA repository for the GradingInstruction entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingScaleRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingScaleRepository.java index c30edc4b2f04..76e41b186351 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingScaleRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingScaleRepository.java @@ -19,9 +19,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.assessment.domain.GradeStep; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.GradeStep; -import de.tum.cit.aet.artemis.domain.GradingScale; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/LongFeedbackTextRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/LongFeedbackTextRepository.java index 72a2fd31c3d6..cf14579e726e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/LongFeedbackTextRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/LongFeedbackTextRepository.java @@ -6,8 +6,8 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.tum.cit.aet.artemis.assessment.domain.LongFeedbackText; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.LongFeedbackText; public interface LongFeedbackTextRepository extends ArtemisJpaRepository { diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java index 72f5a087c275..76f45dce0c4a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java @@ -23,7 +23,7 @@ import de.tum.cit.aet.artemis.assessment.domain.ParticipantScore; import de.tum.cit.aet.artemis.assessment.dto.ScoreDistribution; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementOverviewExerciseStatisticsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/RatingRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/RatingRepository.java index 74c3c9dfd629..c63ac0da0f67 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/RatingRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/RatingRepository.java @@ -12,9 +12,9 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.assessment.domain.Rating; import de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseRatingCount; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Rating; /** * Spring Data JPA repository for the Rating entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java index 98ca9a1a769c..21a4e8dbeb66 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java @@ -21,20 +21,20 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.dto.dashboard.ResultCount; import de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardAssessments; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.ExampleSubmission; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.util.RoundingUtil; import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; import de.tum.cit.aet.artemis.web.rest.dto.ResultWithPointsPerGradingCriterionDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/StudentScoreRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/StudentScoreRepository.java index 747a7e26fe3a..847a180ba9e9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/StudentScoreRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/StudentScoreRepository.java @@ -16,9 +16,9 @@ import org.springframework.transaction.annotation.Transactional; import de.tum.cit.aet.artemis.assessment.domain.StudentScore; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.web.rest.dto.score.StudentScoreSum; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TeamScoreRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TeamScoreRepository.java index 228d32dd7ef0..88d57074e486 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TeamScoreRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TeamScoreRepository.java @@ -16,10 +16,10 @@ import org.springframework.transaction.annotation.Transactional; import de.tum.cit.aet.artemis.assessment.domain.TeamScore; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.web.rest.dto.score.TeamScoreSum; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TutorParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TutorParticipationRepository.java index 5070bab3842c..dad67442f9ae 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TutorParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TutorParticipationRepository.java @@ -12,10 +12,10 @@ import org.springframework.transaction.annotation.Transactional; import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; /** * Spring Data JPA repository for the TutorParticipation entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/CompetencyProgressConfidenceReason.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/CompetencyProgressConfidenceReason.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/CompetencyProgressConfidenceReason.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/domain/CompetencyProgressConfidenceReason.java index 12c27a00ca7b..9be56432aaac 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/CompetencyProgressConfidenceReason.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/CompetencyProgressConfidenceReason.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.atlas.domain; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/LearningObject.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/LearningObject.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/domain/LearningObject.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/domain/LearningObject.java index f2258257a9ab..765ee9eccf4e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/LearningObject.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/LearningObject.java @@ -1,10 +1,11 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.atlas.domain; import java.time.ZonedDateTime; import java.util.Optional; import java.util.Set; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.core.domain.User; public interface LearningObject { diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/BaseCompetency.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/BaseCompetency.java index 7720d6b59329..e005f3334375 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/BaseCompetency.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/BaseCompetency.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; /** * BaseCompetency is an abstract class that contains basic information shared between all competency types. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CompetencyJol.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CompetencyJol.java index 9d7a2f39070e..483311ff57f9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CompetencyJol.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CompetencyJol.java @@ -11,8 +11,8 @@ import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; /** * An entity to store a students Judgement of Learning (JOL) value for a competency. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CompetencyProgress.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CompetencyProgress.java index 17e1e91d4e7d..73f19f4c7cea 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CompetencyProgress.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CompetencyProgress.java @@ -24,8 +24,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.CompetencyProgressConfidenceReason; +import de.tum.cit.aet.artemis.atlas.domain.CompetencyProgressConfidenceReason; +import de.tum.cit.aet.artemis.core.domain.User; /** * This class models the 'progress' association between a user and a competency. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CompetencyRelation.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CompetencyRelation.java index 4b8613df1903..6cac11b64d08 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CompetencyRelation.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CompetencyRelation.java @@ -8,7 +8,7 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; /** * This class models the relation between two competencies. Imagine a graph: (tail) --- type --> (head) diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CourseCompetency.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CourseCompetency.java index 75c6c2cbccf9..fd81132c2bbb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CourseCompetency.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/CourseCompetency.java @@ -28,8 +28,8 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/KnowledgeArea.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/KnowledgeArea.java index c81fa74244e1..e5eedcca7eb1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/KnowledgeArea.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/KnowledgeArea.java @@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; @Entity @Table(name = "knowledge_area") diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/LearningPath.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/LearningPath.java index a1e206f7dba3..267efe722982 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/LearningPath.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/LearningPath.java @@ -16,9 +16,9 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; @Entity @Table(name = "learning_path") diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/Source.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/Source.java index d5444b56d2b0..29a03b017134 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/Source.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/competency/Source.java @@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; @Entity @Table(name = "source") diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/domain/science/ScienceEvent.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/science/ScienceEvent.java index 6cb660adb0b5..ecf537df5209 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/domain/science/ScienceEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/science/ScienceEvent.java @@ -13,7 +13,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; /** * Individual Science Setting which combined make the Science Settings (inside the hierarchical structure on the client side) diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/domain/science/ScienceSetting.java b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/science/ScienceSetting.java index d74999a68f65..537bbc054c07 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/domain/science/ScienceSetting.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/domain/science/ScienceSetting.java @@ -13,8 +13,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; /** * Individual Science Setting which combined make the Science Settings (inside the hierarchical structure on the client side) diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyProgressRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyProgressRepository.java index 6e4300b2f0ea..61b4bb5c03e4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyProgressRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyProgressRepository.java @@ -16,8 +16,8 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.User; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyRepository.java index 49375f9efc20..eb2fc3eccab5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyRepository.java @@ -13,8 +13,8 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Course; /** * Spring Data JPA repository for the Competency entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CourseCompetencyRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CourseCompetencyRepository.java index 4ab9a0de5940..5d09c666fb21 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CourseCompetencyRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CourseCompetencyRepository.java @@ -10,11 +10,11 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.tum.cit.aet.artemis.atlas.domain.LearningObject; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.LearningObject; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.web.rest.dto.metrics.CompetencyExerciseMasteryCalculationDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/PrerequisiteRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/PrerequisiteRepository.java index 6b67e57775b4..a2187579a427 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/PrerequisiteRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/PrerequisiteRepository.java @@ -8,8 +8,8 @@ import org.springframework.data.repository.query.Param; import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Course; /** * Spring Data JPA repository for the {@link Prerequisite} entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/AnswerPost.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/AnswerPost.java index 9542445bae04..aaedef17af0a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/AnswerPost.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/AnswerPost.java @@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonIncludeProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Course; /** * An AnswerPost. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/ConductAgreement.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/ConductAgreement.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/domain/ConductAgreement.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/ConductAgreement.java index 9c6635b27d93..59c128f3841d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/ConductAgreement.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/ConductAgreement.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.communication.domain; import java.util.Objects; @@ -11,6 +11,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; + /** * A user's agreement of a course's code of conduct. */ diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/ConductAgreementId.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/ConductAgreementId.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/domain/ConductAgreementId.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/ConductAgreementId.java index af3605382c67..7fc8797667f4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/ConductAgreementId.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/ConductAgreementId.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.communication.domain; import java.io.Serializable; import java.util.Objects; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/ConversationNotificationRecipientSummary.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/ConversationNotificationRecipientSummary.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/domain/ConversationNotificationRecipientSummary.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/ConversationNotificationRecipientSummary.java index 07db7afadeb0..a00108fb663f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/ConversationNotificationRecipientSummary.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/ConversationNotificationRecipientSummary.java @@ -1,4 +1,6 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.communication.domain; + +import de.tum.cit.aet.artemis.core.domain.User; /** * Stores the user of a conversation participant, who is supposed to receive a websocket message and stores whether diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/ConversationParticipant.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/ConversationParticipant.java index fbbf98d11900..1ad46374e2c4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/ConversationParticipant.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/ConversationParticipant.java @@ -13,8 +13,8 @@ import com.fasterxml.jackson.annotation.JsonIncludeProperties; import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; @Entity @Table(name = "conversation_participant") diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/CreatedConversationMessage.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/CreatedConversationMessage.java index 01d43708e95a..93dbe76070bb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/CreatedConversationMessage.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/CreatedConversationMessage.java @@ -3,7 +3,7 @@ import java.util.Set; import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; /** * Encapsulates data needed after a new message has been created in a conversation. This data is used to send notifications to involved users about the new message asynchronously diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DefaultChannelType.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/DefaultChannelType.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DefaultChannelType.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/DefaultChannelType.java index a8f5ac94c307..22b9b78eb1fa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DefaultChannelType.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/DefaultChannelType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.communication.domain; /** * Enumeration for default channel types that are automatically created on course creation diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DisplayPriority.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/DisplayPriority.java similarity index 78% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DisplayPriority.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/DisplayPriority.java index e418c9d41632..26061237721e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DisplayPriority.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/DisplayPriority.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.communication.domain; /** * The priority with which a post is shown in a list, PINNED represents a high priority, whereas ARCHIVED low priority. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/GroupNotificationType.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/GroupNotificationType.java similarity index 70% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/GroupNotificationType.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/GroupNotificationType.java index 8e86eec648b9..23731b55c38b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/GroupNotificationType.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/GroupNotificationType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.communication.domain; /** * The GroupNotificationType enumeration. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/NotificationPriority.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/NotificationPriority.java similarity index 67% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/NotificationPriority.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/NotificationPriority.java index df04a3002edf..7357b61471e3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/NotificationPriority.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/NotificationPriority.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.communication.domain; /** * The NotificationPriority enumeration. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/NotificationSetting.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/NotificationSetting.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/domain/NotificationSetting.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/NotificationSetting.java index 98719663047e..c62955fafdb8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/NotificationSetting.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/NotificationSetting.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.communication.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -13,6 +13,9 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; + /** * Individual Notification Setting which combined make the Notification Settings (inside the hierarchical structure on the client side) * The unique constraint is needed to avoid duplications. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/NotificationType.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/NotificationType.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/NotificationType.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/NotificationType.java index be8670248291..8a3a5db896b5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/NotificationType.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/NotificationType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.communication.domain; public enum NotificationType { EXERCISE_SUBMISSION_ASSESSED, ATTACHMENT_CHANGE, EXERCISE_RELEASED, EXERCISE_PRACTICE, QUIZ_EXERCISE_STARTED, EXERCISE_UPDATED, NEW_REPLY_FOR_EXERCISE_POST, diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/Post.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/Post.java index 51824d1c1b66..d3bf4e217ea3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/Post.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/Post.java @@ -26,10 +26,9 @@ import com.fasterxml.jackson.annotation.JsonIncludeProperties; import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/Posting.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/Posting.java index c9a5f9eec9f1..ad60a1130916 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/Posting.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/Posting.java @@ -18,9 +18,9 @@ import com.fasterxml.jackson.annotation.JsonIncludeProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; /** * A METIS Posting. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/Reaction.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/Reaction.java index b0d6c55797c6..65f3181cb555 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/Reaction.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/Reaction.java @@ -15,8 +15,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonIncludeProperties; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; /** * A Reaction on a Posting. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/SystemNotificationType.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/SystemNotificationType.java similarity index 67% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/SystemNotificationType.java rename to src/main/java/de/tum/cit/aet/artemis/communication/domain/SystemNotificationType.java index 5a9fdf31b7cc..8fcf52d98129 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/SystemNotificationType.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/SystemNotificationType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.communication.domain; /** * The SystemNotificationType enumeration. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/Channel.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/Channel.java index 8d71301b8c33..e37beff7d4b7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/Channel.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/Channel.java @@ -18,11 +18,11 @@ import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; import de.tum.cit.aet.artemis.communication.domain.Post; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; @Entity @DiscriminatorValue("C") diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/Conversation.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/Conversation.java index 5287168398d9..52ef4a62c934 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/Conversation.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/Conversation.java @@ -31,9 +31,9 @@ import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; import de.tum.cit.aet.artemis.communication.domain.Post; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; @Entity @Table(name = "conversation") diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/GroupChat.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/GroupChat.java index 902c4985a96a..32cbf12b3726 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/GroupChat.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/GroupChat.java @@ -18,8 +18,8 @@ import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; @Entity @DiscriminatorValue("G") diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/OneToOneChat.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/OneToOneChat.java index 85122ad4582b..4b23a2093c6d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/OneToOneChat.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/conversation/OneToOneChat.java @@ -12,8 +12,8 @@ import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; import de.tum.cit.aet.artemis.communication.domain.Post; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; @Entity @DiscriminatorValue("O") diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/ConversationNotification.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/ConversationNotification.java index 5d72d31e2b16..d4416bb838cf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/ConversationNotification.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/ConversationNotification.java @@ -12,7 +12,7 @@ import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; /** * A Notification concerning all new messages in a conversation. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/ConversationNotificationFactory.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/ConversationNotificationFactory.java index 864419557a4c..033f12e3bfd3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/ConversationNotificationFactory.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/ConversationNotificationFactory.java @@ -3,8 +3,8 @@ import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.findCorrespondingNotificationTitleOrThrow; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createConversationMessageTarget; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.domain.Post; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; public class ConversationNotificationFactory { diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/GroupNotification.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/GroupNotification.java index a1301771b054..aa32090e0f93 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/GroupNotification.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/GroupNotification.java @@ -12,10 +12,10 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority; +import de.tum.cit.aet.artemis.communication.domain.GroupNotificationType; +import de.tum.cit.aet.artemis.communication.domain.NotificationPriority; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; /** * A GroupNotification. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/GroupNotificationFactory.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/GroupNotificationFactory.java index b7ef1fd0e00e..62af1c1ea18a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/GroupNotificationFactory.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/GroupNotificationFactory.java @@ -1,5 +1,25 @@ package de.tum.cit.aet.artemis.communication.domain.notification; +import static de.tum.cit.aet.artemis.communication.domain.NotificationPriority.HIGH; +import static de.tum.cit.aet.artemis.communication.domain.NotificationPriority.MEDIUM; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.ATTACHMENT_CHANGE; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.COURSE_ARCHIVE_FAILED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.COURSE_ARCHIVE_FINISHED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.COURSE_ARCHIVE_STARTED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.DUPLICATE_TEST_CASE; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXAM_ARCHIVE_FAILED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXAM_ARCHIVE_FINISHED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXAM_ARCHIVE_STARTED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXERCISE_PRACTICE; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXERCISE_RELEASED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXERCISE_UPDATED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.ILLEGAL_SUBMISSION; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_ANNOUNCEMENT_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_MANUAL_FEEDBACK_REQUEST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.PROGRAMMING_BUILD_RUN_UPDATE; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.PROGRAMMING_REPOSITORY_LOCKS; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.PROGRAMMING_TEST_CASES_CHANGED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.QUIZ_EXERCISE_STARTED; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createAttachmentUpdatedTarget; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createCoursePostTarget; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createCourseTarget; @@ -8,42 +28,22 @@ import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createExamProgrammingExerciseOrTestCaseTarget; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createExerciseReleasedTarget; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createExerciseUpdatedTarget; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority.HIGH; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority.MEDIUM; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.ATTACHMENT_CHANGE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_FAILED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_FINISHED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_STARTED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DUPLICATE_TEST_CASE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_FAILED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_FINISHED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_STARTED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_PRACTICE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_RELEASED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_UPDATED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.ILLEGAL_SUBMISSION; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_ANNOUNCEMENT_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_MANUAL_FEEDBACK_REQUEST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PROGRAMMING_BUILD_RUN_UPDATE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PROGRAMMING_REPOSITORY_LOCKS; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PROGRAMMING_TEST_CASES_CHANGED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.QUIZ_EXERCISE_STARTED; import java.util.List; import org.jsoup.Jsoup; +import de.tum.cit.aet.artemis.communication.domain.GroupNotificationType; +import de.tum.cit.aet.artemis.communication.domain.NotificationPriority; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.domain.Post; -import de.tum.cit.aet.artemis.domain.Attachment; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.lecture.domain.Attachment; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; public class GroupNotificationFactory { diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/Notification.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/Notification.java index 449c7a814c4d..49efb2397f12 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/Notification.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/Notification.java @@ -27,9 +27,9 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority; +import de.tum.cit.aet.artemis.communication.domain.NotificationPriority; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; /** * A Notification. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/NotificationConstants.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/NotificationConstants.java index 5c3c591107a8..46f1ff9a2218 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/NotificationConstants.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/NotificationConstants.java @@ -1,62 +1,62 @@ package de.tum.cit.aet.artemis.communication.domain.notification; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.ATTACHMENT_CHANGE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_CHANNEL; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_GROUP_CHAT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_CREATE_GROUP_CHAT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_CREATE_ONE_TO_ONE_CHAT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_DELETE_CHANNEL; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_MESSAGE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_REPLY_MESSAGE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_REMOVE_USER_CHANNEL; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_REMOVE_USER_GROUP_CHAT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_USER_MENTIONED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_FAILED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_FINISHED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_STARTED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DATA_EXPORT_CREATED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DATA_EXPORT_FAILED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DUPLICATE_TEST_CASE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_FAILED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_FINISHED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_STARTED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_PRACTICE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_RELEASED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_SUBMISSION_ASSESSED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_UPDATED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.FILE_SUBMISSION_SUCCESSFUL; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.ILLEGAL_SUBMISSION; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_ANNOUNCEMENT_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_COURSE_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_CPC_PLAGIARISM_CASE_STUDENT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_EXAM_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_EXERCISE_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_LECTURE_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_MANUAL_FEEDBACK_REQUEST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_PLAGIARISM_CASE_STUDENT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_COURSE_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_EXAM_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_EXERCISE_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_LECTURE_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PLAGIARISM_CASE_VERDICT_STUDENT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PROGRAMMING_BUILD_RUN_UPDATE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PROGRAMMING_REPOSITORY_LOCKS; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PROGRAMMING_TEST_CASES_CHANGED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.QUIZ_EXERCISE_STARTED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_ASSIGNED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DELETED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_STUDENT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_TUTOR; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_MULTIPLE_REGISTRATION_TUTOR; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_STUDENT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_TUTOR; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UNASSIGNED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UPDATED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.ATTACHMENT_CHANGE; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_ADD_USER_CHANNEL; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_ADD_USER_GROUP_CHAT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_CREATE_GROUP_CHAT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_CREATE_ONE_TO_ONE_CHAT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_DELETE_CHANNEL; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_NEW_MESSAGE; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_NEW_REPLY_MESSAGE; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_REMOVE_USER_CHANNEL; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_REMOVE_USER_GROUP_CHAT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_USER_MENTIONED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.COURSE_ARCHIVE_FAILED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.COURSE_ARCHIVE_FINISHED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.COURSE_ARCHIVE_STARTED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.DATA_EXPORT_CREATED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.DATA_EXPORT_FAILED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.DUPLICATE_TEST_CASE; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXAM_ARCHIVE_FAILED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXAM_ARCHIVE_FINISHED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXAM_ARCHIVE_STARTED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXERCISE_PRACTICE; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXERCISE_RELEASED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXERCISE_SUBMISSION_ASSESSED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXERCISE_UPDATED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.FILE_SUBMISSION_SUCCESSFUL; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.ILLEGAL_SUBMISSION; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_ANNOUNCEMENT_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_COURSE_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_CPC_PLAGIARISM_CASE_STUDENT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_EXAM_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_EXERCISE_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_LECTURE_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_MANUAL_FEEDBACK_REQUEST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_PLAGIARISM_CASE_STUDENT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_REPLY_FOR_COURSE_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_REPLY_FOR_EXAM_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_REPLY_FOR_EXERCISE_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_REPLY_FOR_LECTURE_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.PLAGIARISM_CASE_VERDICT_STUDENT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.PROGRAMMING_BUILD_RUN_UPDATE; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.PROGRAMMING_REPOSITORY_LOCKS; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.PROGRAMMING_TEST_CASES_CHANGED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.QUIZ_EXERCISE_STARTED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_ASSIGNED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_DELETED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_STUDENT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_MULTIPLE_REGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_REGISTRATION_STUDENT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_REGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_UNASSIGNED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_UPDATED; import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableBiMap; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; public class NotificationConstants { diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/NotificationPlaceholderCreator.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/NotificationPlaceholderCreator.java index 0102c6e18dea..c5bab735e2e1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/NotificationPlaceholderCreator.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/NotificationPlaceholderCreator.java @@ -5,7 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; /** * Marks a method to be a notification placeholder creator. Allows automatic testing of placeholders in notifications. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/NotificationTargetFactory.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/NotificationTargetFactory.java index a228afd8a14c..f71204682173 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/NotificationTargetFactory.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/NotificationTargetFactory.java @@ -3,11 +3,11 @@ import de.tum.cit.aet.artemis.communication.domain.AnswerPost; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.DataExport; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DataExport; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; public class NotificationTargetFactory { diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/SingleUserNotification.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/SingleUserNotification.java index 96b379e41fa5..dc95c1e49c9a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/SingleUserNotification.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/SingleUserNotification.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; /** * A SingleUserNotification. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/SingleUserNotificationFactory.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/SingleUserNotificationFactory.java index 473bc1ef6ae7..f143f959f89f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/SingleUserNotificationFactory.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/SingleUserNotificationFactory.java @@ -1,5 +1,33 @@ package de.tum.cit.aet.artemis.communication.domain.notification; +import static de.tum.cit.aet.artemis.communication.domain.NotificationPriority.HIGH; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_ADD_USER_CHANNEL; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_ADD_USER_GROUP_CHAT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_CREATE_GROUP_CHAT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_CREATE_ONE_TO_ONE_CHAT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_DELETE_CHANNEL; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_NEW_REPLY_MESSAGE; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_REMOVE_USER_CHANNEL; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_REMOVE_USER_GROUP_CHAT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_USER_MENTIONED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.DATA_EXPORT_CREATED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.DATA_EXPORT_FAILED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXERCISE_SUBMISSION_ASSESSED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.FILE_SUBMISSION_SUCCESSFUL; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_CPC_PLAGIARISM_CASE_STUDENT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_PLAGIARISM_CASE_STUDENT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_REPLY_FOR_COURSE_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_REPLY_FOR_EXAM_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_REPLY_FOR_EXERCISE_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_REPLY_FOR_LECTURE_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.PLAGIARISM_CASE_VERDICT_STUDENT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_ASSIGNED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_STUDENT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_MULTIPLE_REGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_REGISTRATION_STUDENT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_REGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_UNASSIGNED; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_CHANNEL_TEXT; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_GROUP_CHAT_TEXT; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.CONVERSATION_DELETE_CHANNEL_TEXT; @@ -38,47 +66,19 @@ import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createMessageReplyTarget; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createPlagiarismCaseTarget; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createTutorialGroupTarget; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority.HIGH; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_CHANNEL; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_GROUP_CHAT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_CREATE_GROUP_CHAT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_CREATE_ONE_TO_ONE_CHAT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_DELETE_CHANNEL; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_REPLY_MESSAGE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_REMOVE_USER_CHANNEL; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_REMOVE_USER_GROUP_CHAT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_USER_MENTIONED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DATA_EXPORT_CREATED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DATA_EXPORT_FAILED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_SUBMISSION_ASSESSED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.FILE_SUBMISSION_SUCCESSFUL; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_CPC_PLAGIARISM_CASE_STUDENT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_PLAGIARISM_CASE_STUDENT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_COURSE_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_EXAM_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_EXERCISE_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_LECTURE_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PLAGIARISM_CASE_VERDICT_STUDENT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_ASSIGNED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_STUDENT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_TUTOR; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_MULTIPLE_REGISTRATION_TUTOR; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_STUDENT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_TUTOR; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UNASSIGNED; import java.util.Set; import jakarta.validation.constraints.NotNull; import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; -import de.tum.cit.aet.artemis.domain.DataExport; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.core.domain.DataExport; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/SystemNotification.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/SystemNotification.java index 2ba2a4722bf8..038a776aa62e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/SystemNotification.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/SystemNotification.java @@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.SystemNotificationType; +import de.tum.cit.aet.artemis.communication.domain.SystemNotificationType; /** * A SystemNotification. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/TutorialGroupNotification.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/TutorialGroupNotification.java index ce82925fcb9d..47246fd1b367 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/TutorialGroupNotification.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/TutorialGroupNotification.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.communication.domain.notification; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DELETED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UPDATED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_DELETED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_UPDATED; import java.time.ZonedDateTime; import java.util.Set; @@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/TutorialGroupNotificationFactory.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/TutorialGroupNotificationFactory.java index 2d5308463508..d9b259f7a23d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/TutorialGroupNotificationFactory.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/notification/TutorialGroupNotificationFactory.java @@ -1,13 +1,13 @@ package de.tum.cit.aet.artemis.communication.domain.notification; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_DELETED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_UPDATED; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_DELETED_TEXT; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_UPDATED_TEXT; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.findCorrespondingNotificationTitleOrThrow; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createTutorialGroupTarget; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DELETED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UPDATED; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; public class TutorialGroupNotificationFactory { diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/push_notification/PushNotificationDeviceConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/push_notification/PushNotificationDeviceConfiguration.java index f593a00a3066..c6bfd3384110 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/push_notification/PushNotificationDeviceConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/push_notification/PushNotificationDeviceConfiguration.java @@ -15,7 +15,7 @@ import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; /** * Model for saving PushNotification DeviceTokens for native clients diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/push_notification/PushNotificationDeviceConfigurationId.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/push_notification/PushNotificationDeviceConfigurationId.java index 9b9d6da07d46..12bf71dba10e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/push_notification/PushNotificationDeviceConfigurationId.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/push_notification/PushNotificationDeviceConfigurationId.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.util.Objects; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; /** * The PrimaryKey used for PushNotificationDeviceConfiguration diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConductAgreementRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConductAgreementRepository.java index 14358a141f96..017200b0f3ee 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConductAgreementRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConductAgreementRepository.java @@ -9,9 +9,9 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.communication.domain.ConductAgreement; +import de.tum.cit.aet.artemis.communication.domain.ConductAgreementId; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.ConductAgreement; -import de.tum.cit.aet.artemis.domain.ConductAgreementId; /** * Spring Data repository for the Code of Conduct Agreement entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java index 4e1c14b2d81f..0e983efb10bc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java @@ -27,8 +27,8 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/MessageSpecs.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/MessageSpecs.java index 6baba5fd8367..9dcb9b50143d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/MessageSpecs.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/MessageSpecs.java @@ -22,9 +22,9 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel_; import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation_; +import de.tum.cit.aet.artemis.core.dto.SortingOrder; import de.tum.cit.aet.artemis.domain.Course_; import de.tum.cit.aet.artemis.domain.User_; -import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; public class MessageSpecs { diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/NotificationSettingRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/NotificationSettingRepository.java index d443a7ed20e6..5d5261088c60 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/NotificationSettingRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/NotificationSettingRepository.java @@ -11,9 +11,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.communication.domain.NotificationSetting; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.NotificationSetting; -import de.tum.cit.aet.artemis.domain.User; /** * Spring Data repository for the NotificationSetting entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/PushNotificationDeviceConfigurationRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/PushNotificationDeviceConfigurationRepository.java index c99d84f2ebb2..044df41104bd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/PushNotificationDeviceConfigurationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/PushNotificationDeviceConfigurationRepository.java @@ -15,8 +15,8 @@ import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfiguration; import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfigurationId; import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceType; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.User; /** * The Repository used for PushNotificationDeviceConfiguration diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java b/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java index 1c6c0a200d92..0a6aab6e1912 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java @@ -2,9 +2,9 @@ import java.util.regex.Pattern; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.service.programming.ProgrammingSubmissionService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/GuidedTourConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/GuidedTourConfiguration.java index 67e02eaf33e7..60404b891555 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/GuidedTourConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/GuidedTourConfiguration.java @@ -11,8 +11,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java b/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java index 4de89459f424..8ed477b34c83 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java @@ -34,15 +34,15 @@ import com.zaxxer.hikari.HikariDataSource; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.StatisticsRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; import de.tum.cit.aet.artemis.exercise.dto.ExerciseTypeMetricsEntry; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.ProfileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/ProgrammingLanguageConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/ProgrammingLanguageConfiguration.java index 213de824540d..90faba75bb94 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/ProgrammingLanguageConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/ProgrammingLanguageConfiguration.java @@ -14,8 +14,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Profile; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; /** * This configuration file provides functions to get the configured Docker Images for {@link ProgrammingLanguage ProgrammingLanguages}. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/StaticCodeAnalysisConfigurer.java b/src/main/java/de/tum/cit/aet/artemis/core/config/StaticCodeAnalysisConfigurer.java index 93ef79d65140..54ef93ca02c7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/StaticCodeAnalysisConfigurer.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/StaticCodeAnalysisConfigurer.java @@ -3,10 +3,10 @@ import java.util.List; import java.util.Map; -import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisDefaultCategory; -import de.tum.cit.aet.artemis.domain.enumeration.CategoryState; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.assessment.domain.CategoryState; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisDefaultCategory; +import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; /** * Provides hard-coded programming language specific static code analysis default categories as an unmodifiable Map diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/TheiaConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/TheiaConfiguration.java index 4fd3e217e8b0..cc6a47b67b54 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/TheiaConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/TheiaConfiguration.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; @Profile(PROFILE_THEIA) @Configuration diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/audit/AuditEventConverter.java b/src/main/java/de/tum/cit/aet/artemis/core/config/audit/AuditEventConverter.java index aa03fb507279..65ecee7d1f7a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/audit/AuditEventConverter.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/audit/AuditEventConverter.java @@ -15,7 +15,7 @@ import org.springframework.security.web.authentication.WebAuthenticationDetails; import org.springframework.stereotype.Component; -import de.tum.cit.aet.artemis.domain.PersistentAuditEvent; +import de.tum.cit.aet.artemis.core.domain.PersistentAuditEvent; @Profile(PROFILE_CORE) @Component diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/migration/MigrationService.java b/src/main/java/de/tum/cit/aet/artemis/core/config/migration/MigrationService.java index 48a8371b4914..b0b22e83575a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/migration/MigrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/migration/MigrationService.java @@ -26,8 +26,8 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; +import de.tum.cit.aet.artemis.core.domain.MigrationChangelog; import de.tum.cit.aet.artemis.core.repository.MigrationChangeRepository; -import de.tum.cit.aet.artemis.domain.MigrationChangelog; /** * This service contains utility functionality that verifies a changelog to prevent corruption and executes a given changelog. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/migration/entries/MigrationEntry20240614_140000.java b/src/main/java/de/tum/cit/aet/artemis/core/config/migration/entries/MigrationEntry20240614_140000.java index b0c74f4f17a2..073a144d4ec9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/migration/entries/MigrationEntry20240614_140000.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/migration/entries/MigrationEntry20240614_140000.java @@ -9,8 +9,8 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.core.config.migration.MigrationEntry; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; -import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; public class MigrationEntry20240614_140000 extends MigrationEntry { diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java index 0339275f4dba..1465bdc51a03 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java @@ -61,8 +61,8 @@ import de.tum.cit.aet.artemis.core.security.jwt.JWTFilter; import de.tum.cit.aet.artemis.core.security.jwt.TokenProvider; import de.tum.cit.aet.artemis.core.validation.InetSocketAddressValidator; -import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/AbstractAuditingEntity.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/AbstractAuditingEntity.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/AbstractAuditingEntity.java rename to src/main/java/de/tum/cit/aet/artemis/core/domain/AbstractAuditingEntity.java index f79e0135f2d2..053dd084a3b2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/AbstractAuditingEntity.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/AbstractAuditingEntity.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.core.domain; import java.time.Instant; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/Authority.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/Authority.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/Authority.java rename to src/main/java/de/tum/cit/aet/artemis/core/domain/Authority.java index f89d22804596..424ee97d85b9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/Authority.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/Authority.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.core.domain; import java.io.Serial; import java.io.Serializable; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/Course.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/Course.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/domain/Course.java rename to src/main/java/de/tum/cit/aet/artemis/core/domain/Course.java index 883a022ec78a..5fc14688da64 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/Course.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/Course.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.core.domain; import static de.tum.cit.aet.artemis.core.config.Constants.ARTEMIS_GROUP_DEFAULT_PREFIX; import static de.tum.cit.aet.artemis.core.config.Constants.COMPLAINT_RESPONSE_TEXT_LIMIT; @@ -38,10 +38,11 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; import de.tum.cit.aet.artemis.communication.domain.Post; -import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; +import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.quiz.config.QuizView; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/CourseExamExportErrorCause.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/CourseExamExportErrorCause.java similarity index 78% rename from src/main/java/de/tum/cit/aet/artemis/domain/CourseExamExportErrorCause.java rename to src/main/java/de/tum/cit/aet/artemis/core/domain/CourseExamExportErrorCause.java index 6ebd999b3671..fe7615439f57 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/CourseExamExportErrorCause.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/CourseExamExportErrorCause.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.core.domain; /** * Enum to define the different error causes for an course/exam export diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/CourseExamExportState.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/CourseExamExportState.java similarity index 71% rename from src/main/java/de/tum/cit/aet/artemis/domain/CourseExamExportState.java rename to src/main/java/de/tum/cit/aet/artemis/core/domain/CourseExamExportState.java index 3aad6d1241dc..ff63d88b0055 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/CourseExamExportState.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/CourseExamExportState.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.core.domain; public enum CourseExamExportState { RUNNING, COMPLETED, COMPLETED_WITH_WARNINGS, COMPLETED_WITH_ERRORS diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/CourseInformationSharingConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/CourseInformationSharingConfiguration.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/CourseInformationSharingConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/core/domain/CourseInformationSharingConfiguration.java index 9ededb449881..5df39e811c2f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/CourseInformationSharingConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/CourseInformationSharingConfiguration.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.core.domain; /** * NOTE: Ordinal mapping in property of Course.java do NOT change the order of the existing values. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/DataExport.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/DataExport.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/domain/DataExport.java rename to src/main/java/de/tum/cit/aet/artemis/core/domain/DataExport.java index 201b399082b2..6c438b4e84a9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/DataExport.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/DataExport.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.core.domain; import java.time.ZonedDateTime; @@ -15,8 +15,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.DataExportState; - /** * A data export for user data * We use the creation_date of the AbstractAuditingEntity as the date when the export was requested diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DataExportState.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/DataExportState.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DataExportState.java rename to src/main/java/de/tum/cit/aet/artemis/core/domain/DataExportState.java index 37bcdeacee3f..590b9d5ade71 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DataExportState.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/DataExportState.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.core.domain; /** * An enum representing the state of a data export, which is used to determine which actions are currently available. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/DomainObject.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/DomainObject.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/DomainObject.java rename to src/main/java/de/tum/cit/aet/artemis/core/domain/DomainObject.java index 8cf1ad0342c1..20b2cb604eab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/DomainObject.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/DomainObject.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.core.domain; import java.io.Serial; import java.io.Serializable; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/GraphType.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/GraphType.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/GraphType.java rename to src/main/java/de/tum/cit/aet/artemis/core/domain/GraphType.java index 4f6fc1d2565d..8361c07d1377 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/GraphType.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/GraphType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.core.domain; public enum GraphType { SUBMISSIONS, ACTIVE_USERS, LOGGED_IN_USERS, RELEASED_EXERCISES, EXERCISES_DUE, CONDUCTED_EXAMS, EXAM_PARTICIPATIONS, EXAM_REGISTRATIONS, ACTIVE_TUTORS, CREATED_RESULTS, diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/GuidedTourSetting.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/GuidedTourSetting.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/GuidedTourSetting.java rename to src/main/java/de/tum/cit/aet/artemis/core/domain/GuidedTourSetting.java index c879a7247277..278bfe0f0c4b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/GuidedTourSetting.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/GuidedTourSetting.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.core.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/Language.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/Language.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/Language.java rename to src/main/java/de/tum/cit/aet/artemis/core/domain/Language.java index d979a1e5ece4..93e7f2252e01 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/Language.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/Language.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.core.domain; /** * The Language enumeration. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/LegalDocumentType.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/LegalDocumentType.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/LegalDocumentType.java rename to src/main/java/de/tum/cit/aet/artemis/core/domain/LegalDocumentType.java index 90c9a6d4a882..e93cfc8102b8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/LegalDocumentType.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/LegalDocumentType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.core.domain; /** * An enum representing the type of legal document, currently the imprint and the privacy statement. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/MigrationChangelog.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/MigrationChangelog.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/MigrationChangelog.java rename to src/main/java/de/tum/cit/aet/artemis/core/domain/MigrationChangelog.java index f5a9e2e62009..c140001bfe2e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/MigrationChangelog.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/MigrationChangelog.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.core.domain; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/Organization.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/Organization.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/Organization.java rename to src/main/java/de/tum/cit/aet/artemis/core/domain/Organization.java index f67ac3ae0758..d0deaddd40d2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/Organization.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/Organization.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.core.domain; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/PersistentAuditEvent.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/PersistentAuditEvent.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/PersistentAuditEvent.java rename to src/main/java/de/tum/cit/aet/artemis/core/domain/PersistentAuditEvent.java index 84f77bf85168..a615d6b4bca7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/PersistentAuditEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/PersistentAuditEvent.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.core.domain; import java.io.Serial; import java.io.Serializable; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/SpanType.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/SpanType.java similarity index 54% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/SpanType.java rename to src/main/java/de/tum/cit/aet/artemis/core/domain/SpanType.java index 4d54304ec2ba..351600a487cc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/SpanType.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/SpanType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.core.domain; public enum SpanType { DAY, WEEK, MONTH, QUARTER, YEAR diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/StatisticsView.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/StatisticsView.java similarity index 54% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/StatisticsView.java rename to src/main/java/de/tum/cit/aet/artemis/core/domain/StatisticsView.java index 1edf436e914e..7bb70e64b052 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/StatisticsView.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/StatisticsView.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.core.domain; public enum StatisticsView { ARTEMIS, COURSE, EXERCISE diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/User.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/User.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/domain/User.java rename to src/main/java/de/tum/cit/aet/artemis/core/domain/User.java index 8dea83dc2f8f..593b27e0098b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/User.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/User.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.core.domain; import static de.tum.cit.aet.artemis.core.config.Constants.USERNAME_MAX_LENGTH; import static de.tum.cit.aet.artemis.core.config.Constants.USERNAME_MIN_LENGTH; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/UserGroup.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/UserGroup.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/UserGroup.java rename to src/main/java/de/tum/cit/aet/artemis/core/domain/UserGroup.java index c5c70825778c..8b0bfeb74611 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/UserGroup.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/UserGroup.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.core.domain; import java.io.Serializable; import java.util.Objects; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseStatisticsAverageScore.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseStatisticsAverageScore.java index c959c19f4089..45c95bf17085 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseStatisticsAverageScore.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseStatisticsAverageScore.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; @JsonInclude(JsonInclude.Include.NON_EMPTY) // TODO: convert to record diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/SortingOrder.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/SortingOrder.java similarity index 52% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/SortingOrder.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/SortingOrder.java index 9c950ec914ac..64e20aeb86b5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/SortingOrder.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/SortingOrder.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.core.dto; public enum SortingOrder { ASCENDING, DESCENDING diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/AuthorityRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/AuthorityRepository.java index e17b5960d706..4e3f3f0466af 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/AuthorityRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/AuthorityRepository.java @@ -2,8 +2,8 @@ import java.util.List; +import de.tum.cit.aet.artemis.core.domain.Authority; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Authority; /** * Spring Data JPA repository for the Authority entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/CourseRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/CourseRepository.java index 495192f8e39d..8781e09de89a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/CourseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/CourseRepository.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.core.repository; +import static de.tum.cit.aet.artemis.assessment.domain.AssessmentType.AUTOMATIC; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.AUTOMATIC; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.time.ZonedDateTime; @@ -21,16 +21,16 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.core.domain.Organization; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.dto.StatisticsEntry; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.Organization; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/CustomAuditEventRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/CustomAuditEventRepository.java index 2d1b6e753471..59f0789404f4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/CustomAuditEventRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/CustomAuditEventRepository.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.config.audit.AuditEventConverter; -import de.tum.cit.aet.artemis.domain.PersistentAuditEvent; +import de.tum.cit.aet.artemis.core.domain.PersistentAuditEvent; /** * An implementation of Spring Boot's {@link AuditEventRepository}. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/DataExportRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/DataExportRepository.java index 4a1cdbe7f13a..29c060d7ba7d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/DataExportRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/DataExportRepository.java @@ -11,8 +11,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.domain.DataExport; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.DataExport; /** * Spring Data JPA repository for a data export entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/GuidedTourSettingsRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/GuidedTourSettingsRepository.java index 94b4e9ff3f3f..5fb1ff2d341c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/GuidedTourSettingsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/GuidedTourSettingsRepository.java @@ -5,8 +5,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.domain.GuidedTourSetting; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.GuidedTourSetting; /** * Spring Data JPA repository for the GuidedTourSetting entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/MigrationChangeRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/MigrationChangeRepository.java index 1e0c48226e5c..71b6b9c1a8c4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/MigrationChangeRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/MigrationChangeRepository.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.core.repository; +import de.tum.cit.aet.artemis.core.domain.MigrationChangelog; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.MigrationChangelog; public interface MigrationChangeRepository extends ArtemisJpaRepository { } diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/OrganizationRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/OrganizationRepository.java index 31dcd43c7d21..da1a37730f85 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/OrganizationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/OrganizationRepository.java @@ -16,8 +16,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.domain.Organization; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Organization; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/PersistenceAuditEventRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/PersistenceAuditEventRepository.java index 36b7d8a8c8a5..9c4c133fe6da 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/PersistenceAuditEventRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/PersistenceAuditEventRepository.java @@ -16,8 +16,8 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.tum.cit.aet.artemis.core.domain.PersistentAuditEvent; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.PersistentAuditEvent; /** * Spring Data JPA repository for the PersistentAuditEvent entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/StatisticsRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/StatisticsRepository.java index adab6c7e1dab..34bbed7c75ae 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/StatisticsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/StatisticsRepository.java @@ -25,14 +25,14 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.domain.GraphType; +import de.tum.cit.aet.artemis.core.domain.SpanType; +import de.tum.cit.aet.artemis.core.domain.StatisticsView; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.dto.CourseStatisticsAverageScore; import de.tum.cit.aet.artemis.core.dto.StatisticsEntry; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.GraphType; -import de.tum.cit.aet.artemis.domain.enumeration.SpanType; -import de.tum.cit.aet.artemis.domain.enumeration.StatisticsView; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; /** * Spring Data JPA repository for the statistics pages diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java index 3148aad3e4da..0b7de380a43f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java @@ -38,15 +38,15 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; +import de.tum.cit.aet.artemis.communication.domain.ConversationNotificationRecipientSummary; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.Organization; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.SortingOrder; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.ConversationNotificationRecipientSummary; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.Organization; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.service.dto.UserRoleDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.UserPageableSearchDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/UserSpecs.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/UserSpecs.java index ad5fd8c789af..805e9930fe6a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/UserSpecs.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/UserSpecs.java @@ -9,9 +9,9 @@ import org.springframework.data.jpa.domain.Specification; -import de.tum.cit.aet.artemis.domain.Authority; +import de.tum.cit.aet.artemis.core.domain.Authority; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.domain.Authority_; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.domain.User_; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/security/DomainUserDetailsService.java b/src/main/java/de/tum/cit/aet/artemis/core/security/DomainUserDetailsService.java index 5a2f3a3cb5d7..775d26c826ca 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/security/DomainUserDetailsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/security/DomainUserDetailsService.java @@ -12,8 +12,8 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.User; /** * Authenticate a user from the database. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/validation/TeamAssignmentConfigValidator.java b/src/main/java/de/tum/cit/aet/artemis/core/validation/TeamAssignmentConfigValidator.java index 142d652456f0..afef48c0141a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/validation/TeamAssignmentConfigValidator.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/validation/TeamAssignmentConfigValidator.java @@ -4,7 +4,7 @@ import jakarta.validation.ConstraintValidatorContext; import de.tum.cit.aet.artemis.core.validation.constraints.TeamAssignmentConfigConstraints; -import de.tum.cit.aet.artemis.domain.TeamAssignmentConfig; +import de.tum.cit.aet.artemis.exercise.domain.TeamAssignmentConfig; /** * Validates a team assignment configuration by checking that these criteria are fulfilled: diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java index c874636802a8..c50d8d2cae62 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java @@ -21,7 +21,7 @@ import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.domain.BuildJob; +import de.tum.cit.aet.artemis.programming.domain.BuildJob; import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; import de.tum.cit.aet.artemis.service.connectors.localci.SharedQueueManagementService; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java index 5351a796abf2..b9485a4622b3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java @@ -28,14 +28,14 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import de.tum.cit.aet.artemis.communication.domain.DefaultChannelType; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.DefaultChannelType; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminExerciseResource.java index 4a89bf59497a..44f6b853fee5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminExerciseResource.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminImprintResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminImprintResource.java index 76fe1d167b20..ef6bc3f4b578 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminImprintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminImprintResource.java @@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.domain.enumeration.Language; import de.tum.cit.aet.artemis.service.LegalDocumentService; import de.tum.cit.aet.artemis.web.rest.dto.ImprintDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java index ec5707bf121c..7912e4b77aa9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java @@ -20,7 +20,7 @@ import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; +import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.connectors.lti.LtiDynamicRegistrationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminOrganizationResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminOrganizationResource.java index 2eef77c243fc..59ab5b03c5e2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminOrganizationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminOrganizationResource.java @@ -21,12 +21,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.domain.Organization; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.OrganizationRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.domain.Organization; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.OrganizationService; import de.tum.cit.aet.artemis.web.rest.dto.OrganizationCountDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminPrivacyStatementResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminPrivacyStatementResource.java index 101c2ef7e3a9..7743ecb4beb0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminPrivacyStatementResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminPrivacyStatementResource.java @@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.domain.enumeration.Language; import de.tum.cit.aet.artemis.service.LegalDocumentService; import de.tum.cit.aet.artemis.web.rest.dto.PrivacyStatementDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStatisticsResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStatisticsResource.java index 91bc2f52f95d..a4c46b7594b5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStatisticsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStatisticsResource.java @@ -13,10 +13,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.domain.GraphType; +import de.tum.cit.aet.artemis.core.domain.SpanType; +import de.tum.cit.aet.artemis.core.domain.StatisticsView; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.domain.enumeration.GraphType; -import de.tum.cit.aet.artemis.domain.enumeration.SpanType; -import de.tum.cit.aet.artemis.domain.enumeration.StatisticsView; import de.tum.cit.aet.artemis.service.StatisticsService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java index 11baf627fbf8..96a70ab89a2c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java @@ -30,10 +30,10 @@ import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.AuthorityRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.service.ldap.LdapUserService; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/FileType.java b/src/main/java/de/tum/cit/aet/artemis/domain/FileType.java deleted file mode 100644 index f72ec30a760c..000000000000 --- a/src/main/java/de/tum/cit/aet/artemis/domain/FileType.java +++ /dev/null @@ -1,5 +0,0 @@ -package de.tum.cit.aet.artemis.domain; - -public enum FileType { - FILE, FOLDER -} diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/package-info.java b/src/main/java/de/tum/cit/aet/artemis/domain/package-info.java deleted file mode 100644 index e761a66bde7a..000000000000 --- a/src/main/java/de/tum/cit/aet/artemis/domain/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * JPA domain objects. - */ -package de.tum.cit.aet.artemis.domain; diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/domain/Exam.java b/src/main/java/de/tum/cit/aet/artemis/exam/domain/Exam.java index d39c9556dbb4..ab893c874d88 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/domain/Exam.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/domain/Exam.java @@ -29,9 +29,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.web.rest.util.StringUtil; @Entity diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/domain/ExamSession.java b/src/main/java/de/tum/cit/aet/artemis/exam/domain/ExamSession.java index 27637c7ca964..a5607311dd8a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/domain/ExamSession.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/domain/ExamSession.java @@ -16,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.AbstractAuditingEntity; +import de.tum.cit.aet.artemis.core.domain.AbstractAuditingEntity; import inet.ipaddr.IPAddress; import inet.ipaddr.IPAddressString; diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/domain/ExamUser.java b/src/main/java/de/tum/cit/aet/artemis/exam/domain/ExamUser.java index 0c2195eadf77..359d722324e2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/domain/ExamUser.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/domain/ExamUser.java @@ -9,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.AbstractAuditingEntity; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.AbstractAuditingEntity; +import de.tum.cit.aet.artemis.core.domain.User; @Entity @Table(name = "exam_user") diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/domain/ExerciseGroup.java b/src/main/java/de/tum/cit/aet/artemis/exam/domain/ExerciseGroup.java index 46dd0ad43714..f6581d72f0d1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/domain/ExerciseGroup.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/domain/ExerciseGroup.java @@ -17,8 +17,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; @Entity @Table(name = "exercise_group") diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/domain/StudentExam.java b/src/main/java/de/tum/cit/aet/artemis/exam/domain/StudentExam.java index af2e6eedc1f4..5574f55a6727 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/domain/StudentExam.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/domain/StudentExam.java @@ -28,9 +28,9 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.AbstractAuditingEntity; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.AbstractAuditingEntity; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; @Entity diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamLiveEvent.java b/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamLiveEvent.java index 96fffdde0971..3c321b729fb5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamLiveEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamLiveEvent.java @@ -16,7 +16,7 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.service.exam.ExamLiveEventsService; import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamLiveEventBaseDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamRepository.java b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamRepository.java index 86207dea5d43..a86c05a2ded3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamRepository.java @@ -24,9 +24,9 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.web.rest.dto.CourseContentCount; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/repository/StudentExamRepository.java b/src/main/java/de/tum/cit/aet/artemis/exam/repository/StudentExamRepository.java index 28128c1bd919..b8581affc408 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/repository/StudentExamRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/repository/StudentExamRepository.java @@ -21,12 +21,12 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.StudentExam; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; import de.tum.cit.aet.artemis.service.exam.ExamQuizQuestionsGenerator; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/BaseExercise.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/BaseExercise.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/BaseExercise.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/domain/BaseExercise.java index bba31df0722c..76e4fbb0b3a6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/BaseExercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/BaseExercise.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.exercise.domain; import java.time.ZonedDateTime; @@ -11,10 +11,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.quiz.config.QuizView; import de.tum.cit.aet.artemis.web.rest.util.StringUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DifficultyLevel.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/DifficultyLevel.java similarity index 66% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DifficultyLevel.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/domain/DifficultyLevel.java index 54af08451f95..1d874e2a163a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DifficultyLevel.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/DifficultyLevel.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.exercise.domain; /** * The DifficultyLevel enumeration. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/Exercise.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/Exercise.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java index e3bcabbbb8b0..91f7d80d280b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/Exercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.exercise.domain; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -48,20 +48,27 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonView; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; +import de.tum.cit.aet.artemis.assessment.domain.GradingInstruction; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; +import de.tum.cit.aet.artemis.atlas.domain.LearningObject; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.communication.domain.Post; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismDetectionConfig; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.quiz.config.QuizView; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.ExerciseDateService; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseLifecycle.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/ExerciseLifecycle.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseLifecycle.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/domain/ExerciseLifecycle.java index cca44f562b52..812b7a6534c7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseLifecycle.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/ExerciseLifecycle.java @@ -1,10 +1,9 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.exercise.domain; import java.time.ZonedDateTime; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseMode.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/ExerciseMode.java similarity index 64% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseMode.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/domain/ExerciseMode.java index 9452145dac70..26e0c60570a6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseMode.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/ExerciseMode.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.exercise.domain; /** * The ExerciseMode enumeration. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseType.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/ExerciseType.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseType.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/domain/ExerciseType.java index f05ddeee440f..f96fafde6d7b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseType.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/ExerciseType.java @@ -1,9 +1,8 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.exercise.domain; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.text.domain.TextExercise; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/IExerciseLifecycle.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/IExerciseLifecycle.java similarity index 77% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/IExerciseLifecycle.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/domain/IExerciseLifecycle.java index 2c0696d043ad..7b9f3152191d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/IExerciseLifecycle.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/IExerciseLifecycle.java @@ -1,8 +1,7 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.exercise.domain; import java.time.ZonedDateTime; -import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/IncludedInOverallScore.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/IncludedInOverallScore.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/IncludedInOverallScore.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/domain/IncludedInOverallScore.java index a955c818024e..73e817f29825 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/IncludedInOverallScore.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/IncludedInOverallScore.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.exercise.domain; /** * Enum that decides diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/InitializationState.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/InitializationState.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/InitializationState.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/domain/InitializationState.java index b99e3d2b2a1d..9280d3cc2d61 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/InitializationState.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/InitializationState.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.exercise.domain; /** * The InitializationState enumeration. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/Submission.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Submission.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/Submission.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/domain/Submission.java index 8ad4b9613f46..8c7d55930eaa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/Submission.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Submission.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.exercise.domain; import java.time.Duration; import java.time.ZonedDateTime; @@ -38,9 +38,12 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.quiz.config.QuizView; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.text.domain.TextSubmission; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/SubmissionType.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/SubmissionType.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/SubmissionType.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/domain/SubmissionType.java index 21171e388399..ac523b344e6a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/SubmissionType.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/SubmissionType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.exercise.domain; /** * MANUAL: submission triggered by a student diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/SubmissionVersion.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/SubmissionVersion.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/domain/SubmissionVersion.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/domain/SubmissionVersion.java index 67486f36cc6e..95a0436f1e37 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/SubmissionVersion.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/SubmissionVersion.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.exercise.domain; import java.time.Instant; @@ -16,6 +16,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; + @Entity @Table(name = "submission_version") @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/Team.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Team.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/Team.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/domain/Team.java index 3ee9227257a5..0b513716a8f2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/Team.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Team.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.exercise.domain; import java.time.Instant; import java.util.HashSet; @@ -22,6 +22,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +import de.tum.cit.aet.artemis.core.domain.AbstractAuditingEntity; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/TeamAssignmentConfig.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/TeamAssignmentConfig.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/domain/TeamAssignmentConfig.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/domain/TeamAssignmentConfig.java index b552ac5680a0..5391f0907b2f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/TeamAssignmentConfig.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/TeamAssignmentConfig.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.exercise.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -14,6 +14,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.validation.constraints.TeamAssignmentConfigConstraints; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/Participant.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/Participant.java index 0e72afb7faee..fec27c5b62e9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/Participant.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/Participant.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; public interface Participant { diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/Participation.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/Participation.java index fab696a6b383..ce891aeb9093 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/Participation.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/Participation.java @@ -34,12 +34,12 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/ParticipationInterface.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/ParticipationInterface.java index 220c20a3e2f7..8e14a4f4baf6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/ParticipationInterface.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/ParticipationInterface.java @@ -4,10 +4,10 @@ import java.util.Optional; import java.util.Set; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.Submission; public interface ParticipationInterface { diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/StudentParticipation.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/StudentParticipation.java index 29a013556743..1e9d409f004f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/StudentParticipation.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/participation/StudentParticipation.java @@ -12,9 +12,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.quiz.config.QuizView; @Entity diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseTypeMetricsEntry.java b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseTypeMetricsEntry.java index 192f70946521..ca44a0ddb650 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseTypeMetricsEntry.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseTypeMetricsEntry.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; /** * Custom record for SQL queries. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TeamImportStrategyType.java b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/TeamImportStrategyType.java similarity index 70% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TeamImportStrategyType.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/dto/TeamImportStrategyType.java index 409bceb51d8e..6cd1bc3aacf3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TeamImportStrategyType.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/TeamImportStrategyType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.exercise.dto; /** * The TeamImportStrategyType enumeration. diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseMetricsRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseMetricsRepository.java index f05b8cc72ba5..ed36a71c6c66 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseMetricsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseMetricsRepository.java @@ -12,7 +12,7 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.web.rest.dto.metrics.ExerciseInformationDTO; import de.tum.cit.aet.artemis.web.rest.dto.metrics.MapEntryLongLong; import de.tum.cit.aet.artemis.web.rest.dto.metrics.ResourceTimestampDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java index 4458514b6a87..37817a8e7be8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java @@ -22,7 +22,7 @@ import org.springframework.transaction.annotation.Transactional; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.dto.ExerciseTypeMetricsEntry; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ParticipationRepository.java index ae0745a4eb46..4532a742b4b4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ParticipationRepository.java @@ -17,7 +17,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java index b63e2e61833a..344747ac9a20 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java @@ -27,15 +27,16 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.StudentExam; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.IdToPresentationScoreSum; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmittedAnswerCount; @@ -490,7 +491,7 @@ Optional findByExerciseIdAndStudentIdAndTestRunWithLatestR * Find all participations of submissions that are submitted and do not already have a manual result and do not belong to test runs. * No manual result means that no user has started an assessment for the corresponding submission yet. *

- * If a student can have multiple submissions per exercise type, the latest not {@link de.tum.cit.aet.artemis.domain.enumeration.SubmissionType#ILLEGAL} ILLEGAL submission (by + * If a student can have multiple submissions per exercise type, the latest not {@link SubmissionType#ILLEGAL} ILLEGAL submission (by * id) will be returned. * * @param correctionRound the correction round the fetched results should belong to diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java index d527c6c19132..bd8ac532d414 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java @@ -16,18 +16,18 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntry; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.text.domain.TextExercise; diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionVersionRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionVersionRepository.java index 623816bfbb0a..33a702e08ab2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionVersionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionVersionRepository.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.SubmissionVersion; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionVersion; /** * Spring Data repository for the SubmissionVersion entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/TeamRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/TeamRepository.java index 578ad3bea73a..63cd4eacf987 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/TeamRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/TeamRepository.java @@ -16,10 +16,10 @@ import org.springframework.data.util.Pair; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; import de.tum.cit.aet.artemis.web.rest.errors.StudentsAlreadyAssignedException; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/FileUploadExercise.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/domain/FileUploadExercise.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/domain/FileUploadExercise.java rename to src/main/java/de/tum/cit/aet/artemis/fileupload/domain/FileUploadExercise.java index 9a9ef4ee5393..84c0000b4879 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/FileUploadExercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/domain/FileUploadExercise.java @@ -1,6 +1,6 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.fileupload.domain; -import static de.tum.cit.aet.artemis.domain.enumeration.ExerciseType.FILE_UPLOAD; +import static de.tum.cit.aet.artemis.exercise.domain.ExerciseType.FILE_UPLOAD; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; @@ -8,7 +8,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; /** * A FileUploadExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/FileUploadSubmission.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/domain/FileUploadSubmission.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/domain/FileUploadSubmission.java rename to src/main/java/de/tum/cit/aet/artemis/fileupload/domain/FileUploadSubmission.java index 0e7eb7ef9287..2c37a5ecbeb1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/FileUploadSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/domain/FileUploadSubmission.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.fileupload.domain; import java.net.URI; import java.nio.file.Path; @@ -11,6 +11,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/fileupload/repository/FileUploadExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/repository/FileUploadExerciseRepository.java index 1b0503e2411c..4a0a53761fe0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/fileupload/repository/FileUploadExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/repository/FileUploadExerciseRepository.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; /** * Spring Data JPA repository for the FileUploadExercise entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/fileupload/repository/FileUploadSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/repository/FileUploadSubmissionRepository.java index 7c2021428090..726851aab27c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/fileupload/repository/FileUploadSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/repository/FileUploadSubmissionRepository.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; /** * Spring Data JPA repository for the FileUploadSubmission entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/IrisTemplate.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/IrisTemplate.java index 0c7b6ca9577e..e1b486a34cbf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/domain/IrisTemplate.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/IrisTemplate.java @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; /** * An IrisTemplate represents a handlebars template for Iris. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/message/IrisMessage.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/message/IrisMessage.java index 0a90b062e2e3..3a902f008e7f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/domain/message/IrisMessage.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/message/IrisMessage.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/message/IrisMessageContent.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/message/IrisMessageContent.java index 2a7fcda9b154..343ac716f23f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/domain/message/IrisMessageContent.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/message/IrisMessageContent.java @@ -17,7 +17,7 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; @Entity @Table(name = "iris_message_content") diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisChatSession.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisChatSession.java index 01a179a4594d..e56b935cc2da 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisChatSession.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisChatSession.java @@ -3,7 +3,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.ManyToOne; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; @Entity public abstract class IrisChatSession extends IrisSession { diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisCourseChatSession.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisCourseChatSession.java index 1ac52cea110f..3acf0f65c8eb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisCourseChatSession.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisCourseChatSession.java @@ -9,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; /** * An IrisCourseChatSession represents a conversation between a user and an LLM. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisExerciseChatSession.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisExerciseChatSession.java index 5a14ea4caa75..5989e8e9a5e3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisExerciseChatSession.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisExerciseChatSession.java @@ -9,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; /** * An IrisExerciseChatSession represents a conversation between a user and an LLM. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisSession.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisSession.java index 5e8cbaf25f38..3e6240a383de 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisSession.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/session/IrisSession.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisCourseSettings.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisCourseSettings.java index 020735cb3974..2354ffd3c142 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisCourseSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisCourseSettings.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Course; /** * An {@link IrisSettings} implementation for course specific settings. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisExerciseSettings.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisExerciseSettings.java index 63c1fe91b5b1..410bbde1954c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisExerciseSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisExerciseSettings.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; /** * An {@link IrisSettings} implementation for exercise specific settings. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSettings.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSettings.java index 5f1029add7ee..355dc4a9ebfc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSettings.java @@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; /** * IrisSettings is an abstract super class for the specific settings types. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSubSettings.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSubSettings.java index 3bc8ecfc4148..0af311fd9b64 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSubSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSubSettings.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; /** * IrisSubSettings is an abstract super class for the specific sub settings types. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisCourseChatSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisCourseChatSessionRepository.java index a96e4c6e3fb6..10d9d87904c1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisCourseChatSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisCourseChatSessionRepository.java @@ -12,8 +12,8 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.iris.domain.session.IrisCourseChatSession; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisExerciseChatSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisExerciseChatSessionRepository.java index 8f10d7216795..baca220bf8bf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisExerciseChatSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisExerciseChatSessionRepository.java @@ -12,8 +12,8 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.iris.domain.session.IrisExerciseChatSession; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/Attachment.java b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/Attachment.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/domain/Attachment.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/domain/Attachment.java index fe69983b0caf..6806850fd86b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/Attachment.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/Attachment.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.lecture.domain; import java.io.Serializable; import java.time.ZonedDateTime; @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; -import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; /** * A Attachment. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/AttachmentType.java b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/AttachmentType.java similarity index 63% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/AttachmentType.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/domain/AttachmentType.java index 24627d8c0196..392b36d641d7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/AttachmentType.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/AttachmentType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.lecture.domain; /** * The AttachmentType enumeration. diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/domain/AttachmentUnit.java b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/AttachmentUnit.java index da0d6ba16be5..1af955b43d89 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/domain/AttachmentUnit.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/AttachmentUnit.java @@ -15,8 +15,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Attachment; - @Entity @DiscriminatorValue("A") @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/domain/ExerciseUnit.java b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/ExerciseUnit.java index 92210f3a1385..cfed1218740b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/domain/ExerciseUnit.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/ExerciseUnit.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; @Entity @DiscriminatorValue("E") diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/Lecture.java b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/Lecture.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/Lecture.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/domain/Lecture.java index b2add91d1f4b..0163d67ca23d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/Lecture.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/Lecture.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.lecture.domain; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -23,7 +23,8 @@ import com.fasterxml.jackson.annotation.JsonIncludeProperties; import de.tum.cit.aet.artemis.communication.domain.Post; -import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DomainObject; /** * A Lecture. diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/domain/LectureUnit.java b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/LectureUnit.java index bbc4289ea826..5a46db2a15a5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/domain/LectureUnit.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/LectureUnit.java @@ -33,11 +33,10 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import de.tum.cit.aet.artemis.atlas.domain.LearningObject; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.LearningObject; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; @Entity @Table(name = "lecture_unit") diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/domain/LectureUnitCompletion.java b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/LectureUnitCompletion.java index 6e0e9156664f..99b84a8a0a64 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/domain/LectureUnitCompletion.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/LectureUnitCompletion.java @@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; /** * This class models the 'completion' association between a user and a lecture unit. diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/domain/Slide.java b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/Slide.java index dd1cea4764f3..1eb21299bc15 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/domain/Slide.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/Slide.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; @Entity @Table(name = "slide") diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentRepository.java index 1d60345c4da0..30b1068ed687 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentRepository.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Attachment; +import de.tum.cit.aet.artemis.lecture.domain.Attachment; /** * Spring Data repository for the Attachment entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentUnitRepository.java index 26a15ed1cd1a..2f34236d5966 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentUnitRepository.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentType; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureRepository.java index 6fb174f9ac9b..58ec43d73445 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureRepository.java @@ -17,7 +17,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.web.rest.dto.CourseContentCount; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitCompletionRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitCompletionRepository.java index c98b8f8683d4..7d9dab5f8f6f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitCompletionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitCompletionRepository.java @@ -11,8 +11,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.domain.LectureUnitCompletion; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/LtiPlatformConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/lti/domain/LtiPlatformConfiguration.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/LtiPlatformConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/lti/domain/LtiPlatformConfiguration.java index 70c7b89b0444..f33e005996df 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/LtiPlatformConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/domain/LtiPlatformConfiguration.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.lti.domain; import java.util.HashSet; import java.util.Set; @@ -18,6 +18,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.domain.DomainObject; + /** * Represents the configuration for an LTI platform. * Stores details such as registration ID, client ID, and various URIs needed for LTI communication. diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/domain/LtiResourceLaunch.java b/src/main/java/de/tum/cit/aet/artemis/lti/domain/LtiResourceLaunch.java index 86d926f9bc18..830f27870ad2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/domain/LtiResourceLaunch.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/domain/LtiResourceLaunch.java @@ -5,10 +5,9 @@ import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.lti.dto.Lti13LaunchRequest; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/OnlineCourseConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/lti/domain/OnlineCourseConfiguration.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/domain/OnlineCourseConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/lti/domain/OnlineCourseConfiguration.java index 305116e5f95b..43e281ca4a5f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/OnlineCourseConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/domain/OnlineCourseConfiguration.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.lti.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -13,6 +13,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DomainObject; + @Entity @Table(name = "online_course_configuration") @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/repository/Lti13ResourceLaunchRepository.java b/src/main/java/de/tum/cit/aet/artemis/lti/repository/Lti13ResourceLaunchRepository.java index 93acca5aeebe..918d099aa16a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/repository/Lti13ResourceLaunchRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/repository/Lti13ResourceLaunchRepository.java @@ -5,9 +5,9 @@ import jakarta.validation.constraints.NotNull; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.lti.domain.LtiResourceLaunch; public interface Lti13ResourceLaunchRepository extends ArtemisJpaRepository { diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/repository/LtiPlatformConfigurationRepository.java b/src/main/java/de/tum/cit/aet/artemis/lti/repository/LtiPlatformConfigurationRepository.java index cf7b2ebcfe54..e516f92f278b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/repository/LtiPlatformConfigurationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/repository/LtiPlatformConfigurationRepository.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; +import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/repository/OnlineCourseConfigurationRepository.java b/src/main/java/de/tum/cit/aet/artemis/lti/repository/OnlineCourseConfigurationRepository.java index d7cb48835395..d18f3852ddbf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/repository/OnlineCourseConfigurationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/repository/OnlineCourseConfigurationRepository.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; +import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; /** * Spring Data JPA repository for the OnlineCourseConfiguration entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/domain/ApollonDiagram.java b/src/main/java/de/tum/cit/aet/artemis/modeling/domain/ApollonDiagram.java index a39d050a2948..856b634ebb6a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/domain/ApollonDiagram.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/domain/ApollonDiagram.java @@ -11,8 +11,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; +import de.tum.cit.aet.artemis.core.domain.DomainObject; /** * An ApollonDiagram. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DiagramType.java b/src/main/java/de/tum/cit/aet/artemis/modeling/domain/DiagramType.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DiagramType.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/domain/DiagramType.java index f565a767efc6..535071cdc400 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/DiagramType.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/domain/DiagramType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.modeling.domain; /** * The DiagramType enumeration. This has to be exactly the same as defined in Apollon on the client side diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/domain/ModelCluster.java b/src/main/java/de/tum/cit/aet/artemis/modeling/domain/ModelCluster.java index 073ed43f7ac2..197842c6bcfd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/domain/ModelCluster.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/domain/ModelCluster.java @@ -16,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; /** * A ModelCluster. diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/domain/ModelingExercise.java b/src/main/java/de/tum/cit/aet/artemis/modeling/domain/ModelingExercise.java index c7acbfc18e72..76a7de800587 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/domain/ModelingExercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/domain/ModelingExercise.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.modeling.domain; -import static de.tum.cit.aet.artemis.domain.enumeration.ExerciseType.MODELING; +import static de.tum.cit.aet.artemis.exercise.domain.ExerciseType.MODELING; import java.time.ZonedDateTime; @@ -15,9 +15,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; /** * A ModelingExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/domain/ModelingSubmission.java b/src/main/java/de/tum/cit/aet/artemis/modeling/domain/ModelingSubmission.java index 86f717d02a5d..78bef8949ec3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/domain/ModelingSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/domain/ModelingSubmission.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.Submission; /** * A ModelingSubmission. diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismCase.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismCase.java index 7d1bdf0efacc..d3e1cc732f39 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismCase.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismCase.java @@ -19,10 +19,10 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import de.tum.cit.aet.artemis.communication.domain.Post; -import de.tum.cit.aet.artemis.domain.AbstractAuditingEntity; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.AbstractAuditingEntity; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Team; @Entity @Table(name = "plagiarism_case") diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/PlagiarismCheckState.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismCheckState.java similarity index 54% rename from src/main/java/de/tum/cit/aet/artemis/domain/PlagiarismCheckState.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismCheckState.java index 19421fc5d0d0..4bdf9863e89b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/PlagiarismCheckState.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismCheckState.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.plagiarism.domain; public enum PlagiarismCheckState { RUNNING, COMPLETED diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismComparison.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismComparison.java index c4e6e888f58b..65a8b1fedfb2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismComparison.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismComparison.java @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import de.jplag.JPlagComparison; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextSubmissionElement; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismDetectionConfig.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismDetectionConfig.java index 96b2c766d994..549778ab34e6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismDetectionConfig.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismDetectionConfig.java @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; /** * Stores configuration for manual and continuous plagiarism control. diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismMatch.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismMatch.java index 8305dddf38cf..02efea3c5ab6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismMatch.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismMatch.java @@ -6,6 +6,7 @@ import jakarta.persistence.Embeddable; import de.jplag.Match; +import de.tum.cit.aet.artemis.core.domain.DomainObject; /** * A `PlagiarismMatch` is a sequence of identical elements of both submissions. @@ -78,10 +79,10 @@ public void setLength(int length) { *

* Note: * This is required here since unlike other domain classes this one does not extend - * {@link de.tum.cit.aet.artemis.domain.DomainObject} since it only represents an {@link Embeddable} part of another + * {@link DomainObject} since it only represents an {@link Embeddable} part of another * entity. * Therefore, it does inherit neither the database ID attribute nor the matching - * {@link de.tum.cit.aet.artemis.domain.DomainObject#equals(Object)} implementation. + * {@link DomainObject#equals(Object)} implementation. * Instead, we have to compare all relevant attributes here. * * @param other Some other object. diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismResult.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismResult.java index ff14dbd15c12..421b72e0945f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismResult.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismResult.java @@ -32,8 +32,8 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import de.tum.cit.aet.artemis.domain.AbstractAuditingEntity; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.core.domain.AbstractAuditingEntity; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismSubmission.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismSubmission.java index b9c4eb381373..2be1585f3803 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismSubmission.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import de.jplag.Submission; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingSubmissionElement; diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismSubmissionElement.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismSubmissionElement.java index fbb64f994325..23f23e2a294c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismSubmissionElement.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/PlagiarismSubmissionElement.java @@ -9,7 +9,7 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/text/TextPlagiarismResult.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/text/TextPlagiarismResult.java index 59d27c06c41d..69110e698a48 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/text/TextPlagiarismResult.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/text/TextPlagiarismResult.java @@ -3,7 +3,7 @@ import jakarta.persistence.Entity; import de.jplag.JPlagResult; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismResult; diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/text/TextSubmissionElement.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/text/TextSubmissionElement.java index 3e3b7750cd63..1fc1351bc9e1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/text/TextSubmissionElement.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/text/TextSubmissionElement.java @@ -6,10 +6,10 @@ import jakarta.persistence.Entity; import de.jplag.Token; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmission; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmissionElement; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @Entity // TODO: use @DiscriminatorValue(value = "T") or even better use integers (because they use less space in the database) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/AbstractBaseProgrammingExerciseParticipation.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/AbstractBaseProgrammingExerciseParticipation.java index f7692a85531f..ca895a16fa2d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/AbstractBaseProgrammingExerciseParticipation.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/AbstractBaseProgrammingExerciseParticipation.java @@ -7,8 +7,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.quiz.config.QuizView; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/AeolusTarget.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/AeolusTarget.java similarity index 84% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/AeolusTarget.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/AeolusTarget.java index 01021657dcb0..67a63d02ebd1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/AeolusTarget.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/AeolusTarget.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.programming.domain; /** * Targets Aeolus is able to create build plans for. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/AuxiliaryRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/AuxiliaryRepository.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/AuxiliaryRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/AuxiliaryRepository.java index 75def08c2bf5..8f353ccfbed1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/AuxiliaryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/AuxiliaryRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.programming.domain; import java.net.URISyntaxException; import java.util.Objects; @@ -17,6 +17,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.domain.DomainObject; + @Entity @Table(name = "programming_exercise_auxiliary_repositories") @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/BuildJob.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildJob.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/BuildJob.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildJob.java index 1741af4e68a0..8bac217ad7ce 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/BuildJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildJob.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.programming.domain; import java.time.ZonedDateTime; @@ -13,8 +13,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; @Entity diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/BuildLogEntry.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildLogEntry.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/domain/BuildLogEntry.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildLogEntry.java index d19b2a19ff46..84c5f2c72901 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/BuildLogEntry.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildLogEntry.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.programming.domain; import java.time.ZonedDateTime; @@ -13,6 +13,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.domain.DomainObject; + /** * Created by Josias Montag on 11.11.16. */ diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildLogStatisticsEntry.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildLogStatisticsEntry.java index 4623fd26d80a..c342fd374510 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildLogStatisticsEntry.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildLogStatisticsEntry.java @@ -14,8 +14,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.core.domain.DomainObject; @Entity @Table(name = "build_log_statistics_entry") diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/BuildPlan.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildPlan.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/domain/BuildPlan.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildPlan.java index 3ace1f2e3c8d..873101a389dd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/BuildPlan.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildPlan.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.programming.domain; import java.util.HashSet; import java.util.Objects; @@ -19,6 +19,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.domain.DomainObject; + @Entity @Table(name = "build_plan", uniqueConstraints = { @UniqueConstraint(columnNames = { "build_plan" }) }) @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/BuildPlanType.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildPlanType.java similarity index 81% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/BuildPlanType.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildPlanType.java index d3220f6caa04..639a39a375a8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/BuildPlanType.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildPlanType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.programming.domain; public enum BuildPlanType { diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/BuildRunState.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildRunState.java similarity index 51% rename from src/main/java/de/tum/cit/aet/artemis/domain/BuildRunState.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildRunState.java index e2836db7e2ba..3b9c29dd4015 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/BuildRunState.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildRunState.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.programming.domain; public enum BuildRunState { RUNNING, COMPLETED diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/BuildStatus.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildStatus.java similarity index 81% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/BuildStatus.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildStatus.java index fbc9cb23d59a..a8d3e47c40fc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/BuildStatus.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildStatus.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.programming.domain; /** * SUCCESSFUL: the build was successful diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/Commit.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/Commit.java similarity index 79% rename from src/main/java/de/tum/cit/aet/artemis/domain/Commit.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/Commit.java index ee7a3eeb604b..70502a563903 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/Commit.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/Commit.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.programming.domain; import jakarta.annotation.Nullable; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/File.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/File.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/domain/File.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/File.java index 82144cf568d8..9676e28ae693 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/File.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/File.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.programming.domain; import java.nio.file.Path; import java.util.regex.Pattern; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/FileType.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/FileType.java new file mode 100644 index 000000000000..59d6d5fd6d14 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/FileType.java @@ -0,0 +1,5 @@ +package de.tum.cit.aet.artemis.programming.domain; + +public enum FileType { + FILE, FOLDER +} diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ParticipationLifecycle.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ParticipationLifecycle.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ParticipationLifecycle.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/ParticipationLifecycle.java index eda0c4eeea68..18a8fdd4bd36 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ParticipationLifecycle.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ParticipationLifecycle.java @@ -1,7 +1,9 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.programming.domain; import java.util.Optional; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseLifecycle; + /** * Due to individual due dates for exercises some participations might need a * different schedule than the exercise they belong to. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ParticipationVCSAccessToken.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ParticipationVCSAccessToken.java index ae2b10e936cb..e76d3a4c1d04 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ParticipationVCSAccessToken.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ParticipationVCSAccessToken.java @@ -9,8 +9,8 @@ import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingExercise.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingExercise.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java index c7e19d5d5754..f7cee71b5932 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingExercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java @@ -1,6 +1,6 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.programming.domain; -import static de.tum.cit.aet.artemis.domain.enumeration.ExerciseType.PROGRAMMING; +import static de.tum.cit.aet.artemis.exercise.domain.ExerciseType.PROGRAMMING; import java.net.URISyntaxException; import java.time.ZonedDateTime; @@ -36,18 +36,16 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.domain.Visibility; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingExerciseBuildConfig.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseBuildConfig.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingExerciseBuildConfig.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseBuildConfig.java index b595bb4652eb..4533826d8d9a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingExerciseBuildConfig.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseBuildConfig.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.programming.domain; import java.util.Objects; import java.util.UUID; @@ -18,6 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; import de.tum.cit.aet.artemis.service.connectors.vcs.AbstractVersionControlService; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseParticipation.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseParticipation.java index 9b4b5f5f7bec..d6e555fd96a6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseParticipation.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseParticipation.java @@ -12,9 +12,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.exercise.domain.participation.ParticipationInterface; public interface ProgrammingExerciseParticipation extends ParticipationInterface { diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseStudentParticipation.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseStudentParticipation.java index 4e455edea33e..443d34b9609a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseStudentParticipation.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseStudentParticipation.java @@ -8,8 +8,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.quiz.config.QuizView; import de.tum.cit.aet.artemis.service.connectors.vcs.AbstractVersionControlService; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingExerciseTestCase.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseTestCase.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingExerciseTestCase.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseTestCase.java index b02e83cc37f3..dae43fce9dd9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingExerciseTestCase.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseTestCase.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.programming.domain; import static de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTestCaseType.DEFAULT; @@ -26,8 +26,11 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.domain.Visibility; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTestCaseType; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ProgrammingLanguage.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingLanguage.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ProgrammingLanguage.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingLanguage.java index 353ab470ae66..ea435ac5ea5a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ProgrammingLanguage.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingLanguage.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.programming.domain; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingSubmission.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingSubmission.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingSubmission.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingSubmission.java index 17bf684bcbc9..02fa279b0031 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/ProgrammingSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingSubmission.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.programming.domain; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -19,9 +19,9 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; -import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; /** * A ProgrammingSubmission. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ProjectType.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProjectType.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ProjectType.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/ProjectType.java index 8b43929299f2..8a6262a059b0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ProjectType.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProjectType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.programming.domain; import java.util.Locale; diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/Repository.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/Repository.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/domain/Repository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/Repository.java index 3d6d2f753925..5ede60e9bed7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/Repository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/Repository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.programming.domain; import java.io.IOException; import java.nio.file.Path; @@ -6,7 +6,6 @@ import org.eclipse.jgit.lib.BaseRepositoryBuilder; -import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/RepositoryType.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/RepositoryType.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/RepositoryType.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/RepositoryType.java index 42db072cd900..70bd5a1fd032 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/RepositoryType.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/RepositoryType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.programming.domain; public enum RepositoryType { diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/SolutionProgrammingExerciseParticipation.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/SolutionProgrammingExerciseParticipation.java index a290bbc7b64b..46b837f0df3b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/SolutionProgrammingExerciseParticipation.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/SolutionProgrammingExerciseParticipation.java @@ -7,8 +7,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; - @Entity @DiscriminatorValue(value = "SPEP") @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/StaticCodeAnalysisCategory.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/StaticCodeAnalysisCategory.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/domain/StaticCodeAnalysisCategory.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/StaticCodeAnalysisCategory.java index 387716457c91..f4912e89b375 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/StaticCodeAnalysisCategory.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/StaticCodeAnalysisCategory.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.programming.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -14,7 +14,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.CategoryState; +import de.tum.cit.aet.artemis.assessment.domain.CategoryState; +import de.tum.cit.aet.artemis.core.domain.DomainObject; /** * Entity for storing static code analysis categories and their settings. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/StaticCodeAnalysisDefaultCategory.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/StaticCodeAnalysisDefaultCategory.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/domain/StaticCodeAnalysisDefaultCategory.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/StaticCodeAnalysisDefaultCategory.java index e60f6111e2a8..e338c963fa23 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/StaticCodeAnalysisDefaultCategory.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/StaticCodeAnalysisDefaultCategory.java @@ -1,9 +1,8 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.programming.domain; import java.util.List; -import de.tum.cit.aet.artemis.domain.enumeration.CategoryState; -import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.assessment.domain.CategoryState; /** * Read-only POJO for storing static code analysis configurations initialized at start-up of Artemis diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/StaticCodeAnalysisTool.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/StaticCodeAnalysisTool.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/StaticCodeAnalysisTool.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/StaticCodeAnalysisTool.java index dbdca713e748..9068d7fadd9c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/StaticCodeAnalysisTool.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/StaticCodeAnalysisTool.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.programming.domain; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/TemplateProgrammingExerciseParticipation.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/TemplateProgrammingExerciseParticipation.java index 874b4206b875..2d441961ce63 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/TemplateProgrammingExerciseParticipation.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/TemplateProgrammingExerciseParticipation.java @@ -7,8 +7,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; - @Entity @DiscriminatorValue(value = "TPEP") @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/VcsRepositoryUri.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/VcsRepositoryUri.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/domain/VcsRepositoryUri.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/VcsRepositoryUri.java index 1dea5f77ad0a..b757514f3a39 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/VcsRepositoryUri.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/VcsRepositoryUri.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.programming.domain; import java.net.URI; import java.net.URISyntaxException; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/CoverageFileReport.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/CoverageFileReport.java index ae89f9f0a464..518c4bad4550 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/CoverageFileReport.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/CoverageFileReport.java @@ -16,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; @Entity @Table(name = "coverage_file_report") diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/CoverageReport.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/CoverageReport.java index adf45f112ad7..9349483cb4e6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/CoverageReport.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/CoverageReport.java @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; /** * A testwise coverage report representing the executed code by file path of a single ProgrammingExerciseTestCase. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ExerciseHint.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ExerciseHint.java index 6c53cf7c0e2d..81793d454701 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ExerciseHint.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ExerciseHint.java @@ -28,8 +28,8 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; /** * An ExerciseHint. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ExerciseHintActivation.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ExerciseHintActivation.java index b925d074001b..595c90d61abb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ExerciseHintActivation.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ExerciseHintActivation.java @@ -12,8 +12,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; @Entity @Table(name = "exercise_hint_activation") diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseGitDiffEntry.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseGitDiffEntry.java index e846c7a00ecb..23095ebaea55 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseGitDiffEntry.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseGitDiffEntry.java @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; /** * A single difference from a git-diff report between the template and solution repositories. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseGitDiffReport.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseGitDiffReport.java index 60f2cd2088c6..b63d3fd713b1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseGitDiffReport.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseGitDiffReport.java @@ -16,8 +16,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; /** * A git-diff report representing a git-diff between the template and solution repositories of a ProgrammingExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseSolutionEntry.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseSolutionEntry.java index a68967dac14f..01cf4ce871b4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseSolutionEntry.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseSolutionEntry.java @@ -13,8 +13,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; /** * A ProgrammingExerciseSolutionEntry represents a single change in a file that a students has to make in order to pass the related test. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseTask.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseTask.java index 300a88f93ff8..4a7a26ddee49 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseTask.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ProgrammingExerciseTask.java @@ -21,9 +21,9 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; /** * A ProgrammingExerciseTask diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/TestwiseCoverageReportEntry.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/TestwiseCoverageReportEntry.java index 93c997abc622..60383357c9dc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/TestwiseCoverageReportEntry.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/TestwiseCoverageReportEntry.java @@ -11,8 +11,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; /** * A single entry from testwise coverage report by file path and consecutive executed code block. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ide/Ide.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ide/Ide.java index ed1ae2d317c6..219bfc78bd44 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ide/Ide.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ide/Ide.java @@ -10,7 +10,7 @@ import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; @Entity @Table(name = "ide") diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ide/UserIdeMapping.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ide/UserIdeMapping.java index 67d127077693..07fbb72e68e4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ide/UserIdeMapping.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ide/UserIdeMapping.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; @Entity @Table(name = "user_ide_mapping") diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/submissionpolicy/SubmissionPolicy.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/submissionpolicy/SubmissionPolicy.java index 705d45be0f01..c85c607b8601 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/submissionpolicy/SubmissionPolicy.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/submissionpolicy/SubmissionPolicy.java @@ -17,8 +17,8 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; /** * Represents an abstract submission policy. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshConstants.java b/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshConstants.java index 245f38d4530c..b335ceccd7a6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshConstants.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshConstants.java @@ -5,7 +5,7 @@ import org.apache.sshd.common.AttributeRepository; import org.springframework.context.annotation.Profile; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; @Profile(PROFILE_LOCALVC) public class SshConstants { diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshGitCommand.java b/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshGitCommand.java index ace2d54bc32a..bda6f1d18d19 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshGitCommand.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshGitCommand.java @@ -20,7 +20,7 @@ import org.eclipse.jgit.transport.UploadPack; import org.eclipse.jgit.util.FS; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCPostPushHook; import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCPrePushHook; import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCServletService; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/AuxiliaryRepositoryRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/AuxiliaryRepositoryRepository.java index b49aed5e6518..dc127ff01982 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/AuxiliaryRepositoryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/AuxiliaryRepositoryRepository.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; /** * Spring Data repository for the AuxiliaryRepository entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java index 21472d73aef8..5ef14ee4cd88 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java @@ -19,10 +19,10 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.BuildJob; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; +import de.tum.cit.aet.artemis.programming.domain.BuildJob; +import de.tum.cit.aet.artemis.programming.domain.BuildStatus; import de.tum.cit.aet.artemis.service.connectors.localci.dto.DockerImageBuild; import de.tum.cit.aet.artemis.service.connectors.localci.dto.ResultBuildJob; import de.tum.cit.aet.artemis.service.dto.BuildJobResultCountDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogEntryRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogEntryRepository.java index fec6645bb8a1..a7d1b07c535b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogEntryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogEntryRepository.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; /** * Spring Data JPA repository for the BuildLogEntry entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogStatisticsEntryRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogStatisticsEntryRepository.java index 0de400cf038c..e9a26fe0c3a1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogStatisticsEntryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogStatisticsEntryRepository.java @@ -11,9 +11,9 @@ import org.springframework.transaction.annotation.Transactional; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.BuildLogStatisticsEntry; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.web.rest.dto.BuildLogStatisticsDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildPlanRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildPlanRepository.java index aaec68045c22..f025c6a52aa3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildPlanRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildPlanRepository.java @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.BuildPlan; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.BuildPlan; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; public interface BuildPlanRepository extends ArtemisJpaRepository { diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseBuildConfigRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseBuildConfigRepository.java index 4e2744de64b5..e543335002df 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseBuildConfigRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseBuildConfigRepository.java @@ -9,8 +9,8 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java index 058c2ed8cb92..d0c860be64fa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java @@ -22,13 +22,14 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntry; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.base.DynamicSpecificationRepository; import de.tum.cit.aet.artemis.core.repository.base.FetchOptions; -import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.domain.Exercise_; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise_; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; @@ -363,7 +364,7 @@ Optional findByIdWithEagerBuildConfigTestCasesStaticCodeAna /** * Returns all programming exercises that have a due date after {@code now} and have tests marked with - * {@link de.tum.cit.aet.artemis.domain.enumeration.Visibility#AFTER_DUE_DATE} but no buildAndTestStudentSubmissionsAfterDueDate. + * {@link Visibility#AFTER_DUE_DATE} but no buildAndTestStudentSubmissionsAfterDueDate. * * @param now the time after which the due date of the exercise has to be * @return List (can be empty) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseTestCaseRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseTestCaseRepository.java index d01dd24e6c31..b067931544ef 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseTestCaseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseTestCaseRepository.java @@ -10,8 +10,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; /** * Spring Data repository for the ProgrammingExerciseTestCase entity. @@ -75,10 +76,10 @@ default ProgrammingExerciseTestCase findByIdWithExerciseElseThrow(long testCaseI Set findByExerciseIdAndActive(long exerciseId, Boolean active); /** - * Returns the number of test cases marked as {@link de.tum.cit.aet.artemis.domain.enumeration.Visibility#AFTER_DUE_DATE} for the given exercise. + * Returns the number of test cases marked as {@link Visibility#AFTER_DUE_DATE} for the given exercise. * * @param exerciseId the exercise which test cases should be considered. - * @return the number of test cases marked as {@link de.tum.cit.aet.artemis.domain.enumeration.Visibility#AFTER_DUE_DATE}. + * @return the number of test cases marked as {@link Visibility#AFTER_DUE_DATE}. */ @Query(""" SELECT COUNT(DISTINCT testCase) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingSubmissionRepository.java index 91ce974ff318..ac4f00f3f46f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingSubmissionRepository.java @@ -18,7 +18,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.service.dto.ProgrammingSubmissionIdAndSubmissionDateDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/StaticCodeAnalysisCategoryRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/StaticCodeAnalysisCategoryRepository.java index 89fecc6582f6..d8e23cdb63ee 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/StaticCodeAnalysisCategoryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/StaticCodeAnalysisCategoryRepository.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisCategory; +import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisCategory; /** * Spring Data repository for the StaticCodeAnalysisCategory entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageReportRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageReportRepository.java index e5b2ae757c08..4d42ca916bde 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageReportRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageReportRepository.java @@ -16,8 +16,8 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.DomainObject; import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageReport; import de.tum.cit.aet.artemis.service.dto.CoverageReportAndSubmissionDateDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/AbstractQuizSubmission.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/AbstractQuizSubmission.java index 82c54a9a8eec..38368058eb91 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/AbstractQuizSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/AbstractQuizSubmission.java @@ -17,8 +17,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.domain.Submission; import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.quiz.config.QuizView; @Entity diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/AnswerOption.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/AnswerOption.java index f2563568b1d9..b2229283844b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/AnswerOption.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/AnswerOption.java @@ -13,7 +13,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.quiz.config.QuizView; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragAndDropMapping.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragAndDropMapping.java index 4be8afd16746..60352e8e3df6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragAndDropMapping.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragAndDropMapping.java @@ -13,7 +13,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.quiz.config.QuizView; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragItem.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragItem.java index 2f4d37d7e471..c998ed9ccf8f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragItem.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragItem.java @@ -26,7 +26,6 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; -import de.tum.cit.aet.artemis.domain.TempIdObject; import de.tum.cit.aet.artemis.quiz.config.QuizView; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DropLocation.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DropLocation.java index 7ad38666c14b..8237750bf7b0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DropLocation.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DropLocation.java @@ -18,7 +18,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.domain.TempIdObject; import de.tum.cit.aet.artemis.quiz.config.QuizView; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/MultipleChoiceQuestion.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/MultipleChoiceQuestion.java index 60c944b17b94..0060f82e44f1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/MultipleChoiceQuestion.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/MultipleChoiceQuestion.java @@ -21,7 +21,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.domain.enumeration.ScoringType; import de.tum.cit.aet.artemis.quiz.config.QuizView; import de.tum.cit.aet.artemis.quiz.domain.scoring.ScoringStrategy; import de.tum.cit.aet.artemis.quiz.domain.scoring.ScoringStrategyMultipleChoiceAllOrNothing; diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/MultipleChoiceSubmittedAnswer.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/MultipleChoiceSubmittedAnswer.java index a456c08bcbb2..18e5145b4ddf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/MultipleChoiceSubmittedAnswer.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/MultipleChoiceSubmittedAnswer.java @@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.quiz.config.QuizView; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/QuizAction.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizAction.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/QuizAction.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizAction.java index d9b10d5aeb8a..b32174bd1745 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/QuizAction.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizAction.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.quiz.domain; public enum QuizAction { diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizBatch.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizBatch.java index f73cfd6a873c..1a3faadb4a8a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizBatch.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizBatch.java @@ -17,7 +17,7 @@ import com.fasterxml.jackson.annotation.JsonView; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.quiz.config.QuizView; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizExercise.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizExercise.java index 323978b2035c..d476a26cbcde 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizExercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizExercise.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.quiz.domain; -import static de.tum.cit.aet.artemis.domain.enumeration.ExerciseType.QUIZ; +import static de.tum.cit.aet.artemis.exercise.domain.ExerciseType.QUIZ; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -34,11 +34,10 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; -import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.quiz.config.QuizView; diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizGroup.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizGroup.java index 34974ce38f71..c84b723a61c3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizGroup.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizGroup.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; @Entity @Table(name = "quiz_group") diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/QuizMode.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizMode.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/QuizMode.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizMode.java index 0263ddb7f9fb..f9ad0e5bd7ad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/QuizMode.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizMode.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.quiz.domain; /** * The QuizMode enumeration. Describe the different (participation) modes of a quiz. diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizPool.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizPool.java index eca2fe3506b9..e48c3661a466 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizPool.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizPool.java @@ -17,7 +17,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.quiz.config.QuizView; diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizQuestion.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizQuestion.java index 822b08fee764..73c5c4ee3e48 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizQuestion.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizQuestion.java @@ -27,8 +27,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.enumeration.ScoringType; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.quiz.config.QuizView; import de.tum.cit.aet.artemis.quiz.domain.scoring.ScoringStrategy; diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizStatistic.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizStatistic.java index ed517edb789c..49b730e53416 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizStatistic.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizStatistic.java @@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; /** * A QuizStatistic. diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizStatisticCounter.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizStatisticCounter.java index d9f1ce5d6798..60894749c1a0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizStatisticCounter.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizStatisticCounter.java @@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; /** * A QuizStatisticCounter. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ScoringType.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ScoringType.java similarity index 73% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ScoringType.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/ScoringType.java index 1db11c6e2b7b..073ba188ab6d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/ScoringType.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ScoringType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.quiz.domain; /** * The ScoringType enumeration. diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerMapping.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerMapping.java index f6e33a8779e1..2c39bd098a5b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerMapping.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerMapping.java @@ -13,7 +13,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.quiz.config.QuizView; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSolution.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSolution.java index 5b30156d6f7a..f55298937de9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSolution.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSolution.java @@ -18,7 +18,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.domain.TempIdObject; import de.tum.cit.aet.artemis.quiz.config.QuizView; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSpot.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSpot.java index 05f8590def23..2d428efa5acb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSpot.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSpot.java @@ -18,7 +18,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.domain.TempIdObject; import de.tum.cit.aet.artemis.quiz.config.QuizView; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSubmittedText.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSubmittedText.java index 6c269ef85033..20af145a0e44 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSubmittedText.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/ShortAnswerSubmittedText.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.quiz.config.QuizView; import me.xdrop.fuzzywuzzy.FuzzySearch; diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/SubmittedAnswer.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/SubmittedAnswer.java index d81c473e35d8..46df8c2ff5a4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/SubmittedAnswer.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/SubmittedAnswer.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.quiz.config.QuizView; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/TempIdObject.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/TempIdObject.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/domain/TempIdObject.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/domain/TempIdObject.java index 30049ffda17f..efb8575103da 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/TempIdObject.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/TempIdObject.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain; +package de.tum.cit.aet.artemis.quiz.domain; import java.util.Objects; @@ -6,6 +6,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.domain.DomainObject; + @JsonInclude(JsonInclude.Include.NON_EMPTY) public abstract class TempIdObject extends DomainObject { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AbstractQuizSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/AbstractQuizSubmissionService.java index 8ed29118b893..3fec3e51f903 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AbstractQuizSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AbstractQuizSubmissionService.java @@ -10,8 +10,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.quiz.domain.AbstractQuizSubmission; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AssessmentDashboardService.java b/src/main/java/de/tum/cit/aet/artemis/service/AssessmentDashboardService.java index 0b8ec4f327c4..d32a65b64513 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AssessmentDashboardService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AssessmentDashboardService.java @@ -13,17 +13,17 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.ExampleSubmission; import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntry; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; -import de.tum.cit.aet.artemis.domain.ExampleSubmission; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorParticipationStatus; import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/service/AssessmentService.java index e1fea13d7c50..f0ef11b057a2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AssessmentService.java @@ -10,22 +10,22 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.domain.AssessmentNote; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.ComplaintResponse; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.connectors.lti.LtiNewResultService; import de.tum.cit.aet.artemis.service.exam.ExamDateService; import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java b/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java index d18d2c956834..e55ce4b73b00 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java @@ -16,10 +16,10 @@ import org.springframework.web.multipart.MultipartFile; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.domain.Attachment; -import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; +import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.Slide; import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AuthorizationCheckService.java b/src/main/java/de/tum/cit/aet/artemis/service/AuthorizationCheckService.java index 9a51e56ff0b5..a6f929708d99 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AuthorizationCheckService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AuthorizationCheckService.java @@ -19,21 +19,21 @@ import com.google.errorprone.annotations.CheckReturnValue; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.core.domain.Authority; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Organization; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.Authority; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.Organization; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.service.exam.ExamDateService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/BonusService.java b/src/main/java/de/tum/cit/aet/artemis/service/BonusService.java index a85efad02113..b185d80fd0da 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/BonusService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/BonusService.java @@ -5,13 +5,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.Bonus; +import de.tum.cit.aet.artemis.assessment.domain.GradeStep; +import de.tum.cit.aet.artemis.assessment.domain.GradeType; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; +import de.tum.cit.aet.artemis.assessment.domain.IBonusStrategy; import de.tum.cit.aet.artemis.assessment.repository.BonusRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; -import de.tum.cit.aet.artemis.domain.Bonus; -import de.tum.cit.aet.artemis.domain.GradeStep; -import de.tum.cit.aet.artemis.domain.GradeType; -import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.IBonusStrategy; import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/BuildLogEntryService.java b/src/main/java/de/tum/cit/aet/artemis/service/BuildLogEntryService.java index 9dd2211b2b01..121bdadde0f4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/BuildLogEntryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/BuildLogEntryService.java @@ -23,9 +23,9 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.BuildLogEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ComplaintResponseService.java b/src/main/java/de/tum/cit/aet/artemis/service/ComplaintResponseService.java index 577cc74f70b7..a1272061b783 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ComplaintResponseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ComplaintResponseService.java @@ -9,16 +9,16 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.Complaint; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Complaint; -import de.tum.cit.aet.artemis.domain.ComplaintResponse; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ComplaintService.java b/src/main/java/de/tum/cit/aet/artemis/service/ComplaintService.java index 716b0a793d23..b494d8924a81 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ComplaintService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ComplaintService.java @@ -15,22 +15,22 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Complaint; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntry; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Complaint; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ConductAgreementService.java b/src/main/java/de/tum/cit/aet/artemis/service/ConductAgreementService.java index 11bcea3b7d8c..f9662f9f44ce 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ConductAgreementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ConductAgreementService.java @@ -5,10 +5,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.domain.ConductAgreement; import de.tum.cit.aet.artemis.communication.repository.ConductAgreementRepository; -import de.tum.cit.aet.artemis.domain.ConductAgreement; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; /** * Service Implementation for managing a user's agreement to a course's code of conduct. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ConsistencyCheckService.java b/src/main/java/de/tum/cit/aet/artemis/service/ConsistencyCheckService.java index 307bcac6029d..e41b1917a42c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ConsistencyCheckService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ConsistencyCheckService.java @@ -9,7 +9,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationService.java b/src/main/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationService.java index 1babb56fbfc3..a49b206880a0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationService.java @@ -23,15 +23,14 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; @@ -39,6 +38,7 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.dto.MaxAndReachablePoints; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismCaseService.PlagiarismMapping; import de.tum.cit.aet.artemis.web.rest.dto.BonusSourceResultDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java b/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java index 0d33f03e3cf4..dcf4546582fc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.service; +import static de.tum.cit.aet.artemis.assessment.domain.ComplaintType.COMPLAINT; +import static de.tum.cit.aet.artemis.assessment.domain.ComplaintType.MORE_FEEDBACK; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.domain.enumeration.ComplaintType.COMPLAINT; -import static de.tum.cit.aet.artemis.domain.enumeration.ComplaintType.MORE_FEEDBACK; import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; import java.nio.file.Files; @@ -43,6 +43,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; @@ -52,35 +53,34 @@ import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.domain.notification.GroupNotification; import de.tum.cit.aet.artemis.communication.repository.GroupNotificationRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.dto.StatisticsEntry; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.StatisticsRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.exam.ExamDeletionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/EmailSummaryService.java b/src/main/java/de/tum/cit/aet/artemis/service/EmailSummaryService.java index 9eb6de21dcd9..4e728fe1e318 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/EmailSummaryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/EmailSummaryService.java @@ -13,10 +13,10 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.notifications.MailService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExampleSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExampleSubmissionService.java index 9f32915ab8ad..0427bf5354e3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExampleSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExampleSubmissionService.java @@ -10,13 +10,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.assessment.domain.GradingInstruction; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; -import de.tum.cit.aet.artemis.domain.ExampleSubmission; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.GradingInstruction; -import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDateService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDateService.java index c446d5084e18..237773e5459f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDateService.java @@ -10,8 +10,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.ParticipationInterface; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDeletionService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDeletionService.java index 5e4696dee46f..7641e52037e3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDeletionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDeletionService.java @@ -17,15 +17,15 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; import de.tum.cit.aet.artemis.lecture.repository.ExerciseUnitRepository; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseImportService.java index 452800b17e76..7d01c8d5b2ed 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseImportService.java @@ -7,14 +7,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.GradingInstruction; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.GradingInstruction; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismDetectionConfig; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleService.java index a16419242792..6c8a6f9bf4fb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleService.java @@ -14,11 +14,11 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; -import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseLifecycle; import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.service.util.Tuple; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseScoresChartService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseScoresChartService.java index 08143d072522..4968ede0a026 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseScoresChartService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseScoresChartService.java @@ -17,9 +17,9 @@ import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.TeamScoreRepository; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseScoresAggregatedInformation; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseScoresDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseService.java index fbb17751f342..cc2ba142b207 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseService.java @@ -27,7 +27,13 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintType; +import de.tum.cit.aet.artemis.assessment.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; +import de.tum.cit.aet.artemis.assessment.domain.GradingInstruction; import de.tum.cit.aet.artemis.assessment.domain.ParticipantScore; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; @@ -37,20 +43,13 @@ import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ExampleSubmission; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.GradingInstruction; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; @@ -58,6 +57,7 @@ import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.lti.domain.LtiResourceLaunch; import de.tum.cit.aet.artemis.lti.repository.Lti13ResourceLaunchRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.exam.ExamLiveEventsService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseSpecificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseSpecificationService.java index f25bdb4e0aa0..09f104f60316 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseSpecificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseSpecificationService.java @@ -11,18 +11,18 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.domain.Course_; -import de.tum.cit.aet.artemis.domain.Exercise; import de.tum.cit.aet.artemis.domain.Exercise_; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.domain.ProgrammingExercise_; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.Exam_; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup_; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/FeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/service/FeedbackService.java index 42f850e24d93..f2fbaebda8e9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/FeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/FeedbackService.java @@ -9,9 +9,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.LongFeedbackText; import de.tum.cit.aet.artemis.assessment.repository.LongFeedbackTextRepository; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.LongFeedbackText; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/FilePathService.java b/src/main/java/de/tum/cit/aet/artemis/service/FilePathService.java index be6fb05ca971..b129614bfa84 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/FilePathService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/FilePathService.java @@ -13,7 +13,7 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; -import de.tum.cit.aet.artemis.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseImportService.java index c7b6c4529b13..3fd3334a073a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseImportService.java @@ -14,8 +14,8 @@ import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseService.java index d6e545cb4ca7..a1e01bd27756 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseService.java @@ -9,8 +9,8 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadSubmissionService.java index 48b2a13a391f..d427e2e1330d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadSubmissionService.java @@ -22,19 +22,19 @@ import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.EmptyFileException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadSubmissionRepository; import de.tum.cit.aet.artemis.service.connectors.athena.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.service.exam.ExamDateService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/GradingScaleService.java b/src/main/java/de/tum/cit/aet/artemis/service/GradingScaleService.java index df84da111862..92ffdf89b00b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/GradingScaleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/GradingScaleService.java @@ -12,10 +12,10 @@ import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.GradeStep; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; -import de.tum.cit.aet.artemis.domain.GradeStep; -import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/InternalUrlService.java b/src/main/java/de/tum/cit/aet/artemis/service/InternalUrlService.java index b55df1188089..962155e0f4c6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/InternalUrlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/InternalUrlService.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.util.UriComponentsBuilder; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java b/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java index 03365a55f9b3..4e9602ce99b4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java @@ -11,10 +11,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.LearningObject; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.atlas.domain.LearningObject; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LectureImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/LectureImportService.java index 0bd5dca4fa61..419c56b1e458 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LectureImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LectureImportService.java @@ -16,12 +16,12 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import de.tum.cit.aet.artemis.domain.Attachment; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; +import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.domain.OnlineUnit; import de.tum.cit.aet.artemis.lecture.domain.TextUnit; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LectureService.java b/src/main/java/de/tum/cit/aet/artemis/service/LectureService.java index 33fb99ce0c1f..18bad73f8614 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LectureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LectureService.java @@ -15,12 +15,12 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; -import de.tum.cit.aet.artemis.domain.Attachment; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitProcessingService.java index 52510b9b4cd6..d98e907f5a3b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitProcessingService.java @@ -28,10 +28,10 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import de.tum.cit.aet.artemis.domain.Attachment; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; +import de.tum.cit.aet.artemis.lecture.domain.Attachment; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentType; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.web.rest.dto.LectureUnitInformationDTO; import de.tum.cit.aet.artemis.web.rest.dto.LectureUnitSplitDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitService.java b/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitService.java index 6ebec1a26fa0..ce309c9ca287 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitService.java @@ -23,12 +23,12 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.domain.LectureUnitCompletion; import de.tum.cit.aet.artemis.lecture.domain.Slide; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LegalDocumentService.java b/src/main/java/de/tum/cit/aet/artemis/service/LegalDocumentService.java index a3aeba6e30aa..ea7ad5628c0a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LegalDocumentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LegalDocumentService.java @@ -15,8 +15,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.enumeration.LegalDocumentType; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.domain.LegalDocumentType; import de.tum.cit.aet.artemis.web.rest.dto.ImprintDTO; import de.tum.cit.aet.artemis.web.rest.dto.LegalDocument; import de.tum.cit.aet.artemis.web.rest.dto.PrivacyStatementDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseImportService.java index fb1b1c678d35..b92d147964a5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseImportService.java @@ -15,13 +15,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.assessment.domain.GradingInstruction; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; -import de.tum.cit.aet.artemis.domain.ExampleSubmission; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.GradingInstruction; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseService.java index e0aeb27fba8f..9f5acd44d0b6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseService.java @@ -10,7 +10,7 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.modeling.domain.ModelCluster; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.repository.ModelClusterRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ModelingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/ModelingSubmissionService.java index 5e457feabfd8..dbcb8bb2c319 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ModelingSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ModelingSubmissionService.java @@ -17,16 +17,16 @@ import org.springframework.stereotype.Service; import org.springframework.web.server.ResponseStatusException; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationService.java b/src/main/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationService.java index 9cda45dd1027..a25d4dadde1b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service; import static de.tum.cit.aet.artemis.core.config.Constants.LOGIN_REGEX; -import static de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration.ENTITY_NAME; +import static de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration.ENTITY_NAME; import java.util.List; import java.util.Objects; @@ -17,10 +17,10 @@ import org.springframework.security.oauth2.core.AuthorizationGrantType; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; -import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer; +import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; +import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/OrganizationService.java b/src/main/java/de/tum/cit/aet/artemis/service/OrganizationService.java index 8ff8591b3263..259190287069 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/OrganizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/OrganizationService.java @@ -7,10 +7,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.domain.Organization; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.OrganizationRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Organization; /** * Service implementation for managing Organization entities diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipantScoreService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipantScoreService.java index 94ff62fbc356..a0717d75f08c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipantScoreService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipantScoreService.java @@ -18,19 +18,19 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.domain.ParticipantScore; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.TeamScoreRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.web.rest.dto.score.ScoreDTO; import de.tum.cit.aet.artemis.web.rest.dto.score.StudentScoreSum; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java index f9cdf2a036d9..c2d72c330e42 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java @@ -9,14 +9,14 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.ParticipationInterface; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleService.java index 0fb29d1c6d62..6f805b52a0cf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleService.java @@ -13,9 +13,9 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.enumeration.ParticipationLifecycle; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.programming.domain.ParticipationLifecycle; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java index 5b05b0e81ce8..add112135856 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java @@ -18,23 +18,19 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.TeamScoreRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.VersionControlException; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -42,7 +38,11 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.programming.domain.BuildPlanType; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationVcsAccessTokenService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationVcsAccessTokenService.java index cd6691cd9bed..ea4901867284 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationVcsAccessTokenService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationVcsAccessTokenService.java @@ -7,7 +7,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ParticipationVCSAccessToken; import de.tum.cit.aet.artemis.programming.repository.ParticipationVCSAccessTokenRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationService.java b/src/main/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationService.java index dadf65d405b4..a970b230cbfc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationService.java @@ -8,8 +8,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/RatingService.java b/src/main/java/de/tum/cit/aet/artemis/service/RatingService.java index fa6ae6becb97..3c4a980eff87 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/RatingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/RatingService.java @@ -8,14 +8,14 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.Rating; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseRatingCount; import de.tum.cit.aet.artemis.assessment.repository.RatingRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; -import de.tum.cit.aet.artemis.domain.Rating; -import de.tum.cit.aet.artemis.domain.Result; /** - * Service Implementation for managing {@link de.tum.cit.aet.artemis.domain.Rating}. + * Service Implementation for managing {@link Rating}. */ @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/ResultService.java index 01fa370f1381..2074b375b0e4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ResultService.java @@ -23,6 +23,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.LongFeedbackText; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; @@ -30,23 +35,18 @@ import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.RatingRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.LongFeedbackText; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.BuildPlanType; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/StaticCodeAnalysisService.java b/src/main/java/de/tum/cit/aet/artemis/service/StaticCodeAnalysisService.java index 39e848727a79..1308067c1bf9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/StaticCodeAnalysisService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/StaticCodeAnalysisService.java @@ -15,9 +15,9 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.config.StaticCodeAnalysisConfigurer; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisCategory; -import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisDefaultCategory; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisCategory; +import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisDefaultCategory; import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; import de.tum.cit.aet.artemis.service.programming.ProgrammingTriggerService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java b/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java index 62ac30d6b538..4da1c1f1ad26 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java @@ -23,21 +23,21 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.dto.ScoreDistribution; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.GraphType; +import de.tum.cit.aet.artemis.core.domain.SpanType; +import de.tum.cit.aet.artemis.core.domain.StatisticsView; import de.tum.cit.aet.artemis.core.dto.CourseStatisticsAverageScore; import de.tum.cit.aet.artemis.core.dto.StatisticsEntry; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.StatisticsRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.enumeration.GraphType; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.cit.aet.artemis.domain.enumeration.SpanType; -import de.tum.cit.aet.artemis.domain.enumeration.StatisticsView; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionPolicyService.java b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionPolicyService.java index c55c9f52e0e0..e5e7e8f1d06c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionPolicyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionPolicyService.java @@ -6,16 +6,16 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPenaltyPolicy; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java index 9118fea8abe2..6643d258156f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java @@ -21,29 +21,29 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.domain.AssessmentNote; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Complaint; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintType; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Complaint; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.service.connectors.athena.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.service.exam.ExamDateService; import de.tum.cit.aet.artemis.text.domain.TextSubmission; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionVersionService.java b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionVersionService.java index ad99ef8a2a03..98a9d19a60b1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionVersionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionVersionService.java @@ -10,10 +10,10 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.SubmissionVersion; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionVersion; import de.tum.cit.aet.artemis.exercise.repository.SubmissionVersionRepository; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TeamService.java b/src/main/java/de/tum/cit/aet/artemis/service/TeamService.java index bf556bcc37c5..8f37d3ccae47 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TeamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TeamService.java @@ -16,12 +16,12 @@ import org.springframework.data.util.Pair; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.TeamImportStrategyType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Team; +import de.tum.cit.aet.artemis.exercise.dto.TeamImportStrategyType; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlRepositoryPermission; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextAssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextAssessmentService.java index 6f013f8aed0a..bdc32c6b3b25 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextAssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextAssessmentService.java @@ -11,13 +11,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseFeedbackService.java index c9a2b7f24f44..c0d07bd63ce4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseFeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseFeedbackService.java @@ -12,11 +12,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.service.connectors.athena.AthenaFeedbackSuggestionsService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseImportService.java index 78e9ec877be7..f48b40b74dec 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseImportService.java @@ -18,16 +18,16 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.GradingInstruction; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.repository.TextBlockRepository; -import de.tum.cit.aet.artemis.domain.ExampleSubmission; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.GradingInstruction; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseService.java index 7c0343b63fc3..c1e5618f387d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseService.java @@ -9,7 +9,7 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextSubmissionService.java index 6d75f21b1fc0..bbdcee00b87c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextSubmissionService.java @@ -16,11 +16,11 @@ import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionService.java b/src/main/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionService.java index 4b0725c9d615..ac16cf17b660 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionService.java @@ -22,12 +22,12 @@ import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.Organization; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Organization; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.modeling.domain.ApollonDiagram; import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TutorLeaderboardService.java b/src/main/java/de/tum/cit/aet/artemis/service/TutorLeaderboardService.java index 6355f3d5932d..08fdaaf8b97d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TutorLeaderboardService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TutorLeaderboardService.java @@ -19,11 +19,11 @@ import de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardMoreFeedbackRequests; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.web.rest.dto.TutorLeaderboardDTO; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TutorParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/service/TutorParticipationService.java index e00f5e5d6eb4..b97e23829272 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TutorParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TutorParticipationService.java @@ -1,11 +1,11 @@ package de.tum.cit.aet.artemis.service; +import static de.tum.cit.aet.artemis.assessment.domain.FeedbackType.MANUAL_UNREFERENCED; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.domain.enumeration.FeedbackType.MANUAL_UNREFERENCED; -import static de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus.NOT_PARTICIPATED; -import static de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus.REVIEWED_INSTRUCTIONS; -import static de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus.TRAINED; import static de.tum.cit.aet.artemis.service.TutorParticipationService.FeedbackCorrectionErrorType.UNNECESSARY_FEEDBACK; +import static de.tum.cit.aet.artemis.tutorialgroup.domain.TutorParticipationStatus.NOT_PARTICIPATED; +import static de.tum.cit.aet.artemis.tutorialgroup.domain.TutorParticipationStatus.REVIEWED_INSTRUCTIONS; +import static de.tum.cit.aet.artemis.tutorialgroup.domain.TutorParticipationStatus.TRAINED; import java.util.Comparator; import java.util.HashSet; @@ -24,13 +24,13 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.assessment.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; -import de.tum.cit.aet.artemis.domain.ExampleSubmission; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/UriService.java b/src/main/java/de/tum/cit/aet/artemis/service/UriService.java index c520a929e8fc..1a3928e1cf0b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/UriService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/UriService.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.exception.VersionControlException; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/archival/ArchivalReportEntry.java b/src/main/java/de/tum/cit/aet/artemis/service/archival/ArchivalReportEntry.java index 6657a892d717..9c0c8f9b2d15 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/archival/ArchivalReportEntry.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/archival/ArchivalReportEntry.java @@ -2,7 +2,7 @@ import jakarta.annotation.Nullable; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; public class ArchivalReportEntry { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/CompassService.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/CompassService.java index 2a60d396b8cb..8fc785b13ccf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/CompassService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/CompassService.java @@ -13,10 +13,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.modeling.domain.ModelCluster; import de.tum.cit.aet.artemis.modeling.domain.ModelElement; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/controller/FeedbackSelector.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/controller/FeedbackSelector.java index 8e398d50f364..9787930960e7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/controller/FeedbackSelector.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/controller/FeedbackSelector.java @@ -10,10 +10,10 @@ import java.util.Objects; import java.util.Set; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.GradingInstruction; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.GradingInstruction; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.modeling.domain.ModelElement; import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/controller/ModelClusterFactory.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/controller/ModelClusterFactory.java index 8bd190e2e94f..22f78d5eb69f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/controller/ModelClusterFactory.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/controller/ModelClusterFactory.java @@ -16,7 +16,7 @@ import com.google.gson.JsonObject; -import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.modeling.domain.ModelCluster; import de.tum.cit.aet.artemis.modeling.domain.ModelElement; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/UMLModelV2Parser.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/UMLModelV2Parser.java index 817a463e3a6b..936dfbfe3fc4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/UMLModelV2Parser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/UMLModelV2Parser.java @@ -11,7 +11,7 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; +import de.tum.cit.aet.artemis.modeling.domain.DiagramType; import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; public class UMLModelV2Parser { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/UMLModelV3Parser.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/UMLModelV3Parser.java index 8e90803cda5e..1c0e9d6e6c4e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/UMLModelV3Parser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/UMLModelV3Parser.java @@ -10,7 +10,7 @@ import com.google.gson.JsonObject; -import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; +import de.tum.cit.aet.artemis.modeling.domain.DiagramType; import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; public class UMLModelV3Parser { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyProgressService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyProgressService.java index 94034867eb61..fe7a7b3798bf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyProgressService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyProgressService.java @@ -19,18 +19,18 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.domain.CompetencyProgressConfidenceReason; +import de.tum.cit.aet.artemis.atlas.domain.LearningObject; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.LearningObject; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.CompetencyProgressConfidenceReason; -import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; +import de.tum.cit.aet.artemis.exercise.domain.DifficultyLevel; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyRelationService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyRelationService.java index 1df1f7e736b9..ee3f23b8b405 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyRelationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyRelationService.java @@ -17,7 +17,7 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.RelationType; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; -import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Course; /** * Service for managing CompetencyRelations. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyService.java index e788167f97e5..44301838626e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyService.java @@ -18,7 +18,7 @@ import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; -import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/CourseCompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/CourseCompetencyService.java index 8ec7b7c8a299..240629dae143 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/CourseCompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/CourseCompetencyService.java @@ -28,9 +28,9 @@ import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/PrerequisiteService.java b/src/main/java/de/tum/cit/aet/artemis/service/competency/PrerequisiteService.java index 3f53bde441f6..a8ec89493a08 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/PrerequisiteService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/competency/PrerequisiteService.java @@ -18,7 +18,7 @@ import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; -import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/AbstractGitService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/AbstractGitService.java index 2611f366b45f..37526e3d6d80 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/AbstractGitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/AbstractGitService.java @@ -47,8 +47,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; -import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.domain.Repository; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; public abstract class AbstractGitService { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/BuildScriptGenerationService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/BuildScriptGenerationService.java index 929697217a4f..bdd761d51204 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/BuildScriptGenerationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/BuildScriptGenerationService.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; /** * Abstract Service for generating build scripts for programming exercises diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/BuildScriptProviderService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/BuildScriptProviderService.java index 8585e1cf86bd..748b9c213ecd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/BuildScriptProviderService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/BuildScriptProviderService.java @@ -18,10 +18,10 @@ import org.springframework.core.io.Resource; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.service.ResourceLoaderService; import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/GenericBuildScriptGenerationService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/GenericBuildScriptGenerationService.java index 7d3a31bb8e19..0ced441ad48e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/GenericBuildScriptGenerationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/GenericBuildScriptGenerationService.java @@ -8,8 +8,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; /** * Service for generating build scripts for programming exercises diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/GitService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/GitService.java index 6e570f5a3270..81c595bfb9f0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/GitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/GitService.java @@ -71,18 +71,18 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.GitException; -import de.tum.cit.aet.artemis.domain.File; -import de.tum.cit.aet.artemis.domain.FileType; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.File; +import de.tum.cit.aet.artemis.programming.domain.FileType; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.Repository; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.ZipFileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/SAML2Service.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/SAML2Service.java index 9a79275f533a..0af0a594c4fc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/SAML2Service.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/SAML2Service.java @@ -22,11 +22,11 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.config.SAML2Properties; +import de.tum.cit.aet.artemis.core.domain.Authority; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.UserNotActivatedException; -import de.tum.cit.aet.artemis.domain.Authority; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.notifications.MailService; import de.tum.cit.aet.artemis.service.user.UserCreationService; import de.tum.cit.aet.artemis.service.user.UserService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusBuildPlanService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusBuildPlanService.java index 965adec3af4e..d310369cb97d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusBuildPlanService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusBuildPlanService.java @@ -3,7 +3,7 @@ import static de.tum.cit.aet.artemis.core.config.Constants.ASSIGNMENT_REPO_NAME; import static de.tum.cit.aet.artemis.core.config.Constants.SOLUTION_REPO_NAME; import static de.tum.cit.aet.artemis.core.config.Constants.TEST_REPO_NAME; -import static de.tum.cit.aet.artemis.domain.enumeration.AeolusTarget.JENKINS; +import static de.tum.cit.aet.artemis.programming.domain.AeolusTarget.JENKINS; import java.net.URL; import java.util.HashMap; @@ -29,10 +29,10 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.AeolusTarget; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.AeolusTarget; +import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.service.InternalUrlService; import de.tum.cit.aet.artemis.service.connectors.aeolus.dto.AeolusGenerationResponseDTO; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusBuildScriptGenerationService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusBuildScriptGenerationService.java index b27e2ddcb99c..a283bd67652a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusBuildScriptGenerationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusBuildScriptGenerationService.java @@ -5,8 +5,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.enumeration.AeolusTarget; +import de.tum.cit.aet.artemis.programming.domain.AeolusTarget; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.connectors.BuildScriptGenerationService; import de.tum.cit.aet.artemis.service.connectors.BuildScriptProviderService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusTemplateService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusTemplateService.java index 7ccf7b47df29..aad04f07b150 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusTemplateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusTemplateService.java @@ -20,10 +20,10 @@ import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import de.tum.cit.aet.artemis.core.config.ProgrammingLanguageConfiguration; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.service.ResourceLoaderService; import de.tum.cit.aet.artemis.service.connectors.BuildScriptProviderService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaDTOConverterService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaDTOConverterService.java index 7395c6d3be79..4098738d8071 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaDTOConverterService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaDTOConverterService.java @@ -6,14 +6,14 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.repository.TextBlockRepository; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.dto.athena.ExerciseBaseDTO; import de.tum.cit.aet.artemis.service.dto.athena.FeedbackBaseDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingService.java index 7fa97d3d2f31..aa2557c7e2dd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingService.java @@ -12,10 +12,10 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.core.exception.NetworkingException; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.service.dto.athena.ExerciseBaseDTO; import de.tum.cit.aet.artemis.service.dto.athena.FeedbackBaseDTO; import de.tum.cit.aet.artemis.service.dto.athena.SubmissionBaseDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsService.java index 0bce59827677..33e6875cde20 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsService.java @@ -13,10 +13,10 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.core.exception.NetworkingException; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.service.dto.athena.ExerciseBaseDTO; import de.tum.cit.aet.artemis.service.dto.athena.ModelingFeedbackDTO; import de.tum.cit.aet.artemis.service.dto.athena.ProgrammingFeedbackDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaModuleService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaModuleService.java index a4a9c29fed9e..fd1867ec1a4d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaModuleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaModuleService.java @@ -20,10 +20,10 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.exception.NetworkingException; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportService.java index cfa4abda8009..c364f4789c27 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportService.java @@ -12,9 +12,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionService.java index 8dc856086110..77474e36675a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionService.java @@ -16,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import de.tum.cit.aet.artemis.core.exception.NetworkingException; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.service.dto.athena.ExerciseBaseDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingService.java index ea10c80d6982..559260b61b53 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingService.java @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.core.exception.NetworkingException; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.service.dto.athena.ExerciseBaseDTO; import de.tum.cit.aet.artemis.service.dto.athena.SubmissionBaseDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractBuildPlanCreator.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractBuildPlanCreator.java index 44e20b803477..03a521b07b4a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractBuildPlanCreator.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractBuildPlanCreator.java @@ -5,7 +5,7 @@ import org.springframework.beans.factory.annotation.Value; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractContinuousIntegrationResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractContinuousIntegrationResultService.java index 2bb078e2cdda..0e7bbde5261d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractContinuousIntegrationResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractContinuousIntegrationResultService.java @@ -4,12 +4,12 @@ import java.util.List; import java.util.function.Predicate; -import de.tum.cit.aet.artemis.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/CIUserManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/CIUserManagementService.java index 414534fab251..6ccd4468c29a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/CIUserManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/CIUserManagementService.java @@ -2,9 +2,9 @@ import java.util.Set; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; public interface CIUserManagementService { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationResultService.java index e7cb2ce24b76..6287023111c3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationResultService.java @@ -2,12 +2,12 @@ import java.util.List; -import de.tum.cit.aet.artemis.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationService.java index 23e1f10ecfc5..e0fdef59706b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationService.java @@ -12,10 +12,10 @@ import com.fasterxml.jackson.core.JsonProcessingException; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationTriggerService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationTriggerService.java index f16521abbcb9..46035da88e4c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationTriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationTriggerService.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.service.connectors.ci; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; /** * Abstract service for managing entities related to continuous integration. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/BuildLogParseUtils.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/BuildLogParseUtils.java index 77b7b31a7e14..44e2e6bbb6fd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/BuildLogParseUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/BuildLogParseUtils.java @@ -7,7 +7,7 @@ import org.apache.commons.lang3.StringUtils; -import de.tum.cit.aet.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; public class BuildLogParseUtils { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestCaseDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestCaseDTO.java index d09b8c9bab58..581c1bdcc518 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestCaseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestCaseDTO.java @@ -13,7 +13,7 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.service.dto.TestCaseBaseDTO; @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestResultsDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestResultsDTO.java index 26879df429cf..76b285270669 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestResultsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestResultsDTO.java @@ -13,8 +13,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import de.tum.cit.aet.artemis.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.service.connectors.ci.notification.BuildLogParseUtils; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; import de.tum.cit.aet.artemis.service.dto.BuildJobDTOInterface; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java index faef9d4cfdd1..b10c583ee26b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java @@ -23,8 +23,8 @@ import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.connectors.gitlab.dto.GitLabPersonalAccessTokenListResponseDTO; import de.tum.cit.aet.artemis.service.connectors.vcs.VcsTokenManagementService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabService.java index 273720885dda..6ccef972866e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabService.java @@ -45,15 +45,15 @@ import com.fasterxml.jackson.databind.JsonNode; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Commit; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.domain.Commit; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabUserManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabUserManagementService.java index b2877caf911b..ca13cb55c337 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabUserManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabUserManagementService.java @@ -19,11 +19,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.connectors.vcs.VcsTokenManagementService; import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java index 32a47fa64af9..dd5aef54f3ad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java @@ -12,8 +12,8 @@ import org.springframework.stereotype.Service; import org.springframework.util.StreamUtils; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.ResourceLoaderService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java index fd279070eb06..8e48c8c24338 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java @@ -1,10 +1,10 @@ package de.tum.cit.aet.artemis.service.connectors.gitlabci; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.EMPTY; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.JAVA; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.RUST; -import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.MAVEN_MAVEN; -import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.PLAIN_MAVEN; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.EMPTY; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.JAVA; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.RUST; +import static de.tum.cit.aet.artemis.programming.domain.ProjectType.MAVEN_MAVEN; +import static de.tum.cit.aet.artemis.programming.domain.ProjectType.PLAIN_MAVEN; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIResultService.java index 9e93080ffa27..026d213baef3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIResultService.java @@ -9,11 +9,11 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.BuildLogStatisticsEntry; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIService.java index 11b6cfcc574d..76412480c226 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIService.java @@ -26,13 +26,13 @@ import de.tum.cit.aet.artemis.core.config.ProgrammingLanguageConfiguration; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.GitLabCIException; -import de.tum.cit.aet.artemis.domain.BuildPlan; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.BuildPlan; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.UriService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCITriggerService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCITriggerService.java index f45e31664469..bd6adeefbd67 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCITriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCITriggerService.java @@ -8,9 +8,9 @@ import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.GitLabCIException; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.UriService; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java index 26938451a911..02d07c3e9e65 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java @@ -7,9 +7,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java index 803450b15a3e..db1c2b2f1236 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java @@ -1,21 +1,21 @@ package de.tum.cit.aet.artemis.service.connectors.jenkins; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.C; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.EMPTY; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.HASKELL; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.JAVA; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.KOTLIN; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.PYTHON; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.RUST; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.SWIFT; -import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.FACT; -import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.GCC; -import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.GRADLE_GRADLE; -import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.MAVEN_BLACKBOX; -import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.MAVEN_MAVEN; -import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.PLAIN; -import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.PLAIN_GRADLE; -import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.PLAIN_MAVEN; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.C; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.EMPTY; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.HASKELL; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.JAVA; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.KOTLIN; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.PYTHON; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.RUST; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.SWIFT; +import static de.tum.cit.aet.artemis.programming.domain.ProjectType.FACT; +import static de.tum.cit.aet.artemis.programming.domain.ProjectType.GCC; +import static de.tum.cit.aet.artemis.programming.domain.ProjectType.GRADLE_GRADLE; +import static de.tum.cit.aet.artemis.programming.domain.ProjectType.MAVEN_BLACKBOX; +import static de.tum.cit.aet.artemis.programming.domain.ProjectType.MAVEN_MAVEN; +import static de.tum.cit.aet.artemis.programming.domain.ProjectType.PLAIN; +import static de.tum.cit.aet.artemis.programming.domain.ProjectType.PLAIN_GRADLE; +import static de.tum.cit.aet.artemis.programming.domain.ProjectType.PLAIN_MAVEN; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsResultService.java index f0df9b95fca5..3c978fdf0657 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsResultService.java @@ -11,10 +11,10 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsService.java index e45b1181b722..c146994a7340 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsService.java @@ -21,12 +21,12 @@ import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.JenkinsException; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.BuildPlanType; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsUserManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsUserManagementService.java index 9df2be0c997d..4cadc7c6db73 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsUserManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsUserManagementService.java @@ -27,12 +27,12 @@ import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.JenkinsException; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; import de.tum.cit.aet.artemis.service.connectors.jenkins.dto.JenkinsUserDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsXmlConfigBuilder.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsXmlConfigBuilder.java index 5a8b4316e953..f10faaca50e2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsXmlConfigBuilder.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsXmlConfigBuilder.java @@ -4,9 +4,9 @@ import org.w3c.dom.Document; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; public interface JenkinsXmlConfigBuilder { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanCreator.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanCreator.java index e8e5a3e043fb..7cdb14e79834 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanCreator.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanCreator.java @@ -19,8 +19,8 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationBuildPlanException; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.service.ResourceLoaderService; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsXmlConfigBuilder; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java index d09914ec3756..1fe65f1a4a60 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java @@ -35,19 +35,19 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.offbytwo.jenkins.JenkinsServer; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationBuildPlanException; import de.tum.cit.aet.artemis.core.exception.JenkinsException; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.AeolusTarget; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.AeolusTarget; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java index a1bda8f721b5..2281abef560f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java @@ -18,9 +18,9 @@ import de.tum.cit.aet.artemis.core.config.ProgrammingLanguageConfiguration; import de.tum.cit.aet.artemis.core.exception.JenkinsException; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.ResourceLoaderService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ldap/LdapAuthenticationProvider.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ldap/LdapAuthenticationProvider.java index 8e1073573131..9956e9739e69 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ldap/LdapAuthenticationProvider.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/ldap/LdapAuthenticationProvider.java @@ -18,11 +18,11 @@ import org.springframework.security.ldap.SpringSecurityLdapTemplate; import org.springframework.stereotype.Component; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProvider; import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProviderImpl; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; import de.tum.cit.aet.artemis.service.ldap.LdapUserService; import de.tum.cit.aet.artemis.service.user.AuthorityService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIBuildConfigurationService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIBuildConfigurationService.java index a212f33dfcf3..d317d08b3925 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIBuildConfigurationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIBuildConfigurationService.java @@ -9,8 +9,8 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.exception.LocalCIException; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; import de.tum.cit.aet.artemis.service.connectors.aeolus.ScriptAction; import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java index 9adb3dd7da6c..95c9058c600d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java @@ -1,23 +1,23 @@ package de.tum.cit.aet.artemis.service.connectors.localci; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.ASSEMBLER; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.C; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.HASKELL; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.JAVA; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.KOTLIN; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.OCAML; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.PYTHON; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.RUST; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.SWIFT; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.VHDL; -import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.FACT; -import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.GCC; -import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.GRADLE_GRADLE; -import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.MAVEN_MAVEN; -import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.PLAIN; -import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.PLAIN_GRADLE; -import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.PLAIN_MAVEN; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.ASSEMBLER; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.C; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.HASKELL; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.JAVA; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.KOTLIN; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.OCAML; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.PYTHON; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.RUST; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.SWIFT; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.VHDL; +import static de.tum.cit.aet.artemis.programming.domain.ProjectType.FACT; +import static de.tum.cit.aet.artemis.programming.domain.ProjectType.GCC; +import static de.tum.cit.aet.artemis.programming.domain.ProjectType.GRADLE_GRADLE; +import static de.tum.cit.aet.artemis.programming.domain.ProjectType.MAVEN_MAVEN; +import static de.tum.cit.aet.artemis.programming.domain.ProjectType.PLAIN; +import static de.tum.cit.aet.artemis.programming.domain.ProjectType.PLAIN_GRADLE; +import static de.tum.cit.aet.artemis.programming.domain.ProjectType.PLAIN_MAVEN; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultProcessingService.java index 8ea34827966b..e2df43d29beb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultProcessingService.java @@ -22,16 +22,16 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.map.IMap; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.BuildJob; -import de.tum.cit.aet.artemis.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.BuildJob; +import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.BuildStatus; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.BuildLogEntryService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultService.java index e1219313f93c..b435f04e3a7b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultService.java @@ -8,10 +8,10 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.exception.LocalCIException; -import de.tum.cit.aet.artemis.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIService.java index b49470e5d6fc..c380766100c3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIService.java @@ -17,11 +17,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.core.exception.LocalCIException; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.connectors.BuildScriptProviderService; import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCITriggerService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCITriggerService.java index c9a0fcd264e5..201564a67b7e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCITriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCITriggerService.java @@ -25,15 +25,15 @@ import de.tum.cit.aet.artemis.core.config.ProgrammingLanguageConfiguration; import de.tum.cit.aet.artemis.core.exception.LocalCIException; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; -import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/SharedQueueManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/SharedQueueManagementService.java index 8dd8de95e79a..a684749fcd05 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/SharedQueueManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/SharedQueueManagementService.java @@ -30,8 +30,8 @@ import com.hazelcast.map.IMap; import com.hazelcast.topic.ITopic; -import de.tum.cit.aet.artemis.domain.BuildJob; -import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; +import de.tum.cit.aet.artemis.core.dto.SortingOrder; +import de.tum.cit.aet.artemis.programming.domain.BuildJob; import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobContainerService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobContainerService.java index 652a6475278e..9ff87d7004df 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobContainerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobContainerService.java @@ -43,8 +43,8 @@ import com.github.dockerjava.api.model.HostConfig; import de.tum.cit.aet.artemis.core.exception.LocalCIException; -import de.tum.cit.aet.artemis.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService.RepositoryCheckoutPath; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobExecutionService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobExecutionService.java index 5279ec59084d..5d1a62ecae30 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobExecutionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobExecutionService.java @@ -35,10 +35,10 @@ import de.tum.cit.aet.artemis.core.exception.GitException; import de.tum.cit.aet.artemis.core.exception.LocalCIException; -import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.programming.domain.Repository; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildResult; import de.tum.cit.aet.artemis.service.connectors.localci.scaparser.ReportParser; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobGitService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobGitService.java index 15bf5d49e6a0..5d8763f11579 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobGitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobGitService.java @@ -29,8 +29,8 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.exception.GitException; -import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.domain.Repository; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.service.connectors.AbstractGitService; @Profile(PROFILE_BUILDAGENT) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobManagementService.java index fd406097b455..349bfa4653af 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobManagementService.java @@ -32,7 +32,7 @@ import com.hazelcast.topic.ITopic; import de.tum.cit.aet.artemis.core.exception.LocalCIException; -import de.tum.cit.aet.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildResult; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildLogsMap.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildLogsMap.java index a4ffdd0779e9..9a88c5c84828 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildLogsMap.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildLogsMap.java @@ -11,7 +11,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.cit.aet.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; @Profile(PROFILE_BUILDAGENT) @Component diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java index c6a55ac38cfd..8e2c1564c49f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java @@ -35,8 +35,8 @@ import com.hazelcast.map.IMap; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; +import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.BuildStatus; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildResult; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildConfig.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildConfig.java index 4fc3add6c00b..c0f82d17ee2f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildConfig.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildConfig.java @@ -6,8 +6,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildJobQueueItem.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildJobQueueItem.java index defce1e9deb9..c9047510d081 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildJobQueueItem.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildJobQueueItem.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; +import de.tum.cit.aet.artemis.programming.domain.BuildStatus; import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildResult.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildResult.java index 610ab99ba45c..92ae4fd0a48f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildResult.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildResult.java @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestwiseCoverageReportDTO; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; import de.tum.cit.aet.artemis.service.dto.BuildJobDTOInterface; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/RepositoryInfo.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/RepositoryInfo.java index 0490d5b92b86..cfef44b7f9e7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/RepositoryInfo.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/RepositoryInfo.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/ResultQueueItem.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/ResultQueueItem.java index c21506a74bae..d434d3156d13 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/ResultQueueItem.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/ResultQueueItem.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ResultQueueItem(BuildResult buildResult, BuildJobQueueItem buildJobQueueItem, List buildLogs, Throwable exception) implements Serializable { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/CheckstyleParser.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/CheckstyleParser.java index 2ac441babce2..6d3fc06ecca6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/CheckstyleParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/CheckstyleParser.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/PMDCPDParser.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/PMDCPDParser.java index 75421604a644..f6a25cf55c67 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/PMDCPDParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/PMDCPDParser.java @@ -10,7 +10,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/PMDParser.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/PMDParser.java index 4a7555dd061c..7e56619a2d20 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/PMDParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/PMDParser.java @@ -10,7 +10,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText; -import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/ParserPolicy.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/ParserPolicy.java index 0932c49f3efe..26562df56c8e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/ParserPolicy.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/ParserPolicy.java @@ -2,7 +2,7 @@ import java.nio.file.Path; -import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; import de.tum.cit.aet.artemis.service.connectors.localci.scaparser.exception.UnsupportedToolException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/SpotbugsParser.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/SpotbugsParser.java index 3a0dec001c53..70240010388b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/SpotbugsParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/SpotbugsParser.java @@ -10,7 +10,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/utils/ReportUtils.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/utils/ReportUtils.java index 543e70b85b9d..b51396d6f871 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/utils/ReportUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/utils/ReportUtils.java @@ -2,7 +2,7 @@ import java.util.List; -import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPrePushHook.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPrePushHook.java index 19dfdb310d15..a10d464e6f11 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPrePushHook.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPrePushHook.java @@ -12,8 +12,8 @@ import org.eclipse.jgit.transport.ReceiveCommand; import org.eclipse.jgit.transport.ReceivePack; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; -import de.tum.cit.aet.artemis.domain.User; /** * Contains an onPreReceive method that is called by JGit before a push is received (i.e. before the pushed files are written to disk but after the authorization check was diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCRepositoryUri.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCRepositoryUri.java index f95fab514a47..3949ff489905 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCRepositoryUri.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCRepositoryUri.java @@ -7,7 +7,7 @@ import java.nio.file.Paths; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; /** * Represents a URI for a local version control (VC) repository. This class extends {@link VcsRepositoryUri} by adding specific properties diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCService.java index 715b46b0350c..516ad11a941c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCService.java @@ -30,13 +30,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; -import de.tum.cit.aet.artemis.domain.Commit; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.domain.Commit; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; @@ -329,7 +329,7 @@ public Commit getLastCommitDetails(Object requestBody) { public ZonedDateTime getPushDate(ProgrammingExerciseParticipation participation, String commitHash, Object eventObject) { // The eventObject is null for every call of this method. Use the commitHash to determine date of the latest commit. - de.tum.cit.aet.artemis.domain.Repository repository; + de.tum.cit.aet.artemis.programming.domain.Repository repository; try { repository = gitService.getOrCheckoutRepository(participation); } diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCServletService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCServletService.java index 7fab83ac53bb..cc40d6c4e00a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCServletService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCServletService.java @@ -37,6 +37,7 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCAuthException; @@ -44,13 +45,12 @@ import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.Commit; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.Commit; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.ParticipationVCSAccessTokenRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/Lti13Service.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/Lti13Service.java index 934d00dcfa08..869adab0933c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/Lti13Service.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/Lti13Service.java @@ -31,21 +31,21 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProvider; import de.tum.cit.aet.artemis.core.security.lti.Lti13TokenRetriever; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; -import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.domain.LtiResourceLaunch; +import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.lti.dto.Claims; import de.tum.cit.aet.artemis.lti.dto.Lti13AgsClaim; import de.tum.cit.aet.artemis.lti.dto.Lti13LaunchRequest; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingService.java index ee9a19f7fd6f..2d13057142bd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingService.java @@ -14,8 +14,8 @@ import org.springframework.web.util.UriComponentsBuilder; import de.tum.cit.aet.artemis.core.security.lti.Lti13TokenRetriever; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lti.dto.Lti13DeepLinkingResponse; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDynamicRegistrationService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDynamicRegistrationService.java index f560329f3a12..536738ae572a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDynamicRegistrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDynamicRegistrationService.java @@ -16,7 +16,7 @@ import org.springframework.web.client.RestTemplate; import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; -import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; +import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.dto.Lti13ClientRegistration; import de.tum.cit.aet.artemis.lti.dto.Lti13PlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiService.java index 13ed9bc5d475..20dcddb151ac 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiService.java @@ -25,15 +25,15 @@ import org.springframework.web.util.UriComponentsBuilder; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.LtiEmailAlreadyInUseException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProvider; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.jwt.JWTCookieService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; import de.tum.cit.aet.artemis.service.user.UserCreationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisDTOService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisDTOService.java index 892c2261df17..2dacc9bf3e6d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisDTOService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisDTOService.java @@ -15,11 +15,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Repository; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisBuildLogEntryDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisPipelineService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisPipelineService.java index e49b696a5464..1db53595a97b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisPipelineService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisPipelineService.java @@ -16,14 +16,14 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyJol; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.iris.domain.session.IrisCourseChatSession; import de.tum.cit.aet.artemis.iris.domain.session.IrisExerciseChatSession; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionDTO; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.course.PyrisCourseChatPipelineExecutionDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisWebhookService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisWebhookService.java index 4292640f0f1b..6e6105c0e256 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisWebhookService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisWebhookService.java @@ -14,10 +14,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.iris.domain.settings.IrisCourseSettings; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentType; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisCourseDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisCourseDTO.java index 9dbcfc59e64a..045035e3a533 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisCourseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisCourseDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Course; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisCourseDTO(long id, String name, String description) { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExerciseWithStudentSubmissionsDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExerciseWithStudentSubmissionsDTO.java index 7dde521231f3..20ef2752a33c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExerciseWithStudentSubmissionsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExerciseWithStudentSubmissionsDTO.java @@ -9,12 +9,12 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.exercise.domain.DifficultyLevel; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisExerciseWithStudentSubmissionsDTO(long id, String title, ExerciseType type, ExerciseMode mode, double maxPoints, double bonusPoints, diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExtendedCourseDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExtendedCourseDTO.java index 333a4a58b720..63f6c94fe5f2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExtendedCourseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExtendedCourseDTO.java @@ -7,8 +7,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; /** * An extended course DTO for Pyris so it can better answer diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisProgrammingExerciseDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisProgrammingExerciseDTO.java index 375bc2b210f5..2a5866dd13bd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisProgrammingExerciseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisProgrammingExerciseDTO.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisProgrammingExerciseDTO(long id, String name, ProgrammingLanguage programmingLanguage, Map templateRepository, diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisUserDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisUserDTO.java index 2bf71c239fa1..4d2fd25c9d36 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisUserDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisUserDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisUserDTO(long id, String firstName, String lastName) { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/CompetencyExtractionJob.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/CompetencyExtractionJob.java index 12a400cbb68d..f9db80826a69 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/CompetencyExtractionJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/CompetencyExtractionJob.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Course; /** * A pyris job that extracts competencies from a course description. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/CourseChatJob.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/CourseChatJob.java index b47ad8b88817..56b373eef297 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/CourseChatJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/CourseChatJob.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Course; /** * An implementation of a PyrisJob for course chat messages. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/ExerciseChatJob.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/ExerciseChatJob.java index 5f35d6bf3783..bcea3e5b9a8d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/ExerciseChatJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/ExerciseChatJob.java @@ -2,8 +2,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; /** * An implementation of a PyrisJob for exercise chat messages. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/IngestionWebhookJob.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/IngestionWebhookJob.java index e313f7f3cfe7..47acb059d731 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/IngestionWebhookJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/IngestionWebhookJob.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.connectors.pyris.job; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; /** * An implementation of a PyrisJob for Lecture Ingestion in Pyris. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/PyrisJob.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/PyrisJob.java index fed983f0c3ae..538a842a13ef 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/PyrisJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/PyrisJob.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/AbstractVersionControlService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/AbstractVersionControlService.java index 19329e363629..29ab3a30c39a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/AbstractVersionControlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/AbstractVersionControlService.java @@ -13,12 +13,12 @@ import org.springframework.beans.factory.annotation.Value; import de.tum.cit.aet.artemis.core.exception.VersionControlException; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.Repository; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenManagementService.java index f9864f166d3e..f493e3fef615 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenManagementService.java @@ -2,7 +2,7 @@ import java.time.Duration; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; /** * Provides an interface for managing VCS access tokens. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalService.java index 7d179acfc7d7..72ae7a92eaad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalService.java @@ -14,8 +14,8 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsUserManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsUserManagementService.java index 3e773d22f62d..2fd4cc6c1404 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsUserManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsUserManagementService.java @@ -2,9 +2,9 @@ import java.util.Set; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.VersionControlException; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; public interface VcsUserManagementService { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlService.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlService.java index 4c7f22f5cef7..2a573f3f770f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlService.java @@ -5,13 +5,13 @@ import jakarta.annotation.Nullable; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.VersionControlException; -import de.tum.cit.aet.artemis.domain.Commit; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.domain.Commit; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; public interface VersionControlService { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/AbstractBuildResultNotificationDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/AbstractBuildResultNotificationDTO.java index 9b436e203529..f0e5175e7e48 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/AbstractBuildResultNotificationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/AbstractBuildResultNotificationDTO.java @@ -9,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; +import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestwiseCoverageReportDTO; @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/BuildJobResultCountDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/BuildJobResultCountDTO.java index 19449ed58f38..a161fdb3da17 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/BuildJobResultCountDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/BuildJobResultCountDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; +import de.tum.cit.aet.artemis.programming.domain.BuildStatus; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record BuildJobResultCountDTO(BuildStatus status, long count) { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/BuildJobsStatisticsDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/BuildJobsStatisticsDTO.java index 65447956c4ee..7293002eebbc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/BuildJobsStatisticsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/BuildJobsStatisticsDTO.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; +import de.tum.cit.aet.artemis.programming.domain.BuildStatus; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record BuildJobsStatisticsDTO(long totalBuilds, long successfulBuilds, long failedBuilds, long cancelledBuilds) { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/ComplaintRequestDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/ComplaintRequestDTO.java index a5d190c2f87d..a56106b2c505 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/ComplaintRequestDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/ComplaintRequestDTO.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintType; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ComplaintRequestDTO(long resultId, String complaintText, ComplaintType complaintType, Optional examId) { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/ConsistencyErrorDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/ConsistencyErrorDTO.java index 2072ce8e61e4..0ad73d0713ad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/ConsistencyErrorDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/ConsistencyErrorDTO.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; /** * A DTO representing a consistency error diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/FinishedBuildJobDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/FinishedBuildJobDTO.java index 3b84dfa992e5..7dedfd8cedf6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/FinishedBuildJobDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/FinishedBuildJobDTO.java @@ -6,13 +6,12 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.BuildJob; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.programming.domain.BuildJob; +import de.tum.cit.aet.artemis.programming.domain.BuildStatus; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.web.rest.dto.ParticipationDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/GradingCriterionDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/GradingCriterionDTO.java index 4f1ce549bbff..4c93c2a65b7e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/GradingCriterionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/GradingCriterionDTO.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.GradingCriterion; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record GradingCriterionDTO(long id, String title, Set structuredGradingInstructions) { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/GradingInstructionDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/GradingInstructionDTO.java index 87f71bb91456..ea071e935540 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/GradingInstructionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/GradingInstructionDTO.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.GradingInstruction; +import de.tum.cit.aet.artemis.assessment.domain.GradingInstruction; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record GradingInstructionDTO(long id, double credits, String gradingScale, String instructionDescription, String feedback, int usageCount) { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/StaticCodeAnalysisReportDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/StaticCodeAnalysisReportDTO.java index a68415aaeede..e78bb5f61231 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/StaticCodeAnalysisReportDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/StaticCodeAnalysisReportDTO.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; /** * Record to represent the data transfer object for static code analysis reports. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/StudentDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/StudentDTO.java index a216a6ac6e2a..947c2c7a495f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/StudentDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/StudentDTO.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record StudentDTO(@Size(max = 50) String login, @Size(max = 50) String firstName, @Size(max = 50) String lastName, @Size(max = 10) String registrationNumber, diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/TeamSearchUserDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/TeamSearchUserDTO.java index 005b19f73c64..79ce195e5f17 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/TeamSearchUserDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/TeamSearchUserDTO.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; /** * A DTO representing a user returned by searching for a student to add to a team. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/UserDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/UserDTO.java index edd6941e3fb8..05f8567bf955 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/UserDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/UserDTO.java @@ -19,10 +19,10 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.domain.Authority; -import de.tum.cit.aet.artemis.domain.GuidedTourSetting; -import de.tum.cit.aet.artemis.domain.Organization; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Authority; +import de.tum.cit.aet.artemis.core.domain.GuidedTourSetting; +import de.tum.cit.aet.artemis.core.domain.Organization; +import de.tum.cit.aet.artemis.core.domain.User; /** * A DTO representing a user, with his authorities. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/UserPublicInfoDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/UserPublicInfoDTO.java index 88744310b6b3..d53522c3d347 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/UserPublicInfoDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/UserPublicInfoDTO.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; /** * A DTO representing a user with the minimal information allowed to be seen by other users in a course diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingFeedbackDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingFeedbackDTO.java index 570ee1ef2678..1404c78a9899 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingFeedbackDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingFeedbackDTO.java @@ -6,6 +6,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; + /** * A DTO representing a Feedback on a ModelingExercise, for transferring data to Athena and receiving suggestions from Athena */ @@ -21,7 +23,7 @@ public record ModelingFeedbackDTO(long id, long exerciseId, long submissionId, S * @param feedback the feedback object * @return the ModelingFeedbackDTO */ - public static ModelingFeedbackDTO of(long exerciseId, long submissionId, @NotNull de.tum.cit.aet.artemis.domain.Feedback feedback) { + public static ModelingFeedbackDTO of(long exerciseId, long submissionId, @NotNull Feedback feedback) { Long gradingInstructionId = null; if (feedback.getGradingInstruction() != null) { gradingInstructionId = feedback.getGradingInstruction().getId(); diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingExerciseDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingExerciseDTO.java index d8ab88d96912..ded0ce80fe9b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingExerciseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingExerciseDTO.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.dto.GradingCriterionDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingFeedbackDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingFeedbackDTO.java index 00bec43895ef..cb35b06e47d5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingFeedbackDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingFeedbackDTO.java @@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; + /** * A DTO representing a Feedback on a ProgrammingExercise, for transferring data to Athena and receiving suggestions from Athena */ @@ -19,7 +21,7 @@ public record ProgrammingFeedbackDTO(long id, long exerciseId, long submissionId * @param feedback the feedback object * @return the ProgrammingFeedbackDTO */ - public static ProgrammingFeedbackDTO of(long exerciseId, long submissionId, @NotNull de.tum.cit.aet.artemis.domain.Feedback feedback) { + public static ProgrammingFeedbackDTO of(long exerciseId, long submissionId, @NotNull Feedback feedback) { // Referenced feedback has a reference looking like this: "file:src/main/java/SomeFile.java_line:42" String filePath = null; Integer lineStart = null; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingSubmissionDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingSubmissionDTO.java index cea173fcd746..0ecc04c7e615 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingSubmissionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingSubmissionDTO.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; /** * A DTO representing a ProgrammingSubmission, for transferring data to Athena diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextFeedbackDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextFeedbackDTO.java index e201bf51696a..e1dcf3b8665b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextFeedbackDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextFeedbackDTO.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.text.domain.TextBlock; /** @@ -22,7 +23,7 @@ public record TextFeedbackDTO(long id, long exerciseId, long submissionId, Strin * @param feedbackBlock the TextBlock that the feedback is on (must be passed because this record cannot fetch it for itself) * @return the TextFeedbackDTO */ - public static TextFeedbackDTO of(long exerciseId, long submissionId, @NotNull de.tum.cit.aet.artemis.domain.Feedback feedback, TextBlock feedbackBlock) { + public static TextFeedbackDTO of(long exerciseId, long submissionId, @NotNull Feedback feedback, TextBlock feedbackBlock) { Integer startIndex = feedbackBlock == null ? null : feedbackBlock.getStartIndex(); Integer endIndex = feedbackBlock == null ? null : feedbackBlock.getEndIndex(); Long gradingInstructionId = null; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamAccessService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamAccessService.java index 02bd587b92aa..a6a8d5b7a214 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamAccessService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamAccessService.java @@ -8,17 +8,17 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDateService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDateService.java index e2651f16e278..d6429fede9ba 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDateService.java @@ -13,13 +13,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDeletionService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDeletionService.java index 36adf6f19850..88b833d00183 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDeletionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDeletionService.java @@ -18,20 +18,20 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamLiveEventRepository; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.quiz.domain.QuizPool; import de.tum.cit.aet.artemis.quiz.repository.QuizPoolRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamImportService.java index 9cda10833d0f..6dd0e914b085 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamImportService.java @@ -12,22 +12,22 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; -import de.tum.cit.aet.artemis.domain.BaseExercise; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; +import de.tum.cit.aet.artemis.exercise.domain.BaseExercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamLiveEventsService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamLiveEventsService.java index ab826699cce0..e6edea0f2c8d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamLiveEventsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamLiveEventsService.java @@ -6,9 +6,8 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.domain.event.ExamAttendanceCheckEvent; @@ -18,6 +17,7 @@ import de.tum.cit.aet.artemis.exam.domain.event.WorkingTimeUpdateEvent; import de.tum.cit.aet.artemis.exam.repository.ExamLiveEventRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizService.java index 9f80b31dd6b0..55b3a14a0148 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizService.java @@ -10,9 +10,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamRegistrationService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamRegistrationService.java index e99c461cfc9e..ea0b35f15a5e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamRegistrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamRegistrationService.java @@ -18,11 +18,11 @@ import org.springframework.util.StringUtils; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.domain.StudentExam; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamService.java index 5209524d0a50..b4bd0bfaefc2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamService.java @@ -39,43 +39,43 @@ import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.BonusStrategy; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintType; +import de.tum.cit.aet.artemis.assessment.domain.GradeStep; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.BonusStrategy; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.domain.GradeStep; -import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionService.java index 66c9d571b860..b480f6b8d3d3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionService.java @@ -11,15 +11,15 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamUserService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamUserService.java index ab69d094d780..0063d6a24719 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamUserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamUserService.java @@ -24,8 +24,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.service.FilePathService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessService.java index 5d690f2eb8aa..f502a2c6d7e4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessService.java @@ -7,10 +7,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamService.java b/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamService.java index eac5e223e553..6a2f5de319bb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamService.java @@ -33,23 +33,23 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.quiz.domain.DragAndDropSubmittedAnswer; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/CourseExamExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/CourseExamExportService.java index 3c3ddbb30fe2..35d9b2e89138 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/CourseExamExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/CourseExamExportService.java @@ -28,16 +28,16 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.CourseExamExportErrorCause; -import de.tum.cit.aet.artemis.domain.CourseExamExportState; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.CourseExamExportErrorCause; +import de.tum.cit.aet.artemis.core.domain.CourseExamExportState; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCommunicationDataService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCommunicationDataService.java index 10285178e85a..5f33def6cd74 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCommunicationDataService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCommunicationDataService.java @@ -23,7 +23,7 @@ import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.communication.repository.ReactionRepository; -import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Course; /** * A service to create the communication data export for users diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCreationService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCreationService.java index 8c0eb91e878c..26462b3c4c2c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCreationService.java @@ -19,11 +19,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.domain.DataExport; +import de.tum.cit.aet.artemis.core.domain.DataExportState; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ArtemisMailException; import de.tum.cit.aet.artemis.core.repository.DataExportRepository; -import de.tum.cit.aet.artemis.domain.DataExport; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.DataExportState; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ResourceLoaderService; import de.tum.cit.aet.artemis.service.ZipFileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExamCreationService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExamCreationService.java index 207c24045b65..3a67ce95e96f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExamCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExamCreationService.java @@ -20,12 +20,12 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.exam.ExamService; import de.tum.cit.aet.artemis.web.rest.dto.ExamScoresDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExerciseCreationService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExerciseCreationService.java index 5ec0159fae54..a02e6288fe87 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExerciseCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExerciseCreationService.java @@ -26,22 +26,22 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Complaint; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintType; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.communication.domain.AnswerPost; -import de.tum.cit.aet.artemis.domain.Complaint; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportService.java index 1c70fa0c8404..7c46934da4a6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportService.java @@ -18,11 +18,11 @@ import org.springframework.core.io.Resource; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.domain.DataExport; +import de.tum.cit.aet.artemis.core.domain.DataExportState; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.DataExportRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.DataExport; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.DataExportState; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.web.rest.dto.DataExportDTO; import de.tum.cit.aet.artemis.web.rest.dto.RequestDataExportDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportUtil.java b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportUtil.java index deef8434ac37..d3c5df9a1e72 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportUtil.java @@ -4,7 +4,7 @@ import java.nio.file.Files; import java.nio.file.Path; -import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Course; /** * A utility class for data export containing helper methods that are frequently used in the different services responsible for creating data exports. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/ExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/ExerciseWithSubmissionsExportService.java index a1e7befede88..baba95795261 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/ExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/ExerciseWithSubmissionsExportService.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.archival.ArchivalReportEntry; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadExerciseWithSubmissionsExportService.java index 1a1765ed5583..7e44275f2bfd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadExerciseWithSubmissionsExportService.java @@ -9,7 +9,7 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.archival.ArchivalReportEntry; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadSubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadSubmissionExportService.java index d033c016b1eb..10593f69fb12 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadSubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadSubmissionExportService.java @@ -14,10 +14,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ZipFileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingSubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingSubmissionExportService.java index 1b21e6036e70..3dfd0caa9c25 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingSubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingSubmissionExportService.java @@ -11,8 +11,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/ProgrammingExerciseExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/ProgrammingExerciseExportService.java index 3a29fca05876..ed0f2535f8d9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/ProgrammingExerciseExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/ProgrammingExerciseExportService.java @@ -52,19 +52,19 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.exception.GitException; -import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.Repository; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/SubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/SubmissionExportService.java index eab1c35bb652..ef952935ad86 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/SubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/SubmissionExportService.java @@ -24,10 +24,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.ExerciseDateService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/TextSubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/service/export/TextSubmissionExportService.java index d2b7161c9f8d..04ea7eb5b6ce 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/TextSubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/export/TextSubmissionExportService.java @@ -11,8 +11,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ZipFileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/CodeHintService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/CodeHintService.java index 4695a0270ed2..b639cad30d82 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/CodeHintService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/CodeHintService.java @@ -12,8 +12,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.iris.domain.session.IrisHestiaSession; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ExerciseHintService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ExerciseHintService.java index 3c395bfec3ed..a669824ee7bd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ExerciseHintService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ExerciseHintService.java @@ -18,13 +18,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.Role; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHintActivation; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java index 3acef16c6b69..802694efb8bd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java @@ -20,14 +20,14 @@ import org.springframework.stereotype.Service; import org.springframework.util.FileSystemUtils; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseTaskService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseTaskService.java index b3a81ea31b6c..65d7be3cf1a3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseTaskService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseTaskService.java @@ -19,8 +19,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/TestwiseCoverageService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/TestwiseCoverageService.java index 6f8b1ca09e09..0fef56e1fae0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/TestwiseCoverageService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/TestwiseCoverageService.java @@ -20,8 +20,8 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageFileReport; import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageReport; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralTestCaseService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralTestCaseService.java index e388634be488..669a2de17422 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralTestCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralTestCaseService.java @@ -14,7 +14,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/GroupedFile.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/GroupedFile.java index 75a2045baa96..92017c67268e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/GroupedFile.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/GroupedFile.java @@ -6,7 +6,7 @@ import java.util.SortedSet; import java.util.TreeSet; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; import de.tum.cit.aet.artemis.programming.domain.hestia.TestwiseCoverageReportEntry; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralTestCaseService.java b/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralTestCaseService.java index b83efd727102..ca0f55065696 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralTestCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralTestCaseService.java @@ -28,9 +28,9 @@ import com.thoughtworks.qdox.model.JavaClass; import com.thoughtworks.qdox.model.JavaType; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTestCaseType; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/icl/ArtemisGitServletService.java b/src/main/java/de/tum/cit/aet/artemis/service/icl/ArtemisGitServletService.java index 53c0b95c7f42..dffcf76ea558 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/icl/ArtemisGitServletService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/icl/ArtemisGitServletService.java @@ -9,7 +9,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCFetchFilter; import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCPostPushHook; import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCPrePushHook; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitLocationResolverService.java b/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitLocationResolverService.java index f820457bf931..c35c37bc6ada 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitLocationResolverService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitLocationResolverService.java @@ -20,7 +20,7 @@ import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCForbiddenException; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.icl.ssh.SshConstants; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisCompetencyGenerationService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisCompetencyGenerationService.java index bd456715d9f5..ff3696e3a55a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisCompetencyGenerationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisCompetencyGenerationService.java @@ -4,8 +4,8 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisJobService; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisPipelineService; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionPipelineExecutionDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisRateLimitService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisRateLimitService.java index b6908eadce85..07cb5846dddb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisRateLimitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisRateLimitService.java @@ -6,7 +6,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.iris.repository.IrisMessageRepository; import de.tum.cit.aet.artemis.service.iris.exception.IrisRateLimitExceededException; import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisSessionService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisSessionService.java index 0f41683b6139..4dcb9709a23b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisSessionService.java @@ -6,8 +6,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; import de.tum.cit.aet.artemis.iris.domain.session.IrisCourseChatSession; import de.tum.cit.aet.artemis.iris.domain.session.IrisExerciseChatSession; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisCourseChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisCourseChatSessionService.java index 2fccc3aefa9f..17298ffe5ade 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisCourseChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisCourseChatSessionService.java @@ -12,9 +12,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyJol; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.Role; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessageSender; import de.tum.cit.aet.artemis.iris.domain.message.IrisTextMessageContent; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisExerciseChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisExerciseChatSessionService.java index 2d0dbd976329..d096aebc035c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisExerciseChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisExerciseChatSessionService.java @@ -8,17 +8,17 @@ import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.Role; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessageSender; import de.tum.cit.aet.artemis.iris.domain.message.IrisTextMessageContent; import de.tum.cit.aet.artemis.iris.domain.session.IrisExerciseChatSession; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisHestiaSessionService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisHestiaSessionService.java index 5bb11f1114b6..701a5f25863b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisHestiaSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisHestiaSessionService.java @@ -9,13 +9,13 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.Role; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.iris.domain.session.IrisHestiaSession; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; import de.tum.cit.aet.artemis.iris.repository.IrisHestiaSessionRepository; import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisConnectorService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisRateLimitedFeatureInterface.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisRateLimitedFeatureInterface.java index 86fe4e65eedc..0321d07c291f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisRateLimitedFeatureInterface.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisRateLimitedFeatureInterface.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.iris.session; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; public interface IrisRateLimitedFeatureInterface { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisSubFeatureInterface.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisSubFeatureInterface.java index e0c6b8b23279..309a3cd04b2e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisSubFeatureInterface.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisSubFeatureInterface.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.iris.session; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; public interface IrisSubFeatureInterface { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSettingsService.java b/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSettingsService.java index ea1e150dfd85..b6cfedbefa28 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSettingsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSettingsService.java @@ -16,9 +16,9 @@ import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; import de.tum.cit.aet.artemis.iris.domain.settings.IrisChatSubSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisCompetencyGenerationSubSettings; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserService.java b/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserService.java index 335dfb7e0d2b..0063d23b7013 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserService.java @@ -18,8 +18,8 @@ import org.springframework.ldap.query.SearchScope; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.LdapUserRepository; -import de.tum.cit.aet.artemis.domain.User; @Service @Profile("ldap | ldap-only") diff --git a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNavigationService.java b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNavigationService.java index 0dc764086283..4eea542c7d7d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNavigationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNavigationService.java @@ -9,10 +9,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.domain.LearningObject; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; -import de.tum.cit.aet.artemis.domain.LearningObject; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.service.LearningObjectService; import de.tum.cit.aet.artemis.service.learningpath.LearningPathRecommendationService.RecommendationState; import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNgxService.java b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNgxService.java index f27e24e462ce..063c31372777 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNgxService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNgxService.java @@ -17,14 +17,14 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.domain.LearningObject; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyRelation; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; import de.tum.cit.aet.artemis.atlas.domain.competency.RelationType; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.LearningObject; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.web.rest.dto.competency.NgxLearningPathDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathRecommendationService.java b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathRecommendationService.java index f1782cc6d45b..f3342ec3a4a7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathRecommendationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathRecommendationService.java @@ -22,6 +22,7 @@ import com.google.common.util.concurrent.AtomicDouble; +import de.tum.cit.aet.artemis.atlas.domain.LearningObject; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; @@ -30,11 +31,10 @@ import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.LearningObject; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.DifficultyLevel; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.service.LearningObjectService; import de.tum.cit.aet.artemis.service.ParticipantScoreService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathService.java b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathService.java index c2f1adffa1b4..4bb933378b3e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathService.java @@ -26,11 +26,11 @@ import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.LearningPathRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/listeners/ResultListener.java b/src/main/java/de/tum/cit/aet/artemis/service/listeners/ResultListener.java index e551b3fd4864..87eba14d00b1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/listeners/ResultListener.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/listeners/ResultListener.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Component; import de.tum.cit.aet.artemis.assessment.domain.ParticipantScore; -import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageReceiveService.java b/src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageReceiveService.java index 7d89e6f25bc1..90d90cd1b26b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageReceiveService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageReceiveService.java @@ -14,14 +14,14 @@ import com.hazelcast.core.HazelcastInstance; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.quiz.QuizScheduleService; import de.tum.cit.aet.artemis.service.scheduled.AthenaScheduleService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/AnswerMessageService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/AnswerMessageService.java index 6f5670cb6863..4cc588de7396 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/AnswerMessageService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/AnswerMessageService.java @@ -20,11 +20,11 @@ import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/ConversationMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/ConversationMessagingService.java index b50f28e184fc..ff2181ea76b0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/ConversationMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/ConversationMessagingService.java @@ -26,7 +26,10 @@ import com.google.common.collect.Lists; +import de.tum.cit.aet.artemis.communication.domain.ConversationNotificationRecipientSummary; import de.tum.cit.aet.artemis.communication.domain.CreatedConversationMessage; +import de.tum.cit.aet.artemis.communication.domain.DisplayPriority; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; @@ -39,15 +42,12 @@ import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.SingleUserNotificationRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.ConversationNotificationRecipientSummary; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/PostingService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/PostingService.java index 91ca819b065c..287f26525304 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/PostingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/PostingService.java @@ -18,6 +18,7 @@ import org.slf4j.LoggerFactory; import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.ConversationNotificationRecipientSummary; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.Posting; import de.tum.cit.aet.artemis.communication.domain.UserRole; @@ -26,13 +27,12 @@ import de.tum.cit.aet.artemis.communication.domain.notification.ConversationNotification; import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; -import de.tum.cit.aet.artemis.domain.ConversationNotificationRecipientSummary; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/ReactionService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/ReactionService.java index 3d9611958333..128666be36c1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/ReactionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/ReactionService.java @@ -14,10 +14,10 @@ import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.communication.repository.ReactionRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismAnswerPostService; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismPostService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ChannelService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ChannelService.java index 569a4018fa50..c3e813e65703 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ChannelService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ChannelService.java @@ -20,12 +20,12 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.service.metis.conversation.errors.ChannelNameDuplicateException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationDTOService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationDTOService.java index 2874ad9f8e5e..0493552deb06 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationDTOService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationDTOService.java @@ -20,10 +20,10 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.OneToOneChat; import de.tum.cit.aet.artemis.communication.dto.ConversationSummary; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.dto.UserPublicInfoDTO; import de.tum.cit.aet.artemis.service.metis.conversation.auth.ChannelAuthorizationService; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationService.java index bf6967781ba8..54a578cd3fb1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationService.java @@ -33,10 +33,10 @@ import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.GroupChatRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.OneToOneChatRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/GroupChatService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/GroupChatService.java index 716c0db4dca5..9aae93a17d08 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/GroupChatService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/GroupChatService.java @@ -13,9 +13,9 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.GroupChat; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.GroupChatRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.GroupChatDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/OneToOneChatService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/OneToOneChatService.java index 66eb0178f706..6119d0ff29c1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/OneToOneChatService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/OneToOneChatService.java @@ -11,9 +11,9 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.OneToOneChat; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.OneToOneChatRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ChannelAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ChannelAuthorizationService.java index 3a276b7c11d6..7725f13ad39b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ChannelAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ChannelAuthorizationService.java @@ -17,10 +17,10 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ConversationAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ConversationAuthorizationService.java index fd6171137957..060cd2f6347e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ConversationAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ConversationAuthorizationService.java @@ -8,8 +8,8 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/GroupChatAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/GroupChatAuthorizationService.java index 3749dee58e3e..d856d32cac81 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/GroupChatAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/GroupChatAuthorizationService.java @@ -11,10 +11,10 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.GroupChat; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.GroupChatRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/OneToOneChatAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/OneToOneChatAuthorizationService.java index d9f4fb4e6833..41dc18a5bfb8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/OneToOneChatAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/OneToOneChatAuthorizationService.java @@ -10,10 +10,10 @@ import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.OneToOneChatRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationService.java index 068ea98e564e..7cac3fddb776 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationService.java @@ -1,11 +1,11 @@ package de.tum.cit.aet.artemis.service.notifications; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_NEW_MESSAGE; import static de.tum.cit.aet.artemis.communication.domain.notification.ConversationNotificationFactory.createConversationMessageNotification; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.NEW_MESSAGE_CHANNEL_TEXT; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.NEW_MESSAGE_DIRECT_TEXT; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.NEW_MESSAGE_GROUP_CHAT_TEXT; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_MESSAGE; import java.util.Set; import java.util.stream.Collectors; @@ -13,6 +13,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; @@ -23,9 +24,8 @@ import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotificationFactory; import de.tum.cit.aet.artemis.communication.repository.SingleUserNotificationRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationNotificationRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; /** * Service for sending notifications about new messages in conversations. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationService.java index 3a1e3fa4cea6..722fb75678e6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationService.java @@ -11,11 +11,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.service.notifications.push_notifications.ApplePushNotificationService; import de.tum.cit.aet.artemis.service.notifications.push_notifications.FirebasePushNotificationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationScheduleService.java index 8ad78dbaeccf..0d39a0dc197b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationScheduleService.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationService.java index 583ea701f556..fdf59de395d4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationService.java @@ -1,25 +1,25 @@ package de.tum.cit.aet.artemis.service.notifications; +import static de.tum.cit.aet.artemis.communication.domain.GroupNotificationType.EDITOR; +import static de.tum.cit.aet.artemis.communication.domain.GroupNotificationType.INSTRUCTOR; +import static de.tum.cit.aet.artemis.communication.domain.GroupNotificationType.STUDENT; +import static de.tum.cit.aet.artemis.communication.domain.GroupNotificationType.TA; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.ATTACHMENT_CHANGE; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.DUPLICATE_TEST_CASE; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXERCISE_PRACTICE; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXERCISE_RELEASED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXERCISE_UPDATED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.ILLEGAL_SUBMISSION; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_ANNOUNCEMENT_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_MANUAL_FEEDBACK_REQUEST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.PROGRAMMING_BUILD_RUN_UPDATE; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.PROGRAMMING_REPOSITORY_LOCKS; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.PROGRAMMING_TEST_CASES_CHANGED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.QUIZ_EXERCISE_STARTED; import static de.tum.cit.aet.artemis.communication.domain.notification.GroupNotificationFactory.createAnnouncementNotification; import static de.tum.cit.aet.artemis.communication.domain.notification.GroupNotificationFactory.createNotification; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.LIVE_EXAM_EXERCISE_UPDATE_NOTIFICATION_TITLE; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.EDITOR; -import static de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.INSTRUCTOR; -import static de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.STUDENT; -import static de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.TA; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.ATTACHMENT_CHANGE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DUPLICATE_TEST_CASE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_PRACTICE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_RELEASED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_UPDATED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.ILLEGAL_SUBMISSION; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_ANNOUNCEMENT_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_MANUAL_FEEDBACK_REQUEST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PROGRAMMING_BUILD_RUN_UPDATE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PROGRAMMING_REPOSITORY_LOCKS; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PROGRAMMING_TEST_CASES_CHANGED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.QUIZ_EXERCISE_STARTED; import java.time.ZonedDateTime; import java.util.Collections; @@ -31,20 +31,20 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.domain.GroupNotificationType; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.notification.GroupNotification; import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; import de.tum.cit.aet.artemis.communication.domain.notification.NotificationTarget; import de.tum.cit.aet.artemis.communication.repository.GroupNotificationRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Attachment; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.lecture.domain.Attachment; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/InstantNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/InstantNotificationService.java index 0007c62e8856..aa25b283be71 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/InstantNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/InstantNotificationService.java @@ -3,7 +3,7 @@ import java.util.Set; import de.tum.cit.aet.artemis.communication.domain.notification.Notification; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; /** * The Interface which should be used for InstantNotifications such as Mails and PushNotifications. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailSendingService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailSendingService.java index 8dc03f8afe40..e7f5db5360dd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailSendingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailSendingService.java @@ -16,7 +16,7 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; import tech.jhipster.config.JHipsterProperties; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailService.java index 8b22930ab83b..2297653f2041 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailService.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.service.notifications; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXERCISE_SUBMISSION_ASSESSED; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.extractNotificationUrl; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_SUBMISSION_ASSESSED; import java.net.URL; import java.util.Locale; @@ -18,14 +18,14 @@ import org.thymeleaf.context.Context; import org.thymeleaf.spring6.SpringTemplateEngine; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.DataExport; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DataExport; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.service.TimeService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsService.java index 917fc2fd8498..7c83fadaeba0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsService.java @@ -1,48 +1,48 @@ package de.tum.cit.aet.artemis.service.notifications; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.ATTACHMENT_CHANGE; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_ADD_USER_CHANNEL; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_ADD_USER_GROUP_CHAT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_CREATE_GROUP_CHAT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_CREATE_ONE_TO_ONE_CHAT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_NEW_MESSAGE; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_NEW_REPLY_MESSAGE; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_REMOVE_USER_CHANNEL; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_REMOVE_USER_GROUP_CHAT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_USER_MENTIONED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.COURSE_ARCHIVE_STARTED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.DATA_EXPORT_CREATED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.DATA_EXPORT_FAILED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.DUPLICATE_TEST_CASE; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXAM_ARCHIVE_STARTED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXERCISE_PRACTICE; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXERCISE_RELEASED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXERCISE_SUBMISSION_ASSESSED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.FILE_SUBMISSION_SUCCESSFUL; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_ANNOUNCEMENT_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_COURSE_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_CPC_PLAGIARISM_CASE_STUDENT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_EXAM_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_EXERCISE_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_LECTURE_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_PLAGIARISM_CASE_STUDENT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_REPLY_FOR_COURSE_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_REPLY_FOR_EXERCISE_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_REPLY_FOR_LECTURE_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.PLAGIARISM_CASE_VERDICT_STUDENT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.PROGRAMMING_TEST_CASES_CHANGED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.QUIZ_EXERCISE_STARTED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_ASSIGNED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_DELETED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_STUDENT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_MULTIPLE_REGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_REGISTRATION_STUDENT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_REGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_UNASSIGNED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_UPDATED; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.findCorrespondingNotificationType; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.ATTACHMENT_CHANGE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_CHANNEL; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_GROUP_CHAT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_CREATE_GROUP_CHAT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_CREATE_ONE_TO_ONE_CHAT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_MESSAGE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_REPLY_MESSAGE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_REMOVE_USER_CHANNEL; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_REMOVE_USER_GROUP_CHAT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_USER_MENTIONED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_STARTED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DATA_EXPORT_CREATED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DATA_EXPORT_FAILED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DUPLICATE_TEST_CASE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_STARTED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_PRACTICE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_RELEASED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_SUBMISSION_ASSESSED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.FILE_SUBMISSION_SUCCESSFUL; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_ANNOUNCEMENT_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_COURSE_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_CPC_PLAGIARISM_CASE_STUDENT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_EXAM_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_EXERCISE_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_LECTURE_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_PLAGIARISM_CASE_STUDENT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_COURSE_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_EXERCISE_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_LECTURE_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PLAGIARISM_CASE_VERDICT_STUDENT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PROGRAMMING_TEST_CASES_CHANGED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.QUIZ_EXERCISE_STARTED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_ASSIGNED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DELETED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_STUDENT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_TUTOR; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_MULTIPLE_REGISTRATION_TUTOR; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_STUDENT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_TUTOR; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UNASSIGNED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UPDATED; import java.util.Arrays; import java.util.HashMap; @@ -54,13 +54,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.domain.NotificationSetting; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.NotificationSetting; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/SingleUserNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/SingleUserNotificationService.java index 6007e1320fa5..b639135683f4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/SingleUserNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/SingleUserNotificationService.java @@ -1,5 +1,25 @@ package de.tum.cit.aet.artemis.service.notifications; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_NEW_REPLY_MESSAGE; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_USER_MENTIONED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.DATA_EXPORT_CREATED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.DATA_EXPORT_FAILED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXERCISE_SUBMISSION_ASSESSED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.FILE_SUBMISSION_SUCCESSFUL; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_CPC_PLAGIARISM_CASE_STUDENT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_PLAGIARISM_CASE_STUDENT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_REPLY_FOR_COURSE_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_REPLY_FOR_EXAM_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_REPLY_FOR_EXERCISE_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_REPLY_FOR_LECTURE_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.PLAGIARISM_CASE_VERDICT_STUDENT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_ASSIGNED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_STUDENT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_MULTIPLE_REGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_REGISTRATION_STUDENT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_REGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_UNASSIGNED; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_CHANNEL_TITLE; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_GROUP_CHAT_TITLE; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.CONVERSATION_CREATE_GROUP_CHAT_TITLE; @@ -16,26 +36,6 @@ import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.findCorrespondingNotificationTitleOrThrow; import static de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotificationFactory.createNotification; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_REPLY_MESSAGE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_USER_MENTIONED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DATA_EXPORT_CREATED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DATA_EXPORT_FAILED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_SUBMISSION_ASSESSED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.FILE_SUBMISSION_SUCCESSFUL; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_CPC_PLAGIARISM_CASE_STUDENT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_PLAGIARISM_CASE_STUDENT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_COURSE_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_EXAM_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_EXERCISE_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_LECTURE_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PLAGIARISM_CASE_VERDICT_STUDENT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_ASSIGNED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_STUDENT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_TUTOR; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_MULTIPLE_REGISTRATION_TUTOR; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_STUDENT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_TUTOR; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UNASSIGNED; import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel.WEBAPP; import java.util.Objects; @@ -47,7 +47,9 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; @@ -55,17 +57,15 @@ import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotification; import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; import de.tum.cit.aet.artemis.communication.repository.SingleUserNotificationRepository; +import de.tum.cit.aet.artemis.core.domain.DataExport; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.DataExport; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationService.java index 27160127824b..223876edadc9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationService.java @@ -1,9 +1,9 @@ package de.tum.cit.aet.artemis.service.notifications; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_DELETED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_UPDATED; import static de.tum.cit.aet.artemis.communication.domain.notification.TutorialGroupNotificationFactory.createTutorialGroupNotification; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DELETED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UPDATED; import java.util.Set; import java.util.stream.Collectors; @@ -14,11 +14,11 @@ import org.springframework.util.StringUtils; import de.tum.cit.aet.artemis.communication.domain.notification.TutorialGroupNotification; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistrationType; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupNotificationRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRegistrationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/PushNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/PushNotificationService.java index e204c5f7b5f4..b294b92b7655 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/PushNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/PushNotificationService.java @@ -37,14 +37,14 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfiguration; import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceType; import de.tum.cit.aet.artemis.communication.repository.PushNotificationDeviceConfigurationRepository; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.service.notifications.InstantNotificationService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlService.java index fa7f27e2bda7..880616ba00e8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlService.java @@ -13,11 +13,10 @@ import org.springframework.stereotype.Service; import de.jplag.exceptions.ExitException; +import de.tum.cit.aet.artemis.communication.domain.DisplayPriority; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.core.exception.ArtemisMailException; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; @@ -28,6 +27,7 @@ import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; import de.tum.cit.aet.artemis.text.domain.TextExercise; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ModelingPlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ModelingPlagiarismDetectionService.java index 6289178fd352..a5cd4b3e032d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ModelingPlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ModelingPlagiarismDetectionService.java @@ -19,10 +19,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.PlagiarismCheckState; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCheckState; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmission; import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingPlagiarismResult; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismAnswerPostService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismAnswerPostService.java index 3b4f99a5aca2..4d75591fad82 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismAnswerPostService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismAnswerPostService.java @@ -13,11 +13,11 @@ import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismCaseService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismCaseService.java index 54cd175d8b62..991115797ef7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismCaseService.java @@ -13,8 +13,8 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmission; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java index 2736ca3f9b2a..3faae74e0217 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java @@ -4,7 +4,7 @@ import org.slf4j.LoggerFactory; import org.springframework.data.jpa.repository.JpaRepository; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismDetectionConfig; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionService.java index 5ca7adc35372..22ac6383ce77 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionService.java @@ -13,12 +13,12 @@ import org.springframework.stereotype.Service; import de.jplag.exceptions.ExitException; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeatureService; import de.tum.cit.aet.artemis.text.domain.TextExercise; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismPostService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismPostService.java index eb2b5ab010fc..78e3d40182cf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismPostService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismPostService.java @@ -9,15 +9,15 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.domain.DisplayPriority; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismService.java index 7d2569a9d3e0..e494e4fa97d0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismService.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismWebsocketService.java index 901f7f4855f0..2c16e2c70da0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismWebsocketService.java @@ -14,7 +14,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.domain.PlagiarismCheckState; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCheckState; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingLanguageNotSupportedForPlagiarismDetectionException.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingLanguageNotSupportedForPlagiarismDetectionException.java index ee8e588f551c..fc508d8482f7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingLanguageNotSupportedForPlagiarismDetectionException.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingLanguageNotSupportedForPlagiarismDetectionException.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.plagiarism; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; public class ProgrammingLanguageNotSupportedForPlagiarismDetectionException extends Exception { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java index 664ab61d64fc..0916f19fc276 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java @@ -38,13 +38,13 @@ import de.jplag.reporting.reportobject.ReportObjectFactory; import de.jplag.swift.SwiftLanguage; import de.tum.cit.aet.artemis.core.exception.GitException; -import de.tum.cit.aet.artemis.domain.PlagiarismCheckState; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Repository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCheckState; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.UriService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/TextPlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/TextPlagiarismDetectionService.java index ed9e7712296c..52c52fb9c977 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/TextPlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/TextPlagiarismDetectionService.java @@ -24,9 +24,9 @@ import de.jplag.exceptions.ExitException; import de.jplag.options.JPlagOptions; import de.jplag.text.NaturalLanguage; -import de.tum.cit.aet.artemis.domain.PlagiarismCheckState; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCheckState; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; import de.tum.cit.aet.artemis.service.export.TextSubmissionExportService; import de.tum.cit.aet.artemis.service.plagiarism.cache.PlagiarismCacheService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/AuxiliaryRepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/AuxiliaryRepositoryService.java index 957bc65dc52f..ead7278df9ab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/AuxiliaryRepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/AuxiliaryRepositoryService.java @@ -12,10 +12,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/CommitHistoryService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/CommitHistoryService.java index ba86eef8714c..2b3a9ba3e4bf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/CommitHistoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/CommitHistoryService.java @@ -18,8 +18,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.domain.Repository; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; import de.tum.cit.aet.artemis.service.ProfileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/DefaultTemplateUpgradeService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/DefaultTemplateUpgradeService.java index e97b26b7e434..a35bf7d0f843 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/DefaultTemplateUpgradeService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/DefaultTemplateUpgradeService.java @@ -5,7 +5,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/JavaTemplateUpgradeService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/JavaTemplateUpgradeService.java index 108b2884f058..e1382a48ec33 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/JavaTemplateUpgradeService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/JavaTemplateUpgradeService.java @@ -29,10 +29,10 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.File; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.File; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.Repository; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ResourceLoaderService; import de.tum.cit.aet.artemis.service.connectors.GitService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingAssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingAssessmentService.java index 2e6f2a370060..36d91b6981f0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingAssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingAssessmentService.java @@ -10,21 +10,21 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.domain.AssessmentNote; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.service.AssessmentService; import de.tum.cit.aet.artemis.service.ComplaintResponseService; import de.tum.cit.aet.artemis.service.ExerciseDateService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseCodeReviewFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseCodeReviewFeedbackService.java index 1abdde409cc6..68a652a8705f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseCodeReviewFeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseCodeReviewFeedbackService.java @@ -14,14 +14,14 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.service.SubmissionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationService.java index 2a99e74f9c1e..5765c26bfdae 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationService.java @@ -27,19 +27,19 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.assessment.domain.CategoryState; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.config.StaticCodeAnalysisConfigurer; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisCategory; -import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisDefaultCategory; -import de.tum.cit.aet.artemis.domain.enumeration.CategoryState; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; -import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisCategory; +import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisDefaultCategory; +import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTestCaseType; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseGradingService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseGradingService.java index fb4d4748e2f5..6b9f70875a52 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseGradingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseGradingService.java @@ -2,7 +2,7 @@ import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.config.Constants.TEST_CASES_DUPLICATE_NOTIFICATION; -import static de.tum.cit.aet.artemis.domain.ProgrammingSubmission.createFallbackSubmission; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission.createFallbackSubmission; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -30,28 +30,28 @@ import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; +import de.tum.cit.aet.artemis.assessment.domain.CategoryState; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.VersionControlException; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisCategory; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.CategoryState; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisCategory; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPenaltyPolicy; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportBasicService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportBasicService.java index 779fcb99f8db..390cd1a263a2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportBasicService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportBasicService.java @@ -15,14 +15,14 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisCategory; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismDetectionConfig; +import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisCategory; import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportFromFileService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportFromFileService.java index eb592264f869..00b5c8878aab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportFromFileService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportFromFileService.java @@ -26,12 +26,12 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.Repository; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportService.java index 78b8aeb85a76..e85d0c0ac0db 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportService.java @@ -20,16 +20,16 @@ import com.fasterxml.jackson.core.JsonProcessingException; +import de.tum.cit.aet.artemis.assessment.domain.Visibility; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.programming.domain.BuildPlanType; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.domain.Repository; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseParticipationService.java index 91973561a274..20243122db3e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseParticipationService.java @@ -19,25 +19,25 @@ import org.springframework.stereotype.Service; import org.springframework.util.FileSystemUtils; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.exam.domain.StudentExam; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.programming.domain.BuildPlanType; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.Repository; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseRepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseRepositoryService.java index 2f5f7ac19a3d..d3103b08f455 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseRepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseRepositoryService.java @@ -2,7 +2,7 @@ import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.config.Constants.SETUP_COMMIT_MESSAGE; -import static de.tum.cit.aet.artemis.domain.enumeration.ProjectType.isMavenProject; +import static de.tum.cit.aet.artemis.programming.domain.ProjectType.isMavenProject; import java.io.FileNotFoundException; import java.io.IOException; @@ -25,14 +25,14 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.Repository; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ResourceLoaderService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseService.java index aa12e4028d12..c060c9f2e6cf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseService.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.service.programming; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.SOLUTION; -import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.TEMPLATE; +import static de.tum.cit.aet.artemis.programming.domain.BuildPlanType.SOLUTION; +import static de.tum.cit.aet.artemis.programming.domain.BuildPlanType.TEMPLATE; import static de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository.ProgrammingExerciseFetchOptions.AuxiliaryRepositories; import static de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository.ProgrammingExerciseFetchOptions.GradingCriteria; import static de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository.SolutionParticipationFetchOptions; @@ -43,22 +43,22 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.Repository; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseTestCaseService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseTestCaseService.java index 6d784b419ef3..08c2aecd89d0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseTestCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseTestCaseService.java @@ -17,10 +17,10 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingLanguageFeature.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingLanguageFeature.java index 11c491afec13..d6f46e1cf4bd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingLanguageFeature.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingLanguageFeature.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; /** * Store configuration of a specific programming language. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingLanguageFeatureService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingLanguageFeatureService.java index 9b4fb0658a5e..9de5197d1919 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingLanguageFeatureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingLanguageFeatureService.java @@ -8,7 +8,7 @@ import org.springframework.boot.actuate.info.Info; import org.springframework.boot.actuate.info.InfoContributor; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; /** * This service provides information about features the different ProgrammingLanguages support. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingMessagingService.java index 8eb025a010a7..af2ade3d137f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingMessagingService.java @@ -15,16 +15,16 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.BuildRunState; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.programming.domain.BuildRunState; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.connectors.lti.LtiNewResultService; import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingSubmissionService.java index 89dd4ecc7c72..8395e16f75bd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingSubmissionService.java @@ -21,32 +21,32 @@ import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.Commit; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.programming.domain.AbstractBaseProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.Commit; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingTriggerService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingTriggerService.java index 75d9286fe9ff..3934b4b75336 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingTriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingTriggerService.java @@ -18,19 +18,19 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryAccessService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryAccessService.java index ca2e4bb0caff..385abb17e36d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryAccessService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryAccessService.java @@ -5,10 +5,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryParticipationService.java index e36b17fae169..74877e5eb2c8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryParticipationService.java @@ -9,10 +9,10 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Repository; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryService.java index 6e6b283f511a..39e0ee26ca3c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryService.java @@ -34,15 +34,15 @@ import org.springframework.stereotype.Service; import org.springframework.util.FileSystemUtils; -import de.tum.cit.aet.artemis.domain.File; -import de.tum.cit.aet.artemis.domain.FileType; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.programming.domain.File; +import de.tum.cit.aet.artemis.programming.domain.FileType; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.Repository; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.connectors.GitService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/TemplateUpgradePolicyService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/TemplateUpgradePolicyService.java index 3c242fb494d6..e05744eb721b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/TemplateUpgradePolicyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/TemplateUpgradePolicyService.java @@ -5,7 +5,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; /** * The policy for choosing the appropriate service for upgrading of template files diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/TemplateUpgradeService.java b/src/main/java/de/tum/cit/aet/artemis/service/programming/TemplateUpgradeService.java index 070d7aa34068..4d55aed77310 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/TemplateUpgradeService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/programming/TemplateUpgradeService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.programming; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; public interface TemplateUpgradeService { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizBatchService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizBatchService.java index 3837ef76a0ae..fa8141d19397 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizBatchService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizBatchService.java @@ -17,12 +17,12 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.QuizJoinException; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.quiz.repository.QuizBatchRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseService.java index 2122131b5b13..003290c6deed 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseService.java @@ -31,17 +31,17 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; import de.tum.cit.aet.artemis.quiz.domain.DragItem; import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.quiz.domain.QuizPointStatistic; import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizMessagingService.java index b2fdb8fc07c2..8ac0fa42a0f6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizMessagingService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service.quiz; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.domain.enumeration.QuizAction.START_BATCH; +import static de.tum.cit.aet.artemis.quiz.domain.QuizAction.START_BATCH; import jakarta.annotation.Nullable; @@ -15,7 +15,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.domain.enumeration.QuizAction; +import de.tum.cit.aet.artemis.quiz.domain.QuizAction; import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizResultService.java index 6dea13a76a53..0afc6ed90cb7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizResultService.java @@ -15,11 +15,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizScheduleService.java index d5be3ae2ef65..8c1681f06d1f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizScheduleService.java @@ -2,7 +2,7 @@ import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import static de.tum.cit.aet.artemis.core.config.StartupDelayConfig.QUIZ_EXERCISE_SCHEDULE_DELAY_SEC; -import static de.tum.cit.aet.artemis.domain.enumeration.QuizAction.START_NOW; +import static de.tum.cit.aet.artemis.quiz.domain.QuizAction.START_NOW; import java.time.Instant; import java.time.ZonedDateTime; @@ -19,10 +19,10 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; -import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseLifecycle; import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.quiz.repository.QuizBatchRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.service.ProfileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizStatisticService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizStatisticService.java index 1c3269d8cc6c..e1211bae043a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizStatisticService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizStatisticService.java @@ -12,8 +12,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; -import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizSubmissionService.java index d28dd6a38a2d..088ac21245e1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizSubmissionService.java @@ -11,20 +11,20 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.QuizSubmissionException; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.quiz.domain.AbstractQuizSubmission; import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AthenaScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AthenaScheduleService.java index 8ab4802efe86..fd3eff465d5c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AthenaScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AthenaScheduleService.java @@ -21,8 +21,8 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseLifecycle; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.ExerciseLifecycleService; import de.tum.cit.aet.artemis.service.ProfileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AutomaticProgrammingExerciseCleanupService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AutomaticProgrammingExerciseCleanupService.java index 91afc65b4468..adca63533235 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AutomaticProgrammingExerciseCleanupService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AutomaticProgrammingExerciseCleanupService.java @@ -19,9 +19,9 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleService.java index 7a5f4a18d700..870fdf587a5c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleService.java @@ -16,10 +16,10 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.domain.DataExport; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.DataExportRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.DataExport; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.export.DataExportCreationService; import de.tum.cit.aet.artemis.service.export.DataExportService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/IExerciseScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/IExerciseScheduleService.java index 2cd2bc98595b..956640feabae 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/IExerciseScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/IExerciseScheduleService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.scheduled; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; /** * Interface for exercise specific schedulers. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ModelingExerciseScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ModelingExerciseScheduleService.java index a325e94726d9..9c13de35a02d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ModelingExerciseScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ModelingExerciseScheduleService.java @@ -24,9 +24,9 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseLifecycle; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.service.compass.CompassService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/NotificationScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/NotificationScheduleService.java index e3ea32615c64..88a7e0fcd54a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/NotificationScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/NotificationScheduleService.java @@ -17,8 +17,8 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseLifecycle; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.ProfileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ParticipantScoreScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ParticipantScoreScheduleService.java index 1e5366e0f4d1..47b597662ee2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ParticipantScoreScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ParticipantScoreScheduleService.java @@ -29,18 +29,18 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.domain.ParticipantScore; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.domain.StudentScore; import de.tum.cit.aet.artemis.assessment.domain.TeamScore; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.TeamScoreRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ProgrammingExerciseScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ProgrammingExerciseScheduleService.java index d41b786789c2..7dc35dbaeeba 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ProgrammingExerciseScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ProgrammingExerciseScheduleService.java @@ -34,20 +34,21 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; -import de.tum.cit.aet.artemis.domain.enumeration.ParticipationLifecycle; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseLifecycle; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.ParticipationLifecycle; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; @@ -557,7 +558,7 @@ public Runnable lockStudentRepositoriesAndParticipationsRegularDueDate(Programmi * individual due date is set. *

* This might be needed for an exercise that has test cases marked with - * {@link de.tum.cit.aet.artemis.domain.enumeration.Visibility#AFTER_DUE_DATE}. + * {@link Visibility#AFTER_DUE_DATE}. *

* Those test cases might already have been run in the continuous integration * service and their feedbacks are therefore stored in the database. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ScheduleService.java index ab128b459780..696d489aa0fc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ScheduleService.java @@ -16,10 +16,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; -import de.tum.cit.aet.artemis.domain.enumeration.ParticipationLifecycle; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseLifecycle; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.programming.domain.ParticipationLifecycle; import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.ExerciseLifecycleService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/UserScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/UserScheduleService.java index b3ca8ff77674..b3dcc7752d03 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/UserScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/scheduled/UserScheduleService.java @@ -17,9 +17,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/team/TeamImportStrategy.java b/src/main/java/de/tum/cit/aet/artemis/service/team/TeamImportStrategy.java index 080f89149710..be8a3121655f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/team/TeamImportStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/team/TeamImportStrategy.java @@ -4,8 +4,8 @@ import org.hibernate.Hibernate; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; public abstract class TeamImportStrategy { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/team/strategies/CreateOnlyStrategy.java b/src/main/java/de/tum/cit/aet/artemis/service/team/strategies/CreateOnlyStrategy.java index e174ef647ed5..cc92b0103bd1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/team/strategies/CreateOnlyStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/team/strategies/CreateOnlyStrategy.java @@ -6,9 +6,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.service.team.TeamImportStrategy; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/team/strategies/PurgeExistingStrategy.java b/src/main/java/de/tum/cit/aet/artemis/service/team/strategies/PurgeExistingStrategy.java index a0547ed6ed6a..f5dffe49ffd5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/team/strategies/PurgeExistingStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/team/strategies/PurgeExistingStrategy.java @@ -2,8 +2,8 @@ import java.util.List; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.team.TeamImportStrategy; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupChannelManagementService.java b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupChannelManagementService.java index 9c23d4edd0e7..7df495bce16f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupChannelManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupChannelManagementService.java @@ -16,8 +16,8 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupFreePeriodService.java b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupFreePeriodService.java index 8bd37a504fc9..b4f9d7c69efc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupFreePeriodService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupFreePeriodService.java @@ -9,10 +9,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupFreePeriod; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSessionStatus; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupFreePeriodRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupSessionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupScheduleService.java index 659e47ba1cb0..b1f067397ce8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupScheduleService.java @@ -18,12 +18,12 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupFreePeriod; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSchedule; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSessionStatus; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupScheduleRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupSessionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupService.java b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupService.java index d89de4c8f8aa..fdf12c933b01 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupService.java @@ -33,19 +33,19 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; -import de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationDTOService; import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistrationType; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSessionStatus; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRegistrationRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupSessionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupsConfigurationService.java b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupsConfigurationService.java index 98b6f002c0ac..41f4cb4b421d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupsConfigurationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupsConfigurationService.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupFreePeriod; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSchedule; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/user/AuthorityService.java b/src/main/java/de/tum/cit/aet/artemis/service/user/AuthorityService.java index 9801f9323c7d..15f30a43dff3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/user/AuthorityService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/user/AuthorityService.java @@ -1,11 +1,11 @@ package de.tum.cit.aet.artemis.service.user; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.domain.Authority.ADMIN_AUTHORITY; import static de.tum.cit.aet.artemis.core.security.Role.EDITOR; import static de.tum.cit.aet.artemis.core.security.Role.INSTRUCTOR; import static de.tum.cit.aet.artemis.core.security.Role.STUDENT; import static de.tum.cit.aet.artemis.core.security.Role.TEACHING_ASSISTANT; -import static de.tum.cit.aet.artemis.domain.Authority.ADMIN_AUTHORITY; import java.util.HashSet; import java.util.Optional; @@ -15,9 +15,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.domain.Authority; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; -import de.tum.cit.aet.artemis.domain.Authority; -import de.tum.cit.aet.artemis.domain.User; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/user/UserCreationService.java b/src/main/java/de/tum/cit/aet/artemis/service/user/UserCreationService.java index 1d8d4c8ee93e..8e1f033248d8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/user/UserCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/user/UserCreationService.java @@ -24,14 +24,14 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.domain.Authority; +import de.tum.cit.aet.artemis.core.domain.Organization; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.AuthorityRepository; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.OrganizationRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.Authority; -import de.tum.cit.aet.artemis.domain.Organization; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/user/UserService.java b/src/main/java/de/tum/cit/aet/artemis/service/user/UserService.java index 7e2077456e93..a3a365a66374 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/user/UserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/user/UserService.java @@ -8,9 +8,9 @@ import static de.tum.cit.aet.artemis.core.config.Constants.USER_EMAIL_DOMAIN_AFTER_SOFT_DELETE; import static de.tum.cit.aet.artemis.core.config.Constants.USER_FIRST_NAME_AFTER_SOFT_DELETE; import static de.tum.cit.aet.artemis.core.config.Constants.USER_LAST_NAME_AFTER_SOFT_DELETE; +import static de.tum.cit.aet.artemis.core.domain.Authority.ADMIN_AUTHORITY; import static de.tum.cit.aet.artemis.core.security.Role.ADMIN; import static de.tum.cit.aet.artemis.core.security.Role.STUDENT; -import static de.tum.cit.aet.artemis.domain.Authority.ADMIN_AUTHORITY; import static org.apache.commons.lang3.StringUtils.lowerCase; import java.net.URI; @@ -39,6 +39,9 @@ import org.springframework.util.StringUtils; import de.tum.cit.aet.artemis.atlas.repository.science.ScienceEventRepository; +import de.tum.cit.aet.artemis.core.domain.Authority; +import de.tum.cit.aet.artemis.core.domain.GuidedTourSetting; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.AccountRegistrationBlockedException; import de.tum.cit.aet.artemis.core.exception.UsernameAlreadyUsedException; import de.tum.cit.aet.artemis.core.exception.VersionControlException; @@ -46,9 +49,6 @@ import de.tum.cit.aet.artemis.core.repository.GuidedTourSettingsRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.Authority; -import de.tum.cit.aet.artemis.domain.GuidedTourSetting; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.programming.domain.ParticipationVCSAccessToken; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/util/RoundingUtil.java b/src/main/java/de/tum/cit/aet/artemis/service/util/RoundingUtil.java index cc3c89db239f..7abf047829e6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/util/RoundingUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/util/RoundingUtil.java @@ -3,7 +3,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; -import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Course; public class RoundingUtil { diff --git a/src/main/java/de/tum/cit/aet/artemis/text/domain/TextAssessmentEvent.java b/src/main/java/de/tum/cit/aet/artemis/text/domain/TextAssessmentEvent.java index 76930a406179..3c6a3c091f8f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/domain/TextAssessmentEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/domain/TextAssessmentEvent.java @@ -14,9 +14,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.TextAssessmentEventType; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.text.dto.TextAssessmentEventType; /** * A TextAssessmentEvent. diff --git a/src/main/java/de/tum/cit/aet/artemis/text/domain/TextBlock.java b/src/main/java/de/tum/cit/aet/artemis/text/domain/TextBlock.java index f028a0c7437d..2c618e9f0be0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/domain/TextBlock.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/domain/TextBlock.java @@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; /** * A TextBlock. diff --git a/src/main/java/de/tum/cit/aet/artemis/text/domain/TextExercise.java b/src/main/java/de/tum/cit/aet/artemis/text/domain/TextExercise.java index 55cb664cb385..4182c6184758 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/domain/TextExercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/domain/TextExercise.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.text.domain; -import static de.tum.cit.aet.artemis.domain.enumeration.ExerciseType.TEXT; +import static de.tum.cit.aet.artemis.exercise.domain.ExerciseType.TEXT; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; @@ -9,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; /** * A TextExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/text/domain/TextSubmission.java b/src/main/java/de/tum/cit/aet/artemis/text/domain/TextSubmission.java index cd186fef451b..dddb20e93251 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/domain/TextSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/domain/TextSubmission.java @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.exercise.domain.Submission; /** * A TextSubmission. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TextAssessmentEventType.java b/src/main/java/de/tum/cit/aet/artemis/text/dto/TextAssessmentEventType.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TextAssessmentEventType.java rename to src/main/java/de/tum/cit/aet/artemis/text/dto/TextAssessmentEventType.java index ac4af965c3e2..cd7c160d7b36 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TextAssessmentEventType.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/dto/TextAssessmentEventType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.text.dto; /** * The TextAssessmentEventType enumeration. diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TutorParticipationStatus.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorParticipationStatus.java similarity index 75% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TutorParticipationStatus.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorParticipationStatus.java index 90026606893d..e696cf49ddfa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TutorParticipationStatus.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorParticipationStatus.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.tutorialgroup.domain; /** * The TutorParticipationStatus enumeration. diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroup.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroup.java index 3a633bea1020..f7558b8af135 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroup.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroup.java @@ -27,9 +27,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; @Entity diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupFreePeriod.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupFreePeriod.java index 2fcaada0af3c..90168765a57b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupFreePeriod.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupFreePeriod.java @@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; @Entity @Table(name = "tutorial_group_free_period") diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupRegistration.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupRegistration.java index 4c649bbba72d..7746b212eaf5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupRegistration.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupRegistration.java @@ -15,9 +15,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; @Entity @Table(name = "tutorial_group_registration") diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/tutorialgroups/TutorialGroupRegistrationType.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupRegistrationType.java similarity index 59% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/tutorialgroups/TutorialGroupRegistrationType.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupRegistrationType.java index 118906addfe8..f539c41e3748 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/tutorialgroups/TutorialGroupRegistrationType.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupRegistrationType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup.domain; public enum TutorialGroupRegistrationType { SELF_REGISTRATION, INSTRUCTOR_REGISTRATION, diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupSchedule.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupSchedule.java index 6a00d35b8232..e6f5db9a1523 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupSchedule.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupSchedule.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; /** * A {@link TutorialGroupSchedule} is a schedule for a {@link TutorialGroup}. It represents a recurrence pattern for {@link TutorialGroupSession}s. diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupSession.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupSession.java index de848c0867dc..35fdb8ebd3f2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupSession.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupSession.java @@ -21,8 +21,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; +import de.tum.cit.aet.artemis.core.domain.DomainObject; @Entity @Table(name = "tutorial_group_session") diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TutorialGroupSessionStatus.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupSessionStatus.java similarity index 68% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TutorialGroupSessionStatus.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupSessionStatus.java index 3620e3b3bbe6..2876241b830b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/TutorialGroupSessionStatus.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupSessionStatus.java @@ -1,6 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; - -import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; +package de.tum.cit.aet.artemis.tutorialgroup.domain; /** * Describes the status of a {@link TutorialGroupSession} diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupsConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupsConfiguration.java index e52654689b7d..7d17ec70c253 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupsConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroupsConfiguration.java @@ -18,8 +18,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DomainObject; @Entity @Table(name = "tutorial_groups_configuration") diff --git a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/Weekday.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/Weekday.java similarity index 67% rename from src/main/java/de/tum/cit/aet/artemis/domain/enumeration/Weekday.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/Weekday.java index e5921bc431a0..3fa7a9c00ce2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/domain/enumeration/Weekday.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/Weekday.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.domain.enumeration; +package de.tum.cit.aet.artemis.tutorialgroup.domain; /** * The Weekday enumeration. diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupFreePeriodRepository.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupFreePeriodRepository.java index 6d8558a6a29f..0ed432b6480a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupFreePeriodRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupFreePeriodRepository.java @@ -11,8 +11,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupFreePeriod; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupRegistrationRepository.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupRegistrationRepository.java index 4411d4b569ca..a5b4f96c79db 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupRegistrationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupRegistrationRepository.java @@ -12,12 +12,12 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistrationType; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupRepository.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupRepository.java index 3bb9971326b8..111ec21fbfb3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupRepository.java @@ -13,8 +13,8 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupScheduleRepository.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupScheduleRepository.java index aa92028fb9db..a2f8f67f2db5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupScheduleRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupScheduleRepository.java @@ -10,8 +10,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSchedule; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupSessionRepository.java index 00a6dc96001f..bf15358821e6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/repository/TutorialGroupSessionRepository.java @@ -13,12 +13,12 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSchedule; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSessionStatus; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AbstractSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AbstractSubmissionResource.java index 07be1b973a4e..f561c22bee25 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AbstractSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AbstractSubmissionResource.java @@ -4,11 +4,11 @@ import org.springframework.http.ResponseEntity; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AccountResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AccountResource.java index d4b9889865ca..f99d6ada28f3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AccountResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AccountResource.java @@ -31,9 +31,9 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.programming.icl.ssh.HashUtils; import de.tum.cit.aet.artemis.service.AccountService; import de.tum.cit.aet.artemis.service.FilePathService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AeolusTemplateResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AeolusTemplateResource.java index c0bf7bce70a2..fc5f743d2856 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AeolusTemplateResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AeolusTemplateResource.java @@ -19,8 +19,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.service.connectors.BuildScriptProviderService; import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonDiagramResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonDiagramResource.java index e773c4d19723..9bbd02b5414d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonDiagramResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonDiagramResource.java @@ -20,12 +20,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.modeling.domain.ApollonDiagram; import de.tum.cit.aet.artemis.modeling.repository.ApollonDiagramRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AssessmentResource.java index 4b1ae169a433..afc9fc1146e4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AssessmentResource.java @@ -7,17 +7,17 @@ import org.springframework.http.ResponseEntity; import org.springframework.util.StringUtils; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AthenaResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AthenaResource.java index 1a5ca4638868..64be2a94c0c5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AthenaResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AthenaResource.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.exception.NetworkingException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -24,13 +25,12 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.core.security.annotations.ManualConfig; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AttachmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AttachmentResource.java index a44b8ffab15e..f8ca459c5dd3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AttachmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AttachmentResource.java @@ -26,15 +26,15 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.Attachment; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; +import de.tum.cit.aet.artemis.lecture.domain.Attachment; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentType; import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.FilePathService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/BonusResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/BonusResource.java index e33fb9119f75..7206b6118567 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/BonusResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/BonusResource.java @@ -21,18 +21,18 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.Bonus; +import de.tum.cit.aet.artemis.assessment.domain.BonusStrategy; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.repository.BonusRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.ManualConfig; -import de.tum.cit.aet.artemis.domain.Bonus; -import de.tum.cit.aet.artemis.domain.BonusStrategy; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.GradingScale; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.BonusService; import de.tum.cit.aet.artemis.service.CourseScoreCalculationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResource.java index 949e1acdb480..a3569dd305cc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResource.java @@ -21,30 +21,30 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.Complaint; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.Complaint; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ComplaintService; import de.tum.cit.aet.artemis.service.dto.ComplaintRequestDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResponseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResponseResource.java index 20ead88a42cc..f073ff5d835b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResponseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResponseResource.java @@ -17,12 +17,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.Complaint; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintResponse; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.Complaint; -import de.tum.cit.aet.artemis.domain.ComplaintResponse; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.ComplaintResponseService; import de.tum.cit.aet.artemis.service.dto.ComplaintAction; import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ConsistencyCheckResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ConsistencyCheckResource.java index c98f38afa417..abd55f810841 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ConsistencyCheckResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ConsistencyCheckResource.java @@ -15,7 +15,7 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ConsistencyCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java index afabc2355c08..72f6ab064705 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java @@ -56,10 +56,13 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -67,18 +70,15 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.service.AssessmentDashboardService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ComplaintService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java index 3a5e8084620f..d610740c45d9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java @@ -23,11 +23,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.domain.DataExport; +import de.tum.cit.aet.artemis.core.domain.DataExportState; import de.tum.cit.aet.artemis.core.repository.DataExportRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.DataExport; -import de.tum.cit.aet.artemis.domain.enumeration.DataExportState; import de.tum.cit.aet.artemis.service.export.DataExportService; import de.tum.cit.aet.artemis.web.rest.dto.DataExportDTO; import de.tum.cit.aet.artemis.web.rest.dto.RequestDataExportDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java index fb0cbbcc7ff5..429981edbe38 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java @@ -55,6 +55,8 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.CustomAuditEventRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -63,17 +65,15 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.domain.SuspiciousSessionsAnalysisOptions; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.AssessmentDashboardService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.SubmissionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java index e3797d59890f..15b22ae99a13 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java @@ -21,14 +21,14 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.ExampleSubmission; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.ExampleSubmission; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExampleSubmissionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java index 6d3a69c9ecb1..225847b89ac2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java @@ -25,16 +25,16 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.service.ExerciseDeletionService; import de.tum.cit.aet.artemis.service.exam.ExamAccessService; import de.tum.cit.aet.artemis.service.exam.ExamImportService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java index 862a56621240..c82cf358d1b6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java @@ -21,26 +21,25 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.ExampleSubmission; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus; import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; @@ -56,6 +55,7 @@ import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismCaseService; import de.tum.cit.aet.artemis.service.quiz.QuizBatchService; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorParticipationStatus; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseDetailsDTO; import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseScoresChartResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseScoresChartResource.java index ee1329a43e31..621babdeaaad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseScoresChartResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseScoresChartResource.java @@ -15,13 +15,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.ExerciseScoresChartService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java index ffa12f8357ec..bc8b4f98155c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java @@ -39,6 +39,8 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -47,25 +49,23 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; -import de.tum.cit.aet.artemis.domain.Attachment; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadSubmissionRepository; +import de.tum.cit.aet.artemis.lecture.domain.Attachment; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentType; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.Slide; import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.SlideRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; import de.tum.cit.aet.artemis.quiz.domain.DragItem; import de.tum.cit.aet.artemis.quiz.repository.DragItemRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java index a4994917bf58..e170ebcc3d7f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java @@ -17,20 +17,20 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadSubmissionRepository; import de.tum.cit.aet.artemis.service.AssessmentService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java index dc4616bdc103..a77ad78be239 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java @@ -26,21 +26,21 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java index 950a0ef38ff5..5b2d00344c3f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java @@ -26,24 +26,24 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.server.ResponseStatusException; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.EmptyFileException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadSubmissionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/GradeStepResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/GradeStepResource.java index fb21ae336c4b..4a26f197d27d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/GradeStepResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/GradeStepResource.java @@ -15,17 +15,17 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.GradeStep; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.repository.GradeStepRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.GradeStep; -import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/GradingScaleResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/GradingScaleResource.java index 00a86676e840..769a844f9001 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/GradingScaleResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/GradingScaleResource.java @@ -23,13 +23,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.GradingScale; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/GuidedTourSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/GuidedTourSettingsResource.java index 81196a4e561d..7bac1979cc83 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/GuidedTourSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/GuidedTourSettingsResource.java @@ -16,9 +16,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.domain.GuidedTourSetting; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.GuidedTourSetting; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.user.UserService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java index f504a3e03174..f188854683d7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java @@ -26,13 +26,13 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; import de.tum.cit.aet.artemis.atlas.repository.LearningPathRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.LearningObjectService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java index d0c6639f871c..c4ac51d184e9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java @@ -28,18 +28,18 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java index d05be6c05516..f0e9254ab21f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java @@ -12,10 +12,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.LongFeedbackText; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.LongFeedbackTextRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.LongFeedbackText; -import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java index 2790bd6fe0c4..2f87f57bbb67 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java @@ -25,11 +25,11 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.nimbusds.jwt.SignedJWT; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; +import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.connectors.lti.LtiDeepLinkingService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java index e06f3c2bb910..42e51f512069 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java @@ -20,16 +20,16 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java index e112e744164f..989d91a5bc55 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java @@ -27,19 +27,19 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java index 7fcd5e0ce7c8..a44e77437f05 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java @@ -26,15 +26,15 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationResource.java index 6cba53be5a32..d6896e632334 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationResource.java @@ -24,9 +24,9 @@ import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.communication.repository.NotificationRepository; import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel; import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService; import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java index 157b996880de..91785828748d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java @@ -20,11 +20,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.communication.domain.NotificationSetting; import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.NotificationSetting; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/OrganizationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/OrganizationResource.java index 08237bd09a88..9c7b36a3ec32 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/OrganizationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/OrganizationResource.java @@ -14,9 +14,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.domain.Organization; import de.tum.cit.aet.artemis.core.repository.OrganizationRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.Organization; /** * REST controller for managing the Organization entities diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java index d86a5691b842..47eb7628226d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java @@ -13,10 +13,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java index 3d11678aabc2..0301d5774f3d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java @@ -41,9 +41,14 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ResponseStatusException; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.config.GuidedTourConfiguration; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -51,17 +56,11 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -70,6 +69,7 @@ import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java index 1ace759b4f7c..e245059477f7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java @@ -41,6 +41,8 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; import de.tum.cit.aet.artemis.core.exception.QuizJoinException; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -52,15 +54,13 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastInstructorInExercise; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.QuizAction; -import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; import de.tum.cit.aet.artemis.quiz.domain.DragItem; +import de.tum.cit.aet.artemis.quiz.domain.QuizAction; import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.quiz.repository.QuizBatchRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java index a3e33b1545a2..d1308ea3cbc0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java @@ -18,11 +18,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java index 346e175ddeb8..a681596b9e3a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java @@ -14,10 +14,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.quiz.domain.QuizPool; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.exam.ExamAccessService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java index 7dea13314697..dbebe5059644 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java @@ -20,16 +20,16 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.QuizSubmissionException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java index c0f5e5ae9f54..ddcea3d96f60 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java @@ -19,16 +19,16 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.Rating; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Rating; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.RatingService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java index 7bbcc042f71d..85ff47f1d8e9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java @@ -25,21 +25,21 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java index 5e7783e961e3..e5c9722021c1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java @@ -20,8 +20,8 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisCategory; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisCategory; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/StatisticsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/StatisticsResource.java index 8d2b2080bb9a..2333e790294d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/StatisticsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/StatisticsResource.java @@ -11,14 +11,14 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.GraphType; +import de.tum.cit.aet.artemis.core.domain.SpanType; +import de.tum.cit.aet.artemis.core.domain.StatisticsView; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.enumeration.GraphType; -import de.tum.cit.aet.artemis.domain.enumeration.SpanType; -import de.tum.cit.aet.artemis.domain.enumeration.StatisticsView; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.StatisticsService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java index 84b82dbb9b19..5d07aa0fbd6d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java @@ -36,13 +36,11 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExamSession; import de.tum.cit.aet.artemis.exam.domain.StudentExam; @@ -50,8 +48,10 @@ import de.tum.cit.aet.artemis.exam.repository.ExamLiveEventRepository; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.SubmissionPolicyRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java index b7a3fd460b4f..a6f0d8f1c255 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java @@ -25,7 +25,7 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java index 55f166a8713e..c9047adadb93 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java @@ -17,23 +17,23 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.SubmissionVersion; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionVersion; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionVersionRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.BuildLogEntryService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java index a71682b3946a..869dd6ab66e8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java @@ -36,6 +36,8 @@ import de.tum.cit.aet.artemis.assessment.repository.TeamScoreRepository; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -43,16 +45,14 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.TeamImportStrategyType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.dto.TeamImportStrategyType; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.SubmissionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentEventResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentEventResource.java index 78b2f44045d2..bb5d2e98362b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentEventResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentEventResource.java @@ -19,14 +19,14 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.assessment.repository.TextAssessmentEventRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.text.domain.TextAssessmentEvent; import de.tum.cit.aet.artemis.text.domain.TextSubmission; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java index 6e9b9556c285..0ff1c8189bbf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java @@ -29,22 +29,22 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.ExampleSubmission; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java index b18c079b1695..25644b4ca70f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java @@ -29,6 +29,11 @@ import org.springframework.web.bind.annotation.RestController; import de.jplag.exceptions.ExitException; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; @@ -36,6 +41,8 @@ import de.tum.cit.aet.artemis.assessment.repository.TextBlockRepository; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -43,15 +50,8 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ExampleSubmission; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java index 4233b796c446..3efc838c931e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java @@ -22,14 +22,14 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorEffortResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorEffortResource.java index f38b0830559b..65df7908ee83 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorEffortResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorEffortResource.java @@ -14,13 +14,13 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.assessment.dto.TutorEffort; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.TutorEffortService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java index c3d03595f115..fbe719c7c649 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java @@ -17,15 +17,15 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.ExampleSubmission; import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.core.config.GuidedTourConfiguration; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.ExampleSubmission; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.TutorParticipationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/UserResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/UserResource.java index 39888ab60178..6c68bb6ff45b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/UserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/UserResource.java @@ -23,10 +23,10 @@ import org.springframework.web.server.ResponseStatusException; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.connectors.lti.LtiService; import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.service.dto.UserInitializationDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java index da5daa9374be..ecc7584f4c57 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java @@ -29,14 +29,14 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.LectureUnitService; import de.tum.cit.aet.artemis.service.competency.CompetencyService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java index d65a8b247583..5bed0c105e3f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java @@ -31,6 +31,8 @@ import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -39,8 +41,6 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.competency.CompetencyJolService; import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java index 88f5b9357de3..b54ea29c9b54 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java @@ -29,14 +29,14 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.LectureUnitService; import de.tum.cit.aet.artemis.service.competency.CourseCompetencyService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/AssessmentUpdateBaseDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/AssessmentUpdateBaseDTO.java index fc58d5870e97..a8dc4e094d27 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/AssessmentUpdateBaseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/AssessmentUpdateBaseDTO.java @@ -6,8 +6,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.ComplaintResponse; -import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; @JsonInclude(JsonInclude.Include.NON_EMPTY) public interface AssessmentUpdateBaseDTO { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/AssessmentUpdateDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/AssessmentUpdateDTO.java index 1eadcc8daf1a..9686a24037ec 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/AssessmentUpdateDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/AssessmentUpdateDTO.java @@ -6,8 +6,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.ComplaintResponse; -import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; /** * @param feedbacks the updated feedback list diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusResultDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusResultDTO.java index 1186a04c204d..35d46ecf191e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusResultDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusResultDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.BonusStrategy; +import de.tum.cit.aet.artemis.assessment.domain.BonusStrategy; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseForDashboardDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseForDashboardDTO.java index 87cdedbf0a08..b2efd3e2ebde 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseForDashboardDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseForDashboardDTO.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Course; /** * Returned by the for-dashboard resources. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseForImportDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseForImportDTO.java index dedb691298b6..96a39cfafd2c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseForImportDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseForImportDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Course; /** * DTO containing {@link Course} information. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/DataExportDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/DataExportDTO.java index 4625ec73b37e..05f54235ac98 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/DataExportDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/DataExportDTO.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.DataExportState; +import de.tum.cit.aet.artemis.core.domain.DataExportState; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record DataExportDTO(Long id, DataExportState dataExportState, ZonedDateTime createdDate, ZonedDateTime nextRequestDate) { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDTO.java index e6ff5135dd23..f4ca3f3444be 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDTO.java @@ -2,8 +2,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; /** * A DTO representing an exercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDetailsDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDetailsDTO.java index 07157ef467b4..160b90e296f1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDetailsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDetailsDTO.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedSettingsDTO; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseScoresDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseScoresDTO.java index bdf5a9b7288e..cfd284cffb26 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseScoresDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseScoresDTO.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; /** * This DTO contains the information used for the exercise-scores-chart.component.ts diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/FileUploadAssessmentDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/FileUploadAssessmentDTO.java index 71aacfe63b25..b58a97b218da 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/FileUploadAssessmentDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/FileUploadAssessmentDTO.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record FileUploadAssessmentDTO(List feedbacks, String assessmentNote) { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/GradeDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/GradeDTO.java index 4b015d538c40..b02c26fe2b80 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/GradeDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/GradeDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.GradeType; +import de.tum.cit.aet.artemis.assessment.domain.GradeType; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record GradeDTO(String gradeName, Boolean isPassingGrade, GradeType gradeType) { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/GradeStepsDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/GradeStepsDTO.java index 986be200144d..908360e9906b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/GradeStepsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/GradeStepsDTO.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.GradeStep; -import de.tum.cit.aet.artemis.domain.GradeType; +import de.tum.cit.aet.artemis.assessment.domain.GradeStep; +import de.tum.cit.aet.artemis.assessment.domain.GradeType; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record GradeStepsDTO(String title, GradeType gradeType, Set gradeSteps, Integer maxPoints, String plagiarismGrade, String noParticipationGrade, diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ImprintDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ImprintDTO.java index fadd8b7e859c..8d01973978c7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ImprintDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ImprintDTO.java @@ -2,8 +2,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.enumeration.LegalDocumentType; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.domain.LegalDocumentType; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ImprintDTO(LegalDocumentType type, String text, Language language) implements LegalDocument { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LegalDocument.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LegalDocument.java index daaf19a7aa51..28f0ec8b338d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LegalDocument.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LegalDocument.java @@ -2,8 +2,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.enumeration.LegalDocumentType; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.domain.LegalDocumentType; @JsonInclude(JsonInclude.Include.NON_EMPTY) public interface LegalDocument { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ModelingAssessmentDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ModelingAssessmentDTO.java index beb1e624f4de..1c100543d75f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ModelingAssessmentDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ModelingAssessmentDTO.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ModelingAssessmentDTO(List feedbacks, String assessmentNote) { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationDTO.java index 213fa06243b6..567a3475e2a5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationDTO.java @@ -8,10 +8,10 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/PostContextFilterDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/PostContextFilterDTO.java index 7fa807cfb44b..a45e030b7e64 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/PostContextFilterDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/PostContextFilterDTO.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.communication.domain.PostSortCriterion; -import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; +import de.tum.cit.aet.artemis.core.dto.SortingOrder; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PostContextFilterDTO(@NotBlank Long courseId, long[] courseWideChannelIds, Long plagiarismCaseId, Long conversationId, String searchText, Boolean filterToUnresolved, diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/PrivacyStatementDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/PrivacyStatementDTO.java index 28d96486447d..6b28c9e317ca 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/PrivacyStatementDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/PrivacyStatementDTO.java @@ -2,8 +2,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.enumeration.LegalDocumentType; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.domain.LegalDocumentType; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PrivacyStatementDTO(LegalDocumentType type, String text, Language language) implements LegalDocument { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseGradingStatisticsDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseGradingStatisticsDTO.java index f3ed2123fab4..0534bb6bfd19 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseGradingStatisticsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseGradingStatisticsDTO.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; /** * This is a dto for providing statistics for the programming exercise test cases & sca categories. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseTestCaseDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseTestCaseDTO.java index 9dd9defe9719..e73d72b4e76e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseTestCaseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ProgrammingExerciseTestCaseDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.assessment.domain.Visibility; /** * This is a dto for updating a programming exercise test case. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/RequestDataExportDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/RequestDataExportDTO.java index ace915cf76d6..37226dd2f184 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/RequestDataExportDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/RequestDataExportDTO.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.DataExportState; +import de.tum.cit.aet.artemis.core.domain.DataExportState; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record RequestDataExportDTO(long id, DataExportState dataExportState, ZonedDateTime createdDate) { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ResultDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ResultDTO.java index 3c23ae51196b..6e49849bc9bb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ResultDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ResultDTO.java @@ -8,12 +8,12 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.domain.Visibility; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; /** * DTO containing {@link Result} information. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ResultWithPointsPerGradingCriterionDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ResultWithPointsPerGradingCriterionDTO.java index 3d387587820c..8a2befdae200 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ResultWithPointsPerGradingCriterionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ResultWithPointsPerGradingCriterionDTO.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; +import de.tum.cit.aet.artemis.assessment.domain.Result; /** * @param pointsPerCriterion Map of {@link GradingCriterion#getId()} to the result points in that category. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StudentExamWithGradeDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StudentExamWithGradeDTO.java index 75b721cd6916..43dd656d72f9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StudentExamWithGradeDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StudentExamWithGradeDTO.java @@ -4,7 +4,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.GradeType; +import de.tum.cit.aet.artemis.assessment.domain.GradeType; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.exam.domain.StudentExam; /** @@ -12,7 +13,7 @@ * Includes max points and max bonus points. *

* It is possible to calculate data included in this DTO by using the {@link StudentExam}, {@link ExamScoresDTO.StudentResult} - * and {@link de.tum.cit.aet.artemis.domain.GradingScale} for the exam. The calculations are done in the server and returned with this DTO so that the client + * and {@link GradingScale} for the exam. The calculations are done in the server and returned with this DTO so that the client * does not need to repeat the same filtering and calculation logic. Also this removes the need for client to send an extra request to * {@link de.tum.cit.aet.artemis.web.rest.GradeStepResource#getGradeStepByPercentageForExam(Long, Long, Double)} * by including the grade in {@link ExamScoresDTO.StudentResult#overallGrade()}. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionDTO.java index 6766b06e733b..5f1585ead642 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionDTO.java @@ -5,9 +5,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; /** * DTO containing {@link Submission} information. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionVersionDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionVersionDTO.java index 3fe1270f8583..d0e0620b3314 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionVersionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionVersionDTO.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.SubmissionVersion; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionVersion; /** * A DTO representing a submission version. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionWithComplaintDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionWithComplaintDTO.java index 02cf814c556d..019817d21fda 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionWithComplaintDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionWithComplaintDTO.java @@ -2,8 +2,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Complaint; -import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.assessment.domain.Complaint; +import de.tum.cit.aet.artemis.exercise.domain.Submission; /** * Wrapper Class to send achieved points and achieved scores of a student to the client for courses / exam diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionWithParticipationDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionWithParticipationDTO.java index b8545b0119df..688ed63ae9ce 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionWithParticipationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionWithParticipationDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.Submission; /** * A DTO representing a submission. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentDTO.java index 75cf4c32266b..2739c537c1e1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentDTO.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.text.domain.TextBlock; @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentUpdateDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentUpdateDTO.java index 87d49eedf256..f8da441d1d9d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentUpdateDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentUpdateDTO.java @@ -5,8 +5,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.ComplaintResponse; -import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.text.domain.TextBlock; @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathNavigationObjectDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathNavigationObjectDTO.java index f029a67734d8..8ee1e06fea4e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathNavigationObjectDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathNavigationObjectDTO.java @@ -2,8 +2,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.LearningObject; +import de.tum.cit.aet.artemis.atlas.domain.LearningObject; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyExerciseMasteryCalculationDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyExerciseMasteryCalculationDTO.java index 4c64afb5f2aa..287d4b3742a8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyExerciseMasteryCalculationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyExerciseMasteryCalculationDTO.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; +import de.tum.cit.aet.artemis.exercise.domain.DifficultyLevel; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record CompetencyExerciseMasteryCalculationDTO(double maxPoints, DifficultyLevel difficulty, boolean isProgrammingExercise, Double lastScore, Double lastPoints, diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ExerciseInformationDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ExerciseInformationDTO.java index 43ce83306c5a..36fa2b019d10 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ExerciseInformationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ExerciseInformationDTO.java @@ -4,11 +4,11 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.exercise.domain.DifficultyLevel; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; /** * DTO for exercise information. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/FinishedBuildJobPageableSearchDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/FinishedBuildJobPageableSearchDTO.java index 40a33ced5655..0e27134b7b85 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/FinishedBuildJobPageableSearchDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/FinishedBuildJobPageableSearchDTO.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; +import de.tum.cit.aet.artemis.programming.domain.BuildStatus; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record FinishedBuildJobPageableSearchDTO(BuildStatus buildStatus, String buildAgentAddress, ZonedDateTime startDate, ZonedDateTime endDate, Integer buildDurationLower, diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/PageableSearchDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/PageableSearchDTO.java index 4ac7613ad5b0..b4459b9b5d75 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/PageableSearchDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/PageableSearchDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; +import de.tum.cit.aet.artemis.core.dto.SortingOrder; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/ScoreDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/ScoreDTO.java index b6ccc896de9a..927b9bbd17d8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/ScoreDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/ScoreDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; /** * DTO to send achieved points and achieved scores of a student to the client for courses / exam diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/settings/ide/IdeMappingDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/settings/ide/IdeMappingDTO.java index 505f8257b481..96cb0aba7fe2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/settings/ide/IdeMappingDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/settings/ide/IdeMappingDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ide.Ide; @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/user/UserNameAndLoginDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/user/UserNameAndLoginDTO.java index bb13b3c7adb5..3f3b90d0668f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/user/UserNameAndLoginDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/user/UserNameAndLoginDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record UserNameAndLoginDTO(String name, String login) { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ComplaintResponseLockedException.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ComplaintResponseLockedException.java index 234a73689011..2083cfa3d759 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ComplaintResponseLockedException.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ComplaintResponseLockedException.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.Map; -import de.tum.cit.aet.artemis.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintResponse; import de.tum.cit.aet.artemis.web.rest.ComplaintResponseResource; public class ComplaintResponseLockedException extends BadRequestAlertException { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/StudentsAlreadyAssignedException.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/StudentsAlreadyAssignedException.java index 9337e10b9018..c086542618ea 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/StudentsAlreadyAssignedException.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/StudentsAlreadyAssignedException.java @@ -7,8 +7,8 @@ import org.springframework.data.util.Pair; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.web.rest.TeamResource; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/StudentsAppearMultipleTimesException.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/StudentsAppearMultipleTimesException.java index 2c8b8ef48920..b25841ce3d99 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/StudentsAppearMultipleTimesException.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/StudentsAppearMultipleTimesException.java @@ -7,7 +7,7 @@ import org.springframework.data.util.Pair; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.web.rest.TeamResource; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CodeHintResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CodeHintResource.java index b5696e9b4245..d18fc6c450dc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CodeHintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CodeHintResource.java @@ -20,8 +20,8 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CodeHintRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ExerciseHintResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ExerciseHintResource.java index 4e52f95f3a35..f04ae73f77f1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ExerciseHintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ExerciseHintResource.java @@ -25,9 +25,9 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java index 8f4fea172353..4d59b930b967 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java @@ -19,11 +19,11 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java index b38704689ef9..2fe7852015a5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java @@ -25,8 +25,8 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java index 07ecdf655670..b7495569d71a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java @@ -15,7 +15,7 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisExerciseChatSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisExerciseChatSessionResource.java index 5aaf97bc0bbe..f9566b1138d5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisExerciseChatSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisExerciseChatSessionResource.java @@ -15,12 +15,12 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.iris.domain.session.IrisExerciseChatSession; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; import de.tum.cit.aet.artemis.iris.repository.IrisExerciseChatSessionRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisHealthIndicator; import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; import de.tum.cit.aet.artemis.service.iris.IrisSessionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java index 0b0aac412f84..8147b91c7824 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java @@ -31,9 +31,9 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.domain.Attachment; -import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.AttachmentUnitService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/ExerciseUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/ExerciseUnitResource.java index 137673b57db7..24e878de0203 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/ExerciseUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/ExerciseUnitResource.java @@ -21,8 +21,8 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.repository.ExerciseUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java index 2794f99c95af..ca0ad92eddcb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java @@ -22,13 +22,13 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java index 3b66a8adde1c..724f48018579 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java @@ -30,7 +30,7 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.OnlineUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.OnlineUnitRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java index 479590bf8f27..3c7871e09dbb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java @@ -20,7 +20,7 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.TextUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java index 34105e82a67d..5c978c14534b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java @@ -22,7 +22,7 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.VideoUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.VideoUnitRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildJobQueueResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildJobQueueResource.java index 08e3ed9c3b1f..1b746be829ff 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildJobQueueResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildJobQueueResource.java @@ -20,11 +20,11 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; -import de.tum.cit.aet.artemis.domain.BuildJob; -import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.programming.domain.BuildJob; import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.connectors.localci.SharedQueueManagementService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildPlanResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildPlanResource.java index 5f0c9b509ea5..3bf4e70619e5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildPlanResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildPlanResource.java @@ -13,8 +13,8 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.domain.BuildPlan; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.BuildPlan; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java index 03411243b1c8..3b0c1b07eb80 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java @@ -29,12 +29,12 @@ import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import de.tum.cit.aet.artemis.communication.domain.CreatedConversationMessage; +import de.tum.cit.aet.artemis.communication.domain.DisplayPriority; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.metis.ConversationMessagingService; import de.tum.cit.aet.artemis.service.util.TimeLogUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java index 4c93d065cda3..238e5d8b5ded 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java @@ -31,15 +31,15 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationDTOService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationManagementResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationManagementResource.java index 5dd1307425ba..2ac98a8ef331 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationManagementResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationManagementResource.java @@ -3,9 +3,9 @@ import org.springframework.http.HttpStatus; import org.springframework.web.server.ResponseStatusException; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.core.repository.CourseRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; public class ConversationManagementResource { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java index ce36d9b311f3..e324ee1093ba 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java @@ -27,11 +27,11 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ConductAgreementService; import de.tum.cit.aet.artemis.service.dto.ResponsibleUserDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/GroupChatResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/GroupChatResource.java index 35ed252d03c6..d6ca136bd168 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/GroupChatResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/GroupChatResource.java @@ -21,12 +21,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.domain.conversation.GroupChat; import de.tum.cit.aet.artemis.communication.repository.conversation.GroupChatRepository; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationDTOService; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; import de.tum.cit.aet.artemis.service.metis.conversation.GroupChatService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/OneToOneChatResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/OneToOneChatResource.java index 346370c03f07..686f31256707 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/OneToOneChatResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/OneToOneChatResource.java @@ -18,10 +18,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationDTOService; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; import de.tum.cit.aet.artemis.service.metis.conversation.OneToOneChatService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ConversationUserDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ConversationUserDTO.java index d8c10e762aef..f6c72f8d54a2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ConversationUserDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ConversationUserDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.service.dto.UserPublicInfoDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicAccountResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicAccountResource.java index 9d5dd608c95a..91400fd6a239 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicAccountResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicAccountResource.java @@ -25,10 +25,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.AccountService; import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.service.notifications.MailService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicBuildPlanResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicBuildPlanResource.java index 0d4aa08e73ec..b39e8522938a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicBuildPlanResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicBuildPlanResource.java @@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; -import de.tum.cit.aet.artemis.domain.BuildPlan; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.BuildPlan; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicImprintResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicImprintResource.java index 74df1bd238da..3e6a284508e0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicImprintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicImprintResource.java @@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; -import de.tum.cit.aet.artemis.domain.enumeration.Language; import de.tum.cit.aet.artemis.service.LegalDocumentService; import de.tum.cit.aet.artemis.web.rest.dto.ImprintDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPrivacyStatementResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPrivacyStatementResource.java index 55e3e3be599a..0743f983d077 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPrivacyStatementResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPrivacyStatementResource.java @@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; -import de.tum.cit.aet.artemis.domain.enumeration.Language; import de.tum.cit.aet.artemis.service.LegalDocumentService; import de.tum.cit.aet.artemis.web.rest.dto.PrivacyStatementDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicProgrammingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicProgrammingSubmissionResource.java index 6f394572a28b..19e03a8b217e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicProgrammingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicProgrammingSubmissionResource.java @@ -19,11 +19,11 @@ import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; -import de.tum.cit.aet.artemis.domain.Commit; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.Commit; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicResultResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicResultResource.java index 8f4ed691f87e..76ef0f937e4c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicResultResource.java @@ -15,12 +15,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java index 3da0024a0e65..d73baed640af 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java @@ -20,13 +20,13 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismDetectionConfig; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java index 3c420758c2a6..f7dbef2d8f55 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java @@ -17,15 +17,15 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java index 371bd6bb396b..954d333d48cc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java @@ -19,20 +19,20 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.exam.ExamService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java index fa06e9db8753..f84babeacf69 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java @@ -40,6 +40,9 @@ import com.fasterxml.jackson.core.JsonProcessingException; +import de.tum.cit.aet.artemis.assessment.domain.Visibility; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -47,14 +50,11 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.enumeration.Visibility; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java index 734734d11798..1d8ccc2b2319 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java @@ -14,15 +14,15 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseGradingService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java index 4a37d9a9b071..47d9d7b3ebb4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java @@ -20,22 +20,22 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java index 676c0919f146..07a21e6005d9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java @@ -22,9 +22,9 @@ import de.jplag.exceptions.ExitException; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.feature.Feature; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java index ecab3e936337..dccf7a5d64cd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java @@ -38,9 +38,13 @@ import com.fasterxml.jackson.core.JsonProcessingException; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -49,16 +53,12 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; -import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java index 87fb45171659..54aec0df422e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java @@ -16,13 +16,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java index 1a5488000300..c2574b3b3763 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java @@ -21,25 +21,25 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationResource.java index cb172e4eeecd..7d88e6f38b39 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationResource.java @@ -28,10 +28,10 @@ import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfigurationId; import de.tum.cit.aet.artemis.communication.repository.PushNotificationDeviceConfigurationRepository; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.jwt.TokenProvider; -import de.tum.cit.aet.artemis.domain.User; import io.jsonwebtoken.ExpiredJwtException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java index feb900c65025..e5e2074dad71 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java @@ -33,17 +33,17 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.domain.FileType; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.FileType; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.Repository; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.repository.SubmissionPolicyRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryResource.java index f4422b588b4b..1a5e06494cec 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryResource.java @@ -27,13 +27,13 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.server.ResponseStatusException; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.File; -import de.tum.cit.aet.artemis.domain.FileType; -import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.domain.File; +import de.tum.cit.aet.artemis.programming.domain.FileType; +import de.tum.cit.aet.artemis.programming.domain.Repository; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ProfileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/TestRepositoryResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/TestRepositoryResource.java index 6661191ba9ee..a79d64bf3385 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/TestRepositoryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/TestRepositoryResource.java @@ -27,13 +27,13 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ResponseStatusException; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.FileType; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.domain.FileType; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.Repository; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ProfileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceSettingsResource.java index dd9d9e30db74..ed0b92f0c465 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceSettingsResource.java @@ -22,9 +22,9 @@ import de.tum.cit.aet.artemis.atlas.domain.science.ScienceSetting; import de.tum.cit.aet.artemis.atlas.repository.science.ScienceSettingRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/settings/ide/IdeSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/settings/ide/IdeSettingsResource.java index 0468316e619f..a40d9d54e0ba 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/settings/ide/IdeSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/settings/ide/IdeSettingsResource.java @@ -17,10 +17,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ide.Ide; import de.tum.cit.aet.artemis.programming.domain.ide.UserIdeMapping; import de.tum.cit.aet.artemis.programming.repository.settings.IdeRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/theia/TheiaConfigurationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/theia/TheiaConfigurationResource.java index 4a983823b61e..5349041d97c1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/theia/TheiaConfigurationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/theia/TheiaConfigurationResource.java @@ -13,7 +13,7 @@ import de.tum.cit.aet.artemis.core.config.TheiaConfiguration; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; @Profile(PROFILE_THEIA) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java index ab4c089dba3e..726bfb520cd6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java @@ -43,6 +43,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -50,8 +51,6 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.feature.Feature; @@ -62,6 +61,7 @@ import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupScheduleService; import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupService; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistrationType; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSchedule; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupNotificationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java index 2979280d6987..d64dcc8fea5f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java @@ -39,13 +39,13 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.feature.Feature; import de.tum.cit.aet.artemis.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupService; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupFreePeriod; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSessionStatus; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupFreePeriodRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/util/PageUtil.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/util/PageUtil.java index d156934e6596..8a39bdcc1ec7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/util/PageUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/util/PageUtil.java @@ -7,7 +7,7 @@ import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; -import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; +import de.tum.cit.aet.artemis.core.dto.SortingOrder; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.PageableSearchDTO; public class PageUtil { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/ManagedUserVM.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/ManagedUserVM.java index 392e5f0d359f..31561d04e548 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/ManagedUserVM.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/ManagedUserVM.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.service.dto.UserDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java index ea8f5d7a5d0f..4fc35181c79d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java @@ -13,10 +13,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/SubmissionSyncPayload.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/SubmissionSyncPayload.java index 1e5c5890d561..c0dc8a36e2f2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/SubmissionSyncPayload.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/SubmissionSyncPayload.java @@ -2,8 +2,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Submission; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record SubmissionSyncPayload(Submission submission, User sender) { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/TeamAssignmentPayload.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/TeamAssignmentPayload.java index 3c557050d00a..2fb00179b093 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/TeamAssignmentPayload.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/TeamAssignmentPayload.java @@ -7,8 +7,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Team; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/ParticipationTeamWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/ParticipationTeamWebsocketService.java index 57088c1bbfb4..1731bf0c285d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/ParticipationTeamWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/ParticipationTeamWebsocketService.java @@ -32,11 +32,11 @@ import com.hazelcast.core.HazelcastInstance; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/TeamWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/TeamWebsocketService.java index 9243e850dafc..d579dac78f43 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/TeamWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/TeamWebsocketService.java @@ -12,9 +12,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Controller; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.web.websocket.dto.TeamAssignmentPayload; diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractArtemisIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractArtemisIntegrationTest.java index 9e7af8509d2b..4dab769f9cbb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractArtemisIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractArtemisIntegrationTest.java @@ -24,14 +24,14 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.MockDelegate; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ModelingSubmissionService; import de.tum.cit.aet.artemis.service.TextBlockService; diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java index fc19cf1b57d4..40edd8bcba66 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java @@ -29,16 +29,16 @@ import com.fasterxml.jackson.core.JsonProcessingException; import de.tum.cit.aet.artemis.connector.GitlabRequestMockProvider; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.programming.domain.AbstractBaseProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabService; import de.tum.cit.aet.artemis.service.connectors.gitlabci.GitLabCIService; import de.tum.cit.aet.artemis.service.connectors.gitlabci.GitLabCITriggerService; diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java index bdccc69d7911..9217cd926ed2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java @@ -17,16 +17,16 @@ import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.TestPropertySource; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.programming.domain.AbstractBaseProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.service.exam.ExamLiveEventsService; import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java index ab0bc9d07186..b25d6f90f9b0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java @@ -4,8 +4,8 @@ import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import static de.tum.cit.aet.artemis.core.config.Constants.TEST_REPO_NAME; -import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.SOLUTION; -import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.TEMPLATE; +import static de.tum.cit.aet.artemis.programming.domain.BuildPlanType.SOLUTION; +import static de.tum.cit.aet.artemis.programming.domain.BuildPlanType.TEMPLATE; import static de.tum.cit.aet.artemis.util.TestConstants.COMMIT_HASH_OBJECT_ID; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doReturn; @@ -32,16 +32,16 @@ import de.tum.cit.aet.artemis.connector.AeolusRequestMockProvider; import de.tum.cit.aet.artemis.connector.GitlabRequestMockProvider; import de.tum.cit.aet.artemis.connector.JenkinsRequestMockProvider; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.AeolusTarget; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.programming.domain.AbstractBaseProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.AeolusTarget; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabService; import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsService; import de.tum.cit.aet.artemis.service.exam.ExamLiveEventsService; diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java index ff2ca5522a12..411ff86656dc 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java @@ -26,16 +26,16 @@ import com.github.dockerjava.api.DockerClient; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.localvcci.LocalVCLocalCITestService; import de.tum.cit.aet.artemis.localvcci.TestBuildAgentConfiguration; import de.tum.cit.aet.artemis.programming.domain.AbstractBaseProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/BuildPlanIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/BuildPlanIntegrationTest.java index a92988dbe6ae..86e18e893f61 100644 --- a/src/test/java/de/tum/cit/aet/artemis/BuildPlanIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/BuildPlanIntegrationTest.java @@ -9,12 +9,12 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.domain.BuildPlan; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.BuildPlan; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/DatabaseQueryCountTest.java b/src/test/java/de/tum/cit/aet/artemis/DatabaseQueryCountTest.java index c870ccc76e74..691ef9ccfe34 100644 --- a/src/test/java/de/tum/cit/aet/artemis/DatabaseQueryCountTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/DatabaseQueryCountTest.java @@ -10,8 +10,8 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.lecture.LectureUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/FileIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/FileIntegrationTest.java index 0e7eb1eccab2..f4217433b0c7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/FileIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/FileIntegrationTest.java @@ -25,15 +25,15 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.domain.Attachment; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.lecture.LectureFactory; import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.lecture.domain.Attachment; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentType; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/GuidedTourSettingResourceTest.java b/src/test/java/de/tum/cit/aet/artemis/GuidedTourSettingResourceTest.java index 81e6f1a27e50..e8a48ed0719e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/GuidedTourSettingResourceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/GuidedTourSettingResourceTest.java @@ -11,8 +11,8 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.domain.GuidedTourSetting; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.GuidedTourSetting; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.user.UserUtilService; class GuidedTourSettingResourceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/ImprintResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/ImprintResourceIntegrationTest.java index 4b6757bfbe16..df192c1b5239 100644 --- a/src/test/java/de/tum/cit/aet/artemis/ImprintResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/ImprintResourceIntegrationTest.java @@ -24,7 +24,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.web.rest.dto.ImprintDTO; class ImprintResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/LongFeedbackResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/LongFeedbackResourceIntegrationTest.java index 9781f1fc0900..de5cba8fc5ac 100644 --- a/src/test/java/de/tum/cit/aet/artemis/LongFeedbackResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/LongFeedbackResourceIntegrationTest.java @@ -8,13 +8,13 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; class LongFeedbackResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/LtiDeepLinkingIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/LtiDeepLinkingIntegrationTest.java index 1791bbda26d0..375dab3f26fa 100644 --- a/src/test/java/de/tum/cit/aet/artemis/LtiDeepLinkingIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/LtiDeepLinkingIntegrationTest.java @@ -28,7 +28,7 @@ import com.nimbusds.jose.jwk.JWK; import com.nimbusds.jose.jwk.RSAKey; -import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer; import de.tum.cit.aet.artemis.lti.dto.Claims; diff --git a/src/test/java/de/tum/cit/aet/artemis/LtiIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/LtiIntegrationTest.java index 14b4195a5870..f1ba6132123c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/LtiIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/LtiIntegrationTest.java @@ -30,7 +30,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; +import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; class LtiIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/LtiQuizIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/LtiQuizIntegrationTest.java index f3a937e4bdd5..b1e3ca9fb53f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/LtiQuizIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/LtiQuizIntegrationTest.java @@ -28,15 +28,15 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.service.quiz.QuizExerciseService; diff --git a/src/test/java/de/tum/cit/aet/artemis/ManagementResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/ManagementResourceIntegrationTest.java index 78ca37351cce..7f2b5009135c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/ManagementResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/ManagementResourceIntegrationTest.java @@ -21,13 +21,13 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; +import de.tum.cit.aet.artemis.core.domain.PersistentAuditEvent; import de.tum.cit.aet.artemis.core.repository.PersistenceAuditEventRepository; -import de.tum.cit.aet.artemis.domain.PersistentAuditEvent; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.service.feature.Feature; diff --git a/src/test/java/de/tum/cit/aet/artemis/MetricsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/MetricsIntegrationTest.java index 28499bb3c0c1..dacdb3731526 100644 --- a/src/test/java/de/tum/cit/aet/artemis/MetricsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/MetricsIntegrationTest.java @@ -22,10 +22,10 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.test.util.ReflectionTestUtils; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseMetricsRepository; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.web.rest.dto.metrics.ExerciseInformationDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/OAuth2JWKSIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/OAuth2JWKSIntegrationTest.java index 75a2a5cd27fc..7a86c2f448aa 100644 --- a/src/test/java/de/tum/cit/aet/artemis/OAuth2JWKSIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/OAuth2JWKSIntegrationTest.java @@ -10,10 +10,10 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.course.CourseFactory; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; -import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; +import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; +import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.lti.repository.OnlineCourseConfigurationRepository; class OAuth2JWKSIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/PrivacyStatementResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/PrivacyStatementResourceIntegrationTest.java index 375eef7eba24..ee9b9ed4784d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/PrivacyStatementResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/PrivacyStatementResourceIntegrationTest.java @@ -24,7 +24,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.web.rest.dto.PrivacyStatementDTO; class PrivacyStatementResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/StatisticsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/StatisticsIntegrationTest.java index 82a6d8942a1a..862adb871c63 100644 --- a/src/test/java/de/tum/cit/aet/artemis/StatisticsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/StatisticsIntegrationTest.java @@ -20,19 +20,19 @@ import org.springframework.util.MultiValueMap; import de.tum.cit.aet.artemis.assessment.GradingScaleFactory; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.communication.domain.AnswerPost; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.GraphType; -import de.tum.cit.aet.artemis.domain.enumeration.SpanType; -import de.tum.cit.aet.artemis.domain.enumeration.StatisticsView; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.GraphType; +import de.tum.cit.aet.artemis.core.domain.SpanType; +import de.tum.cit.aet.artemis.core.domain.StatisticsView; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; diff --git a/src/test/java/de/tum/cit/aet/artemis/StudentScoreUtilService.java b/src/test/java/de/tum/cit/aet/artemis/StudentScoreUtilService.java index 14cf92300d42..5fab36709fcf 100644 --- a/src/test/java/de/tum/cit/aet/artemis/StudentScoreUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/StudentScoreUtilService.java @@ -3,11 +3,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.domain.StudentScore; import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; /** * Service responsible for initializing the database with specific testdata related to student scores for use in integration tests. diff --git a/src/test/java/de/tum/cit/aet/artemis/architecture/FeedbackArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/architecture/FeedbackArchitectureTest.java index 9fa659dcd228..446ee130bb44 100644 --- a/src/test/java/de/tum/cit/aet/artemis/architecture/FeedbackArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/architecture/FeedbackArchitectureTest.java @@ -10,7 +10,7 @@ import com.tngtech.archunit.core.domain.JavaClasses; import com.tngtech.archunit.lang.ArchRule; -import de.tum.cit.aet.artemis.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.service.FeedbackService; class FeedbackArchitectureTest extends AbstractArchitectureTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/aspects/AbstractEnforceRoleInResourceTest.java b/src/test/java/de/tum/cit/aet/artemis/aspects/AbstractEnforceRoleInResourceTest.java index d27d6730eb05..692668ee76f4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/aspects/AbstractEnforceRoleInResourceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/aspects/AbstractEnforceRoleInResourceTest.java @@ -4,8 +4,8 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.user.UserUtilService; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/aspects/EnforceRoleInExerciseTest.java b/src/test/java/de/tum/cit/aet/artemis/aspects/EnforceRoleInExerciseTest.java index 20ce48f12c31..10225958ed9b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/aspects/EnforceRoleInExerciseTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/aspects/EnforceRoleInExerciseTest.java @@ -9,8 +9,8 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; class EnforceRoleInExerciseTest extends AbstractEnforceRoleInResourceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentComplaintIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentComplaintIntegrationTest.java index 1f0a662519f3..4262cfbdae48 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentComplaintIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentComplaintIntegrationTest.java @@ -17,34 +17,34 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Complaint; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintType; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; -import de.tum.cit.aet.artemis.domain.Complaint; -import de.tum.cit.aet.artemis.domain.ComplaintResponse; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.ExamFactory; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.dto.ComplaintAction; import de.tum.cit.aet.artemis.service.dto.ComplaintRequestDTO; import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java index 68a4ef5b44be..60d2d3942267 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java @@ -15,17 +15,17 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.domain.Complaint; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintType; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; -import de.tum.cit.aet.artemis.domain.Complaint; -import de.tum.cit.aet.artemis.domain.ComplaintResponse; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintResponseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintResponseIntegrationTest.java index 2ed88bad5de4..b10c52049136 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintResponseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintResponseIntegrationTest.java @@ -15,16 +15,16 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.domain.Complaint; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.domain.Complaint; -import de.tum.cit.aet.artemis.domain.ComplaintResponse; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintUtilService.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintUtilService.java index e7ac76418794..7a11bb3fa40f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintUtilService.java @@ -3,17 +3,17 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.Complaint; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Complaint; -import de.tum.cit.aet.artemis.domain.ComplaintResponse; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ExampleSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ExampleSubmissionIntegrationTest.java index b7ac16cae77a..4c6a9d524666 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ExampleSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ExampleSubmissionIntegrationTest.java @@ -20,19 +20,19 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ExampleSubmission; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java index 10ee02d49bd0..73551c3e2c37 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java @@ -19,10 +19,10 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/GradeStepIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/GradeStepIntegrationTest.java index c8847b48c440..90365cfa3b11 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/GradeStepIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/GradeStepIntegrationTest.java @@ -13,12 +13,12 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.domain.GradeStep; +import de.tum.cit.aet.artemis.assessment.domain.GradeType; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.GradeStep; -import de.tum.cit.aet.artemis.domain.GradeType; -import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleFactory.java b/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleFactory.java index c940b8d2823d..7ff10a886970 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleFactory.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.assessment; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.GradeType; -import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.assessment.domain.GradeType; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exam.domain.Exam; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleIntegrationTest.java index 0b5381f9f0e7..325318fbde75 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleIntegrationTest.java @@ -13,12 +13,12 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.domain.GradeStep; +import de.tum.cit.aet.artemis.assessment.domain.GradeType; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.GradeStep; -import de.tum.cit.aet.artemis.domain.GradeType; -import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.dto.SortingOrder; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleUtilService.java b/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleUtilService.java index ab104d09dd6c..52d14ad44eb8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/GradingScaleUtilService.java @@ -18,11 +18,11 @@ import com.opencsv.CSVReader; +import de.tum.cit.aet.artemis.assessment.domain.GradeStep; +import de.tum.cit.aet.artemis.assessment.domain.GradeType; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.GradeStep; -import de.tum.cit.aet.artemis.domain.GradeType; -import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exam.domain.Exam; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java index 0dc8a2260456..07491542e0de 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java @@ -18,23 +18,23 @@ import org.springframework.test.util.ReflectionTestUtils; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.lecture.LectureUtilService; import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/RatingResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/RatingResourceIntegrationTest.java index 42f0a2d855e5..b8df7878304c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/RatingResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/RatingResourceIntegrationTest.java @@ -13,11 +13,11 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Rating; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.assessment.domain.Rating; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java index 70420de0afe6..75c0784fde93 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java @@ -26,28 +26,21 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; +import de.tum.cit.aet.artemis.assessment.domain.GradingInstruction; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.GradingInstruction; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; -import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseFactory; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; @@ -57,17 +50,24 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; +import de.tum.cit.aet.artemis.modeling.domain.DiagramType; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorEffortIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorEffortIntegrationTest.java index b6dc542fd774..e5ddbd27ac28 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorEffortIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorEffortIntegrationTest.java @@ -16,8 +16,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.dto.TutorEffort; import de.tum.cit.aet.artemis.assessment.repository.TextAssessmentEventRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java index 74eb7f0da430..35df3be13b26 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java @@ -13,9 +13,9 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationIntegrationTest.java index ca579a2c3f73..e9e0b0d5c0a1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationIntegrationTest.java @@ -17,16 +17,15 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingInstructionRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ExampleSubmission; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.ExerciseFactory; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.participation.ParticipationFactory; @@ -38,6 +37,7 @@ import de.tum.cit.aet.artemis.text.domain.TextBlock; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorParticipationStatus; import de.tum.cit.aet.artemis.util.TestResourceUtils; class TutorParticipationIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationResourceIntegrationTest.java index 29c41f89b096..e9ca776383c9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationResourceIntegrationTest.java @@ -11,13 +11,13 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.domain.ExampleSubmission; import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ExampleSubmission; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; class TutorParticipationResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/authentication/InternalAuthenticationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/InternalAuthenticationIntegrationTest.java index 8bf0c5da74c4..cd3005427bc0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authentication/InternalAuthenticationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/InternalAuthenticationIntegrationTest.java @@ -1,9 +1,9 @@ package de.tum.cit.aet.artemis.authentication; -import static de.tum.cit.aet.artemis.domain.Authority.EDITOR_AUTHORITY; -import static de.tum.cit.aet.artemis.domain.Authority.INSTRUCTOR_AUTHORITY; -import static de.tum.cit.aet.artemis.domain.Authority.TA_AUTHORITY; -import static de.tum.cit.aet.artemis.domain.Authority.USER_AUTHORITY; +import static de.tum.cit.aet.artemis.core.domain.Authority.EDITOR_AUTHORITY; +import static de.tum.cit.aet.artemis.core.domain.Authority.INSTRUCTOR_AUTHORITY; +import static de.tum.cit.aet.artemis.core.domain.Authority.TA_AUTHORITY; +import static de.tum.cit.aet.artemis.core.domain.Authority.USER_AUTHORITY; import static de.tum.cit.aet.artemis.user.UserFactory.USER_PASSWORD; import static org.assertj.core.api.Assertions.assertThat; @@ -28,15 +28,15 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.connector.GitlabRequestMockProvider; +import de.tum.cit.aet.artemis.core.domain.Authority; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.AuthorityRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.course.CourseFactory; -import de.tum.cit.aet.artemis.domain.Authority; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.user.PasswordService; import de.tum.cit.aet.artemis.tutorialgroups.TutorialGroupUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java index edbeb2f212ee..0a30b1d877b3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java @@ -21,15 +21,15 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.core.domain.Authority; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.AuthorityRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Authority; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; diff --git a/src/test/java/de/tum/cit/aet/artemis/authentication/UserJenkinsGitlabIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/UserJenkinsGitlabIntegrationTest.java index 72d555283c26..5c0427782c03 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authentication/UserJenkinsGitlabIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/UserJenkinsGitlabIntegrationTest.java @@ -18,11 +18,11 @@ import org.springframework.test.util.ReflectionTestUtils; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabPersonalAccessTokenManagementService; import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabUserManagementService; import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsUserManagementService; diff --git a/src/test/java/de/tum/cit/aet/artemis/authentication/UserSaml2IntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/UserSaml2IntegrationTest.java index 2a0cfe939a22..908422d96031 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authentication/UserSaml2IntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/UserSaml2IntegrationTest.java @@ -20,7 +20,7 @@ import org.springframework.security.test.context.TestSecurityContextHolder; import de.tum.cit.aet.artemis.AbstractSpringIntegrationGitlabCIGitlabSamlTest; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.service.connectors.SAML2Service; import de.tum.cit.aet.artemis.service.user.PasswordService; import de.tum.cit.aet.artemis.web.rest.open.PublicUserJwtResource; diff --git a/src/test/java/de/tum/cit/aet/artemis/bonus/BonusFactory.java b/src/test/java/de/tum/cit/aet/artemis/bonus/BonusFactory.java index 2262523c7b90..3c8679064faa 100644 --- a/src/test/java/de/tum/cit/aet/artemis/bonus/BonusFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/bonus/BonusFactory.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.bonus; -import de.tum.cit.aet.artemis.domain.Bonus; -import de.tum.cit.aet.artemis.domain.BonusStrategy; -import de.tum.cit.aet.artemis.domain.GradingScale; +import de.tum.cit.aet.artemis.assessment.domain.Bonus; +import de.tum.cit.aet.artemis.assessment.domain.BonusStrategy; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; /** * Factory for creating Bonuses and related objects. diff --git a/src/test/java/de/tum/cit/aet/artemis/bonus/BonusIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/bonus/BonusIntegrationTest.java index 43b1397d29e6..50b328fb273a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/bonus/BonusIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/bonus/BonusIntegrationTest.java @@ -19,19 +19,19 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.GradingScaleFactory; import de.tum.cit.aet.artemis.assessment.GradingScaleUtilService; +import de.tum.cit.aet.artemis.assessment.domain.Bonus; +import de.tum.cit.aet.artemis.assessment.domain.BonusStrategy; +import de.tum.cit.aet.artemis.assessment.domain.GradeStep; +import de.tum.cit.aet.artemis.assessment.domain.GradeType; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.repository.BonusRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; -import de.tum.cit.aet.artemis.domain.Bonus; -import de.tum.cit.aet.artemis.domain.BonusStrategy; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.GradeStep; -import de.tum.cit.aet.artemis.domain.GradeType; -import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/AbstractCompetencyPrerequisiteIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/AbstractCompetencyPrerequisiteIntegrationTest.java index 0ef75f0e2475..5cd7565d9bbd 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/AbstractCompetencyPrerequisiteIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/AbstractCompetencyPrerequisiteIntegrationTest.java @@ -25,16 +25,16 @@ import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.lecture.LectureUtilService; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.domain.TextUnit; import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyIntegrationTest.java index 984298ea988d..b278da4b3fac 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyIntegrationTest.java @@ -15,7 +15,7 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyJolIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyJolIntegrationTest.java index edb0adb15c99..4c49fd1c8bdd 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyJolIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyJolIntegrationTest.java @@ -17,7 +17,7 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; import de.tum.cit.aet.artemis.atlas.repository.competency.CompetencyJolRepository; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolPairDTO; class CompetencyJolIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyProgressUtilService.java b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyProgressUtilService.java index 26704e294cad..fb1161fc8f45 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyProgressUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyProgressUtilService.java @@ -6,7 +6,7 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; /** * Service responsible for initializing the database with specific testdata related to competency progress for use in integration tests. diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyUtilService.java b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyUtilService.java index 4df841e5c1ac..0103cef27a60 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyUtilService.java @@ -15,9 +15,9 @@ import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.competency.CompetencyJolRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/CourseCompetencyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/CourseCompetencyIntegrationTest.java index 19ef67399bfa..62bdaa19da5d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/CourseCompetencyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/CourseCompetencyIntegrationTest.java @@ -21,6 +21,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; import de.tum.cit.aet.artemis.StudentScoreUtilService; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyRelation; @@ -32,18 +33,14 @@ import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.DifficultyLevel; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; @@ -53,6 +50,7 @@ import de.tum.cit.aet.artemis.lecture.LectureUtilService; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.domain.TextUnit; import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; @@ -61,6 +59,8 @@ import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.service.LectureUnitService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.team.TeamUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java index 334d2d50ef4e..48d2e21f1694 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java @@ -25,7 +25,9 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.StudentScoreUtilService; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.atlas.domain.LearningObject; import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyRelation; import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; @@ -33,14 +35,12 @@ import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.LearningPathRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.LearningObject; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.domain.TextUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathUtilService.java b/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathUtilService.java index 1eca58fe62e4..edcd417e6384 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathUtilService.java @@ -10,9 +10,9 @@ import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.LearningPathRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.learningpath.LearningPathService; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteIntegrationTest.java index 910802afa3b1..888cdab1bc49 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteIntegrationTest.java @@ -15,7 +15,7 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteUtilService.java b/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteUtilService.java index 1964d35db3e0..476ec5598d77 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteUtilService.java @@ -8,7 +8,7 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; -import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Course; /** * Service responsible for initializing the database with specific test data related to prerequisites for use in integration tests. diff --git a/src/test/java/de/tum/cit/aet/artemis/config/MetricsBeanTest.java b/src/test/java/de/tum/cit/aet/artemis/config/MetricsBeanTest.java index 4d79aafcb253..9381a89aa3d1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/config/MetricsBeanTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/config/MetricsBeanTest.java @@ -14,17 +14,16 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.core.config.MetricsBean; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; -import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; @@ -33,6 +32,7 @@ import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.user.UserUtilService; import io.micrometer.core.instrument.MeterRegistry; diff --git a/src/test/java/de/tum/cit/aet/artemis/config/ProgrammingLanguageConfigurationTest.java b/src/test/java/de/tum/cit/aet/artemis/config/ProgrammingLanguageConfigurationTest.java index 39c9180fc46f..79b31842e033 100644 --- a/src/test/java/de/tum/cit/aet/artemis/config/ProgrammingLanguageConfigurationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/config/ProgrammingLanguageConfigurationTest.java @@ -14,8 +14,8 @@ import org.junit.jupiter.api.Test; import de.tum.cit.aet.artemis.core.config.ProgrammingLanguageConfiguration; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; class ProgrammingLanguageConfigurationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/config/TheiaConfigurationTest.java b/src/test/java/de/tum/cit/aet/artemis/config/TheiaConfigurationTest.java index 8c604e042655..0d375e4189b2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/config/TheiaConfigurationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/config/TheiaConfigurationTest.java @@ -9,7 +9,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.core.config.TheiaConfiguration; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; class TheiaConfigurationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/connector/AeolusRequestMockProvider.java b/src/test/java/de/tum/cit/aet/artemis/connector/AeolusRequestMockProvider.java index 9c5fcb8b8fc8..f7b1aba4682b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connector/AeolusRequestMockProvider.java +++ b/src/test/java/de/tum/cit/aet/artemis/connector/AeolusRequestMockProvider.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.domain.enumeration.AeolusTarget; +import de.tum.cit.aet.artemis.programming.domain.AeolusTarget; /** * Mocks requests to Aeolus diff --git a/src/test/java/de/tum/cit/aet/artemis/connector/GitlabRequestMockProvider.java b/src/test/java/de/tum/cit/aet/artemis/connector/GitlabRequestMockProvider.java index 7f73a357f31c..cd0d99c67039 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connector/GitlabRequestMockProvider.java +++ b/src/test/java/de/tum/cit/aet/artemis/connector/GitlabRequestMockProvider.java @@ -90,12 +90,12 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.UriService; import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabException; @@ -454,7 +454,7 @@ public void mockCopyRepositoryForParticipation(ProgrammingExercise exercise, Str mockCreateRepository(exercise, clonedRepoName); } - public void mockConfigureRepository(ProgrammingExercise exercise, Set users, boolean userExists) throws GitLabApiException { + public void mockConfigureRepository(ProgrammingExercise exercise, Set users, boolean userExists) throws GitLabApiException { programmingExerciseUtilService.addTemplateParticipationForProgrammingExercise(exercise); var repositoryUri = exercise.getVcsTemplateRepositoryUri(); for (var user : users) { @@ -472,7 +472,7 @@ public void mockUserExists(String username, boolean exists) throws GitLabApiExce doReturn(exists ? new User().withUsername(username) : null).when(userApi).getUser(username); } - private void mockImportUser(de.tum.cit.aet.artemis.domain.User user, boolean shouldFail) throws GitLabApiException { + private void mockImportUser(de.tum.cit.aet.artemis.core.domain.User user, boolean shouldFail) throws GitLabApiException { final var gitlabUser = new org.gitlab4j.api.models.User().withEmail(user.getEmail()).withUsername(user.getLogin()).withName(user.getName()).withCanCreateGroup(false) .withCanCreateProject(false).withSkipConfirmation(true); if (!shouldFail) { @@ -538,7 +538,7 @@ public void mockRemoveMemberFromRepository(String repositoryPath, String login) doNothing().when(projectApi).removeMember(repositoryPath, mockedUserId); } - public void mockUpdateVcsUser(String login, de.tum.cit.aet.artemis.domain.User user, Set removedGroups, Set addedGroups, boolean shouldSynchronizePassword) + public void mockUpdateVcsUser(String login, de.tum.cit.aet.artemis.core.domain.User user, Set removedGroups, Set addedGroups, boolean shouldSynchronizePassword) throws GitLabApiException { mockUpdateBasicUserInformation(login, shouldSynchronizePassword); mockUpdateUserActivationState(user, false); @@ -573,7 +573,7 @@ else if (user.getGroups().contains(course.getTeachingAssistantGroupName())) { } } - public void mockUpdateVcsUserFailToActivate(String login, de.tum.cit.aet.artemis.domain.User user) throws GitLabApiException { + public void mockUpdateVcsUserFailToActivate(String login, de.tum.cit.aet.artemis.core.domain.User user) throws GitLabApiException { mockUpdateBasicUserInformation(login, true); mockUpdateUserActivationState(user, true); } @@ -630,7 +630,7 @@ else if (userExists) { } } - public void mockCreateVcsUser(de.tum.cit.aet.artemis.domain.User user, boolean shouldFail) throws GitLabApiException { + public void mockCreateVcsUser(de.tum.cit.aet.artemis.core.domain.User user, boolean shouldFail) throws GitLabApiException { var userId = mockGetUserIdCreateIfNotExist(user, false, shouldFail); // Add user to existing exercises @@ -646,17 +646,17 @@ public void mockCreateVcsUser(de.tum.cit.aet.artemis.domain.User user, boolean s } } - public void mockAddUserToGroupsUserExists(de.tum.cit.aet.artemis.domain.User user, String projectKey) throws GitLabApiException { + public void mockAddUserToGroupsUserExists(de.tum.cit.aet.artemis.core.domain.User user, String projectKey) throws GitLabApiException { Long userId = mockGetUserIdCreateIfNotExist(user, false, false); doThrow(new GitLabApiException("Member already exists")).when(groupApi).addMember(eq(projectKey), eq(userId), any(AccessLevel.class)); } - public void mockAddUserToGroupsFails(de.tum.cit.aet.artemis.domain.User user, String projectKey) throws GitLabApiException { + public void mockAddUserToGroupsFails(de.tum.cit.aet.artemis.core.domain.User user, String projectKey) throws GitLabApiException { Long userId = mockGetUserIdCreateIfNotExist(user, false, false); doThrow(new GitLabApiException("Oh no")).when(groupApi).addMember(eq(projectKey), eq(userId), any(AccessLevel.class)); } - private Long mockGetUserIdCreateIfNotExist(de.tum.cit.aet.artemis.domain.User user, boolean userExists, boolean shouldFail) throws GitLabApiException { + private Long mockGetUserIdCreateIfNotExist(de.tum.cit.aet.artemis.core.domain.User user, boolean userExists, boolean shouldFail) throws GitLabApiException { var userToReturn = new User().withId(1L).withUsername(user.getLogin()); doReturn(userExists ? userToReturn : null).when(userApi).getUser(user.getLogin()); if (!userExists) { @@ -687,8 +687,8 @@ public void mockUpdateCoursePermissions(Course updatedCourse, String oldInstruct allUsers.addAll(userRepository.findAllUserInGroupAndNotIn(updatedCourse.getEditorGroupName(), allUsers)); allUsers.addAll(userRepository.findAllUserInGroupAndNotIn(updatedCourse.getTeachingAssistantGroupName(), allUsers)); - final Set oldUsers = new HashSet<>(); - final Set newUsers = new HashSet<>(); + final Set oldUsers = new HashSet<>(); + final Set newUsers = new HashSet<>(); for (var user : allUsers) { Set userGroups = user.getGroups(); @@ -704,7 +704,7 @@ public void mockUpdateCoursePermissions(Course updatedCourse, String oldInstruct mockSetPermissionsForNewGroupMembers(programmingExercises, newUsers, updatedCourse); } - private void mockUpdateOldGroupMembers(List programmingExercises, Set oldUsers, Course updatedCourse) + private void mockUpdateOldGroupMembers(List programmingExercises, Set oldUsers, Course updatedCourse) throws GitLabApiException { for (var user : oldUsers) { mockGetUserId(user.getLogin(), true, false); @@ -725,8 +725,8 @@ private void mockUpdateOldGroupMembers(List programmingExer } } - private void mockSetPermissionsForNewGroupMembers(List programmingExercises, Set newUsers, Course updatedCourse) { - for (de.tum.cit.aet.artemis.domain.User user : newUsers) { + private void mockSetPermissionsForNewGroupMembers(List programmingExercises, Set newUsers, Course updatedCourse) { + for (de.tum.cit.aet.artemis.core.domain.User user : newUsers) { try { mockGetUserId(user.getLogin(), true, false); @@ -775,16 +775,16 @@ private void mockRemoveMemberFromExercises(List programming } } - public void mockFailToGetUserWhenUpdatingOldMembers(de.tum.cit.aet.artemis.domain.User user) throws GitLabApiException { + public void mockFailToGetUserWhenUpdatingOldMembers(de.tum.cit.aet.artemis.core.domain.User user) throws GitLabApiException { mockGetUserId(user.getLogin(), false, true); } - public void mockFailToUpdateOldGroupMembers(ProgrammingExercise exercise, de.tum.cit.aet.artemis.domain.User user) throws GitLabApiException { + public void mockFailToUpdateOldGroupMembers(ProgrammingExercise exercise, de.tum.cit.aet.artemis.core.domain.User user) throws GitLabApiException { mockGetUserId(user.getLogin(), true, false); doThrow(GitLabApiException.class).when(groupApi).updateMember(eq(exercise.getProjectKey()), eq(1L), any(AccessLevel.class)); } - public void mockFailToRemoveOldMember(ProgrammingExercise programmingExercise, de.tum.cit.aet.artemis.domain.User user) throws GitLabApiException { + public void mockFailToRemoveOldMember(ProgrammingExercise programmingExercise, de.tum.cit.aet.artemis.core.domain.User user) throws GitLabApiException { mockGetUserId(user.getLogin(), true, false); doThrow(GitLabApiException.class).when(groupApi).removeMember(programmingExercise.getProjectKey(), 1L); } @@ -823,7 +823,7 @@ public void mockRepositoryUriIsValid(VcsRepositoryUri repositoryUri, boolean isU } } - public void setRepositoryPermissionsToReadOnly(VcsRepositoryUri repositoryUri, Set users) throws GitLabApiException { + public void setRepositoryPermissionsToReadOnly(VcsRepositoryUri repositoryUri, Set users) throws GitLabApiException { for (var user : users) { mockGetUserId(user.getLogin(), true, false); final var repositoryPath = uriService.getRepositoryPathFromRepositoryUri(repositoryUri); @@ -841,7 +841,7 @@ public void mockActivateUser(String userLogin, boolean shouldFail) throws GitLab mockUnblockUser(shouldFail); } - public void mockUpdateUserActivationState(de.tum.cit.aet.artemis.domain.User user, boolean shouldFail) throws GitLabApiException { + public void mockUpdateUserActivationState(de.tum.cit.aet.artemis.core.domain.User user, boolean shouldFail) throws GitLabApiException { if (user.getActivated()) { mockUnblockUser(shouldFail); } diff --git a/src/test/java/de/tum/cit/aet/artemis/connector/JenkinsRequestMockProvider.java b/src/test/java/de/tum/cit/aet/artemis/connector/JenkinsRequestMockProvider.java index 7847eac78d03..ed5f802c00d4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connector/JenkinsRequestMockProvider.java +++ b/src/test/java/de/tum/cit/aet/artemis/connector/JenkinsRequestMockProvider.java @@ -45,9 +45,9 @@ import com.offbytwo.jenkins.model.JobWithDetails; import com.offbytwo.jenkins.model.QueueReference; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.connectors.jenkins.dto.JenkinsUserDTO; import de.tum.cit.aet.artemis.service.connectors.jenkins.jobs.JenkinsJobPermissionsService; diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusBuildScriptGenerationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusBuildScriptGenerationServiceTest.java index a0ee26e0284d..2a52dd80d9bc 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusBuildScriptGenerationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusBuildScriptGenerationServiceTest.java @@ -18,11 +18,11 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; import de.tum.cit.aet.artemis.connector.AeolusRequestMockProvider; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.cit.aet.artemis.domain.enumeration.AeolusTarget; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.AeolusTarget; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusBuildPlanService; import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusBuildScriptGenerationService; import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusServiceTest.java index 1c6ca80a2de0..090a8a0190a9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusServiceTest.java @@ -25,13 +25,13 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.connector.AeolusRequestMockProvider; -import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.AeolusTarget; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.AeolusTarget; +import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusBuildPlanService; import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusBuildScriptGenerationService; import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java index eb49a167427e..2447c5f20d8b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java @@ -43,25 +43,25 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProvider; import de.tum.cit.aet.artemis.core.security.lti.Lti13TokenRetriever; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; -import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.domain.LtiResourceLaunch; +import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.lti.dto.Scopes; import de.tum.cit.aet.artemis.lti.repository.Lti13ResourceLaunchRepository; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; import de.tum.cit.aet.artemis.service.connectors.lti.Lti13Service; import de.tum.cit.aet.artemis.service.connectors.lti.LtiService; diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java index 41461482e1e2..1fde16ad1323 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java @@ -19,9 +19,9 @@ import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; +import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.lti.dto.Lti13ClientRegistration; import de.tum.cit.aet.artemis.lti.dto.Lti13PlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiNewResultServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiNewResultServiceTest.java index 97ca63625fae..b286487dd2ad 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiNewResultServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiNewResultServiceTest.java @@ -11,8 +11,8 @@ import org.mockito.MockitoAnnotations; import org.springframework.security.core.context.SecurityContextHolder; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.service.connectors.lti.Lti13Service; import de.tum.cit.aet.artemis.service.connectors.lti.LtiNewResultService; diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiServiceTest.java index 936be5ead6ac..51d9e34c4fe6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiServiceTest.java @@ -28,14 +28,14 @@ import org.springframework.web.util.UriComponents; import org.springframework.web.util.UriComponentsBuilder; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProvider; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.jwt.JWTCookieService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; import de.tum.cit.aet.artemis.service.connectors.lti.LtiService; import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; diff --git a/src/test/java/de/tum/cit/aet/artemis/course/CourseFactory.java b/src/test/java/de/tum/cit/aet/artemis/course/CourseFactory.java index 94390ef4cec5..3ef03f95a68c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/course/CourseFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/course/CourseFactory.java @@ -4,11 +4,11 @@ import java.util.Set; import java.util.UUID; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; -import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; -import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; +import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; /** * Factory for creating Courses and related objects. diff --git a/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java b/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java index 1ccdbf3f5d6d..77114952ee52 100644 --- a/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java @@ -61,6 +61,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Complaint; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintType; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; @@ -69,40 +75,21 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; import de.tum.cit.aet.artemis.atlas.repository.LearningPathRepository; import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; +import de.tum.cit.aet.artemis.communication.domain.DefaultChannelType; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.competency.PrerequisiteUtilService; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.core.domain.Organization; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.CustomAuditEventRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.Complaint; -import de.tum.cit.aet.artemis.domain.ComplaintResponse; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; -import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; -import de.tum.cit.aet.artemis.domain.Organization; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; -import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.cit.aet.artemis.domain.enumeration.DefaultChannelType; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus; import de.tum.cit.aet.artemis.exam.ExamFactory; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; @@ -110,6 +97,10 @@ import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; @@ -121,9 +112,13 @@ import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.lecture.LectureUtilService; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; +import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.lti.repository.OnlineCourseConfigurationRepository; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; @@ -131,9 +126,13 @@ import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.ParticipationService; @@ -148,6 +147,7 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorParticipationStatus; import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/course/CourseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/course/CourseUtilService.java index 926eca02f27b..b4d80cd0ad86 100644 --- a/src/test/java/de/tum/cit/aet/artemis/course/CourseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/course/CourseUtilService.java @@ -20,40 +20,30 @@ import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; import de.tum.cit.aet.artemis.assessment.GradingScaleUtilService; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.domain.Organization; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Attachment; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; -import de.tum.cit.aet.artemis.domain.Organization; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseFactory; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; @@ -66,26 +56,36 @@ import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadSubmissionRepository; import de.tum.cit.aet.artemis.lecture.LectureFactory; import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.lecture.domain.Attachment; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; +import de.tum.cit.aet.artemis.modeling.domain.DiagramType; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; import de.tum.cit.aet.artemis.organization.OrganizationUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.ModelingSubmissionService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorParticipationStatus; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.TestResourceUtils; diff --git a/src/test/java/de/tum/cit/aet/artemis/dataexport/DataExportResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/dataexport/DataExportResourceIntegrationTest.java index 73f2154eb91c..f9d90feb5fc5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/dataexport/DataExportResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/dataexport/DataExportResourceIntegrationTest.java @@ -27,9 +27,9 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.domain.DataExport; +import de.tum.cit.aet.artemis.core.domain.DataExportState; import de.tum.cit.aet.artemis.core.repository.DataExportRepository; -import de.tum.cit.aet.artemis.domain.DataExport; -import de.tum.cit.aet.artemis.domain.enumeration.DataExportState; import de.tum.cit.aet.artemis.service.export.DataExportService; import de.tum.cit.aet.artemis.web.rest.dto.DataExportDTO; import de.tum.cit.aet.artemis.web.rest.dto.RequestDataExportDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/CourseTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/CourseTest.java index 385d849ec567..68519362a6de 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/CourseTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/CourseTest.java @@ -10,6 +10,7 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; class CourseTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/ExerciseTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/ExerciseTest.java index 3c68880f34ad..9eee7f7abcb8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/ExerciseTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/ExerciseTest.java @@ -12,18 +12,24 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.course.CourseFactory; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.exam.ExamFactory; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.modeling.domain.DiagramType; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.text.domain.TextExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/FeedbackTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/FeedbackTest.java index 9a11c6873b62..796f9dc0e946 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/FeedbackTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/FeedbackTest.java @@ -4,6 +4,8 @@ import org.junit.jupiter.api.Test; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.LongFeedbackText; import de.tum.cit.aet.artemis.core.config.Constants; class FeedbackTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/GuidedTourSettingTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/GuidedTourSettingTest.java index a383b5575ebf..891395893471 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/GuidedTourSettingTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/GuidedTourSettingTest.java @@ -4,6 +4,8 @@ import org.junit.jupiter.api.Test; +import de.tum.cit.aet.artemis.core.domain.GuidedTourSetting; + class GuidedTourSettingTest { @Test diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTest.java index 69963d61d707..b13435d3d8d9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTest.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ide.UserIdeMapping; import de.tum.cit.aet.artemis.util.classpath.ClassNode; import de.tum.cit.aet.artemis.util.classpath.ClassPathNode; diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTestExclusions.java b/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTestExclusions.java index 6697a77f9820..8a6db18d47f6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTestExclusions.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTestExclusions.java @@ -6,7 +6,7 @@ import java.util.Map.Entry; import de.tum.cit.aet.artemis.communication.ConversationSettings; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; /** * Exclusions of domain classes for specific tests. diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/ResultTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/ResultTest.java index f3ab6f44d84d..957325d28775 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/ResultTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/ResultTest.java @@ -12,12 +12,17 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.domain.AssessmentNote; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.Visibility; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.text.domain.TextExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseTypeTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseTypeTest.java index fcea9a723e18..a5d15c209b28 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseTypeTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/enumeration/ExerciseTypeTest.java @@ -5,10 +5,11 @@ import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.text.domain.TextExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/notification/GroupNotificationFactoryTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/notification/GroupNotificationFactoryTest.java index 982d5b0b0811..932bb305abe8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/notification/GroupNotificationFactoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/notification/GroupNotificationFactoryTest.java @@ -1,5 +1,21 @@ package de.tum.cit.aet.artemis.domain.notification; +import static de.tum.cit.aet.artemis.communication.domain.NotificationPriority.HIGH; +import static de.tum.cit.aet.artemis.communication.domain.NotificationPriority.MEDIUM; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.ATTACHMENT_CHANGE; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.COURSE_ARCHIVE_FAILED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.COURSE_ARCHIVE_FINISHED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.COURSE_ARCHIVE_STARTED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.DUPLICATE_TEST_CASE; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXAM_ARCHIVE_FAILED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXAM_ARCHIVE_FINISHED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXAM_ARCHIVE_STARTED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXERCISE_PRACTICE; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXERCISE_RELEASED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXERCISE_UPDATED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_ANNOUNCEMENT_POST; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.PROGRAMMING_TEST_CASES_CHANGED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.QUIZ_EXERCISE_STARTED; import static de.tum.cit.aet.artemis.communication.domain.notification.GroupNotificationFactory.createAnnouncementNotification; import static de.tum.cit.aet.artemis.communication.domain.notification.GroupNotificationFactory.createNotification; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.ATTACHMENT_CHANGE_TEXT; @@ -42,22 +58,6 @@ import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createExerciseTarget; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createLectureTarget; import static de.tum.cit.aet.artemis.core.config.Constants.TEST_CASES_DUPLICATE_NOTIFICATION; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority.HIGH; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority.MEDIUM; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.ATTACHMENT_CHANGE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_FAILED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_FINISHED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_STARTED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DUPLICATE_TEST_CASE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_FAILED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_FINISHED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_STARTED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_PRACTICE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_RELEASED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_UPDATED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_ANNOUNCEMENT_POST; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PROGRAMMING_TEST_CASES_CHANGED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.QUIZ_EXERCISE_STARTED; import static org.assertj.core.api.Assertions.assertThat; import java.util.List; @@ -67,22 +67,22 @@ import org.junit.jupiter.api.Test; import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.GroupNotificationType; +import de.tum.cit.aet.artemis.communication.domain.NotificationPriority; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.domain.notification.GroupNotification; import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; import de.tum.cit.aet.artemis.communication.domain.notification.NotificationTarget; -import de.tum.cit.aet.artemis.domain.Attachment; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.lecture.domain.Attachment; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.text.domain.TextExercise; class GroupNotificationFactoryTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/notification/SingleUserNotificationFactoryTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/notification/SingleUserNotificationFactoryTest.java index 25500d25801b..1b5fc1aea585 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/notification/SingleUserNotificationFactoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/notification/SingleUserNotificationFactoryTest.java @@ -1,5 +1,20 @@ package de.tum.cit.aet.artemis.domain.notification; +import static de.tum.cit.aet.artemis.communication.domain.NotificationPriority.HIGH; +import static de.tum.cit.aet.artemis.communication.domain.NotificationPriority.MEDIUM; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.DATA_EXPORT_CREATED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.DATA_EXPORT_FAILED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXERCISE_SUBMISSION_ASSESSED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.FILE_SUBMISSION_SUCCESSFUL; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_PLAGIARISM_CASE_STUDENT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.PLAGIARISM_CASE_VERDICT_STUDENT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_ASSIGNED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_STUDENT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_MULTIPLE_REGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_REGISTRATION_STUDENT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_REGISTRATION_TUTOR; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_UNASSIGNED; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.DATA_EXPORT_CREATED_TEXT; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.DATA_EXPORT_CREATED_TITLE; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.DATA_EXPORT_FAILED_TEXT; @@ -32,21 +47,6 @@ import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createPlagiarismCaseTarget; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.createTutorialGroupTarget; import static de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotificationFactory.createNotification; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority.HIGH; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority.MEDIUM; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DATA_EXPORT_CREATED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DATA_EXPORT_FAILED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_SUBMISSION_ASSESSED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.FILE_SUBMISSION_SUCCESSFUL; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_PLAGIARISM_CASE_STUDENT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.PLAGIARISM_CASE_VERDICT_STUDENT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_ASSIGNED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_STUDENT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_DEREGISTRATION_TUTOR; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_MULTIPLE_REGISTRATION_TUTOR; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_STUDENT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_REGISTRATION_TUTOR; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.TUTORIAL_GROUP_UNASSIGNED; import static org.assertj.core.api.Assertions.assertThat; import java.time.ZonedDateTime; @@ -61,17 +61,17 @@ import org.junit.jupiter.params.provider.MethodSource; import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.NotificationPriority; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.domain.notification.NotificationTarget; import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotification; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.DataExport; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationPriority; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DataExport; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismResult; diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/notification/TutorialGroupNotificationFactoryTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/notification/TutorialGroupNotificationFactoryTest.java index 2cc972c69d49..26e264548433 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/notification/TutorialGroupNotificationFactoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/notification/TutorialGroupNotificationFactoryTest.java @@ -10,12 +10,12 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.domain.notification.NotificationTarget; import de.tum.cit.aet.artemis.communication.domain.notification.TutorialGroupNotification; import de.tum.cit.aet.artemis.communication.domain.notification.TutorialGroupNotificationFactory; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; class TutorialGroupNotificationFactoryTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/entitylistener/ResultListenerIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/entitylistener/ResultListenerIntegrationTest.java index 21e3d0424adb..3df627a23979 100644 --- a/src/test/java/de/tum/cit/aet/artemis/entitylistener/ResultListenerIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/entitylistener/ResultListenerIntegrationTest.java @@ -21,15 +21,15 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; import de.tum.cit.aet.artemis.assessment.domain.ParticipantScore; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.domain.StudentScore; import de.tum.cit.aet.artemis.assessment.domain.TeamScore; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamFactory.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamFactory.java index 9f0ca2f7a9c2..d665ca134eb9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamFactory.java @@ -6,7 +6,7 @@ import java.util.HashSet; import java.util.Set; -import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExamSession; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java index f8cd1cf3b81d..0b03af43abbe 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java @@ -43,13 +43,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseType; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; @@ -59,6 +54,9 @@ import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; @@ -66,7 +64,9 @@ import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizGroup; import de.tum.cit.aet.artemis.quiz.domain.QuizPool; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java index c0e705164da7..c1b82c48b73e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java @@ -34,24 +34,18 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.assessment.GradingScaleUtilService; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.BonusStrategy; +import de.tum.cit.aet.artemis.assessment.domain.GradeType; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.BonusRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.bonus.BonusFactory; -import de.tum.cit.aet.artemis.domain.BonusStrategy; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.GradeType; -import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; @@ -59,6 +53,10 @@ import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseTestService; @@ -72,6 +70,8 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java index fa4b84a9bc6e..15c2bb91ad41 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java @@ -21,8 +21,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamSessionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamSessionIntegrationTest.java index 6d348e0d4eaa..e39e5d9f9f64 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamSessionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamSessionIntegrationTest.java @@ -8,7 +8,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamSessionRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java index e87b8aa827de..365e895342a5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java @@ -27,18 +27,16 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; @@ -46,9 +44,11 @@ import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.modeling.domain.DiagramType; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.repository.ParticipationTestRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamUserIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamUserIntegrationTest.java index 4114accf1b4f..a19f24625d1b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamUserIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamUserIntegrationTest.java @@ -32,8 +32,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.domain.StudentExam; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamUtilService.java index b00aa33b4c75..fbc4e72e20f1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamUtilService.java @@ -14,25 +14,16 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExamSession; import de.tum.cit.aet.artemis.exam.domain.ExamUser; @@ -43,6 +34,11 @@ import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseFactory; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; @@ -57,10 +53,14 @@ import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.modeling.domain.DiagramType; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.post.ConversationFactory; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizPool; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExerciseGroupIntegrationJenkinsGitlabTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExerciseGroupIntegrationJenkinsGitlabTest.java index c308ccfa71af..f4a09ad2eede 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExerciseGroupIntegrationJenkinsGitlabTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExerciseGroupIntegrationJenkinsGitlabTest.java @@ -20,19 +20,19 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ProgrammingExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ProgrammingExamIntegrationTest.java index 16ef48faf968..ef2fe00c2edb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ProgrammingExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ProgrammingExamIntegrationTest.java @@ -28,10 +28,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.StudentExam; @@ -41,6 +39,8 @@ import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseTestService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/QuizPoolIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/QuizPoolIntegrationTest.java index 8495e7637767..dafd46ccc2b5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/QuizPoolIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/QuizPoolIntegrationTest.java @@ -13,8 +13,8 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java index 5bcff8cc8bf6..46e021ae31fb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java @@ -60,25 +60,18 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.assessment.GradingScaleUtilService; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.BonusStrategy; +import de.tum.cit.aet.artemis.assessment.domain.GradeType; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.BonusRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.bonus.BonusFactory; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.BonusStrategy; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.domain.GradeType; -import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.Language; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; @@ -87,6 +80,9 @@ import de.tum.cit.aet.artemis.exam.repository.ExamSessionRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseTestService; @@ -94,6 +90,8 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionVersionRepository; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.participation.ParticipationFactory; @@ -101,7 +99,9 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.quiz.domain.AnswerOption; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/TestExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/TestExamIntegrationTest.java index 645bcd8180c5..8efb665f3f9f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/TestExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/TestExamIntegrationTest.java @@ -16,8 +16,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.domain.StudentExam; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaExerciseIntegrationTest.java index 3f6c5e8537de..13729c840e36 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaExerciseIntegrationTest.java @@ -20,14 +20,14 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.AbstractAthenaTest; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.course.CourseTestService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaResourceIntegrationTest.java index 966f07153880..d2c25d930d23 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaResourceIntegrationTest.java @@ -24,14 +24,12 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractAthenaTest; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; @@ -42,6 +40,8 @@ import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseFactory.java b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseFactory.java index e9b717667ee5..0b3790d05b46 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseFactory.java @@ -5,14 +5,14 @@ import java.util.Set; import java.util.UUID; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.GradingInstruction; -import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; +import de.tum.cit.aet.artemis.assessment.domain.GradingInstruction; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exercise.domain.DifficultyLevel; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismDetectionConfig; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java index 6ee208959ebe..d31fff922d0f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java @@ -22,37 +22,37 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; -import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; -import de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.DifficultyLevel; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.modeling.domain.DiagramType; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizPointStatistic; import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorParticipationStatus; import de.tum.cit.aet.artemis.util.TestResourceUtils; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseDetailsDTO; import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseUtilService.java index b686a58a717b..ca0e179798e7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseUtilService.java @@ -14,28 +14,24 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; +import de.tum.cit.aet.artemis.assessment.domain.GradingInstruction; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.communication.domain.AnswerPost; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.GradingInstruction; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.StudentExam; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; @@ -44,6 +40,8 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.participation.ParticipationFactory; @@ -53,6 +51,8 @@ import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.post.ConversationFactory; import de.tum.cit.aet.artemis.post.ConversationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.service.ModelingSubmissionService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/GradingCriterionUtil.java b/src/test/java/de/tum/cit/aet/artemis/exercise/GradingCriterionUtil.java index a2092fb8ff65..1ae76a4bb417 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/GradingCriterionUtil.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/GradingCriterionUtil.java @@ -5,9 +5,9 @@ import java.util.Set; import java.util.function.Predicate; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.GradingInstruction; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; +import de.tum.cit.aet.artemis.assessment.domain.GradingInstruction; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; public final class GradingCriterionUtil { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java index d1f1ab5448aa..4280ab281ba5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java @@ -24,29 +24,29 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Complaint; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintType; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.domain.Complaint; -import de.tum.cit.aet.artemis.domain.ComplaintResponse; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseFactory.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseFactory.java index 40ed6ddc92e2..8e577b124304 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseFactory.java @@ -2,10 +2,10 @@ import java.time.ZonedDateTime; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.ExerciseFactory; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; /** * Factory for creating FileUploadExercises and related objects. diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java index 95b65f792ad6..59632fafaefb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java @@ -30,26 +30,26 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; +import de.tum.cit.aet.artemis.assessment.domain.GradingInstruction; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.GradingInstruction; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseUtilService.java index 617e7aad422b..e5981d083deb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseUtilService.java @@ -13,21 +13,21 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.course.CourseFactory; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.domain.Result; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadSubmissionRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java index 0f1b33b55376..7c455d7c665c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java @@ -28,18 +28,18 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadSubmissionRepository; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonDiagramResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonDiagramResourceIntegrationTest.java index 53ed53b86f13..05c2309b672d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonDiagramResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonDiagramResourceIntegrationTest.java @@ -14,10 +14,10 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.course.CourseFactory; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; import de.tum.cit.aet.artemis.modeling.domain.ApollonDiagram; +import de.tum.cit.aet.artemis.modeling.domain.DiagramType; import de.tum.cit.aet.artemis.modeling.repository.ApollonDiagramRepository; class ApollonDiagramResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java index cff49de91e15..42f80ed0c3a6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java @@ -27,33 +27,33 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Complaint; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintType; +import de.tum.cit.aet.artemis.assessment.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.domain.Complaint; -import de.tum.cit.aet.artemis.domain.ComplaintResponse; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ExampleSubmission; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; -import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.modeling.domain.DiagramType; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelClusterRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingComparisonTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingComparisonTest.java index 23d502bed57f..b43efd48c300 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingComparisonTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingComparisonTest.java @@ -7,9 +7,9 @@ import org.junit.jupiter.api.Test; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.course.CourseFactory; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; +import de.tum.cit.aet.artemis.modeling.domain.DiagramType; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.service.exam.StudentExamService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseFactory.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseFactory.java index 96519836cec7..943824bb5a95 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseFactory.java @@ -3,13 +3,13 @@ import java.time.ZonedDateTime; import java.util.HashSet; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.course.CourseFactory; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.ExerciseFactory; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.modeling.domain.ApollonDiagram; +import de.tum.cit.aet.artemis.modeling.domain.DiagramType; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java index 79cebb34c079..b704af228164 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java @@ -30,6 +30,12 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; +import de.tum.cit.aet.artemis.assessment.domain.GradingInstruction; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; @@ -38,32 +44,26 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ExampleSubmission; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.GradingInstruction; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.TeamAssignmentConfig; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; -import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.cit.aet.artemis.domain.enumeration.TutorParticipationStatus; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.exercise.domain.DifficultyLevel; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; +import de.tum.cit.aet.artemis.exercise.domain.Team; +import de.tum.cit.aet.artemis.exercise.domain.TeamAssignmentConfig; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.modeling.domain.DiagramType; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingPlagiarismResult; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorParticipationStatus; import de.tum.cit.aet.artemis.util.ExerciseIntegrationTestService; import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider; import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider.InvalidExamExerciseDateConfiguration; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseUtilService.java index e1f6c9168546..1e62901b1e3c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseUtilService.java @@ -17,23 +17,23 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.course.CourseFactory; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.modeling.domain.DiagramType; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java index 281520e82b6c..a5182c72b185 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java @@ -21,28 +21,28 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.SubmissionVersion; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionVersion; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionVersionRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.modeling.domain.DiagramType; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/FeedbackSelectorTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/FeedbackSelectorTest.java index 55eedf59d762..746f679ed87e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/FeedbackSelectorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/FeedbackSelectorTest.java @@ -6,8 +6,8 @@ import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.Result; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.modeling.domain.ModelElement; import de.tum.cit.aet.artemis.service.compass.controller.FeedbackSelector; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/AbstractUMLDiagramTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/AbstractUMLDiagramTest.java index 9f7e7b004187..4fde4f85dfee 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/AbstractUMLDiagramTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/AbstractUMLDiagramTest.java @@ -8,7 +8,7 @@ import org.assertj.core.data.Offset; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ArgumentSources.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ArgumentSources.java index 0b307491197a..f16380e47e40 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ArgumentSources.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ArgumentSources.java @@ -1,14 +1,14 @@ package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.ASSEMBLER; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.OCAML; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.VHDL; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.ASSEMBLER; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.OCAML; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.VHDL; import java.util.EnumSet; import java.util.List; import java.util.Set; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; public class ArgumentSources { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java index 389c7b27ee68..bfc3151c14f7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java @@ -11,9 +11,9 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.programming.AuxiliaryRepositoryService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ContinuousIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ContinuousIntegrationTestService.java index fff8a5920d47..7cc04e6fa829 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ContinuousIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ContinuousIntegrationTestService.java @@ -17,9 +17,9 @@ import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/CourseGitlabJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/CourseGitlabJenkinsIntegrationTest.java index 9dac13ca21c1..bbd5a09f9d22 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/CourseGitlabJenkinsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/CourseGitlabJenkinsIntegrationTest.java @@ -21,10 +21,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.course.CourseTestService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; class CourseGitlabJenkinsIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/GitServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/GitServiceTest.java index 46deb6102cfc..3355258f7bc0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/GitServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/GitServiceTest.java @@ -35,9 +35,9 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.core.exception.GitException; -import de.tum.cit.aet.artemis.domain.File; -import de.tum.cit.aet.artemis.domain.FileType; -import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.programming.domain.File; +import de.tum.cit.aet.artemis.programming.domain.FileType; +import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.util.GitUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/GitlabServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/GitlabServiceTest.java index 072c9b2c9741..6a33d077e1d3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/GitlabServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/GitlabServiceTest.java @@ -29,11 +29,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.exception.VersionControlException; -import de.tum.cit.aet.artemis.domain.Commit; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.domain.Commit; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/MockDelegate.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/MockDelegate.java index dbf2dea5e7a7..2950d971ba6e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/MockDelegate.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/MockDelegate.java @@ -10,14 +10,14 @@ import com.fasterxml.jackson.core.JsonProcessingException; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.programming.domain.AbstractBaseProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; public interface MockDelegate { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java index 78fd3ea34d80..a4b6b63fdf23 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java @@ -28,34 +28,34 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; import de.tum.cit.aet.artemis.assessment.domain.AssessmentNote; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Complaint; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.LongFeedbackText; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.domain.Complaint; -import de.tum.cit.aet.artemis.domain.ComplaintResponse; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.LongFeedbackText; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseBuildPlanTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseBuildPlanTest.java index 3392e63cf65d..e53e795aaa2d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseBuildPlanTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseBuildPlanTest.java @@ -9,8 +9,8 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationGitlabCIGitlabSamlTest; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; class ProgrammingExerciseBuildPlanTest extends AbstractSpringIntegrationGitlabCIGitlabSamlTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseFactory.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseFactory.java index 566772f71ef7..222daaf4e924 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseFactory.java @@ -9,24 +9,24 @@ import java.util.List; import java.util.Set; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.CategoryState; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisCategory; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.CategoryState; -import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.ExerciseFactory; +import de.tum.cit.aet.artemis.exercise.domain.DifficultyLevel; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisCategory; +import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.CommitDTO; import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestCaseDTO; import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestCaseDetailMessageDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java index a23cee9df1de..707e013dde94 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java @@ -27,9 +27,9 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.util.GitUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitlabJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitlabJenkinsIntegrationTest.java index 0582f7eb79dc..50b5049f9cda 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitlabJenkinsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitlabJenkinsIntegrationTest.java @@ -1,14 +1,14 @@ package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.C; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.EMPTY; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.HASKELL; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.JAVA; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.KOTLIN; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.PYTHON; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.SWIFT; import static de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseTestService.STUDENT_LOGIN; import static de.tum.cit.aet.artemis.exercise.programming.ProgrammingSubmissionConstants.GITLAB_PUSH_EVENT_REQUEST; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.C; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.EMPTY; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.HASKELL; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.JAVA; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.KOTLIN; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.PYTHON; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.SWIFT; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doThrow; @@ -39,10 +39,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.cit.aet.artemis.domain.enumeration.AeolusTarget; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; +import de.tum.cit.aet.artemis.programming.domain.AeolusTarget; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeatureService; import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider; import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider.InvalidExamExerciseDateConfiguration; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java index 9122e4b22675..ad80ce8ce072 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java @@ -30,31 +30,31 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.CategoryState; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.CategoryState; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.Visibility; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java index 90aad8193f6f..b99eaa0ac9df 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.SOLUTION; -import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.TEMPLATE; +import static de.tum.cit.aet.artemis.programming.domain.BuildPlanType.SOLUTION; +import static de.tum.cit.aet.artemis.programming.domain.BuildPlanType.TEMPLATE; import static org.assertj.core.api.Assertions.assertThatNoException; import java.io.IOException; @@ -21,7 +21,7 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseService; class ProgrammingExerciseIntegrationJenkinsGitlabTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java index 6972c8810bb0..b5a5ca411640 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.SOLUTION; -import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.TEMPLATE; +import static de.tum.cit.aet.artemis.programming.domain.BuildPlanType.SOLUTION; +import static de.tum.cit.aet.artemis.programming.domain.BuildPlanType.TEMPLATE; import static de.tum.cit.aet.artemis.util.TestResourceUtils.HalfSecond; import static de.tum.cit.aet.artemis.web.rest.programming.ProgrammingExerciseResourceErrorKeys.INVALID_SOLUTION_BUILD_PLAN_ID; import static de.tum.cit.aet.artemis.web.rest.programming.ProgrammingExerciseResourceErrorKeys.INVALID_SOLUTION_REPOSITORY_URL; @@ -64,30 +64,22 @@ import com.fasterxml.jackson.core.type.TypeReference; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; +import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.enumeration.Visibility; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; @@ -97,7 +89,15 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextSubmissionElement; +import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java index 7e99c4e4a78c..6026c9e52574 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java @@ -34,12 +34,12 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.connector.AeolusRequestMockProvider; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.enumeration.AeolusTarget; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.AeolusTarget; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java index d3ee033e518c..9161091d5968 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java @@ -26,18 +26,18 @@ import org.springframework.util.MultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseRepositoryServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseRepositoryServiceTest.java index 259eddb6b284..20e1ef5dbdde 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseRepositoryServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseRepositoryServiceTest.java @@ -13,9 +13,9 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseRepositoryService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultJenkinsIntegrationTest.java index 2f7297127d80..3bd975b8bad5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultJenkinsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultJenkinsIntegrationTest.java @@ -21,8 +21,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.CommitDTO; import de.tum.cit.aet.artemis.util.TestConstants; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java index 411b38122a2a..eeef82da2b1d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java @@ -33,24 +33,24 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; -import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.hestia.TestwiseCoverageTestUtil; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTestCaseType; import de.tum.cit.aet.artemis.programming.repository.ParticipationVCSAccessTokenRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java index 8ae6aeb75eb1..cd447272f438 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java @@ -29,24 +29,24 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationGitlabCIGitlabSamlTest; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; -import de.tum.cit.aet.artemis.domain.enumeration.ParticipationLifecycle; -import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseLifecycle; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ParticipationLifecycle; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceIntegrationTest.java index 5a6fa59f0c4c..1d28abee891a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceIntegrationTest.java @@ -17,10 +17,10 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisCategory; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisCategory; import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceTest.java index 228ffb0c7058..05da916d397b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceTest.java @@ -11,8 +11,8 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestRepository; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTemplateIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTemplateIntegrationTest.java index 774b996ba7f5..651f2c572229 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTemplateIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTemplateIntegrationTest.java @@ -52,10 +52,10 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeatureService; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTest.java index f1e334bd5951..3909abe016c8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTest.java @@ -24,22 +24,22 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java index 736c6bde1379..f8b0fab31840 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java @@ -22,14 +22,14 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.Visibility; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseFeedbackCreationService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java index db89681c6a1d..e23c9e3dc3b1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java @@ -1,10 +1,10 @@ package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode.INDIVIDUAL; -import static de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode.TEAM; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.C; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.JAVA; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.SWIFT; +import static de.tum.cit.aet.artemis.exercise.domain.ExerciseMode.INDIVIDUAL; +import static de.tum.cit.aet.artemis.exercise.domain.ExerciseMode.TEAM; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.C; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.JAVA; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.SWIFT; import static de.tum.cit.aet.artemis.service.export.ProgrammingExerciseExportService.BUILD_PLAN_FILE_NAME; import static de.tum.cit.aet.artemis.service.export.ProgrammingExerciseExportService.EXPORTED_EXERCISE_DETAILS_FILE_PREFIX; import static de.tum.cit.aet.artemis.service.export.ProgrammingExerciseExportService.EXPORTED_EXERCISE_PROBLEM_STATEMENT_FILE_PREFIX; @@ -70,32 +70,17 @@ import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.core.config.StaticCodeAnalysisConfigurer; +import de.tum.cit.aet.artemis.core.domain.Authority; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.GitException; import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Authority; -import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisCategory; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.TeamAssignmentConfig; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; import de.tum.cit.aet.artemis.exam.ExamFactory; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; @@ -105,6 +90,12 @@ import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.Team; +import de.tum.cit.aet.artemis.exercise.domain.TeamAssignmentConfig; import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; @@ -112,8 +103,17 @@ import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismDetectionConfig; +import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.programming.domain.BuildLogStatisticsEntry; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisCategory; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java index 904a69c6765a..15c8210ec59b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java @@ -26,35 +26,35 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.CategoryState; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.course.CourseFactory; -import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType; -import de.tum.cit.aet.artemis.domain.enumeration.CategoryState; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.enumeration.Visibility; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.programming.domain.BuildPlanType; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.Repository; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java index 917a68ba2f11..ac61b4e92bb4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.JAVA; import static de.tum.cit.aet.artemis.exercise.programming.ProgrammingSubmissionConstants.GITLAB_PUSH_EVENT_REQUEST; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.JAVA; import static org.assertj.core.api.Assertions.assertThat; import java.time.ZonedDateTime; @@ -27,15 +27,15 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java index 4663ff42d357..6f4a3406db36 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage.JAVA; +import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.JAVA; import static org.assertj.core.api.Assertions.assertThat; import java.time.ZonedDateTime; @@ -14,13 +14,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.util.RequestUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java index 5d56c9a29db1..dfefe813c613 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java @@ -35,18 +35,15 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; -import de.tum.cit.aet.artemis.domain.Commit; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; @@ -55,8 +52,11 @@ import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.Commit; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java index 4cbe56d04810..50ffd235ac51 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java @@ -53,21 +53,16 @@ import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.read.ListAppender; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.repository.PostRepository; -import de.tum.cit.aet.artemis.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.FileType; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; @@ -79,7 +74,12 @@ import de.tum.cit.aet.artemis.plagiarism.domain.text.TextSubmissionElement; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.FileType; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.service.BuildLogEntryService; @@ -395,8 +395,8 @@ private String getCommitHash(Git repo) throws GitAPIException { @Test @WithMockUser(username = TEST_PREFIX + "tutor1", roles = "TA") void testGetFilesWithContent_shouldNotThrowException() throws Exception { - Map mockedFiles = new HashMap<>(); - mockedFiles.put(mock(de.tum.cit.aet.artemis.domain.File.class), FileType.FILE); + Map mockedFiles = new HashMap<>(); + mockedFiles.put(mock(de.tum.cit.aet.artemis.programming.domain.File.class), FileType.FILE); doReturn(mockedFiles).when(gitService).listFilesAndFolders(any(Repository.class)); MockedStatic mockedFileUtils = mockStatic(FileUtils.class); diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryProgrammingExerciseParticipationJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryProgrammingExerciseParticipationJenkinsIntegrationTest.java index 913487fec288..ec9cedc1e17b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryProgrammingExerciseParticipationJenkinsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryProgrammingExerciseParticipationJenkinsIntegrationTest.java @@ -21,11 +21,11 @@ import com.offbytwo.jenkins.model.JobWithDetails; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.cit.aet.artemis.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.util.TestConstants; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java index 4ac3cb278617..de6147304599 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java @@ -24,16 +24,16 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.assessment.domain.CategoryState; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.config.StaticCodeAnalysisConfigurer; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.StaticCodeAnalysisCategory; -import de.tum.cit.aet.artemis.domain.enumeration.CategoryState; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisCategory; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java index ed1100c0f608..5a02fc9601ad 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.cit.aet.artemis.domain.Feedback.SUBMISSION_POLICY_FEEDBACK_IDENTIFIER; +import static de.tum.cit.aet.artemis.assessment.domain.Feedback.SUBMISSION_POLICY_FEEDBACK_IDENTIFIER; import static de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseResultTestService.convertBuildResultToJsonObject; import static org.assertj.core.api.Assertions.assertThat; @@ -19,15 +19,15 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPenaltyPolicy; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java index 9e18da25f68f..eb4d1eea557c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java @@ -32,11 +32,11 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.File; -import de.tum.cit.aet.artemis.domain.FileType; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Repository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.programming.domain.File; +import de.tum.cit.aet.artemis.programming.domain.FileType; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.connectors.GitService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizComparisonTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizComparisonTest.java index c1d5c3a16c03..aa8c6732ee13 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizComparisonTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizComparisonTest.java @@ -13,9 +13,8 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.course.CourseFactory; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; import de.tum.cit.aet.artemis.exam.ExamFactory; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.participation.ParticipationFactory; @@ -28,6 +27,7 @@ import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceQuestion; import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceSubmittedAnswer; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestion; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseFactory.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseFactory.java index 3393b30e5855..2e83a5341fdf 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseFactory.java @@ -14,9 +14,7 @@ import org.apache.commons.io.FileUtils; import org.springframework.util.ResourceUtils; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; -import de.tum.cit.aet.artemis.domain.enumeration.ScoringType; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.ExerciseFactory; import de.tum.cit.aet.artemis.participation.ParticipationFactory; @@ -31,9 +29,11 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizGroup; +import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.quiz.domain.QuizPointStatistic; import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; +import de.tum.cit.aet.artemis.quiz.domain.ScoringType; import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerMapping; import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestion; import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSolution; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java index 8f6bc18e1d7e..e4d424cca1bf 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java @@ -42,20 +42,18 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.TeamAssignmentConfig; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; -import de.tum.cit.aet.artemis.domain.enumeration.ScoringType; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exercise.domain.DifficultyLevel; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; +import de.tum.cit.aet.artemis.exercise.domain.Team; +import de.tum.cit.aet.artemis.exercise.domain.TeamAssignmentConfig; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; @@ -70,8 +68,10 @@ import de.tum.cit.aet.artemis.quiz.domain.PointCounter; import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; +import de.tum.cit.aet.artemis.quiz.domain.ScoringType; import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerMapping; import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestion; import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestionStatistic; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseUtilService.java index 1643874af96e..08789c71e278 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseUtilService.java @@ -15,19 +15,18 @@ import org.springframework.stereotype.Service; import org.springframework.util.ResourceUtils; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.TeamAssignmentConfig; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; import de.tum.cit.aet.artemis.exam.ExamFactory; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.Team; +import de.tum.cit.aet.artemis.exercise.domain.TeamAssignmentConfig; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; @@ -40,6 +39,7 @@ import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceSubmittedAnswer; import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestion; import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedAnswer; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java index e74aeaf13405..3d28071b4e5a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java @@ -34,12 +34,10 @@ import org.springframework.web.multipart.MultipartFile; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; -import de.tum.cit.aet.artemis.domain.enumeration.ScoringType; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -56,8 +54,10 @@ import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceSubmittedAnswer; import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; +import de.tum.cit.aet.artemis.quiz.domain.ScoringType; import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestion; import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSpot; import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedAnswer; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextComparisonTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextComparisonTest.java index 7996f037fb78..0e49ddf9623b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextComparisonTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextComparisonTest.java @@ -7,8 +7,8 @@ import org.junit.jupiter.api.Test; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.course.CourseFactory; -import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.service.exam.StudentExamService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextExerciseFactory.java b/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextExerciseFactory.java index d41de2149ec1..e3d2246d38e0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextExerciseFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextExerciseFactory.java @@ -6,9 +6,8 @@ import java.util.List; import java.util.Set; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.TextAssessmentEventType; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.ExerciseFactory; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -17,6 +16,7 @@ import de.tum.cit.aet.artemis.text.domain.TextBlockType; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; +import de.tum.cit.aet.artemis.text.dto.TextAssessmentEventType; /** * Factory for creating TextExercises and related objects. diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextExerciseUtilService.java index 1bae24361ace..cef17c586a3d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextExerciseUtilService.java @@ -11,25 +11,24 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.repository.TextBlockRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseFactory; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.enumeration.TextAssessmentEventType; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; @@ -45,6 +44,7 @@ import de.tum.cit.aet.artemis.text.domain.TextBlockType; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; +import de.tum.cit.aet.artemis.text.dto.TextAssessmentEventType; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintIntegrationTest.java index 402ea95a49a1..1329fae3a40f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintIntegrationTest.java @@ -14,10 +14,10 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintServiceTest.java index e63f0a3d8e42..decbb9662207 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintServiceTest.java @@ -16,12 +16,12 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.assessment.domain.Visibility; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java index 01ed0e1aa190..a727992c1f93 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java @@ -16,17 +16,17 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.domain.Visibility; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHintActivation; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java index 18d17a5ae3a1..8f902e6ddc19 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java @@ -13,21 +13,21 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.Visibility; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHintActivation; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/HestiaDatabaseTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/HestiaDatabaseTest.java index 6b72a913348d..f85731128db0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/HestiaDatabaseTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/HestiaDatabaseTest.java @@ -11,11 +11,11 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java index 6b7e36754b91..511bbcbb3a33 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java @@ -11,10 +11,10 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseGitDiffReportService; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java index fff20ba90065..d86f398094b2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java @@ -12,11 +12,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseGitDiffReportRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseSolutionEntryIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseSolutionEntryIntegrationTest.java index cad6c63b67ff..b2a3ca490e3d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseSolutionEntryIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseSolutionEntryIntegrationTest.java @@ -13,9 +13,9 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskIntegrationTest.java index b05bb90aeddd..c32989e0fcd0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskIntegrationTest.java @@ -15,11 +15,11 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskServiceTest.java index f2203449932d..629f3d366dd0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskServiceTest.java @@ -13,12 +13,12 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/StructuralTestCaseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/StructuralTestCaseServiceTest.java index cc21985becde..6e665c16b092 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/StructuralTestCaseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/StructuralTestCaseServiceTest.java @@ -12,13 +12,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; +import de.tum.cit.aet.artemis.assessment.domain.Visibility; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.enumeration.Visibility; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTestCaseType; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.service.hestia.structural.StructuralSolutionEntryGenerationException; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageIntegrationTest.java index b281d0063921..a0dca02af152 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageIntegrationTest.java @@ -12,12 +12,12 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageFileReport; import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageReport; import de.tum.cit.aet.artemis.programming.domain.hestia.TestwiseCoverageReportEntry; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageReportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageReportServiceTest.java index b2ace76bc3c6..51cf81f98ece 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageReportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageReportServiceTest.java @@ -13,14 +13,14 @@ import org.springframework.data.domain.Pageable; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.hestia.TestwiseCoverageReportEntry; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java index 746ee4aa5190..fee54a37bc6a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java @@ -11,14 +11,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.assessment.domain.Visibility; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageFileReport; import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageReport; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CreateSolutionEntriesTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CreateSolutionEntriesTest.java index 8cd031644b96..ea9b528e1c96 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CreateSolutionEntriesTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CreateSolutionEntriesTest.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/GroupGitDiffAndCoverageEntriesByFilePathAndTestCaseTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/GroupGitDiffAndCoverageEntriesByFilePathAndTestCaseTest.java index c0ff270d9841..1350a7899533 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/GroupGitDiffAndCoverageEntriesByFilePathAndTestCaseTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/GroupGitDiffAndCoverageEntriesByFilePathAndTestCaseTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageFileReport; import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageReport; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java index 041557e53e00..924e3dab38ad 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java @@ -18,13 +18,13 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; import de.tum.cit.aet.artemis.connector.IrisRequestMockProvider; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettings; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; import de.tum.cit.aet.artemis.iris.repository.IrisTemplateRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatMessageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatMessageIntegrationTest.java index b7d96ac74611..5112280d1efb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatMessageIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatMessageIntegrationTest.java @@ -30,9 +30,7 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessageContent; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessageSender; @@ -41,7 +39,9 @@ import de.tum.cit.aet.artemis.iris.repository.IrisMessageRepository; import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatWebsocketTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatWebsocketTest.java index 2a10ef924ac1..e16470281d17 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatWebsocketTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatWebsocketTest.java @@ -13,9 +13,9 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.test.context.ActiveProfiles; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.iris.domain.message.IrisTextMessageContent; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; import de.tum.cit.aet.artemis.service.iris.dto.IrisChatWebsocketDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/IrisCompetencyGenerationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisCompetencyGenerationIntegrationTest.java index 39f11e970dd6..8dbd349efc55 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/IrisCompetencyGenerationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisCompetencyGenerationIntegrationTest.java @@ -15,7 +15,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; -import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionInputDTO; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyRecommendationDTO; import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/IrisExerciseChatSessionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisExerciseChatSessionIntegrationTest.java index 20f001ba7ba6..03a3fc04688d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/IrisExerciseChatSessionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisExerciseChatSessionIntegrationTest.java @@ -10,11 +10,11 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.iris.domain.session.IrisExerciseChatSession; import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; import de.tum.cit.aet.artemis.iris.repository.IrisExerciseChatSessionRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.web.rest.iris.IrisStatusDTO; class IrisExerciseChatSessionIntegrationTest extends AbstractIrisIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/IrisSessionActivationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisSessionActivationIntegrationTest.java index 0f3884134234..90a39a16e2a3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/IrisSessionActivationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisSessionActivationIntegrationTest.java @@ -8,12 +8,12 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessageSender; import de.tum.cit.aet.artemis.iris.domain.message.IrisTextMessageContent; import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.iris.IrisMessageService; import de.tum.cit.aet.artemis.service.iris.session.IrisExerciseChatSessionService; diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/PyrisLectureIngestionTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/PyrisLectureIngestionTest.java index b37d7638ac78..dfe8938c21e2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/PyrisLectureIngestionTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/PyrisLectureIngestionTest.java @@ -15,13 +15,13 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.iris.domain.settings.IrisCourseSettings; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; import de.tum.cit.aet.artemis.lecture.LectureUtilService; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisJobService; import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisStatusUpdateService; diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/settings/IrisSettingsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/settings/IrisSettingsIntegrationTest.java index 4b09f1c21d7d..e50e51ed4ef6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/settings/IrisSettingsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/settings/IrisSettingsIntegrationTest.java @@ -11,8 +11,7 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.iris.AbstractIrisIntegrationTest; import de.tum.cit.aet.artemis.iris.domain.settings.IrisChatSubSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisCompetencyGenerationSubSettings; @@ -23,6 +22,7 @@ import de.tum.cit.aet.artemis.iris.domain.settings.IrisSettings; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; import de.tum.cit.aet.artemis.iris.repository.IrisSubSettingsRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedSettingsDTO; class IrisSettingsIntegrationTest extends AbstractIrisIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/learninganalytics/StudentLearningAnalyticsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/learninganalytics/StudentLearningAnalyticsIntegrationTest.java index 55587a880140..65e411a28b32 100644 --- a/src/test/java/de/tum/cit/aet/artemis/learninganalytics/StudentLearningAnalyticsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/learninganalytics/StudentLearningAnalyticsIntegrationTest.java @@ -12,8 +12,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.course.CourseTestService; -import de.tum.cit.aet.artemis.domain.Course; import de.tum.cit.aet.artemis.util.RequestUtilService; class StudentLearningAnalyticsIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentResourceIntegrationTest.java index c134bfdda7c9..c8506349af8f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentResourceIntegrationTest.java @@ -19,10 +19,10 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.Attachment; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.lecture.domain.Attachment; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitIntegrationTest.java index e06591eaedd9..82d42b46e22e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitIntegrationTest.java @@ -39,9 +39,9 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.Attachment; -import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.domain.Slide; import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java index 9e2d3919ceeb..3a26d081889f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java @@ -29,8 +29,8 @@ import org.springframework.util.ResourceUtils; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.SlideRepository; import de.tum.cit.aet.artemis.service.LectureUnitProcessingService; diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/ExerciseUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/ExerciseUnitIntegrationTest.java index 665edd19e4fe..b0607630a481 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/ExerciseUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/ExerciseUnitIntegrationTest.java @@ -17,15 +17,15 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureFactory.java b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureFactory.java index 56fe2e7049d3..cd904046b938 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureFactory.java @@ -10,11 +10,11 @@ import org.apache.commons.io.FileUtils; import org.springframework.util.ResourceUtils; -import de.tum.cit.aet.artemis.domain.Attachment; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.enumeration.AttachmentType; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.lecture.domain.Attachment; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentType; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.service.FilePathService; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureIntegrationTest.java index b69c9a1205cf..4f959dc82c34 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureIntegrationTest.java @@ -26,11 +26,11 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; -import de.tum.cit.aet.artemis.domain.Attachment; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.domain.OnlineUnit; import de.tum.cit.aet.artemis.lecture.domain.TextUnit; diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitIntegrationTest.java index 5a97dfb359d5..a94255d77a36 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitIntegrationTest.java @@ -18,10 +18,10 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.domain.LectureUnitCompletion; import de.tum.cit.aet.artemis.lecture.domain.OnlineUnit; diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitServiceTest.java index dea20f86081e..837289fd4154 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitServiceTest.java @@ -10,8 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.domain.LectureUnitCompletion; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUtilService.java b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUtilService.java index f42e2f8a100a..69e2d0d58aac 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUtilService.java @@ -18,16 +18,16 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Attachment; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.domain.LectureUnitCompletion; import de.tum.cit.aet.artemis.lecture.domain.OnlineUnit; diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/OnlineUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/OnlineUnitIntegrationTest.java index f34f0d9d34f6..605981f9b0f5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/OnlineUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/OnlineUnitIntegrationTest.java @@ -31,7 +31,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; -import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.domain.OnlineUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/TextUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/TextUnitIntegrationTest.java index 6935ac1353d0..5a4e2fe0986b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/TextUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/TextUnitIntegrationTest.java @@ -18,7 +18,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; -import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.domain.TextUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/VideoUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/VideoUnitIntegrationTest.java index 3fe9d876f8f3..02b5ec49164f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/VideoUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/VideoUnitIntegrationTest.java @@ -18,7 +18,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; -import de.tum.cit.aet.artemis.domain.Lecture; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.domain.VideoUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java index 03b4609e1b94..a8f3f98308db 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java @@ -14,15 +14,15 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentDockerServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentDockerServiceTest.java index 247874115364..b25833f362a0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentDockerServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentDockerServiceTest.java @@ -30,8 +30,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; import de.tum.cit.aet.artemis.core.exception.LocalCIException; -import de.tum.cit.aet.artemis.domain.BuildJob; -import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; +import de.tum.cit.aet.artemis.programming.domain.BuildJob; +import de.tum.cit.aet.artemis.programming.domain.BuildStatus; import de.tum.cit.aet.artemis.service.connectors.localci.buildagent.BuildAgentDockerService; import de.tum.cit.aet.artemis.service.connectors.localci.buildagent.BuildLogsMap; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildConfig; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java index 9785d7ab333c..23405dbba75a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java @@ -50,15 +50,15 @@ import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.model.Frame; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.exception.VersionControlException; -import de.tum.cit.aet.artemis.domain.BuildJob; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.Team; +import de.tum.cit.aet.artemis.programming.domain.BuildJob; +import de.tum.cit.aet.artemis.programming.domain.BuildStatus; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.service.ParticipationVcsAccessTokenService; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResourceIntegrationTest.java index 7e08debdb58f..bd1fbebf4c56 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResourceIntegrationTest.java @@ -21,13 +21,13 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.map.IMap; -import de.tum.cit.aet.artemis.domain.BuildJob; -import de.tum.cit.aet.artemis.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.BuildStatus; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; -import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.core.dto.SortingOrder; +import de.tum.cit.aet.artemis.programming.domain.BuildJob; +import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.BuildStatus; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.service.connectors.localci.buildagent.SharedQueueProcessingService; import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIServiceTest.java index ddb1808ad367..476a9dfd8a33 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIServiceTest.java @@ -24,15 +24,15 @@ import com.hazelcast.map.IMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.service.connectors.BuildScriptProviderService; import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; @@ -105,9 +105,9 @@ void testReturnCorrectBuildStatus() { RepositoryInfo repositoryInfo = new RepositoryInfo("test", null, RepositoryType.USER, "test", "test", "test", null, null); BuildJobQueueItem job1 = new BuildJobQueueItem("1", "job1", "address1", participation.getId(), course.getId(), 1, 1, 1, - de.tum.cit.aet.artemis.domain.enumeration.BuildStatus.SUCCESSFUL, repositoryInfo, jobTimingInfo, buildConfig, null); + de.tum.cit.aet.artemis.programming.domain.BuildStatus.SUCCESSFUL, repositoryInfo, jobTimingInfo, buildConfig, null); BuildJobQueueItem job2 = new BuildJobQueueItem("2", "job2", "address1", participation.getId(), course.getId(), 1, 1, 1, - de.tum.cit.aet.artemis.domain.enumeration.BuildStatus.SUCCESSFUL, repositoryInfo, jobTimingInfo, buildConfig, null); + de.tum.cit.aet.artemis.programming.domain.BuildStatus.SUCCESSFUL, repositoryInfo, jobTimingInfo, buildConfig, null); queuedJobs = hazelcastInstance.getQueue("buildJobQueue"); processingJobs = hazelcastInstance.getMap("processingJobs"); diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIIntegrationTest.java index cd69f4a291b1..b5587a834fc7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIIntegrationTest.java @@ -41,17 +41,17 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.domain.AuxiliaryRepository; -import de.tum.cit.aet.artemis.domain.BuildJob; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.StudentExam; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.Team; +import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; +import de.tum.cit.aet.artemis.programming.domain.BuildJob; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java index 0cea66a358e0..dad85cf75204 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java @@ -10,11 +10,11 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java index 23d29747a8ad..17b256dead9f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java @@ -52,16 +52,16 @@ import com.github.dockerjava.api.command.InspectImageCmd; import com.github.dockerjava.api.command.InspectImageResponse; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.domain.ParticipationVCSAccessToken; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCServiceTest.java index d5c3519e54db..60b53898b2ec 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCServiceTest.java @@ -9,12 +9,12 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; class LocalVCServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCSshIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCSshIntegrationTest.java index 6fdd3ca56492..7652aa8336d5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCSshIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCSshIntegrationTest.java @@ -27,7 +27,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.programming.icl.ssh.HashUtils; import de.tum.cit.aet.artemis.programming.icl.ssh.SshGitCommand; import de.tum.cit.aet.artemis.service.icl.SshGitCommandFactoryService; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/SharedQueueManagementServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/SharedQueueManagementServiceTest.java index bf3af3df3893..88f0387e6f3b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/SharedQueueManagementServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/SharedQueueManagementServiceTest.java @@ -12,7 +12,7 @@ import com.hazelcast.map.IMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.cit.aet.artemis.domain.BuildJob; +import de.tum.cit.aet.artemis.programming.domain.BuildJob; import de.tum.cit.aet.artemis.service.connectors.localci.SharedQueueManagementService; class SharedQueueManagementServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java index 28cdddf3fee7..f765406a0e86 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java @@ -20,6 +20,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; +import de.tum.cit.aet.artemis.communication.domain.DisplayPriority; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; @@ -27,13 +28,12 @@ import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.GroupChatRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.OneToOneChatRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/AnswerMessageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/AnswerMessageIntegrationTest.java index faeaa63c572d..bd6e1e634848 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/AnswerMessageIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/AnswerMessageIntegrationTest.java @@ -26,20 +26,20 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotification; import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.post.ConversationUtilService; import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java index 271146b84c38..f407f380f07c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java @@ -20,13 +20,13 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.post.ConversationUtilService; import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupChannelManagementService; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/ConversationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/ConversationIntegrationTest.java index 599f62ed2950..42be4ab51108 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/ConversationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/ConversationIntegrationTest.java @@ -19,15 +19,15 @@ import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.post.ConversationUtilService; import de.tum.cit.aet.artemis.service.dto.ResponsibleUserDTO; import de.tum.cit.aet.artemis.text.domain.TextExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/GroupChatIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/GroupChatIntegrationTest.java index 2d49cec0e08e..6120f85ecc08 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/GroupChatIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/GroupChatIntegrationTest.java @@ -16,7 +16,7 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.GroupChatDTO; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/MessageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/MessageIntegrationTest.java index 761d2c123a0c..f901bfda169f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/MessageIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/MessageIntegrationTest.java @@ -46,6 +46,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; +import de.tum.cit.aet.artemis.communication.domain.DisplayPriority; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.PostSortCriterion; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; @@ -56,13 +57,12 @@ import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationNotificationRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.OneToOneChatRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.SortingOrder; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; -import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.post.ConversationUtilService; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/OneToOneChatIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/OneToOneChatIntegrationTest.java index 8aa19f4fa606..b251eb425cee 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/OneToOneChatIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/OneToOneChatIntegrationTest.java @@ -16,7 +16,7 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.OneToOneChatDTO; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/PostingServiceUnitTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/PostingServiceUnitTest.java index 9b83b54ac6e0..cfe61501b0e0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/PostingServiceUnitTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/PostingServiceUnitTest.java @@ -20,9 +20,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.metis.ConversationMessagingService; import de.tum.cit.aet.artemis.service.metis.PostingService; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/ReactionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/ReactionIntegrationTest.java index faddd9c71f6d..d47ce3bf5313 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/ReactionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/ReactionIntegrationTest.java @@ -31,10 +31,10 @@ import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.communication.repository.ReactionRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.SortingOrder; import de.tum.cit.aet.artemis.post.ConversationUtilService; class ReactionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/migration/MigrationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/migration/MigrationServiceTest.java index 3dd50162543b..cbba2e5333a8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/migration/MigrationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/migration/MigrationServiceTest.java @@ -27,8 +27,8 @@ import de.tum.cit.aet.artemis.core.config.migration.MigrationIntegrityException; import de.tum.cit.aet.artemis.core.config.migration.MigrationRegistry; import de.tum.cit.aet.artemis.core.config.migration.MigrationService; +import de.tum.cit.aet.artemis.core.domain.MigrationChangelog; import de.tum.cit.aet.artemis.core.repository.MigrationChangeRepository; -import de.tum.cit.aet.artemis.domain.MigrationChangelog; import de.tum.cit.aet.artemis.migration.entries.TestChangeEntry20211214_231800; import de.tum.cit.aet.artemis.migration.entries.TestChangeEntry20211215_231800; import de.tum.cit.aet.artemis.migration.entries.TestChangeEntry20211216_231800; diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/GroupNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/GroupNotificationServiceTest.java index a51dc8e88e2d..2db303e2b4cf 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/GroupNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/GroupNotificationServiceTest.java @@ -1,5 +1,11 @@ package de.tum.cit.aet.artemis.notification; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.COURSE_ARCHIVE_FAILED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.COURSE_ARCHIVE_FINISHED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.COURSE_ARCHIVE_STARTED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXAM_ARCHIVE_FAILED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXAM_ARCHIVE_FINISHED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXAM_ARCHIVE_STARTED; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.ATTACHMENT_CHANGE_TITLE; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.COURSE_ARCHIVE_FAILED_TITLE; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.COURSE_ARCHIVE_FINISHED_TITLE; @@ -14,12 +20,6 @@ import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.ILLEGAL_SUBMISSION_TITLE; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.PROGRAMMING_TEST_CASES_CHANGED_TITLE; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.QUIZ_EXERCISE_STARTED_TITLE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_FAILED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_FINISHED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_STARTED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_FAILED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_FINISHED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_STARTED; import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EDITOR_NOTIFICATION__PROGRAMMING_TEST_CASES_CHANGED; import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_OPEN_FOR_PRACTICE; import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_RELEASED; @@ -45,29 +45,29 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.domain.NotificationSetting; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.communication.repository.NotificationRepository; import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Attachment; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.NotificationSetting; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.lecture.domain.Attachment; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationFactory.java b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationFactory.java index 7b6514e1c683..bb202ab6d027 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationFactory.java @@ -2,12 +2,12 @@ import java.time.ZonedDateTime; +import de.tum.cit.aet.artemis.communication.domain.GroupNotificationType; import de.tum.cit.aet.artemis.communication.domain.notification.GroupNotification; import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotification; import de.tum.cit.aet.artemis.communication.domain.notification.SystemNotification; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; /** * Factory for creating Notifications and related objects. diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationResourceIntegrationTest.java index 46fe4b348adf..d67de4d483d8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationResourceIntegrationTest.java @@ -13,17 +13,17 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.domain.GroupNotificationType; +import de.tum.cit.aet.artemis.communication.domain.NotificationSetting; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.domain.notification.GroupNotification; import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotification; import de.tum.cit.aet.artemis.communication.repository.NotificationRepository; import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.NotificationSetting; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; class NotificationResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationScheduleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationScheduleServiceTest.java index 6f7fcbf24ffc..e618e0c0b2d4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationScheduleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationScheduleServiceTest.java @@ -20,16 +20,16 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.communication.domain.NotificationSetting; import de.tum.cit.aet.artemis.communication.repository.NotificationRepository; import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.NotificationSetting; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsResourceIntegrationTest.java index f0265f32bdeb..efb12f069ee5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsResourceIntegrationTest.java @@ -13,11 +13,11 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.domain.NotificationSetting; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.NotificationSetting; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.post.ConversationUtilService; class NotificationSettingsResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsServiceTest.java index 1e13cfed15ec..5cfc31a07c5f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsServiceTest.java @@ -1,11 +1,11 @@ package de.tum.cit.aet.artemis.notification; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.ATTACHMENT_CHANGE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.COURSE_ARCHIVE_STARTED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DATA_EXPORT_CREATED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.DATA_EXPORT_FAILED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXAM_ARCHIVE_STARTED; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.EXERCISE_PRACTICE; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.ATTACHMENT_CHANGE; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.COURSE_ARCHIVE_STARTED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.DATA_EXPORT_CREATED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.DATA_EXPORT_FAILED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXAM_ARCHIVE_STARTED; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXERCISE_PRACTICE; import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel.EMAIL; import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel.PUSH; import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.DEFAULT_NOTIFICATION_SETTINGS; @@ -24,14 +24,14 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.domain.NotificationSetting; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.domain.notification.GroupNotification; import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.NotificationSetting; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel; import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationTargetFactoryTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationTargetFactoryTest.java index 69244fd025af..12caae8058f9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationTargetFactoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationTargetFactoryTest.java @@ -24,10 +24,10 @@ import de.tum.cit.aet.artemis.communication.domain.notification.GroupNotification; import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.communication.domain.notification.NotificationTarget; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.text.domain.TextExercise; class NotificationTargetFactoryTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/PushNotificationResourceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/PushNotificationResourceTest.java index adf70e5761a6..ba59f5f7b1c7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/PushNotificationResourceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/PushNotificationResourceTest.java @@ -17,8 +17,8 @@ import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfiguration; import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceType; import de.tum.cit.aet.artemis.communication.repository.PushNotificationDeviceConfigurationRepository; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.push_notification.PushNotificationRegisterBody; import de.tum.cit.aet.artemis.web.rest.push_notification.PushNotificationRegisterDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/SingleUserNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/SingleUserNotificationServiceTest.java index 1476dff2fb02..bb5ece56f672 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/SingleUserNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/SingleUserNotificationServiceTest.java @@ -1,5 +1,14 @@ package de.tum.cit.aet.artemis.notification; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_ADD_USER_CHANNEL; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_ADD_USER_GROUP_CHAT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_CREATE_GROUP_CHAT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_CREATE_ONE_TO_ONE_CHAT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_DELETE_CHANNEL; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_NEW_REPLY_MESSAGE; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_REMOVE_USER_CHANNEL; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_REMOVE_USER_GROUP_CHAT; +import static de.tum.cit.aet.artemis.communication.domain.NotificationType.NEW_REPLY_FOR_EXERCISE_POST; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_CHANNEL_TITLE; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.CONVERSATION_ADD_USER_GROUP_CHAT_TITLE; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.CONVERSATION_CREATE_GROUP_CHAT_TITLE; @@ -20,15 +29,6 @@ import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_STUDENT_TITLE; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_TUTOR_TITLE; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_UNASSIGNED_TITLE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_CHANNEL; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_ADD_USER_GROUP_CHAT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_CREATE_GROUP_CHAT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_CREATE_ONE_TO_ONE_CHAT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_DELETE_CHANNEL; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_NEW_REPLY_MESSAGE; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_REMOVE_USER_CHANNEL; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.CONVERSATION_REMOVE_USER_GROUP_CHAT; -import static de.tum.cit.aet.artemis.domain.enumeration.NotificationType.NEW_REPLY_FOR_EXERCISE_POST; import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION_USER_NOTIFICATION_DATA_EXPORT_CREATED; import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION_USER_NOTIFICATION_DATA_EXPORT_FAILED; import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_SUBMISSION_ASSESSED; @@ -66,9 +66,13 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.communication.domain.AnswerPost; import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; +import de.tum.cit.aet.artemis.communication.domain.NotificationSetting; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.domain.conversation.GroupChat; @@ -77,22 +81,18 @@ import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotification; import de.tum.cit.aet.artemis.communication.repository.NotificationRepository; import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DataExport; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.DataExport; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.NotificationSetting; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; diff --git a/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationFactory.java b/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationFactory.java index 207a47fa61ef..c6a653ef11e5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationFactory.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.organization; -import de.tum.cit.aet.artemis.domain.Organization; +import de.tum.cit.aet.artemis.core.domain.Organization; /** * Factory for creating Organizations and related objects. diff --git a/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationIntegrationTest.java index 539080c3975c..c3f6c85678c1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationIntegrationTest.java @@ -14,11 +14,11 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Organization; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.OrganizationRepository; import de.tum.cit.aet.artemis.course.CourseFactory; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Organization; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.web.rest.dto.OrganizationCountDTO; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationUtilService.java b/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationUtilService.java index 94a499c622d4..7054de6fa823 100644 --- a/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationUtilService.java @@ -5,8 +5,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.domain.Organization; import de.tum.cit.aet.artemis.core.repository.OrganizationRepository; -import de.tum.cit.aet.artemis.domain.Organization; /** * Service responsible for initializing the database with specific testdata related to organizations for use in integration tests. diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationFactory.java b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationFactory.java index 7eaee89eef64..9b27083b8dcd 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationFactory.java @@ -9,27 +9,27 @@ import jakarta.validation.constraints.NotNull; +import de.tum.cit.aet.artemis.assessment.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.GradingInstruction; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.domain.ExampleSubmission; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.domain.GradingInstruction; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.SubmissionVersion; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionVersion; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.util.GitUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java index d252422c7efb..82fc3f90fb6c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java @@ -42,23 +42,20 @@ import de.tum.cit.aet.artemis.AbstractAthenaTest; import de.tum.cit.aet.artemis.assessment.GradingScaleUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.enumeration.QuizMode; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.ExamFactory; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; @@ -72,12 +69,15 @@ import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.quiz.domain.QuizPointStatistic; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestion; diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationSubmissionIntegrationTest.java index 0eab9b1a6468..f1bcf54b89b1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationSubmissionIntegrationTest.java @@ -11,8 +11,8 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Submission; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.text.domain.TextExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java index e55bf716b3d7..4974ab23514c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java @@ -21,32 +21,27 @@ import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.GradingInstruction; +import de.tum.cit.aet.artemis.assessment.domain.Rating; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.RatingRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ExampleSubmission; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.domain.GradingInstruction; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Rating; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; -import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -54,10 +49,15 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionExportIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionExportIntegrationTest.java index 0df738895d9c..b66554a03fad 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionExportIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionExportIntegrationTest.java @@ -19,16 +19,16 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.text.domain.TextExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionIntegrationTest.java index b8f82534b738..a049ad6d8de0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionIntegrationTest.java @@ -12,13 +12,13 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.SubmissionVersion; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionVersion; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionVersionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java index 12df346c6bed..929b032baad6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java @@ -21,13 +21,12 @@ import de.jplag.exceptions.BasecodeException; import de.jplag.exceptions.ExitException; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; @@ -40,6 +39,7 @@ import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.plagiarism.ContinuousPlagiarismControlService; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismCaseService; diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismAnswerPostIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismAnswerPostIntegrationTest.java index 58af4ebf9ee5..bd3472b2e25e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismAnswerPostIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismAnswerPostIntegrationTest.java @@ -20,8 +20,8 @@ import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.post.ConversationUtilService; class PlagiarismAnswerPostIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCaseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCaseIntegrationTest.java index eda2a4413799..bfb5fb62a83e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCaseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCaseIntegrationTest.java @@ -18,11 +18,11 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.repository.PostRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionConfigHelperTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionConfigHelperTest.java index 81198c40e656..602f2b7304b4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionConfigHelperTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionConfigHelperTest.java @@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionServiceTest.java index 8e4052a3b144..98f0354f2da8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionServiceTest.java @@ -15,12 +15,12 @@ import org.junit.jupiter.api.Test; import de.jplag.exceptions.ExitException; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismDetectionConfig; import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.plagiarism.ModelingPlagiarismDetectionService; import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionService; import de.tum.cit.aet.artemis.service.plagiarism.ProgrammingLanguageNotSupportedForPlagiarismDetectionException; diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismIntegrationTest.java index 56fbad41e789..5d5ebea1c23b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismIntegrationTest.java @@ -14,9 +14,9 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismPostIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismPostIntegrationTest.java index bc5b57c11541..6a182e391fcc 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismPostIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismPostIntegrationTest.java @@ -25,15 +25,15 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.communication.domain.DisplayPriority; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.UserRole; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.post.ConversationUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismUtilService.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismUtilService.java index 75ed107ad643..d52d0d30be54 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismUtilService.java @@ -10,20 +10,20 @@ import org.springframework.stereotype.Service; import org.springframework.util.LinkedMultiValueMap; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.course.CourseFactory; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.modeling.domain.DiagramType; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/post/ConversationFactory.java b/src/test/java/de/tum/cit/aet/artemis/post/ConversationFactory.java index b2ec3c4539a8..62f4d6b09c31 100644 --- a/src/test/java/de/tum/cit/aet/artemis/post/ConversationFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/post/ConversationFactory.java @@ -5,12 +5,12 @@ import java.util.HashSet; import java.util.Set; +import de.tum.cit.aet.artemis.communication.domain.DisplayPriority; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.Reaction; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; /** * Factory for creating objects related to Conversations. diff --git a/src/test/java/de/tum/cit/aet/artemis/post/ConversationUtilService.java b/src/test/java/de/tum/cit/aet/artemis/post/ConversationUtilService.java index 7e6e0e1d6ac2..081614632e1e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/post/ConversationUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/post/ConversationUtilService.java @@ -16,6 +16,7 @@ import de.tum.cit.aet.artemis.communication.domain.AnswerPost; import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; +import de.tum.cit.aet.artemis.communication.domain.DisplayPriority; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.Posting; import de.tum.cit.aet.artemis.communication.domain.Reaction; @@ -29,19 +30,18 @@ import de.tum.cit.aet.artemis.communication.repository.ReactionRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.OneToOneChatRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.CourseInformationSharingConfiguration; -import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.lecture.LectureFactory; import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseTestRepository.java index 59c5c1563feb..b00d4731f68e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseTestRepository.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @Repository public interface ProgrammingExerciseTestRepository extends ArtemisJpaRepository { diff --git a/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionTestRepository.java index 8f92a5dba8e7..d78c58edc9a5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionTestRepository.java @@ -13,8 +13,8 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; /** * Spring Data JPA repository for the ProgrammingSubmission entity tests. diff --git a/src/test/java/de/tum/cit/aet/artemis/repository/StatisticsRepositoryTest.java b/src/test/java/de/tum/cit/aet/artemis/repository/StatisticsRepositoryTest.java index e9b1a931f5e9..c4925febffd0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repository/StatisticsRepositoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/repository/StatisticsRepositoryTest.java @@ -16,14 +16,14 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.domain.GraphType; +import de.tum.cit.aet.artemis.core.domain.PersistentAuditEvent; +import de.tum.cit.aet.artemis.core.domain.SpanType; +import de.tum.cit.aet.artemis.core.domain.StatisticsView; import de.tum.cit.aet.artemis.core.dto.StatisticsEntry; import de.tum.cit.aet.artemis.core.repository.PersistenceAuditEventRepository; import de.tum.cit.aet.artemis.core.repository.StatisticsRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.PersistentAuditEvent; -import de.tum.cit.aet.artemis.domain.enumeration.GraphType; -import de.tum.cit.aet.artemis.domain.enumeration.SpanType; -import de.tum.cit.aet.artemis.domain.enumeration.StatisticsView; import de.tum.cit.aet.artemis.user.UserUtilService; class StatisticsRepositoryTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/repository/UserRepositoryTest.java b/src/test/java/de/tum/cit/aet/artemis/repository/UserRepositoryTest.java index 84479603f7f3..887a59bf3e14 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repository/UserRepositoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/repository/UserRepositoryTest.java @@ -12,9 +12,9 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.domain.Authority; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Authority; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.user.PasswordService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/repository/UserTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/repository/UserTestRepository.java index ff136a3face6..fb26235e6291 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repository/UserTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/repository/UserTestRepository.java @@ -2,8 +2,8 @@ import java.util.Set; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.domain.User; public interface UserTestRepository extends ArtemisJpaRepository { diff --git a/src/test/java/de/tum/cit/aet/artemis/science/ScienceSettingsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/science/ScienceSettingsIntegrationTest.java index d0af805080fc..37fd5bb78551 100644 --- a/src/test/java/de/tum/cit/aet/artemis/science/ScienceSettingsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/science/ScienceSettingsIntegrationTest.java @@ -14,7 +14,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.atlas.domain.science.ScienceSetting; import de.tum.cit.aet.artemis.atlas.repository.science.ScienceSettingRepository; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; class ScienceSettingsIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java b/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java index 36a92a645318..ef8d4047abb3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java @@ -46,8 +46,8 @@ import de.tum.cit.aet.artemis.core.exception.LtiEmailAlreadyInUseException; import de.tum.cit.aet.artemis.core.web.filter.Lti13LaunchFilter; -import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer; +import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.service.connectors.lti.Lti13Service; import uk.ac.ox.ctl.lti13.lti.Claims; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/AssessmentServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/AssessmentServiceTest.java index b56289cb8fa0..d050eaa7c1cc 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/AssessmentServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/AssessmentServiceTest.java @@ -16,20 +16,17 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.course.CourseFactory; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseFactory; @@ -37,6 +34,9 @@ import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.modeling.domain.DiagramType; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/AuthorizationCheckServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/AuthorizationCheckServiceTest.java index 1daaee43e8c8..32ce1fbfcbba 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/AuthorizationCheckServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/AuthorizationCheckServiceTest.java @@ -14,12 +14,12 @@ import org.springframework.stereotype.Component; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/BuildLogEntryServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/BuildLogEntryServiceTest.java index 158d1a8ccb40..5b85d4b04579 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/BuildLogEntryServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/BuildLogEntryServiceTest.java @@ -15,8 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; class BuildLogEntryServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ComplaintResponseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ComplaintResponseServiceTest.java index 959ac0432075..a33443c09946 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ComplaintResponseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ComplaintResponseServiceTest.java @@ -12,17 +12,17 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; +import de.tum.cit.aet.artemis.assessment.domain.Complaint; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Complaint; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.team.TeamUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ConsistencyCheckTestService.java b/src/test/java/de/tum/cit/aet/artemis/service/ConsistencyCheckTestService.java index 083e1fcfe8ea..1a2dca356b94 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ConsistencyCheckTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ConsistencyCheckTestService.java @@ -11,12 +11,12 @@ import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exercise.programming.MockDelegate; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.dto.ConsistencyErrorDTO; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationServiceTest.java index b95b5fdfd637..515fcfaa1e47 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationServiceTest.java @@ -19,15 +19,15 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.GradingScaleFactory; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java index dce11216d0ba..c3b2a717707f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java @@ -21,11 +21,11 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.enumeration.Language; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/DataExportCreationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/DataExportCreationServiceTest.java index f4dfa7333b0d..8bfa4174b115 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/DataExportCreationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/DataExportCreationServiceTest.java @@ -41,29 +41,28 @@ import org.springframework.web.client.RestTemplate; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.atlas.domain.science.ScienceEvent; import de.tum.cit.aet.artemis.atlas.domain.science.ScienceEventType; import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.connector.apollon.ApollonRequestMockProvider; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DataExport; +import de.tum.cit.aet.artemis.core.domain.DataExportState; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.DataExportRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.DataExport; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.DataExportState; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.Visibility; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseTestService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseUtilService; @@ -72,6 +71,7 @@ import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.post.ConversationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.science.ScienceUtilService; import de.tum.cit.aet.artemis.service.connectors.apollon.ApollonConversionService; import de.tum.cit.aet.artemis.service.export.DataExportCreationService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/EmailSummaryServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/EmailSummaryServiceTest.java index 67430d94d92d..ae08f3e32f5b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/EmailSummaryServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/EmailSummaryServiceTest.java @@ -22,13 +22,13 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.domain.NotificationSetting; import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.NotificationSetting; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; +import de.tum.cit.aet.artemis.exercise.domain.DifficultyLevel; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ExerciseDateServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ExerciseDateServiceTest.java index 2406684f3752..c6131a4d2fde 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ExerciseDateServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ExerciseDateServiceTest.java @@ -13,9 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.StudentExam; @@ -26,6 +25,7 @@ import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.modeling.domain.DiagramType; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleServiceTest.java index e963d61ee969..07b854153d7c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleServiceTest.java @@ -13,8 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseLifecycle; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseLifecycle; import de.tum.cit.aet.artemis.text.domain.TextExercise; class ExerciseLifecycleServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/FeedbackServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/FeedbackServiceTest.java index cc87d7e2e7df..c26d982176b4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/FeedbackServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/FeedbackServiceTest.java @@ -8,11 +8,11 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.LongFeedbackText; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.LongFeedbackTextRepository; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.LongFeedbackText; class FeedbackServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java index e7525e7539c5..ee20e1b44c7b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java @@ -28,19 +28,19 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationGitlabCIGitlabSamlTest; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.exception.GitLabCIException; -import de.tum.cit.aet.artemis.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java index 2278e84f9ce4..6b69ebbac7cd 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java @@ -17,13 +17,13 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.GradingScaleUtilService; +import de.tum.cit.aet.artemis.assessment.domain.GradeStep; +import de.tum.cit.aet.artemis.assessment.domain.GradeType; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.GradeStep; -import de.tum.cit.aet.artemis.domain.GradeType; -import de.tum.cit.aet.artemis.domain.GradingScale; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsInternalUriServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsInternalUriServiceTest.java index 187575752559..fef15b888df7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsInternalUriServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsInternalUriServiceTest.java @@ -18,7 +18,7 @@ import org.springframework.test.util.ReflectionTestUtils; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsInternalUrlService; class JenkinsInternalUriServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsServiceTest.java index 0bed9934e6c8..352939016ad6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsServiceTest.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.service; import static de.tum.cit.aet.artemis.core.config.Constants.ASSIGNMENT_REPO_NAME; -import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.SOLUTION; -import static de.tum.cit.aet.artemis.domain.enumeration.BuildPlanType.TEMPLATE; +import static de.tum.cit.aet.artemis.programming.domain.BuildPlanType.SOLUTION; +import static de.tum.cit.aet.artemis.programming.domain.BuildPlanType.TEMPLATE; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIllegalStateException; @@ -34,13 +34,13 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.core.exception.JenkinsException; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.BuildPlan; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; import de.tum.cit.aet.artemis.exercise.programming.ContinuousIntegrationTestService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.BuildPlan; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/LearningObjectServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/LearningObjectServiceTest.java index 8b1af2372efb..a219e5212ac8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/LearningObjectServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/LearningObjectServiceTest.java @@ -16,11 +16,11 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.StudentScoreUtilService; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.atlas.domain.LearningObject; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.LearningObject; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.lecture.LectureFactory; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java index 53795fcb37a7..d5283b25cb0b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java @@ -20,6 +20,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.StudentScoreUtilService; +import de.tum.cit.aet.artemis.atlas.domain.LearningObject; import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; import de.tum.cit.aet.artemis.atlas.domain.competency.RelationType; @@ -27,18 +28,17 @@ import de.tum.cit.aet.artemis.competency.CompetencyProgressUtilService; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.competency.LearningPathUtilService; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.LearningObject; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; +import de.tum.cit.aet.artemis.exercise.domain.DifficultyLevel; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.service.learningpath.LearningPathNgxService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/LectureImportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/LectureImportServiceTest.java index 40c2fce0f0e2..b18f54c8c031 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/LectureImportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/LectureImportServiceTest.java @@ -11,12 +11,12 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Attachment; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Lecture; import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/LectureServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/LectureServiceTest.java index 27b05ebe2ab7..e0328b080314 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/LectureServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/LectureServiceTest.java @@ -14,13 +14,13 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.Attachment; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.Lecture; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.lecture.LectureFactory; import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.lecture.domain.Attachment; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationServiceTest.java index 0270a09ba31b..e5a8835bf117 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationServiceTest.java @@ -18,8 +18,8 @@ import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.core.AuthorizationGrantType; -import de.tum.cit.aet.artemis.domain.LtiPlatformConfiguration; -import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; +import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; +import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckServiceTest.java index c006839554fe..d05c1ad9f0d9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckServiceTest.java @@ -12,12 +12,12 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.domain.participation.ParticipationInterface; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleServiceTest.java index 1d7181302316..52a015f17505 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleServiceTest.java @@ -13,13 +13,13 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.enumeration.ParticipationLifecycle; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ParticipationLifecycle; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java index 509c5427725f..5d7641f9ff56 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java @@ -18,23 +18,23 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.BuildLogEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationTeamWebsocketServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationTeamWebsocketServiceTest.java index dd7ca8777645..bbd7c67b8ff4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationTeamWebsocketServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationTeamWebsocketServiceTest.java @@ -20,7 +20,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationServiceTest.java index 513f4728f632..e589ea978e60 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationServiceTest.java @@ -9,17 +9,17 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.GradingScaleFactory; +import de.tum.cit.aet.artemis.assessment.domain.GradingScale; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.GradingScale; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.user.UserUtilService; class PresentationPointsCalculationServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/RepositoryAccessServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/RepositoryAccessServiceTest.java index dd6563d010b6..ad59e86852b3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/RepositoryAccessServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/RepositoryAccessServiceTest.java @@ -19,13 +19,13 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ResultServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ResultServiceTest.java index c9242749bc8d..4c385dc38710 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ResultServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ResultServiceTest.java @@ -13,12 +13,11 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; @@ -26,6 +25,7 @@ import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java index 511fa947b74a..839015b77af7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java @@ -17,31 +17,31 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Complaint; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintType; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Complaint; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.ComplaintType; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/TeamWebsocketServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/TeamWebsocketServiceTest.java index fc3d47b6e9be..f5da40367f6f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/TeamWebsocketServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/TeamWebsocketServiceTest.java @@ -15,14 +15,14 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.enumeration.TeamImportStrategyType; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.Team; +import de.tum.cit.aet.artemis.exercise.dto.TeamImportStrategyType; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionServiceTest.java index 6d978ecd526e..bf20bff913e5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionServiceTest.java @@ -12,8 +12,6 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.core.repository.OrganizationRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.enumeration.DiagramType; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; @@ -22,8 +20,10 @@ import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.lecture.LectureUtilService; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.modeling.domain.DiagramType; import de.tum.cit.aet.artemis.modeling.repository.ApollonDiagramRepository; import de.tum.cit.aet.artemis.organization.OrganizationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintRepository; import de.tum.cit.aet.artemis.service.util.Tuple; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/UriServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/UriServiceTest.java index e30f1d2d8240..2b2cfeb104c2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/UriServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/UriServiceTest.java @@ -10,10 +10,10 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.core.exception.VersionControlException; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; class UriServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java index 8d685cace3e8..10b67720baa6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java @@ -16,21 +16,21 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractAthenaTest; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; +import de.tum.cit.aet.artemis.assessment.domain.GradingInstruction; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.repository.TextBlockRepository; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.GradingInstruction; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.text.domain.TextBlock; import de.tum.cit.aet.artemis.text.domain.TextExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java index 70df1a8a08b5..552b33340d96 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java @@ -15,11 +15,11 @@ import de.tum.cit.aet.artemis.AbstractAthenaTest; import de.tum.cit.aet.artemis.core.exception.NetworkingException; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.service.dto.athena.ProgrammingFeedbackDTO; import de.tum.cit.aet.artemis.service.dto.athena.TextFeedbackDTO; import de.tum.cit.aet.artemis.text.domain.TextExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java index 1821f9b3f5a2..e0b2e292fefa 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java @@ -17,12 +17,12 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.enumeration.RepositoryType; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java index 3bcbb4835461..c22461a22150 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java @@ -16,11 +16,11 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractAthenaTest; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java index 08830d1b199e..0f13367cb9ef 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java @@ -12,14 +12,14 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractAthenaTest; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementServiceTest.java index e8de244661c5..99f167d98254 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementServiceTest.java @@ -30,8 +30,8 @@ import org.springframework.web.client.RestTemplate; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.service.connectors.gitlab.dto.GitLabPersonalAccessTokenListResponseDTO; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreatorTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreatorTest.java index 0c329f2baf9b..062a9d8ad65a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreatorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreatorTest.java @@ -10,11 +10,11 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.BuildPlan; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseBuildConfig; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.BuildPlan; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java index 31e009e59e52..31992b50d4c0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java @@ -32,11 +32,11 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.security.lti.Lti13TokenRetriever; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.OnlineCourseConfiguration; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import uk.ac.ox.ctl.lti13.lti.Claims; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalServiceTest.java index 20bca9febfce..950a9026898b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalServiceTest.java @@ -22,8 +22,8 @@ import org.junit.jupiter.params.provider.MethodSource; import org.mockito.Mockito; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.domain.User; class VcsTokenRenewalServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java index 13e259861bc6..fb91c4a07eec 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java @@ -15,11 +15,11 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExamUser; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamQuizServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamQuizServiceTest.java index bdb4bcfdf85d..ce54bbb0f4c8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamQuizServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamQuizServiceTest.java @@ -15,9 +15,8 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; @@ -25,6 +24,7 @@ import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java index 7b3a7e810899..06d2517e35b3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java @@ -15,15 +15,15 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionServiceTest.java index 294aec2326f9..4bc420a2e56b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionServiceTest.java @@ -11,18 +11,18 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.Language; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessServiceTest.java index a9cc716759aa..5c3f361149db 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessServiceTest.java @@ -11,9 +11,9 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.StudentExam; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/export/CourseExamExportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/export/CourseExamExportServiceTest.java index 7ad3025dacdc..b7c2bba00c14 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/export/CourseExamExportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/export/CourseExamExportServiceTest.java @@ -15,9 +15,9 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationServiceTest.java index bdc7bf1fa148..af0e188a06ab 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationServiceTest.java @@ -25,11 +25,11 @@ import de.tum.cit.aet.artemis.communication.repository.NotificationRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationNotificationRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.DomainObject; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.user.UserUtilService; class ConversationNotificationServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationServiceTest.java index 977fbda66583..421a431a8cd2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationServiceTest.java @@ -14,12 +14,12 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import de.tum.cit.aet.artemis.communication.domain.GroupNotificationType; +import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.domain.notification.GroupNotification; import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType; -import de.tum.cit.aet.artemis.domain.enumeration.NotificationType; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.service.notifications.push_notifications.ApplePushNotificationService; import de.tum.cit.aet.artemis.service.notifications.push_notifications.FirebasePushNotificationService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/notifications/MailServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/notifications/MailServiceTest.java index 71a08da0ce2d..b316c22d4414 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/notifications/MailServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/notifications/MailServiceTest.java @@ -24,13 +24,13 @@ import org.springframework.test.util.ReflectionTestUtils; import org.thymeleaf.spring6.SpringTemplateEngine; +import de.tum.cit.aet.artemis.communication.domain.GroupNotificationType; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.domain.notification.GroupNotification; import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.service.TimeService; import tech.jhipster.config.JHipsterProperties; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationServiceTest.java index d99f1f9e9429..ad88aa6f57d5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationServiceTest.java @@ -26,18 +26,18 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.domain.NotificationSetting; import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.communication.domain.notification.TutorialGroupNotification; import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.NotificationSetting; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistrationType; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupNotificationRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRegistrationRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/AppleFirebasePushNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/AppleFirebasePushNotificationServiceTest.java index 6d0611eb1b9f..6f7e5d9a020f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/AppleFirebasePushNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/AppleFirebasePushNotificationServiceTest.java @@ -24,14 +24,14 @@ import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; +import de.tum.cit.aet.artemis.communication.domain.GroupNotificationType; import de.tum.cit.aet.artemis.communication.domain.notification.GroupNotification; import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfiguration; import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceType; import de.tum.cit.aet.artemis.communication.repository.PushNotificationDeviceConfigurationRepository; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType; +import de.tum.cit.aet.artemis.core.domain.User; class AppleFirebasePushNotificationServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java index 711b7689784a..c33657498e62 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java @@ -13,19 +13,19 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExerciseTestCase; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; -import de.tum.cit.aet.artemis.domain.enumeration.ProjectType; -import de.tum.cit.aet.artemis.domain.enumeration.StaticCodeAnalysisTool; -import de.tum.cit.aet.artemis.domain.enumeration.Visibility; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTestCaseType; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleServiceTest.java index b2a1140dc492..b36b2d14c5d7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleServiceTest.java @@ -27,10 +27,10 @@ import org.springframework.scheduling.config.ScheduledTaskHolder; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.domain.DataExport; +import de.tum.cit.aet.artemis.core.domain.DataExportState; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.DataExportRepository; -import de.tum.cit.aet.artemis.domain.DataExport; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.DataExportState; import de.tum.cit.aet.artemis.user.UserUtilService; @ExtendWith(MockitoExtension.class) diff --git a/src/test/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupServiceTest.java index 17b26757ae44..fa1e018846ef 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupServiceTest.java @@ -17,7 +17,7 @@ import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfiguration; import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceType; import de.tum.cit.aet.artemis.communication.repository.PushNotificationDeviceConfigurationRepository; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.user.UserUtilService; class PushNotificationDeviceConfigurationCleanupServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/settings/ide/IdePreferencesIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/settings/ide/IdePreferencesIntegrationTest.java index 7defe2fd31ca..181ff1c5710d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/settings/ide/IdePreferencesIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/settings/ide/IdePreferencesIntegrationTest.java @@ -14,8 +14,8 @@ import org.springframework.util.MultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ide.Ide; import de.tum.cit.aet.artemis.programming.domain.ide.UserIdeMapping; import de.tum.cit.aet.artemis.programming.repository.settings.IdeRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/team/TeamFactory.java b/src/test/java/de/tum/cit/aet/artemis/team/TeamFactory.java index 6b2f6c3d9981..14f8c44e39c7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/team/TeamFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/team/TeamFactory.java @@ -4,11 +4,11 @@ import java.util.List; import java.util.Set; +import de.tum.cit.aet.artemis.core.domain.Authority; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.Role; -import de.tum.cit.aet.artemis.domain.Authority; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.user.UserFactory; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/team/TeamImportIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/team/TeamImportIntegrationTest.java index 24c3f1010521..c87025736992 100644 --- a/src/test/java/de/tum/cit/aet/artemis/team/TeamImportIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/team/TeamImportIntegrationTest.java @@ -18,12 +18,12 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.enumeration.TeamImportStrategyType; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.Team; +import de.tum.cit.aet.artemis.exercise.dto.TeamImportStrategyType; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; class TeamImportIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/team/TeamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/team/TeamIntegrationTest.java index 039986a39e52..c1a914ee4eaf 100644 --- a/src/test/java/de/tum/cit/aet/artemis/team/TeamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/team/TeamIntegrationTest.java @@ -17,14 +17,13 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.TeamAssignmentConfig; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.Team; +import de.tum.cit.aet.artemis.exercise.domain.TeamAssignmentConfig; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; @@ -32,6 +31,7 @@ import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.dto.TeamSearchUserDTO; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; diff --git a/src/test/java/de/tum/cit/aet/artemis/team/TeamUtilService.java b/src/test/java/de/tum/cit/aet/artemis/team/TeamUtilService.java index f3002edfb52e..4b5d1d62acbf 100644 --- a/src/test/java/de/tum/cit/aet/artemis/team/TeamUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/team/TeamUtilService.java @@ -9,12 +9,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.domain.Authority; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; -import de.tum.cit.aet.artemis.domain.Authority; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/text/AssessmentEventIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/AssessmentEventIntegrationTest.java index 932ee8b4b94d..a4c6d6432d79 100644 --- a/src/test/java/de/tum/cit/aet/artemis/text/AssessmentEventIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/AssessmentEventIntegrationTest.java @@ -12,9 +12,9 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.repository.TextAssessmentEventRepository; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; diff --git a/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java index d358b1b69805..f1254ad14d37 100644 --- a/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java @@ -36,30 +36,28 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.ComplaintUtilService; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.Complaint; +import de.tum.cit.aet.artemis.assessment.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.TextBlockRepository; import de.tum.cit.aet.artemis.connector.AthenaRequestMockProvider; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.domain.Complaint; -import de.tum.cit.aet.artemis.domain.ComplaintResponse; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Submission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.FeedbackType; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; +import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseFactory; @@ -68,6 +66,8 @@ import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.service.TextAssessmentService; diff --git a/src/test/java/de/tum/cit/aet/artemis/text/TextExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/TextExerciseIntegrationTest.java index 562e050da012..b0edd3a24a04 100644 --- a/src/test/java/de/tum/cit/aet/artemis/text/TextExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/TextExerciseIntegrationTest.java @@ -35,6 +35,12 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.domain.ExampleSubmission; +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; +import de.tum.cit.aet.artemis.assessment.domain.GradingInstruction; +import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; @@ -42,22 +48,16 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ExampleSubmission; -import de.tum.cit.aet.artemis.domain.Feedback; -import de.tum.cit.aet.artemis.domain.GradingCriterion; -import de.tum.cit.aet.artemis.domain.GradingInstruction; -import de.tum.cit.aet.artemis.domain.Result; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.TeamAssignmentConfig; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.DifficultyLevel; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.enumeration.IncludedInOverallScore; -import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; +import de.tum.cit.aet.artemis.exercise.domain.DifficultyLevel; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; +import de.tum.cit.aet.artemis.exercise.domain.Team; +import de.tum.cit.aet.artemis.exercise.domain.TeamAssignmentConfig; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java index b7f86fdbc566..80a00be5f9b9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java @@ -19,17 +19,17 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.SubmissionVersion; -import de.tum.cit.aet.artemis.domain.Team; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.AssessmentType; -import de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; -import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionVersion; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionVersionRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/AbstractTutorialGroupIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/AbstractTutorialGroupIntegrationTest.java index 696012c82c6f..0c2487bbefb1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/AbstractTutorialGroupIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/AbstractTutorialGroupIntegrationTest.java @@ -26,19 +26,19 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseTestService; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupChannelManagementService; import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupService; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSchedule; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSessionStatus; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupFreePeriodRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupNotificationRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFreePeriodIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFreePeriodIntegrationTest.java index 6252ee7c51e3..8aa797a1512e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFreePeriodIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFreePeriodIntegrationTest.java @@ -16,7 +16,7 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.web.client.HttpClientErrorException; -import de.tum.cit.aet.artemis.domain.enumeration.Language; +import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupFreePeriod; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java index 9a694d5afd4e..16d598136631 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.tutorialgroups; -import static de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType.INSTRUCTOR_REGISTRATION; +import static de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistrationType.INSTRUCTOR_REGISTRATION; import static de.tum.cit.aet.artemis.tutorialgroups.AbstractTutorialGroupIntegrationTest.RandomTutorialGroupGenerator.generateRandomTitle; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; @@ -30,16 +30,16 @@ import com.google.common.collect.ImmutableSet; +import de.tum.cit.aet.artemis.communication.domain.DisplayPriority; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.repository.PostRepository; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.DisplayPriority; -import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.post.ConversationUtilService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistrationType; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupResource; diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupScheduleIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupScheduleIntegrationTest.java index 6e8f8da9746a..cf4b3a388833 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupScheduleIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupScheduleIntegrationTest.java @@ -10,7 +10,7 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.domain.DomainObject; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupResource; diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupSessionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupSessionIntegrationTest.java index dd942b526127..cc2fcaea9374 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupSessionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupSessionIntegrationTest.java @@ -14,10 +14,10 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; +import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSessionStatus; import de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupSessionResource; class TutorialGroupSessionIntegrationTest extends AbstractTutorialGroupIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupUtilService.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupUtilService.java index 7ed8c01115dd..9a232d9d4c72 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupUtilService.java @@ -14,16 +14,16 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.course.CourseFactory; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; -import de.tum.cit.aet.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupFreePeriod; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistrationType; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSessionStatus; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupFreePeriodRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRegistrationRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupsConfigurationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupsConfigurationIntegrationTest.java index 22a08c865919..1569669818ac 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupsConfigurationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupsConfigurationIntegrationTest.java @@ -15,11 +15,11 @@ import org.springframework.security.test.context.TestSecurityContextHolder; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.enumeration.Language; -import de.tum.cit.aet.artemis.domain.enumeration.TutorialGroupSessionStatus; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSessionStatus; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.user.UserFactory; diff --git a/src/test/java/de/tum/cit/aet/artemis/uri/RepositoryUriTest.java b/src/test/java/de/tum/cit/aet/artemis/uri/RepositoryUriTest.java index 822a4f3586a6..ea6126d1f8f2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/uri/RepositoryUriTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/uri/RepositoryUriTest.java @@ -16,7 +16,7 @@ import org.junit.jupiter.api.Test; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; class RepositoryUriTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java index b8fe46b7b040..0063305284e6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java @@ -15,7 +15,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.service.AccountService; import de.tum.cit.aet.artemis.service.dto.PasswordChangeDTO; import de.tum.cit.aet.artemis.service.dto.UserDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceWithGitLabIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceWithGitLabIntegrationTest.java index ad7efeb0bc45..ca965fc79113 100644 --- a/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceWithGitLabIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceWithGitLabIntegrationTest.java @@ -20,7 +20,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.connector.GitlabRequestMockProvider; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; class AccountResourceWithGitLabIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/user/UserFactory.java b/src/test/java/de/tum/cit/aet/artemis/user/UserFactory.java index a39183aec2e4..ce211dca7cf0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/user/UserFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/UserFactory.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.Set; -import de.tum.cit.aet.artemis.domain.Authority; -import de.tum.cit.aet.artemis.domain.User; +import de.tum.cit.aet.artemis.core.domain.Authority; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.service.dto.StudentDTO; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java b/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java index 94f4937e3995..eb4011a37f00 100644 --- a/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java @@ -31,20 +31,20 @@ import de.tum.cit.aet.artemis.atlas.domain.science.ScienceEventType; import de.tum.cit.aet.artemis.atlas.repository.science.ScienceEventRepository; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.domain.Authority; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.AuthorityRepository; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.domain.Authority; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.programming.MockDelegate; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ParticipationVCSAccessTokenRepository; import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; import de.tum.cit.aet.artemis.service.connectors.lti.LtiService; diff --git a/src/test/java/de/tum/cit/aet/artemis/user/UserUtilService.java b/src/test/java/de/tum/cit/aet/artemis/user/UserUtilService.java index c293ce3e46a7..d9d112e1d6c5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/user/UserUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/UserUtilService.java @@ -20,11 +20,11 @@ import org.springframework.security.test.context.TestSecurityContextHolder; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.domain.Authority; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.AuthorityRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; -import de.tum.cit.aet.artemis.domain.Authority; -import de.tum.cit.aet.artemis.domain.User; import de.tum.cit.aet.artemis.repository.UserTestRepository; import de.tum.cit.aet.artemis.service.user.PasswordService; diff --git a/src/test/java/de/tum/cit/aet/artemis/util/ExamPrepareExercisesTestUtil.java b/src/test/java/de/tum/cit/aet/artemis/util/ExamPrepareExercisesTestUtil.java index 8fdd915b543c..cbca99d62cb3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/util/ExamPrepareExercisesTestUtil.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/ExamPrepareExercisesTestUtil.java @@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; -import de.tum.cit.aet.artemis.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.service.util.ExamExerciseStartPreparationStatus; diff --git a/src/test/java/de/tum/cit/aet/artemis/util/ExerciseIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/util/ExerciseIntegrationTestService.java index 01c699be84d9..e928a6c1abff 100644 --- a/src/test/java/de/tum/cit/aet/artemis/util/ExerciseIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/ExerciseIntegrationTestService.java @@ -10,9 +10,9 @@ import org.springframework.stereotype.Service; import org.springframework.util.MultiValueMap; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; +import de.tum.cit.aet.artemis.core.dto.SortingOrder; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.web.rest.util.PageUtil; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/util/GitUtilService.java b/src/test/java/de/tum/cit/aet/artemis/util/GitUtilService.java index a943db5ffe8b..2052d2f4bee9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/util/GitUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/GitUtilService.java @@ -22,16 +22,16 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.course.CourseFactory; -import de.tum.cit.aet.artemis.domain.Course; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.domain.User; -import de.tum.cit.aet.artemis.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.domain.enumeration.InitializationState; +import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.participation.ParticipationFactory; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.Repository; +import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.service.connectors.GitService; @Service diff --git a/src/test/java/de/tum/cit/aet/artemis/util/HestiaUtilTestService.java b/src/test/java/de/tum/cit/aet/artemis/util/HestiaUtilTestService.java index 92ea63e1a1d1..532e6232a3c2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/util/HestiaUtilTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/HestiaUtilTestService.java @@ -18,13 +18,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.domain.Repository; -import de.tum.cit.aet.artemis.domain.enumeration.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/util/InvalidExamExerciseDatesArgumentProvider.java b/src/test/java/de/tum/cit/aet/artemis/util/InvalidExamExerciseDatesArgumentProvider.java index a1d8d9ade4d0..e28bc84dad4f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/util/InvalidExamExerciseDatesArgumentProvider.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/InvalidExamExerciseDatesArgumentProvider.java @@ -8,7 +8,7 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.ArgumentsProvider; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; /** * Provides arguments in form of a for parameterized JUnit 5 tests (see {@link ParameterizedTest}) that are not a valid date configuration for exam exercises. diff --git a/src/test/java/de/tum/cit/aet/artemis/util/InvalidExerciseConfiguration.java b/src/test/java/de/tum/cit/aet/artemis/util/InvalidExerciseConfiguration.java index 233716f58be0..b7c68ea260f5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/util/InvalidExerciseConfiguration.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/InvalidExerciseConfiguration.java @@ -2,7 +2,7 @@ import org.springframework.http.HttpStatus; -import de.tum.cit.aet.artemis.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; /** * Represents an invalid exercise configuration that can be {@linkplain #applyTo(Exercise) applied} to any given exercise of type E. diff --git a/src/test/java/de/tum/cit/aet/artemis/util/PageableSearchUtilService.java b/src/test/java/de/tum/cit/aet/artemis/util/PageableSearchUtilService.java index 3fda3116918c..e41f5a3adc32 100644 --- a/src/test/java/de/tum/cit/aet/artemis/util/PageableSearchUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/PageableSearchUtilService.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.domain.enumeration.SortingOrder; +import de.tum.cit.aet.artemis.core.dto.SortingOrder; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.CompetencyPageableSearchDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.PageableSearchDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/util/SensitiveInformationUtil.java b/src/test/java/de/tum/cit/aet/artemis/util/SensitiveInformationUtil.java index 05ba212b00cd..0afa33a52a2c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/util/SensitiveInformationUtil.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/SensitiveInformationUtil.java @@ -2,10 +2,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import de.tum.cit.aet.artemis.domain.Exercise; -import de.tum.cit.aet.artemis.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.text.domain.TextExercise; public class SensitiveInformationUtil { From e4922905c43c2a1a168ad2992aaab7ff35bd0fb8 Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Wed, 11 Sep 2024 16:32:14 +0200 Subject: [PATCH 08/43] Fix domain/dto package path in repository classes --- .../repository/ComplaintRepository.java | 24 +++--- .../repository/GradingScaleRepository.java | 4 +- .../ParticipantScoreRepository.java | 2 +- .../repository/RatingRepository.java | 2 +- .../repository/ResultRepository.java | 18 ++-- .../CompetencyProgressRepository.java | 2 +- .../CompetencyRelationRepository.java | 2 +- .../communication/domain/PostConstraints.java | 2 +- .../domain/ReactionConstraints.java | 2 +- .../repository/MessageSpecs.java | 4 +- .../repository/NotificationRepository.java | 16 ++-- .../conversation/ConversationRepository.java | 4 +- .../core/repository/StatisticsRepository.java | 14 +-- .../core/repository/UserRepository.java | 26 +++--- .../artemis/core/repository/UserSpecs.java | 4 +- .../core/repository/base/RepositoryImpl.java | 2 +- .../repository/ExerciseMetricsRepository.java | 2 +- .../repository/ExerciseRepository.java | 2 +- .../repository/ParticipationRepository.java | 2 +- .../StudentParticipationRepository.java | 86 +++++++++---------- .../repository/SubmissionRepository.java | 6 +- .../repository/IrisMessageRepository.java | 2 +- .../ModelingExerciseRepository.java | 2 +- .../ProgrammingExerciseRepository.java | 22 ++--- ...xerciseStudentParticipationRepository.java | 6 +- ...ProgrammingExerciseTestCaseRepository.java | 2 +- .../ProgrammingSubmissionRepository.java | 4 +- ...ammingExerciseParticipationRepository.java | 4 +- ...ammingExerciseParticipationRepository.java | 4 +- .../hestia/CoverageReportRepository.java | 2 +- .../service/ExerciseSpecificationService.java | 6 +- .../course-dashboard.service.ts | 10 +-- .../ProgrammingSubmissionTestRepository.java | 4 +- 33 files changed, 147 insertions(+), 147 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintRepository.java index 83a296bb040a..6b074f1d0270 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintRepository.java @@ -103,7 +103,7 @@ public interface ComplaintRepository extends ArtemisJpaRepository findWithBonusGradeTypeByTitleInCourseOrExamAndUserHasAccessTo FROM GradingScale gs LEFT JOIN gs.course LEFT JOIN gs.exam - WHERE gs.gradeType = de.tum.cit.aet.artemis.domain.GradeType.BONUS + WHERE gs.gradeType = de.tum.cit.aet.artemis.assessment.domain.GradeType.BONUS AND (gs.course.title LIKE %:partialTitle% OR gs.exam.title LIKE %:partialTitle%) """) Page findWithBonusGradeTypeByTitleInCourseOrExamForAdmin(@Param("partialTitle") String partialTitle, Pageable pageable); diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java index 76f45dce0c4a..761696c04007 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java @@ -119,7 +119,7 @@ SELECT MAX(ps.lastModifiedDate) AS latestModifiedDate List getAggregatedExerciseScoresInformation(@Param("exercises") Set exercises); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.ScoreDistribution(count(p.id), p.lastRatedScore) + SELECT new de.tum.cit.aet.artemis.assessment.dto.ScoreDistribution(count(p.id), p.lastRatedScore) FROM ParticipantScore p WHERE p.exercise.id = :exerciseId GROUP BY p.id diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/RatingRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/RatingRepository.java index c63ac0da0f67..baa736e4f7b2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/RatingRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/RatingRepository.java @@ -38,7 +38,7 @@ public interface RatingRepository extends ArtemisJpaRepository { // Valid JPQL syntax, only SCA is not able to parse it @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.assessment.dashboard.ExerciseRatingCount( + SELECT new de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseRatingCount( CAST(SUM(ra.rating) AS double) / SUM(CASE WHEN ra.rating IS NOT NULL THEN 1 ELSE 0 END), SUM(CASE WHEN ra.rating IS NOT NULL THEN 1 ELSE 0 END)) FROM Result r diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java index 21a4e8dbeb66..2696451b1844 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java @@ -73,7 +73,7 @@ LEFT JOIN TREAT (r.participation AS ProgrammingExerciseStudentParticipation) sp SELECT MAX(rr.completionDate) FROM Result rr LEFT JOIN TREAT (rr.participation AS ProgrammingExerciseStudentParticipation) sp2 - WHERE rr.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.AUTOMATIC + WHERE rr.assessmentType = de.tum.cit.aet.artemis.assessment.domain.AssessmentType.AUTOMATIC AND sp2.exercise.id = :exerciseId AND sp2.student = sp.student ) @@ -238,7 +238,7 @@ default Optional findFirstByParticipationIdAndRatedWithSubmissionOrderBy * @return a list with 3 elements: count of rated (in time) and unrated (late) assessments of a course and count of assessments without rating (null) */ @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.assessment.dashboard.ResultCount(r.rated, COUNT(r)) + SELECT new de.tum.cit.aet.artemis.assessment.dto.dashboard.ResultCount(r.rated, COUNT(r)) FROM Result r JOIN r.participation p WHERE r.completionDate IS NOT NULL @@ -392,7 +392,7 @@ SELECT COUNT(DISTINCT p) AND p.student.id = :studentId AND r.score IS NOT NULL AND r.completionDate IS NOT NULL - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) ORDER BY p.id DESC, s.id DESC, r.id DESC """) List getResultsOrderedByParticipationIdLegalSubmissionIdResultIdDescForStudent(@Param("exerciseId") long exerciseId, @Param("studentId") long studentId); @@ -407,7 +407,7 @@ SELECT COUNT(DISTINCT p) AND p.team.id = :teamId AND r.score IS NOT NULL AND r.completionDate IS NOT NULL - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) ORDER BY p.id DESC, s.id DESC, r.id DESC """) List getResultsOrderedByParticipationIdLegalSubmissionIdResultIdDescForTeam(@Param("exerciseId") long exerciseId, @Param("teamId") long teamId); @@ -423,7 +423,7 @@ SELECT COUNT(DISTINCT p) AND r.score IS NOT NULL AND r.completionDate IS NOT NULL AND r.rated = TRUE - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) ORDER BY p.id DESC, s.id DESC, r.id DESC """) List getRatedResultsOrderedByParticipationIdLegalSubmissionIdResultIdDescForStudent(@Param("exerciseId") long exerciseId, @Param("studentId") long studentId); @@ -439,7 +439,7 @@ SELECT COUNT(DISTINCT p) AND r.score IS NOT NULL AND r.completionDate IS NOT NULL AND r.rated = TRUE - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) ORDER BY p.id DESC, s.id DESC, r.id DESC """) List getRatedResultsOrderedByParticipationIdLegalSubmissionIdResultIdDescForTeam(@Param("exerciseId") long exerciseId, @Param("teamId") long teamId); @@ -599,7 +599,7 @@ else if (Boolean.FALSE.equals(ratedCount.rated())) { // Valid JPQL syntax, only SCA is not able to parse it @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardAssessments( + SELECT new de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardAssessments( r.assessor.id, COUNT(r), SUM(e.maxPoints), @@ -622,7 +622,7 @@ else if (Boolean.FALSE.equals(ratedCount.rated())) { // Valid JPQL syntax, only SCA is not able to parse it @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardAssessments( + SELECT new de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardAssessments( r.assessor.id, COUNT(r), SUM(e.maxPoints), @@ -642,7 +642,7 @@ else if (Boolean.FALSE.equals(ratedCount.rated())) { List findTutorLeaderboardAssessmentByExerciseId(@Param("exerciseId") long exerciseId); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.leaderboard.tutor.TutorLeaderboardAssessments( + SELECT new de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardAssessments( r.assessor.id, COUNT(r), SUM(e.maxPoints), diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyProgressRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyProgressRepository.java index 61b4bb5c03e4..80f7948e8306 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyProgressRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyProgressRepository.java @@ -93,7 +93,7 @@ SELECT COUNT(cp) LEFT JOIN CompetencyRelation cr ON cr.tailCompetency = c LEFT JOIN CourseCompetency priorC ON priorC = cr.headCompetency LEFT JOIN FETCH CompetencyProgress cp ON cp.competency = priorC - WHERE cr.type <> de.tum.cit.aet.artemis.domain.competency.RelationType.MATCHES + WHERE cr.type <> de.tum.cit.aet.artemis.atlas.domain.competency.RelationType.MATCHES AND cp.user = :user AND c = :competency """) diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyRelationRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyRelationRepository.java index c3ad55c9eed0..e7ebe1d95453 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyRelationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyRelationRepository.java @@ -55,7 +55,7 @@ SELECT COUNT(cr) LEFT JOIN relation.headCompetency LEFT JOIN relation.tailCompetency WHERE relation.tailCompetency.id IN :competencyIds - AND relation.type <> de.tum.cit.aet.artemis.domain.competency.RelationType.MATCHES + AND relation.type <> de.tum.cit.aet.artemis.atlas.domain.competency.RelationType.MATCHES """) Set getPriorCompetenciesByCompetencyIds(@Param("competencyIds") Set competencyIds); diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/PostConstraints.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/PostConstraints.java index a8543c782780..ca8e5dd41cc0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/PostConstraints.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/PostConstraints.java @@ -21,7 +21,7 @@ /** * @return the message of the violated constraint */ - String message() default "{de.tum.cit.aet.artemis.domain.metis.PostConstraints}"; + String message() default "{de.tum.cit.aet.artemis.communication.domain.PostConstraints}"; /** * @return the groups, default is empty diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/ReactionConstraints.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/ReactionConstraints.java index b3452c69170e..60b51aeecd37 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/ReactionConstraints.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/ReactionConstraints.java @@ -21,7 +21,7 @@ /** * @return the message of the violated constraint */ - String message() default "{de.tum.cit.aet.artemis.domain.metis.ReactionConstraints}"; + String message() default "{de.tum.cit.aet.artemis.communication.domain.ReactionConstraints}"; /** * @return the groups, default is empty diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/MessageSpecs.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/MessageSpecs.java index 9dcb9b50143d..938eb9d7a8d3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/MessageSpecs.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/MessageSpecs.java @@ -22,9 +22,9 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel_; import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation_; +import de.tum.cit.aet.artemis.core.domain.Course_; +import de.tum.cit.aet.artemis.core.domain.User_; import de.tum.cit.aet.artemis.core.dto.SortingOrder; -import de.tum.cit.aet.artemis.domain.Course_; -import de.tum.cit.aet.artemis.domain.User_; public class MessageSpecs { diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/NotificationRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/NotificationRepository.java index 4fcb50c78a8f..675fc24aa478 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/NotificationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/NotificationRepository.java @@ -34,16 +34,16 @@ LEFT JOIN TREAT(notification AS SingleUserNotification).recipient recipient (TYPE(notification) = GroupNotification AND (( course.instructorGroupName IN :currentGroups - AND TREAT(notification AS GroupNotification).type = de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.INSTRUCTOR + AND TREAT(notification AS GroupNotification).type = de.tum.cit.aet.artemis.communication.domain.GroupNotificationType.INSTRUCTOR ) OR ( course.teachingAssistantGroupName IN :currentGroups - AND TREAT(notification AS GroupNotification).type = de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.TA + AND TREAT(notification AS GroupNotification).type = de.tum.cit.aet.artemis.communication.domain.GroupNotificationType.TA ) OR ( course.editorGroupName IN :currentGroups - AND TREAT(notification AS GroupNotification).type = de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.EDITOR + AND TREAT(notification AS GroupNotification).type = de.tum.cit.aet.artemis.communication.domain.GroupNotificationType.EDITOR ) OR ( course.studentGroupName IN :currentGroups - AND TREAT(notification AS GroupNotification).type = de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.STUDENT + AND TREAT(notification AS GroupNotification).type = de.tum.cit.aet.artemis.communication.domain.GroupNotificationType.STUDENT ) ) ) OR (TYPE(notification) = SingleUserNotification @@ -71,16 +71,16 @@ LEFT JOIN TREAT(notification AS SingleUserNotification).recipient recipient AND (notification.title NOT IN :deactivatedTitles OR notification.title IS NULL) AND (( course.instructorGroupName IN :currentGroups - AND TREAT(notification AS GroupNotification).type = de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.INSTRUCTOR + AND TREAT(notification AS GroupNotification).type = de.tum.cit.aet.artemis.communication.domain.GroupNotificationType.INSTRUCTOR ) OR ( course.teachingAssistantGroupName IN :currentGroups - AND TREAT(notification AS GroupNotification).type = de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.TA + AND TREAT(notification AS GroupNotification).type = de.tum.cit.aet.artemis.communication.domain.GroupNotificationType.TA ) OR ( course.editorGroupName IN :currentGroups - AND TREAT(notification AS GroupNotification).type = de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.EDITOR + AND TREAT(notification AS GroupNotification).type = de.tum.cit.aet.artemis.communication.domain.GroupNotificationType.EDITOR ) OR ( course.studentGroupName IN :currentGroups - AND TREAT(notification AS GroupNotification).type = de.tum.cit.aet.artemis.domain.enumeration.GroupNotificationType.STUDENT + AND TREAT(notification AS GroupNotification).type = de.tum.cit.aet.artemis.communication.domain.GroupNotificationType.STUDENT ) ) ) OR (TYPE(notification) = SingleUserNotification diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/ConversationRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/ConversationRepository.java index 8e8e36e18a80..09faeaeead0e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/ConversationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/ConversationRepository.java @@ -41,7 +41,7 @@ public interface ConversationRepository extends ArtemisJpaRepository= :startDate AND r.completionDate <= :endDate AND ( - r.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.MANUAL - OR r.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.SEMI_AUTOMATIC + r.assessmentType = de.tum.cit.aet.artemis.assessment.domain.AssessmentType.MANUAL + OR r.assessmentType = de.tum.cit.aet.artemis.assessment.domain.AssessmentType.SEMI_AUTOMATIC ) AND r.assessor.login NOT LIKE '%test%' AND ( r.participation.exercise.exerciseGroup IS NOT NULL @@ -345,8 +345,8 @@ OR EXISTS (SELECT c FROM Course c WHERE r.participation.exercise.course.testCour WHERE r.completionDate >= :startDate AND r.completionDate <= :endDate AND ( - r.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.MANUAL - OR r.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.SEMI_AUTOMATIC + r.assessmentType = de.tum.cit.aet.artemis.assessment.domain.AssessmentType.MANUAL + OR r.assessmentType = de.tum.cit.aet.artemis.assessment.domain.AssessmentType.SEMI_AUTOMATIC ) AND r.assessor.login NOT LIKE '%test%' AND r.participation.exercise.id IN :exerciseIds """) @@ -362,8 +362,8 @@ List getActiveTutorsForCourse(@Param("startDate") ZonedDateTime WHERE r.completionDate >= :startDate AND r.completionDate <= :endDate AND ( - r.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.MANUAL - OR r.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.SEMI_AUTOMATIC + r.assessmentType = de.tum.cit.aet.artemis.assessment.domain.AssessmentType.MANUAL + OR r.assessmentType = de.tum.cit.aet.artemis.assessment.domain.AssessmentType.SEMI_AUTOMATIC ) AND r.assessor.login NOT LIKE '%test%' AND r.participation.exercise.id = :exerciseId """) @@ -544,7 +544,7 @@ List getResolvedExercisePostsInDateRange(@Param("startDate") Zo List findExerciseIdsByCourseId(@Param("courseId") long courseId); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.statistics.CourseStatisticsAverageScore( + SELECT new de.tum.cit.aet.artemis.core.dto.CourseStatisticsAverageScore( p.exercise.id, p.exercise.title, p.exercise.releaseDate, diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java index 0b7de380a43f..b37113931ca0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java @@ -137,7 +137,7 @@ public interface UserRepository extends ArtemisJpaRepository, JpaSpe @Query(""" SELECT new de.tum.cit.aet.artemis.service.dto.UserRoleDTO(user.id, user.login, CASE - WHEN :#{T(de.tum.cit.aet.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities THEN 'INSTRUCTOR' + WHEN :#{T(de.tum.cit.aet.artemis.core.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities THEN 'INSTRUCTOR' WHEN course.instructorGroupName MEMBER OF user.groups THEN 'INSTRUCTOR' WHEN course.editorGroupName MEMBER OF user.groups THEN 'TUTOR' WHEN course.teachingAssistantGroupName MEMBER OF user.groups THEN 'TUTOR' @@ -197,7 +197,7 @@ OR LOWER(user.login) = LOWER(:searchInput) Set findAllByIsDeletedIsFalseAndGroupsContains(String groupName); @Query(""" - SELECT new de.tum.cit.aet.artemis.domain.ConversationNotificationRecipientSummary ( + SELECT new de.tum.cit.aet.artemis.communication.domain.ConversationNotificationRecipientSummary ( user.id, user.login, user.firstName, @@ -824,7 +824,7 @@ void updateUserVcsAccessToken(@Param("userId") long userId, @Param("vcsAccessTok SELECT user.login FROM User user WHERE user.groups IS EMPTY AND NOT user.isDeleted - AND NOT :#{T(de.tum.cit.aet.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities + AND NOT :#{T(de.tum.cit.aet.artemis.core.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities ORDER BY user.login """) List findAllNotEnrolledUsers(); @@ -1203,7 +1203,7 @@ default boolean isCurrentUser(String login) { @Query(""" SELECT user.login FROM User user - WHERE :#{T(de.tum.cit.aet.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities + WHERE :#{T(de.tum.cit.aet.artemis.core.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities AND user.activated = TRUE AND user.isDeleted = FALSE """) @@ -1213,7 +1213,7 @@ default boolean isCurrentUser(String login) { SELECT COUNT(user) > 0 FROM User user WHERE user.login = :login - AND :#{T(de.tum.cit.aet.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities + AND :#{T(de.tum.cit.aet.artemis.core.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities """) boolean isAdmin(@Param("login") String login); @@ -1227,7 +1227,7 @@ SELECT COUNT(user) > 0 OR (course.teachingAssistantGroupName MEMBER OF user.groups) OR (course.editorGroupName MEMBER OF user.groups) OR (course.instructorGroupName MEMBER OF user.groups) - OR (:#{T(de.tum.cit.aet.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) + OR (:#{T(de.tum.cit.aet.artemis.core.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) """) boolean isAtLeastStudentInCourse(@Param("login") String login, @Param("courseId") long courseId); @@ -1240,7 +1240,7 @@ SELECT COUNT(user) > 0 WHERE (course.teachingAssistantGroupName MEMBER OF user.groups) OR (course.editorGroupName MEMBER OF user.groups) OR (course.instructorGroupName MEMBER OF user.groups) - OR (:#{T(de.tum.cit.aet.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) + OR (:#{T(de.tum.cit.aet.artemis.core.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) """) boolean isAtLeastTeachingAssistantInCourse(@Param("login") String login, @Param("courseId") long courseId); @@ -1252,7 +1252,7 @@ SELECT COUNT(user) > 0 AND course.id = :courseId WHERE (course.editorGroupName MEMBER OF user.groups) OR (course.instructorGroupName MEMBER OF user.groups) - OR (:#{T(de.tum.cit.aet.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) + OR (:#{T(de.tum.cit.aet.artemis.core.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) """) boolean isAtLeastEditorInCourse(@Param("login") String login, @Param("courseId") long courseId); @@ -1263,7 +1263,7 @@ SELECT COUNT(user) > 0 ON user.login = :login AND course.id = :courseId WHERE (course.instructorGroupName MEMBER OF user.groups) - OR (:#{T(de.tum.cit.aet.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) + OR (:#{T(de.tum.cit.aet.artemis.core.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) """) boolean isAtLeastInstructorInCourse(@Param("login") String login, @Param("courseId") long courseId); @@ -1283,7 +1283,7 @@ SELECT COUNT(user) > 0 OR (examCourse.teachingAssistantGroupName MEMBER OF user.groups) OR (examCourse.editorGroupName MEMBER OF user.groups) OR (examCourse.instructorGroupName MEMBER OF user.groups) - OR (:#{T(de.tum.cit.aet.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) + OR (:#{T(de.tum.cit.aet.artemis.core.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) """) boolean isAtLeastStudentInExercise(@Param("login") String login, @Param("exerciseId") long exerciseId); @@ -1301,7 +1301,7 @@ SELECT COUNT(user) > 0 OR (examCourse.teachingAssistantGroupName MEMBER OF user.groups) OR (examCourse.editorGroupName MEMBER OF user.groups) OR (examCourse.instructorGroupName MEMBER OF user.groups) - OR (:#{T(de.tum.cit.aet.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) + OR (:#{T(de.tum.cit.aet.artemis.core.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) """) boolean isAtLeastTeachingAssistantInExercise(@Param("login") String login, @Param("exerciseId") long exerciseId); @@ -1317,7 +1317,7 @@ SELECT COUNT(user) > 0 OR (course.instructorGroupName MEMBER OF user.groups) OR (examCourse.editorGroupName MEMBER OF user.groups) OR (examCourse.instructorGroupName MEMBER OF user.groups) - OR (:#{T(de.tum.cit.aet.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) + OR (:#{T(de.tum.cit.aet.artemis.core.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) """) boolean isAtLeastEditorInExercise(@Param("login") String login, @Param("exerciseId") long exerciseId); @@ -1331,7 +1331,7 @@ SELECT COUNT(user) > 0 LEFT JOIN exercise.exerciseGroup.exam.course examCourse WHERE (course.instructorGroupName MEMBER OF user.groups) OR (examCourse.instructorGroupName MEMBER OF user.groups) - OR (:#{T(de.tum.cit.aet.artemis.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) + OR (:#{T(de.tum.cit.aet.artemis.core.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities) """) boolean isAtLeastInstructorInExercise(@Param("login") String login, @Param("exerciseId") long exerciseId); } diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/UserSpecs.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/UserSpecs.java index 805e9930fe6a..6c059c3cd158 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/UserSpecs.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/UserSpecs.java @@ -10,9 +10,9 @@ import org.springframework.data.jpa.domain.Specification; import de.tum.cit.aet.artemis.core.domain.Authority; +import de.tum.cit.aet.artemis.core.domain.Authority_; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.domain.Authority_; -import de.tum.cit.aet.artemis.domain.User_; +import de.tum.cit.aet.artemis.core.domain.User_; /** * This class contains possible specifications to query for specified users. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/base/RepositoryImpl.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/base/RepositoryImpl.java index 2dd7531a3964..af41b6e3c0d8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/base/RepositoryImpl.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/base/RepositoryImpl.java @@ -12,7 +12,7 @@ import org.springframework.data.jpa.repository.support.JpaEntityInformationSupport; import org.springframework.data.jpa.repository.support.SimpleJpaRepository; -import de.tum.cit.aet.artemis.domain.DomainObject_; +import de.tum.cit.aet.artemis.core.domain.DomainObject_; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; public class RepositoryImpl extends SimpleJpaRepository { diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseMetricsRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseMetricsRepository.java index ed36a71c6c66..f9988dd63817 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseMetricsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseMetricsRepository.java @@ -166,7 +166,7 @@ AND COALESCE(p.lastRatedScore, p.lastScore, 0) >= :minScore FROM Exercise e LEFT JOIN e.teams t LEFT JOIN t.students u - WHERE e.mode = de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode.TEAM + WHERE e.mode = de.tum.cit.aet.artemis.exercise.domain.ExerciseMode.TEAM AND e.id IN :exerciseIds AND u.id = :userId """) diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java index 37817a8e7be8..f3b002e2ef80 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java @@ -61,7 +61,7 @@ public interface ExerciseRepository extends ArtemisJpaRepository SELECT e FROM Exercise e WHERE e.course.id = :courseId - AND e.mode = de.tum.cit.aet.artemis.domain.enumeration.ExerciseMode.TEAM + AND e.mode = de.tum.cit.aet.artemis.exercise.domain.ExerciseMode.TEAM """) Set findAllTeamExercisesByCourseId(@Param("courseId") Long courseId); diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ParticipationRepository.java index 4532a742b4b4..21d97fb368f9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ParticipationRepository.java @@ -62,7 +62,7 @@ default Participation findByIdWithLatestSubmissionElseThrow(Long participationId FROM Participation p LEFT JOIN FETCH p.submissions s WHERE p.id = :participationId - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) """) Optional findWithEagerLegalSubmissionsById(@Param("participationId") long participationId); diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java index 344747ac9a20..24e02ea48e34 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java @@ -90,7 +90,7 @@ SELECT COUNT(p.id) > 0 WHERE p.testRun = FALSE AND p.exercise.exerciseGroup.exam.id = :examId AND r.rated = TRUE - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) """) List findByExamIdWithEagerLegalSubmissionsRatedResults(@Param("examId") long examId); @@ -124,7 +124,7 @@ SELECT COUNT(p.id) > 0 LEFT JOIN FETCH p.submissions s WHERE p.exercise.id = :exerciseId AND p.student.login = :username - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) """) Optional findWithEagerLegalSubmissionsByExerciseIdAndStudentLogin(@Param("exerciseId") long exerciseId, @Param("username") String username); @@ -134,7 +134,7 @@ SELECT COUNT(p.id) > 0 LEFT JOIN FETCH p.submissions s WHERE p.exercise.id = :exerciseId AND p.student.login = :username - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) AND p.testRun = :testRun """) Optional findWithEagerLegalSubmissionsByExerciseIdAndStudentLoginAndTestRun(@Param("exerciseId") long exerciseId, @Param("username") String username, @@ -156,7 +156,7 @@ Optional findWithEagerLegalSubmissionsByExerciseIdAndStude LEFT JOIN FETCH t.students WHERE p.exercise.id = :exerciseId AND p.team.id = :teamId - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) """) Optional findWithEagerLegalSubmissionsAndTeamStudentsByExerciseIdAndTeamId(@Param("exerciseId") long exerciseId, @Param("teamId") long teamId); @@ -186,7 +186,7 @@ SELECT COUNT(p) > 0 LEFT JOIN FETCH s.results WHERE p.exercise.id = :exerciseId AND p.testRun = :testRun - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) """) List findByExerciseIdAndTestRunWithEagerLegalSubmissionsResult(@Param("exerciseId") long exerciseId, @Param("testRun") boolean testRun); @@ -246,7 +246,7 @@ Optional findByExerciseIdAndStudentIdAndTestRunWithEagerSu WHERE p.exercise.id = :exerciseId AND ( r.id = (SELECT MAX(p_r.id) FROM p.results p_r) - OR r.assessmentType <> de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.AUTOMATIC + OR r.assessmentType <> de.tum.cit.aet.artemis.assessment.domain.AssessmentType.AUTOMATIC OR r IS NULL ) """) @@ -271,7 +271,7 @@ Optional findByExerciseIdAndStudentIdAndTestRunWithEagerSu WHERE p.exercise.id = :exerciseId AND ( r.id = (SELECT MAX(p_r.id) FROM p.results p_r) - OR r.assessmentType <> de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.AUTOMATIC + OR r.assessmentType <> de.tum.cit.aet.artemis.assessment.domain.AssessmentType.AUTOMATIC OR r IS NULL ) """) @@ -287,7 +287,7 @@ Optional findByExerciseIdAndStudentIdAndTestRunWithEagerSu WHERE p.exercise.id = :exerciseId AND ( r.id = (SELECT MAX(p_r.id) FROM p.results p_r WHERE p_r.rated = TRUE) - OR r.assessmentType <> de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.AUTOMATIC + OR r.assessmentType <> de.tum.cit.aet.artemis.assessment.domain.AssessmentType.AUTOMATIC OR r IS NULL ) """) @@ -300,8 +300,8 @@ Optional findByExerciseIdAndStudentIdAndTestRunWithEagerSu LEFT JOIN FETCH r.submission s WHERE p.exercise.id = :exerciseId AND p.testRun = :testRun - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) - AND r.assessmentType <> de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.AUTOMATIC + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) + AND r.assessmentType <> de.tum.cit.aet.artemis.assessment.domain.AssessmentType.AUTOMATIC AND r.id = (SELECT MAX(r2.id) FROM p.results r2 WHERE r2.completionDate IS NOT NULL) """) Set findByExerciseIdAndTestRunWithEagerLegalSubmissionsAndLatestResultWithCompletionDate(@Param("exerciseId") long exerciseId, @@ -325,9 +325,9 @@ Set findByExerciseIdAndTestRunWithEagerLegalSubmissionsAnd SELECT MAX(pr.id) FROM p.results pr LEFT JOIN pr.submission prs - WHERE pr.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.AUTOMATIC + WHERE pr.assessmentType = de.tum.cit.aet.artemis.assessment.domain.AssessmentType.AUTOMATIC AND ( - prs.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL + prs.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR prs.type IS NULL ) )) @@ -357,9 +357,9 @@ default List findByExerciseIdWithLatestAutomaticResultAndF SELECT MAX(pr.id) FROM p.results pr LEFT JOIN pr.submission prs - WHERE pr.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.AUTOMATIC + WHERE pr.assessmentType = de.tum.cit.aet.artemis.assessment.domain.AssessmentType.AUTOMATIC AND ( - prs.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL + prs.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR prs.type IS NULL ) )) @@ -375,10 +375,10 @@ SELECT MAX(pr.id) LEFT JOIN FETCH f.testCase LEFT JOIN FETCH r.submission s WHERE p.exercise.id = :exerciseId - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) AND ( - r.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.MANUAL - OR r.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.SEMI_AUTOMATIC + r.assessmentType = de.tum.cit.aet.artemis.assessment.domain.AssessmentType.MANUAL + OR r.assessmentType = de.tum.cit.aet.artemis.assessment.domain.AssessmentType.SEMI_AUTOMATIC ) """) List findByExerciseIdWithManualResultAndFeedbacksAndTestCases(@Param("exerciseId") long exerciseId); @@ -395,10 +395,10 @@ default List findByExerciseIdWithManualResultAndFeedbacksA LEFT JOIN FETCH f.testCase LEFT JOIN FETCH r.submission s WHERE p.id = :participationId - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) AND ( - r.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.MANUAL - OR r.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.SEMI_AUTOMATIC + r.assessmentType = de.tum.cit.aet.artemis.assessment.domain.AssessmentType.MANUAL + OR r.assessmentType = de.tum.cit.aet.artemis.assessment.domain.AssessmentType.SEMI_AUTOMATIC ) """) Optional findByIdWithManualResultAndFeedbacks(@Param("participationId") long participationId); @@ -409,7 +409,7 @@ default List findByExerciseIdWithManualResultAndFeedbacksA LEFT JOIN FETCH p.submissions s WHERE p.exercise.id = :exerciseId AND p.student.id = :studentId - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) """) List findByExerciseIdAndStudentIdWithEagerLegalSubmissions(@Param("exerciseId") long exerciseId, @Param("studentId") long studentId); @@ -437,7 +437,7 @@ default List findByExerciseIdWithManualResultAndFeedbacksA LEFT JOIN FETCH p.submissions s WHERE p.exercise.id = :exerciseId AND p.team.id = :teamId - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) """) List findByExerciseIdAndTeamIdWithEagerLegalSubmissions(@Param("exerciseId") long exerciseId, @Param("teamId") long teamId); @@ -461,8 +461,8 @@ default List findByExerciseIdWithManualResultAndFeedbacksA LEFT JOIN FETCH t.students WHERE p.exercise.id = :exerciseId AND p.team.id = :teamId - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) - AND (rs.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR rs.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (rs.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR rs.type IS NULL) """) List findByExerciseIdAndTeamIdWithEagerResultsAndLegalSubmissionsAndTeamStudents(@Param("exerciseId") long exerciseId, @Param("teamId") long teamId); @@ -480,7 +480,7 @@ default List findByExerciseIdWithManualResultAndFeedbacksA SELECT MAX(pr.id) FROM p.results pr LEFT JOIN pr.submission prs - WHERE prs.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL + WHERE prs.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR prs.type IS NULL ) OR r.id IS NULL) """) @@ -522,15 +522,15 @@ SELECT COUNT(r) AND r.submission = submission AND r.completionDate IS NOT NULL AND r.assessmentType IN ( - de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.MANUAL, - de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.SEMI_AUTOMATIC + de.tum.cit.aet.artemis.assessment.domain.AssessmentType.MANUAL, + de.tum.cit.aet.artemis.assessment.domain.AssessmentType.SEMI_AUTOMATIC ) AND (p.exercise.dueDate IS NULL OR r.submission.submissionDate <= p.exercise.dueDate) ) AND :correctionRound = ( SELECT COUNT(prs) FROM p.results prs WHERE prs.assessmentType IN ( - de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.MANUAL, - de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.SEMI_AUTOMATIC + de.tum.cit.aet.artemis.assessment.domain.AssessmentType.MANUAL, + de.tum.cit.aet.artemis.assessment.domain.AssessmentType.SEMI_AUTOMATIC ) ) AND submission.submitted = TRUE AND submission.id = (SELECT MAX(s.id) FROM p.submissions s) @@ -554,8 +554,8 @@ AND NOT EXISTS ( SELECT prs FROM p.results prs WHERE prs.assessmentType IN ( - de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.MANUAL, - de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.SEMI_AUTOMATIC + de.tum.cit.aet.artemis.assessment.domain.AssessmentType.MANUAL, + de.tum.cit.aet.artemis.assessment.domain.AssessmentType.SEMI_AUTOMATIC ) ) AND s.submitted = TRUE AND s.id = (SELECT MAX(s.id) FROM p.submissions s) @@ -568,7 +568,7 @@ List findByExerciseIdWithLatestSubmissionWithoutManualResu FROM Participation p LEFT JOIN FETCH p.submissions s WHERE p.id = :participationId - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) """) Optional findWithEagerLegalSubmissionsById(@Param("participationId") long participationId); @@ -590,7 +590,7 @@ List findByExerciseIdWithLatestSubmissionWithoutManualResu LEFT JOIN FETCH r.submission s LEFT JOIN FETCH r.feedbacks WHERE p.id = :participationId - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) """) Optional findWithEagerResultsAndFeedbackById(@Param("participationId") long participationId); @@ -614,8 +614,8 @@ List findByExerciseIdWithLatestSubmissionWithoutManualResu LEFT JOIN FETCH p.team t LEFT JOIN FETCH t.students WHERE p.id = :participationId - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) - AND (rs.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR rs.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (rs.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR rs.type IS NULL) """) Optional findWithEagerLegalSubmissionsResultsFeedbacksById(@Param("participationId") long participationId); @@ -627,8 +627,8 @@ List findByExerciseIdWithLatestSubmissionWithoutManualResu LEFT JOIN FETCH p.submissions s LEFT JOIN FETCH r.assessor WHERE p.id = :participationId - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) - AND (rs.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR rs.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (rs.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR rs.type IS NULL) """) Optional findWithEagerLegalSubmissionsAndResultsAssessorsById(@Param("participationId") long participationId); @@ -700,8 +700,8 @@ default Page findAllWithEagerSubmissionsAndResultsByExerci LEFT JOIN FETCH p.submissions s LEFT JOIN FETCH s.results sr WHERE p.exercise.id = :exerciseId - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) - AND (rs.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR rs.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (rs.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR rs.type IS NULL) """) List findAllWithEagerLegalSubmissionsAndEagerResultsByExerciseId(@Param("exerciseId") long exerciseId); @@ -733,7 +733,7 @@ default Page findAllWithEagerSubmissionsAndResultsByExerci AND p.testRun = FALSE AND s.id = (SELECT MAX(s2.id) FROM p.submissions s2 - WHERE s2.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s2.type IS NULL) + WHERE s2.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s2.type IS NULL) AND r.id = (SELECT MAX(r2.id) FROM s.results r2 WHERE r2.rated = TRUE) @@ -820,7 +820,7 @@ List findTestRunParticipationsByStudentIdAndIndividualExer LEFT JOIN FETCH t.students teamStudent WHERE teamStudent.id = :studentId AND p.exercise IN :exercises - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) """) Set findByStudentIdAndTeamExercisesWithEagerLegalSubmissionsResult(@Param("studentId") long studentId, @Param("exercises") Collection exercises); @@ -833,7 +833,7 @@ Set findByStudentIdAndTeamExercisesWithEagerLegalSubmissio LEFT JOIN FETCH p.team t WHERE p.exercise.course.id = :courseId AND t.shortName = :teamShortName - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) """) List findAllByCourseIdAndTeamShortNameWithEagerLegalSubmissionsResult(@Param("courseId") long courseId, @Param("teamShortName") String teamShortName); @@ -865,7 +865,7 @@ SELECT p.id, COUNT(s) LEFT JOIN p.submissions s WHERE p.team.shortName = :teamShortName AND p.exercise.course.id = :courseId - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) GROUP BY p.id """) List countLegalSubmissionsPerParticipationByCourseIdAndTeamShortName(@Param("courseId") long courseId, @Param("teamShortName") String teamShortName); diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java index bd8ac532d414..c34441ef5abc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java @@ -212,7 +212,7 @@ SELECT COUNT(DISTINCT s) FROM Submission s LEFT JOIN FETCH s.results r WHERE r.assessor.id IS NOT NULL - AND r.assessmentType <> de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.AUTOMATIC + AND r.assessmentType <> de.tum.cit.aet.artemis.assessment.domain.AssessmentType.AUTOMATIC AND r.completionDate IS NULL AND s.participation.exercise.exerciseGroup.exam.id = :examId """) @@ -294,7 +294,7 @@ SELECT COUNT(DISTINCT p) JOIN p.submissions s WHERE e.id = :exerciseId AND s.submitted = TRUE - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) AND (e.dueDate IS NULL OR s.submissionDate <= e.dueDate) """) long countByExerciseIdSubmittedBeforeDueDate(@Param("exerciseId") long exerciseId); @@ -314,7 +314,7 @@ SELECT COUNT(DISTINCT p) WHERE e.id = :exerciseId AND p.testRun = FALSE AND s.submitted = TRUE - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) AND (e.dueDate IS NULL OR s.submissionDate <= e.dueDate) """) long countByExerciseIdSubmittedBeforeDueDateIgnoreTestRuns(@Param("exerciseId") long exerciseId); diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisMessageRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisMessageRepository.java index 6626e8f56a67..29a126a42936 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisMessageRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisMessageRepository.java @@ -36,7 +36,7 @@ SELECT COUNT(DISTINCT m) FROM IrisMessage m JOIN TREAT (m.session AS IrisChatSession) s WHERE s.user.id = :userId - AND m.sender = de.tum.cit.aet.artemis.domain.iris.message.IrisMessageSender.LLM + AND m.sender = de.tum.cit.aet.artemis.iris.domain.message.IrisMessageSender.LLM AND m.sentAt BETWEEN :start AND :end """) int countLlmResponsesOfUserWithinTimeframe(@Param("userId") long userId, @Param("start") ZonedDateTime start, @Param("end") ZonedDateTime end); diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelingExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelingExerciseRepository.java index c7f0e2d5c8ab..f6e80c0c17b2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelingExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelingExerciseRepository.java @@ -70,7 +70,7 @@ public interface ModelingExerciseRepository extends ArtemisJpaRepository :now """) List findAllToBeScheduled(@Param("now") ZonedDateTime now); diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java index d0c860be64fa..b440faeb72d3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java @@ -27,11 +27,11 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.base.DynamicSpecificationRepository; import de.tum.cit.aet.artemis.core.repository.base.FetchOptions; -import de.tum.cit.aet.artemis.domain.Exercise_; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise_; +import de.tum.cit.aet.artemis.exercise.domain.Exercise_; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise_; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @@ -267,7 +267,7 @@ default ProgrammingExercise findOneByProjectKeyOrThrow(String projectKey, boolea LEFT JOIN FETCH t.students LEFT JOIN FETCH pep.submissions s WHERE pe.id = :exerciseId - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) """) Optional findWithEagerStudentParticipationsStudentAndLegalSubmissionsById(@Param("exerciseId") long exerciseId); @@ -375,7 +375,7 @@ Optional findByIdWithEagerBuildConfigTestCasesStaticCodeAna LEFT JOIN pe.testCases tc WHERE pe.dueDate > :now AND pe.buildAndTestStudentSubmissionsAfterDueDate IS NULL - AND tc.visibility = de.tum.cit.aet.artemis.domain.enumeration.Visibility.AFTER_DUE_DATE + AND tc.visibility = de.tum.cit.aet.artemis.assessment.domain.Visibility.AFTER_DUE_DATE """) List findAllByDueDateAfterDateWithTestsAfterDueDateWithoutBuildStudentSubmissionsDate(@Param("now") ZonedDateTime now); @@ -410,7 +410,7 @@ SELECT COUNT (DISTINCT p) WHERE p.exercise.id = :exerciseId AND p.testRun = FALSE AND s.submitted = TRUE - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) """) long countLegalSubmissionsByExerciseIdSubmittedIgnoreTestRunSubmissions(@Param("exerciseId") long exerciseId); @@ -432,7 +432,7 @@ SELECT COUNT (DISTINCT p) WHERE p.exercise.id IN :exerciseIds AND p.testRun = FALSE AND s.submitted = TRUE - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) GROUP BY p.exercise.id """) List countSubmissionsByExerciseIdsSubmittedIgnoreTestRun(@Param("exerciseIds") Set exerciseIds); @@ -452,7 +452,7 @@ SELECT COUNT (DISTINCT p) WHERE p.exercise.id = :exerciseId AND p.testRun = FALSE AND r.submission.submitted = TRUE - AND (r.submission.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR r.submission.type IS NULL) + AND (r.submission.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR r.submission.type IS NULL) AND r.assessor IS NOT NULL AND r.completionDate IS NOT NULL """) @@ -470,9 +470,9 @@ SELECT COUNT (DISTINCT p) SELECT COUNT (DISTINCT p) FROM ProgrammingExerciseStudentParticipation p JOIN p.submissions s - WHERE p.exercise.assessmentType <> de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.AUTOMATIC + WHERE p.exercise.assessmentType <> de.tum.cit.aet.artemis.assessment.domain.AssessmentType.AUTOMATIC AND p.exercise.exerciseGroup.exam.id = :examId - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) """) long countLegalSubmissionsByExamIdSubmitted(@Param("examId") long examId); @@ -488,10 +488,10 @@ SELECT COUNT (DISTINCT p) SELECT COUNT (DISTINCT p) FROM ProgrammingExerciseStudentParticipation p JOIN p.submissions s - WHERE p.exercise.assessmentType <> de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.AUTOMATIC + WHERE p.exercise.assessmentType <> de.tum.cit.aet.artemis.assessment.domain.AssessmentType.AUTOMATIC AND p.exercise.id IN :exerciseIds AND s.submitted = TRUE - AND (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) """) long countAllSubmissionsByExerciseIdsSubmitted(@Param("exerciseIds") Set exerciseIds); diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseStudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseStudentParticipationRepository.java index fefa355c3c73..63bab2cd8573 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseStudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseStudentParticipationRepository.java @@ -37,7 +37,7 @@ public interface ProgrammingExerciseStudentParticipationRepository extends Artem AND (pr.id = ( SELECT MAX(prr.id) FROM p.results prr - WHERE (prr.assessmentType = de.tum.cit.aet.artemis.domain.enumeration.AssessmentType.AUTOMATIC + WHERE (prr.assessmentType = de.tum.cit.aet.artemis.assessment.domain.AssessmentType.AUTOMATIC OR (prr.completionDate IS NOT NULL AND (p.exercise.assessmentDueDate IS NULL OR p.exercise.assessmentDueDate < :dateTime) ) @@ -210,9 +210,9 @@ default ProgrammingExerciseStudentParticipation findWithTeamStudentsByIdElseThro @Modifying @Query(""" UPDATE ProgrammingExerciseStudentParticipation p - SET p.buildPlanId = NULL, p.initializationState = de.tum.cit.aet.artemis.domain.enumeration.InitializationState.INACTIVE + SET p.buildPlanId = NULL, p.initializationState = de.tum.cit.aet.artemis.exercise.domain.InitializationState.INACTIVE WHERE p.exercise.id = :#{#exerciseId} - AND p.initializationState = de.tum.cit.aet.artemis.domain.enumeration.InitializationState.INITIALIZED + AND p.initializationState = de.tum.cit.aet.artemis.exercise.domain.InitializationState.INITIALIZED """) void unsetBuildPlanIdForExercise(@Param("exerciseId") Long exerciseId); } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseTestCaseRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseTestCaseRepository.java index b067931544ef..be709d2d8ce4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseTestCaseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseTestCaseRepository.java @@ -85,7 +85,7 @@ default ProgrammingExerciseTestCase findByIdWithExerciseElseThrow(long testCaseI SELECT COUNT(DISTINCT testCase) FROM ProgrammingExerciseTestCase testCase WHERE testCase.exercise.id = :exerciseId - AND testCase.visibility = de.tum.cit.aet.artemis.domain.enumeration.Visibility.AFTER_DUE_DATE + AND testCase.visibility = de.tum.cit.aet.artemis.assessment.domain.Visibility.AFTER_DUE_DATE """) long countAfterDueDateByExerciseId(@Param("exerciseId") long exerciseId); } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingSubmissionRepository.java index ac4f00f3f46f..05b3d769834f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingSubmissionRepository.java @@ -82,8 +82,8 @@ default Optional findFirstByParticipationIdWithResultsOrd JOIN s.participation p JOIN p.exercise e WHERE p.id = :participationId - AND (s.type = de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.INSTRUCTOR - OR s.type = de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.TEST + AND (s.type = de.tum.cit.aet.artemis.exercise.domain.SubmissionType.INSTRUCTOR + OR s.type = de.tum.cit.aet.artemis.exercise.domain.SubmissionType.TEST OR e.dueDate IS NULL OR s.submissionDate <= e.dueDate) ORDER BY s.submissionDate DESC diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/SolutionProgrammingExerciseParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/SolutionProgrammingExerciseParticipationRepository.java index aa5ddeb9ef23..59e88f508b8e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/SolutionProgrammingExerciseParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/SolutionProgrammingExerciseParticipationRepository.java @@ -16,10 +16,10 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.domain.DomainObject_; import de.tum.cit.aet.artemis.core.repository.base.DynamicSpecificationRepository; import de.tum.cit.aet.artemis.core.repository.base.FetchOptions; -import de.tum.cit.aet.artemis.domain.DomainObject_; -import de.tum.cit.aet.artemis.domain.Submission_; +import de.tum.cit.aet.artemis.exercise.domain.Submission_; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation_; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation_; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/TemplateProgrammingExerciseParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/TemplateProgrammingExerciseParticipationRepository.java index 6222a43ed3a4..4d02cf5d3359 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/TemplateProgrammingExerciseParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/TemplateProgrammingExerciseParticipationRepository.java @@ -16,10 +16,10 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.domain.DomainObject_; import de.tum.cit.aet.artemis.core.repository.base.DynamicSpecificationRepository; import de.tum.cit.aet.artemis.core.repository.base.FetchOptions; -import de.tum.cit.aet.artemis.domain.DomainObject_; -import de.tum.cit.aet.artemis.domain.Submission_; +import de.tum.cit.aet.artemis.exercise.domain.Submission_; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation_; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageReportRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageReportRepository.java index 4d42ca916bde..78e45cca34ee 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageReportRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageReportRepository.java @@ -40,7 +40,7 @@ public interface CoverageReportRepository extends ArtemisJpaRepository de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + AND (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) ORDER BY s.submissionDate DESC """) List findCoverageReportsByProgrammingExerciseId(@Param("programmingExerciseId") Long programmingExerciseId, Pageable pageable); diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseSpecificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseSpecificationService.java index 09f104f60316..72bc1854b164 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseSpecificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseSpecificationService.java @@ -12,16 +12,16 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Course_; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.domain.Course_; -import de.tum.cit.aet.artemis.domain.Exercise_; -import de.tum.cit.aet.artemis.domain.ProgrammingExercise_; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.Exam_; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup_; import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.Exercise_; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise_; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; diff --git a/src/main/webapp/app/overview/course-dashboard/course-dashboard.service.ts b/src/main/webapp/app/overview/course-dashboard/course-dashboard.service.ts index b048d24126f4..aab8b86f6153 100644 --- a/src/main/webapp/app/overview/course-dashboard/course-dashboard.service.ts +++ b/src/main/webapp/app/overview/course-dashboard/course-dashboard.service.ts @@ -104,15 +104,15 @@ export class CourseDashboardService { private mapToExerciseType(type: string): ExerciseType { switch (type) { - case 'de.tum.cit.aet.artemis.domain.ProgrammingExercise': + case 'de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise': return ExerciseType.PROGRAMMING; - case 'de.tum.cit.aet.artemis.domain.modeling.ModelingExercise': + case 'de.tum.cit.aet.artemis.modeling.domain.ModelingExercise': return ExerciseType.MODELING; - case 'de.tum.cit.aet.artemis.domain.quiz.QuizExercise': + case 'de.tum.cit.aet.artemis.quiz.domain.QuizExercise': return ExerciseType.QUIZ; - case 'de.tum.cit.aet.artemis.domain.TextExercise': + case 'de.tum.cit.aet.artemis.text.domain.TextExercise': return ExerciseType.TEXT; - case 'de.tum.cit.aet.artemis.domain.FileUploadExercise': + case 'de.tum.cit.aet.artemis.file.domain.FileUploadExercise': return ExerciseType.FILE_UPLOAD; default: throw new Error(`Unknown exercise type: ${type}`); diff --git a/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionTestRepository.java index d78c58edc9a5..348b0d9263a6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionTestRepository.java @@ -92,13 +92,13 @@ default ProgrammingSubmission findByIdWithResultsFeedbacksAssessorTestCases(long SELECT s FROM ProgrammingSubmission s LEFT JOIN FETCH s.results - WHERE (s.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL) + WHERE (s.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s.type IS NULL) AND s.participation.id = :participationId AND s.id = ( SELECT MAX(s2.id) FROM ProgrammingSubmission s2 WHERE s2.participation.id = :participationId - AND (s2.type <> de.tum.cit.aet.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s2.type IS NULL)) + AND (s2.type <> de.tum.cit.aet.artemis.exercise.domain.SubmissionType.ILLEGAL OR s2.type IS NULL)) """) Optional findFirstByParticipationIdOrderByLegalSubmissionDateDesc(@Param("participationId") Long participationId); } From a0a73cecddbe4521bd233fcbc88f4f96d803b1d7 Mon Sep 17 00:00:00 2001 From: Maximilian Anzinger Date: Wed, 11 Sep 2024 16:54:43 +0200 Subject: [PATCH 09/43] Temporarily adjust architecture tests --- .../de/tum/cit/aet/artemis/architecture/ArchitectureTest.java | 2 ++ .../cit/aet/artemis/architecture/ResourceArchitectureTest.java | 2 +- .../artemis/authorization/AuthorizationArchitectureTest.java | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java index b0eee3340045..3f2ad777322e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java @@ -39,6 +39,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -206,6 +207,7 @@ void testJSONImplementations() { .check(allClasses); } + @Disabled // TODO: Enable this test once the restructuring is done @Test void testDTOImplementations() { var dtoRecordRule = classes().that().haveSimpleNameEndingWith("DTO").and().areNotInterfaces().should().beRecords().andShould().beAnnotatedWith(JsonInclude.class) diff --git a/src/test/java/de/tum/cit/aet/artemis/architecture/ResourceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/architecture/ResourceArchitectureTest.java index 6edad9fd842b..a679466b8cd9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/architecture/ResourceArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/architecture/ResourceArchitectureTest.java @@ -43,7 +43,7 @@ void shouldBeNamedResource() { @Test void shouldBeInResourcePackage() { - ArchRule rule = classes().that().areAnnotatedWith(RestController.class).should().resideInAPackage("..rest..").because("resources should be in the package 'rest'."); + ArchRule rule = classes().that().areAnnotatedWith(RestController.class).should().resideInAPackage("..web..").because("resources should be in the package 'rest'."); rule.check(productionClasses); } diff --git a/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationArchitectureTest.java index 45f373667797..d6935ba7b900 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationArchitectureTest.java @@ -4,6 +4,7 @@ import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses; import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noMethods; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.RestController; @@ -43,6 +44,7 @@ void testNoPreAuthorizeOnRestEndpoints() { rule.check(productionClasses); } + @Disabled // TODO: Enable this test once the restructuring is done @Test void testEnforceAdminAnnotations() { ArchRule rule = methods().that().areAnnotatedWith(EnforceAdmin.class).and().areNotAnnotatedWith(ManualConfig.class).should().beDeclaredInClassesThat() From ff02f255112738038e6cb3ec8e1479b893bbab1c Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Wed, 11 Sep 2024 16:55:52 +0200 Subject: [PATCH 10/43] move services into modules (part 1) WORK IN PROGRESS --- .../assessment/domain/BonusStrategy.java | 2 +- .../assessment/domain/ParticipantScore.java | 2 +- .../aet/artemis/assessment/domain/Result.java | 6 +-- .../listener}/ResultListener.java | 6 +-- .../ParticipantScoreRepository.java | 2 +- .../repository/ResultRepository.java | 2 +- .../ParticipantScoreScheduleService.java | 9 ++-- .../dto}/ExerciseBaseDTO.java | 2 +- .../dto}/FeedbackBaseDTO.java | 2 +- .../dto}/ModelingExerciseDTO.java | 2 +- .../dto}/ModelingFeedbackDTO.java | 2 +- .../dto}/ModelingSubmissionDTO.java | 2 +- .../dto}/ProgrammingExerciseDTO.java | 2 +- .../dto}/ProgrammingFeedbackDTO.java | 2 +- .../dto}/ProgrammingSubmissionDTO.java | 2 +- .../dto}/SubmissionBaseDTO.java | 2 +- .../dto}/TextExerciseDTO.java | 2 +- .../dto}/TextFeedbackDTO.java | 2 +- .../dto}/TextSubmissionDTO.java | 2 +- .../service}/AthenaScheduleService.java | 4 +- .../service}/ScienceEventService.java | 2 +- .../competency/CompetencyJolService.java | 4 +- .../competency/CompetencyProgressService.java | 8 +-- .../competency/CompetencyRelationService.java | 2 +- .../service/competency/CompetencyService.java | 4 +- .../competency/CourseCompetencyService.java | 4 +- .../competency/KnowledgeAreaService.java | 2 +- .../competency/PrerequisiteService.java | 4 +- .../StandardizedCompetencyService.java | 2 +- .../LearningPathNavigationService.java | 4 +- .../learningpath/LearningPathNgxService.java | 2 +- .../LearningPathRecommendationService.java | 4 +- .../learningpath/LearningPathService.java | 4 +- .../ConversationMessageRepository.java | 2 +- .../service}/AnswerMessageService.java | 8 +-- .../ConversationMessagingService.java | 12 ++--- .../service}/NotificationScheduleService.java | 7 +-- .../service}/PostingService.java | 2 +- ...tionDeviceConfigurationCleanupService.java | 2 +- .../service}/ReactionService.java | 8 +-- .../WeeklyEmailSummaryScheduleService.java | 2 +- .../service}/conversation/ChannelService.java | 4 +- .../conversation/ConversationDTOService.java | 4 +- .../conversation/ConversationService.java | 2 +- .../conversation/GroupChatService.java | 2 +- .../conversation/OneToOneChatService.java | 2 +- .../auth/ChannelAuthorizationService.java | 2 +- .../ConversationAuthorizationService.java | 2 +- .../auth/GroupChatAuthorizationService.java | 2 +- .../OneToOneChatAuthorizationService.java | 2 +- .../errors/ChannelNameDuplicateException.java | 4 +- .../linkpreview/LinkPreviewService.java | 10 ++-- .../service/linkpreview/ogparser/Content.java | 2 +- .../linkpreview/ogparser/OgParser.java | 6 +-- .../linkpreview/ogparser/OpenGraph.java | 2 +- .../ogparser/htmlparser/OgMetaElement.java | 2 +- .../htmlparser/OgMetaElementHtmlParser.java | 2 +- .../ConversationNotificationService.java | 2 +- .../GeneralInstantNotificationService.java | 10 ++-- .../GroupNotificationScheduleService.java | 4 +- .../GroupNotificationService.java | 2 +- .../InstantNotificationService.java | 2 +- .../notifications/MailSendingService.java | 2 +- .../service/notifications/MailService.java | 2 +- ...ificationSettingsCommunicationChannel.java | 2 +- .../NotificationSettingsService.java | 2 +- .../SingleUserNotificationService.java | 6 +-- .../TutorialGroupNotificationService.java | 2 +- .../ApplePushNotificationService.java | 2 +- .../FirebasePushNotificationService.java | 2 +- .../FirebaseRelayNotificationRequests.java | 2 +- .../PushNotificationService.java | 4 +- .../RelayNotificationRequest.java | 2 +- .../PostSimilarityComparisonStrategy.java | 2 +- ...TitleJaccardSimilarityCompareStrategy.java | 2 +- .../core/aop/logging/LoggingAspect.java | 2 +- .../component}/TheiaInfoContributor.java | 2 +- .../core/config/CacheConfiguration.java | 2 +- .../aet/artemis/core/config/Constants.java | 2 +- .../aet/artemis/core/config/MetricsBean.java | 4 +- .../config/RestTemplateConfiguration.java | 4 +- .../core/config/SecurityConfiguration.java | 2 +- .../MigrationEntry20240614_140000.java | 2 +- .../WebsocketBrokerHealthIndicator.java | 2 +- .../tum/cit/aet/artemis/core/domain/User.java | 3 +- .../exception/VersionControlException.java | 2 +- .../core/repository/LdapUserRepository.java | 2 +- .../ArtemisAuthenticationProviderImpl.java | 4 +- ...ArtemisInternalAuthenticationProvider.java | 4 +- .../service}/ArchivalReportEntry.java | 2 +- .../service}/DataExportScheduleService.java | 10 ++-- .../service}/ScheduleService.java | 6 +-- .../service}/TelemetryService.java | 2 +- .../service}/UserScheduleService.java | 4 +- .../connectors/AbstractGitService.java | 2 +- .../BuildScriptGenerationService.java | 2 +- .../BuildScriptProviderService.java | 4 +- .../service/connectors/ConnectorHealth.java | 2 +- .../GenericBuildScriptGenerationService.java | 2 +- .../service/connectors/GitService.java | 4 +- .../connectors/HazelcastHealthIndicator.java | 2 +- .../service/connectors/SAML2Service.java | 8 +-- .../service/connectors/aeolus/Action.java | 2 +- .../connectors/aeolus/ActionDeserializer.java | 2 +- .../aeolus/AeolusBuildPlanService.java | 6 +-- .../AeolusBuildScriptGenerationService.java | 6 +-- .../connectors/aeolus/AeolusRepository.java | 2 +- .../connectors/aeolus/AeolusResult.java | 2 +- .../aeolus/AeolusTemplateService.java | 4 +- .../connectors/aeolus/DockerConfig.java | 2 +- .../connectors/aeolus/PlatformAction.java | 2 +- .../connectors/aeolus/ScriptAction.java | 2 +- .../service/connectors/aeolus/Windfile.java | 2 +- .../connectors/aeolus/WindfileMetadata.java | 2 +- .../dto/AeolusGenerationResponseDTO.java | 2 +- .../apollon/ApollonConversionService.java | 4 +- .../apollon/ApollonHealthIndicator.java | 4 +- .../apollon/dto/ApollonModelDTO.java | 2 +- .../connectors/athena/AthenaConnector.java | 4 +- .../athena/AthenaDTOConverterService.java | 26 +++++----- .../athena/AthenaFeedbackSendingService.java | 8 +-- .../AthenaFeedbackSuggestionsService.java | 12 ++--- .../athena/AthenaHealthIndicator.java | 4 +- .../athena/AthenaModuleService.java | 2 +- .../athena/AthenaRepositoryExportService.java | 4 +- .../AthenaSubmissionSelectionService.java | 4 +- .../AthenaSubmissionSendingService.java | 6 +-- .../ci/AbstractBuildPlanCreator.java | 2 +- ...actContinuousIntegrationResultService.java | 6 +-- .../AbstractContinuousIntegrationService.java | 2 +- .../service/connectors/ci/CIPermission.java | 2 +- .../ci/CIUserManagementService.java | 2 +- .../ContinuousIntegrationResultService.java | 2 +- ...nuousIntegrationServerHealthIndicator.java | 2 +- .../ci/ContinuousIntegrationService.java | 4 +- .../ContinuousIntegrationTriggerService.java | 2 +- .../ContinuousIntegrationUpdateService.java | 2 +- .../ci/notification/BuildLogParseUtils.java | 2 +- .../ci/notification/dto/CommitDTO.java | 2 +- .../ci/notification/dto/TestCaseDTO.java | 2 +- .../dto/TestCaseDetailMessageDTO.java | 2 +- .../ci/notification/dto/TestResultsDTO.java | 4 +- .../ci/notification/dto/TestSuiteDTO.java | 2 +- .../dto/TestwiseCoverageReportDTO.java | 2 +- ...bstractGitLabAuthorizationInterceptor.java | 2 +- .../GitLabAuthorizationInterceptor.java | 2 +- .../connectors/gitlab/GitLabException.java | 2 +- ...bPersonalAccessTokenManagementService.java | 6 +-- .../connectors/gitlab/GitLabService.java | 14 ++--- .../GitLabUserDoesNotExistException.java | 2 +- .../gitlab/GitLabUserManagementService.java | 6 +-- .../gitlab/GitlabInfoContributor.java | 2 +- .../gitlab/dto/GitLabCommitDTO.java | 2 +- ...LabPersonalAccessTokenListResponseDTO.java | 2 +- .../GitLabPersonalAccessTokenRequestDTO.java | 2 +- .../GitLabPersonalAccessTokenResponseDTO.java | 2 +- .../gitlab/dto/GitLabProjectDTO.java | 2 +- .../gitlab/dto/GitLabPushNotificationDTO.java | 2 +- .../gitlab/dto/GitLabRepositoryDTO.java | 2 +- .../GitLabCIAuthorizationInterceptor.java | 4 +- .../gitlabci/GitLabCIBuildPlanService.java | 4 +- .../gitlabci/GitLabCIInfoContributor.java | 2 +- ...abCIProgrammingLanguageFeatureService.java | 6 +-- .../gitlabci/GitLabCIResultService.java | 10 ++-- .../connectors/gitlabci/GitLabCIService.java | 10 ++-- .../gitlabci/GitLabCITriggerService.java | 4 +- .../GitLabCIUserManagementService.java | 4 +- .../JenkinsAuthorizationInterceptor.java | 2 +- .../connectors/jenkins/JenkinsEndpoints.java | 4 +- .../jenkins/JenkinsInfoContributor.java | 2 +- .../jenkins/JenkinsInternalUrlService.java | 2 +- ...kinsProgrammingLanguageFeatureService.java | 6 +-- .../jenkins/JenkinsResultService.java | 10 ++-- .../connectors/jenkins/JenkinsService.java | 18 +++---- .../jenkins/JenkinsTriggerService.java | 6 +-- .../jenkins/JenkinsUserManagementService.java | 12 ++--- .../jenkins/JenkinsXmlConfigBuilder.java | 2 +- .../jenkins/JenkinsXmlFileUtils.java | 2 +- .../build_plan/JenkinsBuildPlanCreator.java | 8 +-- .../JenkinsBuildPlanLinkInfoContributor.java | 2 +- .../build_plan/JenkinsBuildPlanService.java | 24 ++++----- .../build_plan/JenkinsBuildPlanUtils.java | 2 +- .../JenkinsPipelineScriptCreator.java | 4 +- .../jenkins/dto/JenkinsUserDTO.java | 2 +- .../jenkins/jobs/JenkinsJobPermission.java | 2 +- .../jobs/JenkinsJobPermissionsService.java | 2 +- .../jobs/JenkinsJobPermissionsUtils.java | 2 +- .../jenkins/jobs/JenkinsJobService.java | 4 +- .../ldap/LdapAuthenticationProvider.java | 14 ++--- .../LocalCIBuildConfigurationService.java | 8 +-- .../localci/LocalCIInfoContributor.java | 2 +- .../LocalCIPriorityQueueComparator.java | 4 +- ...alCIProgrammingLanguageFeatureService.java | 6 +-- .../localci/LocalCIQueueWebsocketService.java | 6 +-- .../LocalCIResultProcessingService.java | 16 +++--- .../localci/LocalCIResultService.java | 10 ++-- .../connectors/localci/LocalCIService.java | 16 +++--- .../localci/LocalCITriggerService.java | 24 ++++----- .../localci/SharedQueueManagementService.java | 8 +-- .../buildagent/BuildAgentDockerService.java | 6 +-- .../buildagent/BuildAgentSshKeyService.java | 2 +- .../buildagent/BuildJobContainerService.java | 4 +- .../buildagent/BuildJobExecutionService.java | 16 +++--- .../buildagent/BuildJobGitService.java | 4 +- .../buildagent/BuildJobManagementService.java | 6 +-- .../localci/buildagent/BuildLogsMap.java | 2 +- .../SharedQueueProcessingService.java | 12 ++--- .../buildagent/TestResultXmlParser.java | 4 +- .../localci/dto/BuildAgentInformation.java | 2 +- .../connectors/localci/dto/BuildConfig.java | 2 +- .../localci/dto/BuildJobQueueItem.java | 2 +- .../connectors/localci/dto/BuildResult.java | 4 +- .../localci/dto/DockerImageBuild.java | 2 +- .../connectors/localci/dto/JobTimingInfo.java | 2 +- .../localci/dto/RepositoryInfo.java | 2 +- .../localci/dto/ResultBuildJob.java | 2 +- .../localci/dto/ResultQueueItem.java | 2 +- .../localci/scaparser/ReportParser.java | 16 +++--- .../scaparser/exception/ParserException.java | 2 +- .../exception/UnsupportedToolException.java | 2 +- .../scaparser/strategy/CheckstyleParser.java | 2 +- .../scaparser/strategy/PMDCPDParser.java | 2 +- .../localci/scaparser/strategy/PMDParser.java | 2 +- .../scaparser/strategy/ParserPolicy.java | 4 +- .../scaparser/strategy/ParserStrategy.java | 2 +- .../scaparser/strategy/SpotbugsParser.java | 2 +- .../localci/scaparser/utils/FileUtils.java | 2 +- .../localci/scaparser/utils/ReportUtils.java | 2 +- .../localvc/LocalVCFetchFilter.java | 2 +- .../localvc/LocalVCInfoContributor.java | 2 +- ...CPersonalAccessTokenManagementService.java | 2 +- .../localvc/LocalVCPostPushHook.java | 2 +- .../localvc/LocalVCPrePushHook.java | 2 +- .../connectors/localvc/LocalVCPushFilter.java | 2 +- .../localvc/LocalVCRepositoryUri.java | 2 +- .../connectors/localvc/LocalVCService.java | 10 ++-- .../localvc/LocalVCServletService.java | 22 ++++---- .../ExternalPasswordResetInfoContributor.java | 2 +- .../service/connectors/lti/Lti13Service.java | 2 +- .../connectors/lti/LtiDeepLinkingService.java | 2 +- .../lti/LtiDynamicRegistrationService.java | 2 +- .../connectors/lti/LtiNewResultService.java | 2 +- .../service/connectors/lti/LtiService.java | 8 +-- .../pyris/PyrisConnectorException.java | 2 +- .../pyris/PyrisConnectorService.java | 12 ++--- .../connectors/pyris/PyrisDTOService.java | 20 +++---- .../pyris/PyrisHealthIndicator.java | 6 +-- .../connectors/pyris/PyrisJobService.java | 10 ++-- .../pyris/PyrisPipelineService.java | 24 ++++----- .../pyris/PyrisStatusUpdateService.java | 30 +++++------ .../connectors/pyris/PyrisWebhookService.java | 12 ++--- .../pyris/dto/PyrisErrorResponseDTO.java | 2 +- .../pyris/dto/PyrisHealthStatusDTO.java | 2 +- .../connectors/pyris/dto/PyrisModelDTO.java | 2 +- .../pyris/dto/PyrisPipelineExecutionDTO.java | 4 +- .../PyrisPipelineExecutionSettingsDTO.java | 2 +- ...PyrisChatPipelineExecutionBaseDataDTO.java | 15 ++++++ .../dto/chat/PyrisChatStatusUpdateDTO.java | 4 +- .../PyrisCourseChatPipelineExecutionDTO.java | 12 ++--- ...PyrisExerciseChatPipelineExecutionDTO.java | 19 +++++++ .../PyrisCompetencyExtractionInputDTO.java | 2 +- ...petencyExtractionPipelineExecutionDTO.java | 4 +- .../PyrisCompetencyRecommendationDTO.java | 2 +- .../PyrisCompetencyStatusUpdateDTO.java | 4 +- .../pyris/dto/data/PyrisBuildLogEntryDTO.java | 2 +- .../pyris/dto/data/PyrisCompetencyDTO.java | 4 +- .../pyris/dto/data/PyrisCourseDTO.java | 2 +- .../pyris/dto/data/PyrisExamDTO.java | 4 +- ...yrisExerciseWithStudentSubmissionsDTO.java | 4 +- .../dto/data/PyrisExtendedCourseDTO.java | 4 +- .../pyris/dto/data/PyrisFeedbackDTO.java | 2 +- .../dto/data/PyrisImageMessageContentDTO.java | 2 +- .../dto/data/PyrisJsonMessageContentDTO.java | 2 +- .../pyris/dto/data/PyrisLectureDTO.java | 2 +- .../pyris/dto/data/PyrisLectureUnitDTO.java | 2 +- .../dto/data/PyrisMessageContentBaseDTO.java | 2 +- .../pyris/dto/data/PyrisMessageDTO.java | 4 +- .../dto/data/PyrisProgrammingExerciseDTO.java | 2 +- .../pyris/dto/data/PyrisResultDTO.java | 2 +- .../dto/data/PyrisStudentSubmissionDTO.java | 2 +- .../pyris/dto/data/PyrisSubmissionDTO.java | 2 +- .../dto/data/PyrisTextMessageContentDTO.java | 2 +- .../pyris/dto/data/PyrisUserDTO.java | 2 +- .../PyrisLectureIngestionStatusUpdateDTO.java | 4 +- .../PyrisLectureUnitWebhookDTO.java | 2 +- ...isWebhookLectureIngestionExecutionDTO.java | 6 +-- .../pyris/dto/status/PyrisStageDTO.java | 2 +- .../pyris/dto/status/PyrisStageState.java | 2 +- .../pyris/job/CompetencyExtractionJob.java | 2 +- .../connectors/pyris/job/CourseChatJob.java | 2 +- .../connectors/pyris/job/ExerciseChatJob.java | 2 +- .../pyris/job/IngestionWebhookJob.java | 2 +- .../connectors/pyris/job/PyrisJob.java | 2 +- .../vcs/AbstractVersionControlService.java | 4 +- .../vcs/VcsTokenManagementService.java | 2 +- .../vcs/VcsTokenRenewalService.java | 4 +- .../vcs/VcsUserManagementService.java | 2 +- .../VersionControlRepositoryPermission.java | 2 +- .../VersionControlServerHealthIndicator.java | 2 +- .../connectors/vcs/VersionControlService.java | 4 +- .../export/CourseExamExportService.java | 9 +++- .../DataExportCommunicationDataService.java | 8 +-- .../export/DataExportCreationService.java | 10 ++-- .../export/DataExportExamCreationService.java | 10 ++-- .../DataExportExerciseCreationService.java | 13 ++--- ...DataExportQuizExerciseCreationService.java | 4 +- .../export/DataExportScienceEventService.java | 4 +- .../service/export/DataExportService.java | 2 +- .../service/export/DataExportUtil.java | 2 +- .../{ => core}/service/feature/Feature.java | 2 +- .../service/feature/FeatureToggle.java | 2 +- .../service/feature/FeatureToggleAspect.java | 2 +- .../feature/FeatureToggleInfoContributor.java | 2 +- .../service/feature/FeatureToggleService.java | 2 +- .../{ => core}/service/ldap/LdapConfig.java | 2 +- .../{ => core}/service/ldap/LdapUserDto.java | 2 +- .../service/ldap/LdapUserService.java | 2 +- ...DistributedInstanceMessageSendService.java | 2 +- .../InstanceMessageReceiveService.java | 16 +++--- .../messaging/InstanceMessageSendService.java | 2 +- .../MainInstanceMessageSendService.java | 2 +- .../service/messaging/MessageTopic.java | 2 +- .../service/user/AuthorityService.java | 2 +- .../service/user/PasswordService.java | 2 +- .../service/user/UserCreationService.java | 6 +-- .../user/UserManagementInfoContributor.java | 2 +- .../{ => core}/service/user/UserService.java | 14 ++--- .../util/CommonsMultipartFile.java | 2 +- .../ExamExerciseStartPreparationStatus.java | 2 +- .../util/HttpRequestUtils.java | 2 +- .../{service => core}/util/RoundingUtil.java | 2 +- .../{service => core}/util/TimeLogUtil.java | 2 +- .../{service => core}/util/TimeUtil.java | 2 +- .../artemis/{service => core}/util/Tuple.java | 2 +- .../{service => core}/util/UrlUtils.java | 2 +- .../web/admin/AdminBuildJobQueueResource.java | 6 +-- .../core/web/admin/AdminCourseResource.java | 2 +- .../web/admin/AdminDataExportResource.java | 2 +- .../admin/AdminLtiConfigurationResource.java | 2 +- .../admin/AdminModelingExerciseResource.java | 2 +- .../AdminStandardizedCompetencyResource.java | 8 +-- .../core/web/admin/AdminUserResource.java | 6 +-- .../core/web/admin/FeatureToggleResource.java | 4 +- .../admin/iris/AdminIrisSettingsResource.java | 2 +- .../core/web/filter/Lti13LaunchFilter.java | 2 +- .../exam/domain/event/ExamLiveEvent.java | 2 +- .../repository/StudentExamRepository.java | 2 +- .../service}/ExamAccessService.java | 2 +- .../service}/ExamDateService.java | 2 +- .../service}/ExamDeletionService.java | 4 +- .../service}/ExamImportService.java | 10 ++-- .../service}/ExamLiveEventsService.java | 2 +- .../service}/ExamQuizQuestionsGenerator.java | 2 +- .../service}/ExamQuizService.java | 4 +- .../service}/ExamRegistrationService.java | 4 +- .../exam => exam/service}/ExamService.java | 20 +++---- .../service}/ExamSessionService.java | 2 +- .../service}/ExamSubmissionService.java | 2 +- .../service}/ExamUserService.java | 2 +- .../exam => exam/service}/ImageExtractor.java | 2 +- .../service}/StudentExamAccessService.java | 2 +- .../service}/StudentExamService.java | 12 ++--- .../ExerciseWithSubmissionsExportService.java | 12 +++-- .../service}/IExerciseScheduleService.java | 2 +- .../service}/LearningMetricsService.java | 4 +- .../service}/SubmissionExportService.java | 4 +- .../service/team}/CreateOnlyStrategy.java | 3 +- .../service/team}/PurgeExistingStrategy.java | 3 +- .../service/team/TeamImportStrategy.java | 2 +- .../service/team}/TeamService.java | 10 ++-- ...dExerciseWithSubmissionsExportService.java | 5 +- .../FileUploadSubmissionExportService.java | 3 +- .../iris/domain/settings/IrisSettings.java | 2 +- .../iris/domain/settings/IrisSubSettings.java | 2 +- .../iris/dto/IrisChatWebsocketDTO.java | 6 +-- .../dto/IrisCombinedChatSubSettingsDTO.java | 2 +- ...nedCompetencyGenerationSubSettingsDTO.java | 2 +- .../dto/IrisCombinedHestiaSubSettingsDTO.java | 2 +- ...ombinedLectureIngestionSubSettingsDTO.java | 2 +- .../iris/dto/IrisCombinedSettingsDTO.java | 2 +- .../iris/exception/IrisException.java | 2 +- .../exception/IrisForbiddenException.java | 2 +- .../IrisInternalPyrisErrorException.java | 2 +- .../IrisRateLimitExceededException.java | 4 +- .../IrisCompetencyGenerationService.java | 16 +++--- .../service}/IrisDefaultTemplateService.java | 2 +- .../service}/IrisMessageService.java | 2 +- .../service}/IrisRateLimitService.java | 6 +-- .../service}/IrisSessionService.java | 14 ++--- .../AbstractIrisChatSessionService.java | 2 +- .../IrisButtonBasedFeatureInterface.java | 2 +- .../IrisChatBasedFeatureInterface.java | 2 +- .../session/IrisCourseChatSessionService.java | 16 +++--- .../IrisExerciseChatSessionService.java | 16 +++--- .../session/IrisHestiaSessionService.java | 6 +-- .../IrisRateLimitedFeatureInterface.java | 2 +- .../session/IrisSubFeatureInterface.java | 2 +- .../settings/IrisSettingsService.java | 6 +-- .../settings/IrisSubSettingsService.java | 10 ++-- .../websocket/IrisChatWebsocketService.java | 8 +-- .../websocket/IrisWebsocketService.java | 2 +- .../lti/config/CustomLti13Configurer.java | 2 +- .../ModelingExerciseScheduleService.java | 8 +-- ...gExerciseWithSubmissionsExportService.java | 5 +- .../ModelingSubmissionExportService.java | 3 +- .../service/compass/CompassService.java | 10 ++-- .../service/compass/assessment/Context.java | 2 +- .../compass/controller/FeedbackSelector.java | 4 +- .../controller/ModelClusterFactory.java | 16 +++--- .../compass/strategy/NameSimilarity.java | 2 +- .../service/compass/umlmodel/Similarity.java | 2 +- .../compass/umlmodel/UMLContainerElement.java | 4 +- .../service/compass/umlmodel/UMLDiagram.java | 2 +- .../service/compass/umlmodel/UMLElement.java | 4 +- .../umlmodel/activity/UMLActivity.java | 8 +-- .../umlmodel/activity/UMLActivityDiagram.java | 6 +-- .../umlmodel/activity/UMLActivityElement.java | 4 +- .../umlmodel/activity/UMLActivityNode.java | 8 +-- .../umlmodel/activity/UMLControlFlow.java | 6 +-- .../compass/umlmodel/bpmn/BPMNAnnotation.java | 8 +-- .../umlmodel/bpmn/BPMNCallActivity.java | 8 +-- .../compass/umlmodel/bpmn/BPMNDataObject.java | 8 +-- .../compass/umlmodel/bpmn/BPMNDataStore.java | 8 +-- .../compass/umlmodel/bpmn/BPMNDiagram.java | 6 +-- .../compass/umlmodel/bpmn/BPMNEndEvent.java | 8 +-- .../compass/umlmodel/bpmn/BPMNFlow.java | 8 +-- .../compass/umlmodel/bpmn/BPMNGateway.java | 8 +-- .../compass/umlmodel/bpmn/BPMNGroup.java | 10 ++-- .../umlmodel/bpmn/BPMNIntermediateEvent.java | 8 +-- .../compass/umlmodel/bpmn/BPMNPool.java | 10 ++-- .../compass/umlmodel/bpmn/BPMNStartEvent.java | 8 +-- .../compass/umlmodel/bpmn/BPMNSubprocess.java | 8 +-- .../compass/umlmodel/bpmn/BPMNSwimlane.java | 10 ++-- .../compass/umlmodel/bpmn/BPMNTask.java | 8 +-- .../umlmodel/bpmn/BPMNTransaction.java | 8 +-- .../umlmodel/classdiagram/UMLAttribute.java | 10 ++-- .../umlmodel/classdiagram/UMLClass.java | 10 ++-- .../classdiagram/UMLClassDiagram.java | 6 +-- .../umlmodel/classdiagram/UMLMethod.java | 10 ++-- .../umlmodel/classdiagram/UMLPackage.java | 10 ++-- .../classdiagram/UMLRelationship.java | 14 ++--- .../umlmodel/communication/Direction.java | 5 ++ .../UMLCommunicationDiagram.java | 8 +-- .../communication/UMLCommunicationLink.java | 10 ++-- .../umlmodel/communication/UMLMessage.java | 4 +- .../umlmodel/component/UMLComponent.java | 14 ++--- .../component/UMLComponentDiagram.java | 6 +-- .../component/UMLComponentInterface.java | 12 ++--- .../component/UMLComponentRelationship.java | 8 +-- .../umlmodel/deployment/UMLArtifact.java | 12 ++--- .../deployment/UMLDeploymentComponent.java | 4 +- .../deployment/UMLDeploymentDiagram.java | 12 ++--- .../deployment/UMLDeploymentInterface.java | 4 +- .../compass/umlmodel/deployment/UMLNode.java | 14 ++--- .../compass/umlmodel/flowchart/Flowchart.java | 6 +-- .../umlmodel/flowchart/FlowchartDecision.java | 8 +-- .../umlmodel/flowchart/FlowchartFlowline.java | 6 +-- .../flowchart/FlowchartFunctionCall.java | 8 +-- .../flowchart/FlowchartInputOutput.java | 8 +-- .../umlmodel/flowchart/FlowchartProcess.java | 8 +-- .../umlmodel/flowchart/FlowchartTerminal.java | 8 +-- .../compass/umlmodel/object/UMLObject.java | 8 +-- .../umlmodel/object/UMLObjectAttribute.java | 4 +- .../umlmodel/object/UMLObjectDiagram.java | 6 +-- .../umlmodel/object/UMLObjectLink.java | 6 +-- .../umlmodel/object/UMLObjectMethod.java | 4 +- .../umlmodel/parsers/UMLModelParser.java | 14 ++--- .../parsers/v2/ActivityDiagramParser.java | 26 +++++----- .../parsers/v2/ClassDiagramParser.java | 44 ++++++++-------- .../v2/CommunicationDiagramParser.java | 22 ++++---- .../parsers/v2/ComponentDiagramParser.java | 28 +++++----- .../parsers/v2/DeploymentDiagramParser.java | 24 ++++----- .../umlmodel/parsers/v2/FlowchartParser.java | 30 +++++------ .../parsers/v2/ObjectDiagramParser.java | 32 ++++++------ .../umlmodel/parsers/v2/PetriNetParser.java | 24 ++++----- .../umlmodel/parsers/v2/SyntaxTreeParser.java | 24 ++++----- .../umlmodel/parsers/v2/UMLModelV2Parser.java | 10 ++-- .../parsers/v2/UseCaseDiagramParser.java | 30 +++++------ .../parsers/v3/ActivityDiagramParser.java | 26 +++++----- .../parsers/v3/BPMNDiagramParser.java | 52 +++++++++---------- .../parsers/v3/ClassDiagramParser.java | 44 ++++++++-------- .../v3/CommunicationDiagramParser.java | 22 ++++---- .../parsers/v3/ComponentDiagramParser.java | 28 +++++----- .../parsers/v3/DeploymentDiagramParser.java | 24 ++++----- .../umlmodel/parsers/v3/FlowchartParser.java | 30 +++++------ .../parsers/v3/ObjectDiagramParser.java | 32 ++++++------ .../umlmodel/parsers/v3/PetriNetParser.java | 24 ++++----- .../umlmodel/parsers/v3/SyntaxTreeParser.java | 24 ++++----- .../umlmodel/parsers/v3/UMLModelV3Parser.java | 10 ++-- .../parsers/v3/UseCaseDiagramParser.java | 30 +++++------ .../compass/umlmodel/petrinet/PetriNet.java | 6 +-- .../umlmodel/petrinet/PetriNetArc.java | 8 +-- .../umlmodel/petrinet/PetriNetPlace.java | 8 +-- .../umlmodel/petrinet/PetriNetTransition.java | 8 +-- .../umlmodel/syntaxtree/SyntaxTree.java | 6 +-- .../umlmodel/syntaxtree/SyntaxTreeLink.java | 6 +-- .../syntaxtree/SyntaxTreeNonterminal.java | 8 +-- .../syntaxtree/SyntaxTreeTerminal.java | 8 +-- .../compass/umlmodel/usecase/UMLActor.java | 8 +-- .../umlmodel/usecase/UMLSystemBoundary.java | 10 ++-- .../compass/umlmodel/usecase/UMLUseCase.java | 12 ++--- .../usecase/UMLUseCaseAssociation.java | 10 ++-- .../umlmodel/usecase/UMLUseCaseDiagram.java | 6 +-- .../compass/utils/CompassConfiguration.java | 2 +- .../service/compass/utils/JSONMapping.java | 2 +- .../compass/utils/SimilarityUtils.java | 4 +- .../modeling/ModelingSubmissionElement.java | 2 +- ...sPlagiarismControlPostContentProvider.java | 2 +- .../ContinuousPlagiarismControlService.java | 4 +- .../ModelingPlagiarismDetectionService.java | 10 ++-- .../service}/PlagiarismAnswerPostService.java | 4 +- .../service}/PlagiarismCaseService.java | 4 +- .../PlagiarismDetectionConfigHelper.java | 2 +- .../service}/PlagiarismDetectionService.java | 4 +- .../service}/PlagiarismPostService.java | 4 +- .../service}/PlagiarismService.java | 2 +- .../service}/PlagiarismWebsocketService.java | 2 +- ...portedForPlagiarismDetectionException.java | 2 +- ...ProgrammingPlagiarismDetectionService.java | 14 ++--- .../TextPlagiarismDetectionService.java | 10 ++-- .../cache/PlagiarismCacheService.java | 2 +- .../artemis/programming/domain/BuildJob.java | 2 +- .../domain/ProgrammingExercise.java | 2 +- .../ProgrammingExerciseBuildConfig.java | 4 +- ...ogrammingExerciseStudentParticipation.java | 2 +- .../programming/domain/Repository.java | 2 +- .../domain/hestia/ExerciseHint.java | 3 +- .../programming/icl/ssh/SshGitCommand.java | 6 +-- .../repository/BuildJobRepository.java | 4 +- ...aticProgrammingExerciseCleanupService.java | 4 +- .../service}/AuxiliaryRepositoryService.java | 4 +- .../service}/CommitHistoryService.java | 4 +- .../DefaultTemplateUpgradeService.java | 2 +- .../service}/JavaTemplateUpgradeService.java | 4 +- .../ProgrammingAssessmentService.java | 10 ++-- ...mingExerciseCodeReviewFeedbackService.java | 6 +-- .../ProgrammingExerciseExportService.java | 16 +++--- ...ammingExerciseFeedbackCreationService.java | 4 +- .../ProgrammingExerciseGradingService.java | 8 +-- ...ProgrammingExerciseImportBasicService.java | 10 ++-- ...grammingExerciseImportFromFileService.java | 6 +-- .../ProgrammingExerciseImportService.java | 12 ++--- ...ogrammingExerciseParticipationService.java | 8 +-- .../ProgrammingExerciseRepositoryService.java | 8 +-- .../ProgrammingExerciseScheduleService.java | 15 +++--- .../service}/ProgrammingExerciseService.java | 32 ++++++------ .../ProgrammingExerciseTestCaseService.java | 4 +- .../service}/ProgrammingLanguageFeature.java | 2 +- .../ProgrammingLanguageFeatureService.java | 2 +- .../service}/ProgrammingMessagingService.java | 6 +-- .../ProgrammingSubmissionService.java | 16 +++--- .../service}/ProgrammingTriggerService.java | 4 +- .../service}/RepositoryAccessService.java | 4 +- .../RepositoryParticipationService.java | 6 +-- .../service}/RepositoryService.java | 4 +- .../TemplateUpgradePolicyService.java | 2 +- .../service}/TemplateUpgradeService.java | 2 +- .../service/hestia/CodeHintService.java | 4 +- .../service/hestia/ExerciseHintService.java | 2 +- ...ogrammingExerciseGitDiffReportService.java | 4 +- .../ProgrammingExerciseTaskService.java | 2 +- .../hestia/TestwiseCoverageService.java | 8 +-- .../behavioral/BehavioralBlackboard.java | 2 +- ...ioralSolutionEntryGenerationException.java | 2 +- .../behavioral/BehavioralTestCaseService.java | 32 ++++++------ .../hestia/behavioral/GroupedFile.java | 2 +- ...ddUncoveredLinesAsPotentialCodeBlocks.java | 8 +-- .../BehavioralKnowledgeSource.java | 6 +-- .../knowledgesource/CombineChangeBlocks.java | 6 +-- .../CreateCommonChangeBlocks.java | 8 +-- .../CreateSolutionEntries.java | 6 +-- .../DropRemovedGitDiffEntries.java | 4 +- .../knowledgesource/ExtractChangedLines.java | 6 +-- .../knowledgesource/ExtractCoveredLines.java | 6 +-- .../knowledgesource/FindCommonLines.java | 6 +-- ...dCoverageEntriesByFilePathAndTestCase.java | 6 +-- .../knowledgesource/InsertFileContents.java | 8 +-- .../structural/StructuralAttribute.java | 2 +- .../hestia/structural/StructuralClass.java | 2 +- .../structural/StructuralClassElements.java | 2 +- .../structural/StructuralConstructor.java | 2 +- .../hestia/structural/StructuralElement.java | 2 +- .../hestia/structural/StructuralMethod.java | 2 +- ...turalSolutionEntryGenerationException.java | 2 +- .../structural/StructuralTestCaseService.java | 4 +- .../JavaClassDiff.java | 2 +- .../JavaClassDiffSerializer.java | 2 +- .../OracleGenerator.java | 2 +- .../SerializerUtil.java | 2 +- .../service}/QuizBatchService.java | 2 +- .../service}/QuizExerciseImportService.java | 6 +-- .../service}/QuizExerciseService.java | 4 +- ...zExerciseWithSubmissionsExportService.java | 5 +- .../service}/QuizMessagingService.java | 4 +- .../service}/QuizPoolService.java | 4 +- .../service}/QuizResultService.java | 4 +- .../service}/QuizScheduleService.java | 6 +-- .../quiz => quiz/service}/QuizService.java | 2 +- .../service}/QuizStatisticService.java | 4 +- .../service}/QuizSubmissionService.java | 4 +- .../service/AssessmentDashboardService.java | 2 +- .../artemis/service/AssessmentService.java | 8 +-- .../service/AttachmentUnitService.java | 4 +- .../service/AuthorizationCheckService.java | 2 +- .../artemis/service/BuildLogEntryService.java | 2 +- .../service/ConsistencyCheckService.java | 4 +- .../CourseScoreCalculationService.java | 4 +- .../aet/artemis/service/CourseService.java | 18 +++---- .../artemis/service/EmailSummaryService.java | 4 +- .../artemis/service/ExerciseDateService.java | 2 +- .../service/ExerciseDeletionService.java | 10 ++-- .../service/ExerciseLifecycleService.java | 2 +- .../service/ExerciseScoresChartService.java | 2 +- .../aet/artemis/service/ExerciseService.java | 8 +-- .../service/ExerciseSpecificationService.java | 3 +- .../cit/aet/artemis/service/FileService.java | 2 +- .../FileUploadExerciseImportService.java | 4 +- .../service/FileUploadSubmissionService.java | 4 +- .../artemis/service/LectureImportService.java | 2 +- .../aet/artemis/service/LectureService.java | 6 +-- .../artemis/service/LectureUnitService.java | 4 +- .../ModelingExerciseImportService.java | 4 +- .../service/ModelingExerciseService.java | 2 +- .../service/ModelingSubmissionService.java | 6 +-- .../service/ParticipantScoreService.java | 7 +-- .../artemis/service/ParticipationService.java | 10 ++-- .../ParticipationVcsAccessTokenService.java | 2 +- .../PresentationPointsCalculationService.java | 2 +- .../aet/artemis/service/ResultService.java | 6 +-- .../service/StaticCodeAnalysisService.java | 2 +- .../artemis/service/StatisticsService.java | 2 +- .../service/SubmissionPolicyService.java | 2 +- .../artemis/service/SubmissionService.java | 4 +- .../service/TextAssessmentService.java | 6 +-- .../service/TextExerciseFeedbackService.java | 2 +- .../service/TextExerciseImportService.java | 4 +- .../artemis/service/TextExerciseService.java | 2 +- .../service/TextSubmissionService.java | 4 +- .../umlmodel/communication/Direction.java | 5 -- ...PyrisChatPipelineExecutionBaseDataDTO.java | 15 ------ ...PyrisExerciseChatPipelineExecutionDTO.java | 19 ------- .../AbstractBuildResultNotificationDTO.java | 2 +- .../service/icl/ArtemisGitServletService.java | 10 ++-- .../icl/GitPublickeyAuthenticatorService.java | 4 +- .../icl/SshGitCommandFactoryService.java | 2 +- .../icl/SshGitLocationResolverService.java | 4 +- ...tExerciseWithSubmissionsExportService.java | 5 +- .../service}/TextSubmissionExportService.java | 3 +- .../tutorialgroup/domain/TutorialGroup.java | 3 +- ...TutorialGroupChannelManagementService.java | 6 +-- .../TutorialGroupFreePeriodService.java | 2 +- .../TutorialGroupScheduleService.java | 2 +- .../service}/TutorialGroupService.java | 6 +-- .../TutorialGroupsConfigurationService.java | 2 +- .../aet/artemis/web/rest/AccountResource.java | 6 +-- .../web/rest/AeolusTemplateResource.java | 6 +-- .../web/rest/ApollonConversionResource.java | 4 +- .../aet/artemis/web/rest/AthenaResource.java | 12 ++--- .../artemis/web/rest/AttachmentResource.java | 2 +- .../aet/artemis/web/rest/BonusResource.java | 2 +- .../aet/artemis/web/rest/CourseResource.java | 16 +++--- .../artemis/web/rest/DataExportResource.java | 2 +- .../artemis/web/rest/ExamLockResource.java | 4 +- .../aet/artemis/web/rest/ExamResource.java | 32 ++++++------ .../artemis/web/rest/ExamUserResource.java | 4 +- .../web/rest/ExerciseGroupResource.java | 4 +- .../artemis/web/rest/ExerciseResource.java | 14 ++--- .../web/rest/FileUploadExerciseResource.java | 12 ++--- .../rest/FileUploadSubmissionResource.java | 4 +- .../web/rest/GuidedTourSettingsResource.java | 2 +- .../web/rest/LearningPathResource.java | 12 ++--- .../aet/artemis/web/rest/LectureResource.java | 2 +- .../cit/aet/artemis/web/rest/LtiResource.java | 2 +- .../aet/artemis/web/rest/MetricsResource.java | 2 +- .../web/rest/ModelingExerciseResource.java | 18 +++---- .../web/rest/ModelingSubmissionResource.java | 4 +- .../web/rest/NotificationResource.java | 8 +-- .../rest/NotificationSettingsResource.java | 4 +- .../web/rest/ParticipantScoreResource.java | 5 +- .../web/rest/ParticipationResource.java | 18 +++---- .../artemis/web/rest/PlantUmlResource.java | 2 +- .../web/rest/QuizExerciseResource.java | 26 +++++----- .../web/rest/QuizParticipationResource.java | 2 +- .../artemis/web/rest/QuizPoolResource.java | 4 +- .../web/rest/QuizSubmissionResource.java | 4 +- .../aet/artemis/web/rest/ResultResource.java | 2 +- .../artemis/web/rest/StudentExamResource.java | 24 ++++----- .../aet/artemis/web/rest/TeamResource.java | 2 +- .../web/rest/TextAssessmentResource.java | 2 +- .../web/rest/TextExerciseResource.java | 22 ++++---- .../web/rest/TextSubmissionResource.java | 4 +- .../aet/artemis/web/rest/UserResource.java | 6 +-- .../rest/competency/CompetencyResource.java | 4 +- .../competency/CourseCompetencyResource.java | 16 +++--- .../rest/competency/PrerequisiteResource.java | 4 +- .../StandardizedCompetencyResource.java | 6 +-- .../web/rest/dto/ExerciseDetailsDTO.java | 2 +- .../dto/competency/CompetencyNameDTO.java | 2 +- .../web/rest/errors/ExceptionTranslator.java | 2 +- .../web/rest/hestia/CodeHintResource.java | 4 +- .../rest/hestia/CoverageReportResource.java | 2 +- .../web/rest/hestia/ExerciseHintResource.java | 4 +- ...grammingExerciseGitDiffReportResource.java | 6 +-- ...grammingExerciseSolutionEntryResource.java | 8 +-- .../ProgrammingExerciseTaskResource.java | 2 +- .../iris/IrisCourseChatSessionResource.java | 10 ++-- .../iris/IrisExerciseChatSessionResource.java | 8 +-- .../web/rest/iris/IrisMessageResource.java | 4 +- .../web/rest/iris/IrisModelsResource.java | 6 +-- .../artemis/web/rest/iris/IrisResource.java | 4 +- .../web/rest/iris/IrisSettingsResource.java | 4 +- .../artemis/web/rest/iris/IrisStatusDTO.java | 2 +- .../rest/lecture/AttachmentUnitResource.java | 4 +- .../web/rest/lecture/LectureUnitResource.java | 4 +- .../web/rest/lecture/OnlineUnitResource.java | 2 +- .../web/rest/lecture/TextUnitResource.java | 2 +- .../web/rest/lecture/VideoUnitResource.java | 2 +- .../rest/localci/BuildJobQueueResource.java | 4 +- .../web/rest/localci/BuildPlanResource.java | 2 +- .../web/rest/metis/AnswerMessageResource.java | 4 +- .../metis/ConversationMessageResource.java | 4 +- .../web/rest/metis/ReactionResource.java | 2 +- .../metis/conversation/ChannelResource.java | 14 ++--- .../conversation/ConversationResource.java | 6 +-- .../metis/conversation/GroupChatResource.java | 12 ++--- .../conversation/OneToOneChatResource.java | 10 ++-- .../rest/ogparser/LinkPreviewResource.java | 2 +- .../web/rest/open/PublicAccountResource.java | 4 +- .../PublicProgrammingSubmissionResource.java | 10 ++-- .../open/PublicPyrisStatusUpdateResource.java | 20 +++---- .../web/rest/open/PublicResultResource.java | 10 ++-- .../web/rest/open/PublicUserJwtResource.java | 2 +- .../PlagiarismAnswerPostResource.java | 4 +- .../plagiarism/PlagiarismCaseResource.java | 2 +- .../plagiarism/PlagiarismPostResource.java | 4 +- .../rest/plagiarism/PlagiarismResource.java | 2 +- .../ProgrammingAssessmentResource.java | 4 +- ...ogrammingExerciseExportImportResource.java | 22 ++++---- .../ProgrammingExerciseGradingResource.java | 2 +- .../ProgrammingExerciseLockResource.java | 2 +- ...grammingExerciseParticipationResource.java | 8 +-- ...ProgrammingExercisePlagiarismResource.java | 12 ++--- .../ProgrammingExerciseResource.java | 24 ++++----- .../ProgrammingExerciseTestCaseResource.java | 4 +- .../ProgrammingSubmissionResource.java | 12 ++--- ...grammingExerciseParticipationResource.java | 18 +++---- .../rest/repository/RepositoryResource.java | 10 ++-- .../repository/TestRepositoryResource.java | 14 ++--- .../web/rest/science/ScienceResource.java | 6 +-- .../TutorialGroupFreePeriodResource.java | 6 +-- .../tutorialgroups/TutorialGroupResource.java | 14 ++--- .../TutorialGroupSessionResource.java | 8 +-- .../TutorialGroupsConfigurationResource.java | 6 +-- .../web/websocket/ResultWebsocketService.java | 2 +- .../LocalCIWebsocketMessagingService.java | 4 +- .../AbstractArtemisIntegrationTest.java | 38 +++++++------- ...ringIntegrationGitlabCIGitlabSamlTest.java | 8 +-- ...tractSpringIntegrationIndependentTest.java | 4 +- ...actSpringIntegrationJenkinsGitlabTest.java | 10 ++-- ...ctSpringIntegrationLocalCILocalVCTest.java | 12 ++--- .../aet/artemis/LtiQuizIntegrationTest.java | 4 +- .../ManagementResourceIntegrationTest.java | 6 +-- .../aet/artemis/MetricsIntegrationTest.java | 4 +- .../architecture/ArchitectureTest.java | 2 +- .../ExerciseScoresChartIntegrationTest.java | 2 +- .../ParticipantScoreIntegrationTest.java | 2 +- ...InternalAuthenticationIntegrationTest.java | 2 +- .../LdapAuthenticationIntegrationTest.java | 2 +- .../UserJenkinsGitlabIntegrationTest.java | 8 +-- .../UserSaml2IntegrationTest.java | 4 +- .../LearningPathIntegrationTest.java | 2 +- .../competency/LearningPathUtilService.java | 2 +- .../connector/GitlabRequestMockProvider.java | 10 ++-- .../connector/IrisRequestMockProvider.java | 10 ++-- .../connector/JenkinsRequestMockProvider.java | 4 +- ...eolusBuildScriptGenerationServiceTest.java | 10 ++-- .../artemis/connectors/AeolusServiceTest.java | 16 +++--- .../AeolusTemplateResourceTest.java | 4 +- .../aet/artemis/connectors/AeolusTest.java | 14 ++--- .../ApollonConversionServiceTest.java | 2 +- .../ApollonHealthIndicatorTest.java | 2 +- .../artemis/connectors/Lti13ServiceTest.java | 4 +- .../LtiDynamicRegistrationServiceTest.java | 2 +- .../connectors/LtiNewResultServiceTest.java | 4 +- .../artemis/connectors/LtiServiceTest.java | 8 +-- .../aet/artemis/course/CourseTestService.java | 8 +-- .../DataExportResourceIntegrationTest.java | 2 +- .../ResultListenerIntegrationTest.java | 4 +- .../aet/artemis/exam/ExamIntegrationTest.java | 10 ++-- .../ExamParticipationIntegrationTest.java | 8 +-- .../exam/ExamRegistrationIntegrationTest.java | 8 +-- .../exam/ExamSessionIntegrationTest.java | 2 +- .../cit/aet/artemis/exam/ExamStartTest.java | 4 +- .../cit/aet/artemis/exam/ExamUtilService.java | 2 +- .../exam/ProgrammingExamIntegrationTest.java | 2 +- .../artemis/exam/QuizPoolIntegrationTest.java | 2 +- .../exam/StudentExamIntegrationTest.java | 6 +-- .../artemis/exam/TestExamIntegrationTest.java | 4 +- .../ApollonConversionIntegrationTest.java | 4 +- .../ModelingAssessmentIntegrationTest.java | 2 +- .../modeling/ModelingComparisonTest.java | 2 +- .../ModelingSubmissionIntegrationTest.java | 2 +- .../controller/FeedbackSelectorTest.java | 2 +- .../controller/ModelClusterFactoryTest.java | 2 +- .../controller/UMLModelParserTest.java | 50 +++++++++--------- .../umlmodel/AbstractUMLDiagramTest.java | 18 +++---- .../compass/umlmodel/UMLDiagramTest.java | 8 +-- .../activity/UMLActivityDiagramTest.java | 14 ++--- .../activity/UMLActivityNodeTest.java | 8 +-- .../umlmodel/activity/UMLActivityTest.java | 4 +- .../umlmodel/activity/UMLControlFlowTest.java | 6 +-- .../umlmodel/bpmn/BPMNDiagramTest.java | 38 +++++++------- .../classdiagram/UMLAttributeTest.java | 8 +-- .../classdiagram/UMLClassDiagramTest.java | 14 ++--- .../umlmodel/classdiagram/UMLClassTest.java | 18 +++---- .../umlmodel/classdiagram/UMLMethodTest.java | 8 +-- .../umlmodel/classdiagram/UMLPackageTest.java | 4 +- .../classdiagram/UMLRelationshipTest.java | 16 +++--- .../UMLCommunicationDiagramTest.java | 10 ++-- .../component/UMLComponentDiagramTest.java | 18 +++---- .../deployment/UMLDeploymentDiagramTest.java | 12 ++--- .../umlmodel/flowchart/FlowchartTest.java | 18 +++---- .../umlmodel/object/UMLObjectDiagramTest.java | 10 ++-- .../umlmodel/petrinet/PetriNetTest.java | 12 ++--- .../umlmodel/syntaxtree/SyntaxTreeTest.java | 12 ++--- .../usecase/UMLUseCaseDiagramTest.java | 12 ++--- .../AuxiliaryRepositoryServiceTest.java | 2 +- .../ContinuousIntegrationTestService.java | 4 +- .../ProgrammingExerciseFactory.java | 10 ++-- ...ProgrammingExerciseGitIntegrationTest.java | 2 +- ...gExerciseGitlabJenkinsIntegrationTest.java | 2 +- ...ProgrammingExerciseGradingServiceTest.java | 4 +- ...gExerciseIntegrationJenkinsGitlabTest.java | 2 +- ...rammingExerciseIntegrationTestService.java | 8 +-- ...ExerciseLocalVCLocalCIIntegrationTest.java | 2 +- ...grammingExerciseRepositoryServiceTest.java | 2 +- ...gExerciseResultJenkinsIntegrationTest.java | 2 +- .../ProgrammingExerciseResultTestService.java | 6 +-- ...rogrammingExerciseScheduleServiceTest.java | 2 +- ...rammingExerciseServiceIntegrationTest.java | 4 +- ...ammingExerciseTemplateIntegrationTest.java | 2 +- ...rogrammingExerciseTestCaseServiceTest.java | 4 +- .../ProgrammingExerciseTestService.java | 31 +++++------ .../ProgrammingExerciseUtilService.java | 2 +- ...AndResultGitlabJenkinsIntegrationTest.java | 8 +-- .../RepositoryIntegrationTest.java | 6 +-- .../StaticCodeAnalysisIntegrationTest.java | 2 +- .../SubmissionPolicyIntegrationTest.java | 4 +- ...TestRepositoryResourceIntegrationTest.java | 2 +- .../exercise/quiz/QuizComparisonTest.java | 2 +- .../quiz/QuizExerciseIntegrationTest.java | 2 +- .../quiz/QuizExerciseUtilService.java | 2 +- .../quiz/QuizSubmissionIntegrationTest.java | 6 +-- .../exercise/text/TextComparisonTest.java | 2 +- .../artemis/hestia/CodeHintServiceTest.java | 2 +- .../hestia/ExerciseHintIntegrationTest.java | 2 +- .../hestia/ExerciseHintServiceTest.java | 4 +- ...gExerciseGitDiffReportIntegrationTest.java | 2 +- ...mmingExerciseGitDiffReportServiceTest.java | 2 +- ...rogrammingExerciseTaskIntegrationTest.java | 2 +- .../ProgrammingExerciseTaskServiceTest.java | 2 +- .../hestia/StructuralTestCaseServiceTest.java | 4 +- .../TestwiseCoverageReportServiceTest.java | 2 +- ...coveredLinesAsPotentialCodeBlocksTest.java | 6 +-- .../BehavioralTestCaseServiceTest.java | 2 +- .../behavioral/CombineChangeBlocksTest.java | 10 ++-- .../CreateCommonChangeBlocksTest.java | 6 +-- .../behavioral/CreateSolutionEntriesTest.java | 6 +-- .../DropRemovedGitDiffEntriesTest.java | 6 +-- .../behavioral/ExtractChangedLinesTest.java | 6 +-- .../behavioral/ExtractCoveredLinesTest.java | 6 +-- .../behavioral/FindCommonLinesTest.java | 6 +-- ...erageEntriesByFilePathAndTestCaseTest.java | 6 +-- .../behavioral/InsertFileContentsTest.java | 8 +-- .../iris/AbstractIrisIntegrationTest.java | 2 +- .../iris/IrisChatMessageIntegrationTest.java | 18 +++---- .../artemis/iris/IrisChatWebsocketTest.java | 8 +-- ...isCompetencyGenerationIntegrationTest.java | 12 ++--- .../IrisSessionActivationIntegrationTest.java | 4 +- .../iris/PyrisConnectorServiceTest.java | 8 +-- .../iris/PyrisLectureIngestionTest.java | 12 ++--- .../settings/IrisSettingsIntegrationTest.java | 2 +- ...AbstractLocalCILocalVCIntegrationTest.java | 2 +- .../BuildAgentDockerServiceTest.java | 8 +-- ...AgentSshAuthenticationIntegrationTest.java | 6 +-- .../artemis/localvcci/BuildResultTest.java | 2 +- .../localvcci/LocalCIIntegrationTest.java | 4 +- .../LocalCIResourceIntegrationTest.java | 12 ++--- .../localvcci/LocalCIResultServiceTest.java | 2 +- .../artemis/localvcci/LocalCIServiceTest.java | 18 +++---- .../localvcci/LocalVCInfoContributorTest.java | 2 +- .../localvcci/LocalVCIntegrationTest.java | 4 +- .../LocalVCLocalCIIntegrationTest.java | 8 +-- ...VCLocalCIParticipationIntegrationTest.java | 2 +- .../localvcci/LocalVCLocalCITestService.java | 4 +- .../artemis/localvcci/LocalVCServiceTest.java | 2 +- .../SharedQueueManagementServiceTest.java | 2 +- .../TestBuildAgentConfiguration.java | 2 +- .../metis/AbstractConversationTest.java | 2 +- .../artemis/metis/ChannelIntegrationTest.java | 2 +- .../artemis/metis/PostingServiceUnitTest.java | 4 +- ...eJaccardSimilarityCompareStrategyTest.java | 2 +- .../GroupNotificationServiceTest.java | 10 ++-- .../NotificationScheduleServiceTest.java | 6 +-- ...cationSettingsResourceIntegrationTest.java | 2 +- .../NotificationSettingsServiceTest.java | 16 +++--- .../SingleUserNotificationServiceTest.java | 18 +++---- .../ParticipationIntegrationTest.java | 8 +-- .../ParticipationUtilService.java | 4 +- ...ontinuousPlagiarismControlServiceTest.java | 10 ++-- .../PlagiarismDetectionConfigHelperTest.java | 2 +- .../PlagiarismDetectionServiceTest.java | 14 ++--- .../PlagiarismPostIntegrationTest.java | 2 +- .../repository/UserRepositoryTest.java | 2 +- .../science/ScienceIntegrationTest.java | 4 +- .../security/Lti13LaunchFilterTest.java | 2 +- .../artemis/service/CourseServiceTest.java | 2 +- .../DataExportCreationServiceTest.java | 4 +- .../service/EmailSummaryServiceTest.java | 2 +- .../service/FeatureToggleServiceTest.java | 4 +- .../artemis/service/GitlabCIServiceTest.java | 4 +- .../JenkinsAuthorizationInterceptorTest.java | 2 +- .../JenkinsInternalUriServiceTest.java | 2 +- .../JenkinsJobPermissionServiceTest.java | 6 +-- .../service/JenkinsJobServiceTest.java | 6 +-- .../artemis/service/JenkinsServiceTest.java | 4 +- .../service/LearningPathServiceTest.java | 6 +-- .../service/RepositoryAccessServiceTest.java | 4 +- .../TitleCacheEvictionServiceTest.java | 2 +- ...WeeklyEmailSummaryScheduleServiceTest.java | 2 +- .../AthenaFeedbackSendingServiceTest.java | 3 ++ .../AthenaFeedbackSuggestionsServiceTest.java | 5 +- .../athena/AthenaHealthIndicatorTest.java | 1 + .../AthenaRepositoryExportServiceTest.java | 1 + .../AthenaSubmissionSelectionServiceTest.java | 1 + .../AthenaSubmissionSendingServiceTest.java | 3 ++ ...sonalAccessTokenManagementServiceTest.java | 4 +- .../JenkinsPipelineScriptCreatorTest.java | 1 + .../jobs/JenkinsJobPermissionsUtilsTest.java | 4 +- .../buildagent/TestResultXmlParserTest.java | 3 +- .../lti/LtiDeepLinkingServiceTest.java | 1 + .../vcs/VcsTokenRenewalServiceTest.java | 2 + .../service/exam/ExamAccessServiceTest.java | 2 +- .../service/exam/ExamQuizServiceTest.java | 3 +- .../artemis/service/exam/ExamServiceTest.java | 1 + .../exam/ExamSubmissionServiceTest.java | 1 + .../exam/StudentExamAccessServiceTest.java | 1 + .../export/CourseExamExportServiceTest.java | 1 + .../ConversationNotificationServiceTest.java | 1 + ...GeneralInstantNotificationServiceTest.java | 8 ++- .../notifications/MailServiceTest.java | 2 + .../TutorialGroupNotificationServiceTest.java | 2 +- ...leFirebasePushNotificationServiceTest.java | 2 + ...ngExerciseFeedbackCreationServiceTest.java | 1 + .../DataExportScheduleServiceTest.java | 1 + ...DeviceConfigurationCleanupServiceTest.java | 1 + .../service/util/HttpRequestUtilsTest.java | 2 + .../artemis/service/util/TimeUtilTest.java | 2 +- .../StaticCodeAnalysisParserUnitTest.java | 4 +- .../telemetry/TelemetryServiceTest.java | 2 +- .../theia/TheiaInfoContributorTest.java | 2 +- .../AbstractTutorialGroupIntegrationTest.java | 4 +- .../aet/artemis/uri/RepositoryUriTest.java | 2 +- .../user/AccountResourceIntegrationTest.java | 2 +- .../cit/aet/artemis/user/UserTestService.java | 8 +-- .../cit/aet/artemis/user/UserUtilService.java | 2 +- .../util/ExamPrepareExercisesTestUtil.java | 2 +- .../cit/aet/artemis/util/GitUtilService.java | 2 +- .../artemis/util/HestiaUtilTestService.java | 2 +- .../cit/aet/artemis/util/LocalRepository.java | 2 +- 970 files changed, 2856 insertions(+), 2795 deletions(-) rename src/main/java/de/tum/cit/aet/artemis/{service/listeners => assessment/listener}/ResultListener.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{service/scheduled => assessment/service}/ParticipantScoreScheduleService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/dto/athena => athena/dto}/ExerciseBaseDTO.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{service/dto/athena => athena/dto}/FeedbackBaseDTO.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{service/dto/athena => athena/dto}/ModelingExerciseDTO.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{service/dto/athena => athena/dto}/ModelingFeedbackDTO.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{service/dto/athena => athena/dto}/ModelingSubmissionDTO.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{service/dto/athena => athena/dto}/ProgrammingExerciseDTO.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{service/dto/athena => athena/dto}/ProgrammingFeedbackDTO.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{service/dto/athena => athena/dto}/ProgrammingSubmissionDTO.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{service/dto/athena => athena/dto}/SubmissionBaseDTO.java (74%) rename src/main/java/de/tum/cit/aet/artemis/{service/dto/athena => athena/dto}/TextExerciseDTO.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{service/dto/athena => athena/dto}/TextFeedbackDTO.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{service/dto/athena => athena/dto}/TextSubmissionDTO.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{service/scheduled => athena/service}/AthenaScheduleService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{service/science => atlas/service}/ScienceEventService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/service/competency/CompetencyJolService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/service/competency/CompetencyProgressService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/service/competency/CompetencyRelationService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/service/competency/CompetencyService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/service/competency/CourseCompetencyService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/service/competency/KnowledgeAreaService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/service/competency/PrerequisiteService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/service/competency/StandardizedCompetencyService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/service/learningpath/LearningPathNavigationService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/service/learningpath/LearningPathNgxService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/service/learningpath/LearningPathRecommendationService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => atlas}/service/learningpath/LearningPathService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/metis => communication/service}/AnswerMessageService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{service/metis => communication/service}/ConversationMessagingService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/scheduled => communication/service}/NotificationScheduleService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{service/metis => communication/service}/PostingService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/scheduled => communication/service}/PushNotificationDeviceConfigurationCleanupService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{service/metis => communication/service}/ReactionService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{service/scheduled => communication/service}/WeeklyEmailSummaryScheduleService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/metis => communication/service}/conversation/ChannelService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/metis => communication/service}/conversation/ConversationDTOService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/metis => communication/service}/conversation/ConversationService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/metis => communication/service}/conversation/GroupChatService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/metis => communication/service}/conversation/OneToOneChatService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{service/metis => communication/service}/conversation/auth/ChannelAuthorizationService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/metis => communication/service}/conversation/auth/ConversationAuthorizationService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{service/metis => communication/service}/conversation/auth/GroupChatAuthorizationService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/metis => communication/service}/conversation/auth/OneToOneChatAuthorizationService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{service/metis => communication/service}/conversation/errors/ChannelNameDuplicateException.java (84%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/service/linkpreview/LinkPreviewService.java (80%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/service/linkpreview/ogparser/Content.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/service/linkpreview/ogparser/OgParser.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/service/linkpreview/ogparser/OpenGraph.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/service/linkpreview/ogparser/htmlparser/OgMetaElement.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/service/linkpreview/ogparser/htmlparser/OgMetaElementHtmlParser.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/service/notifications/ConversationNotificationService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/service/notifications/GeneralInstantNotificationService.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/service/notifications/GroupNotificationScheduleService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/service/notifications/GroupNotificationService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/service/notifications/InstantNotificationService.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/service/notifications/MailSendingService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/service/notifications/MailService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/service/notifications/NotificationSettingsCommunicationChannel.java (72%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/service/notifications/NotificationSettingsService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/service/notifications/SingleUserNotificationService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/service/notifications/TutorialGroupNotificationService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/service/notifications/push_notifications/ApplePushNotificationService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/service/notifications/push_notifications/FirebasePushNotificationService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/service/notifications/push_notifications/FirebaseRelayNotificationRequests.java (58%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/service/notifications/push_notifications/PushNotificationService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/service/notifications/push_notifications/RelayNotificationRequest.java (56%) rename src/main/java/de/tum/cit/aet/artemis/{service/metis => communication/service}/similarity/PostSimilarityComparisonStrategy.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{service/metis => communication/service}/similarity/TitleJaccardSimilarityCompareStrategy.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{service/theia => core/component}/TheiaInfoContributor.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{service/archival => core/service}/ArchivalReportEntry.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{service/scheduled => core/service}/DataExportScheduleService.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{service/scheduled => core/service}/ScheduleService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/telemetry => core/service}/TelemetryService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/scheduled => core/service}/UserScheduleService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/AbstractGitService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/BuildScriptGenerationService.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/BuildScriptProviderService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/ConnectorHealth.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/GenericBuildScriptGenerationService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/GitService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/HazelcastHealthIndicator.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/SAML2Service.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/aeolus/Action.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/aeolus/ActionDeserializer.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/aeolus/AeolusBuildPlanService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/aeolus/AeolusBuildScriptGenerationService.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/aeolus/AeolusRepository.java (84%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/aeolus/AeolusResult.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/aeolus/AeolusTemplateService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/aeolus/DockerConfig.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/aeolus/PlatformAction.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/aeolus/ScriptAction.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/aeolus/Windfile.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/aeolus/WindfileMetadata.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/aeolus/dto/AeolusGenerationResponseDTO.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/apollon/ApollonConversionService.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/apollon/ApollonHealthIndicator.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/apollon/dto/ApollonModelDTO.java (74%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/athena/AthenaConnector.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/athena/AthenaDTOConverterService.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/athena/AthenaFeedbackSendingService.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/athena/AthenaFeedbackSuggestionsService.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/athena/AthenaHealthIndicator.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/athena/AthenaModuleService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/athena/AthenaRepositoryExportService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/athena/AthenaSubmissionSelectionService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/athena/AthenaSubmissionSendingService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/ci/AbstractBuildPlanCreator.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/ci/AbstractContinuousIntegrationResultService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/ci/AbstractContinuousIntegrationService.java (63%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/ci/CIPermission.java (56%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/ci/CIUserManagementService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/ci/ContinuousIntegrationResultService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/ci/ContinuousIntegrationServerHealthIndicator.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/ci/ContinuousIntegrationService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/ci/ContinuousIntegrationTriggerService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/ci/ContinuousIntegrationUpdateService.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/ci/notification/BuildLogParseUtils.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/ci/notification/dto/CommitDTO.java (79%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/ci/notification/dto/TestCaseDTO.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/ci/notification/dto/TestCaseDetailMessageDTO.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/ci/notification/dto/TestResultsDTO.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/ci/notification/dto/TestSuiteDTO.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/ci/notification/dto/TestwiseCoverageReportDTO.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/gitlab/AbstractGitLabAuthorizationInterceptor.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/gitlab/GitLabAuthorizationInterceptor.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/gitlab/GitLabException.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/gitlab/GitLabService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/gitlab/GitLabUserDoesNotExistException.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/gitlab/GitLabUserManagementService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/gitlab/GitlabInfoContributor.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/gitlab/dto/GitLabCommitDTO.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/gitlab/dto/GitLabProjectDTO.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/gitlab/dto/GitLabRepositoryDTO.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java (71%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/gitlabci/GitLabCIBuildPlanService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/gitlabci/GitLabCIInfoContributor.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/gitlabci/GitLabCIResultService.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/gitlabci/GitLabCIService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/gitlabci/GitLabCITriggerService.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/gitlabci/GitLabCIUserManagementService.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/jenkins/JenkinsAuthorizationInterceptor.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/jenkins/JenkinsEndpoints.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/jenkins/JenkinsInfoContributor.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/jenkins/JenkinsInternalUrlService.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/jenkins/JenkinsResultService.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/jenkins/JenkinsService.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/jenkins/JenkinsTriggerService.java (77%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/jenkins/JenkinsUserManagementService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/jenkins/JenkinsXmlConfigBuilder.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/jenkins/JenkinsXmlFileUtils.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/jenkins/build_plan/JenkinsBuildPlanCreator.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/jenkins/build_plan/JenkinsBuildPlanLinkInfoContributor.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/jenkins/build_plan/JenkinsBuildPlanUtils.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/jenkins/dto/JenkinsUserDTO.java (80%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/jenkins/jobs/JenkinsJobPermission.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/jenkins/jobs/JenkinsJobPermissionsService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtils.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/jenkins/jobs/JenkinsJobService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/ldap/LdapAuthenticationProvider.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/LocalCIBuildConfigurationService.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/LocalCIInfoContributor.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/LocalCIPriorityQueueComparator.java (80%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/LocalCIQueueWebsocketService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/LocalCIResultProcessingService.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/LocalCIResultService.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/LocalCIService.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/LocalCITriggerService.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/SharedQueueManagementService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/buildagent/BuildAgentDockerService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/buildagent/BuildAgentSshKeyService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/buildagent/BuildJobContainerService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/buildagent/BuildJobExecutionService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/buildagent/BuildJobGitService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/buildagent/BuildJobManagementService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/buildagent/BuildLogsMap.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/buildagent/SharedQueueProcessingService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/buildagent/TestResultXmlParser.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/dto/BuildAgentInformation.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/dto/BuildConfig.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/dto/BuildJobQueueItem.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/dto/BuildResult.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/dto/DockerImageBuild.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/dto/JobTimingInfo.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/dto/RepositoryInfo.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/dto/ResultBuildJob.java (80%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/dto/ResultQueueItem.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/scaparser/ReportParser.java (80%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/scaparser/exception/ParserException.java (79%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/scaparser/exception/UnsupportedToolException.java (79%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/scaparser/strategy/CheckstyleParser.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/scaparser/strategy/PMDCPDParser.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/scaparser/strategy/PMDParser.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/scaparser/strategy/ParserPolicy.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/scaparser/strategy/ParserStrategy.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/scaparser/strategy/SpotbugsParser.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/scaparser/utils/FileUtils.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localci/scaparser/utils/ReportUtils.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localvc/LocalVCFetchFilter.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localvc/LocalVCInfoContributor.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localvc/LocalVCPersonalAccessTokenManagementService.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localvc/LocalVCPostPushHook.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localvc/LocalVCPrePushHook.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localvc/LocalVCPushFilter.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localvc/LocalVCRepositoryUri.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localvc/LocalVCService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/localvc/LocalVCServletService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/lti/ExternalPasswordResetInfoContributor.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/lti/Lti13Service.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/lti/LtiDeepLinkingService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/lti/LtiDynamicRegistrationService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/lti/LtiNewResultService.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/lti/LtiService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/PyrisConnectorException.java (70%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/PyrisConnectorService.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/PyrisDTOService.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/PyrisHealthIndicator.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/PyrisJobService.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/PyrisPipelineService.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/PyrisStatusUpdateService.java (75%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/PyrisWebhookService.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/PyrisErrorResponseDTO.java (76%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/PyrisHealthStatusDTO.java (78%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/PyrisModelDTO.java (72%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/PyrisPipelineExecutionDTO.java (61%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/PyrisPipelineExecutionSettingsDTO.java (89%) create mode 100644 src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/PyrisChatPipelineExecutionBaseDataDTO.java rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/chat/PyrisChatStatusUpdateDTO.java (60%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java (51%) create mode 100644 src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/exercise/PyrisExerciseChatPipelineExecutionDTO.java rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionInputDTO.java (75%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/competency/PyrisCompetencyStatusUpdateDTO.java (78%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/data/PyrisBuildLogEntryDTO.java (73%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/data/PyrisCompetencyDTO.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/data/PyrisCourseDTO.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/data/PyrisExamDTO.java (84%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/data/PyrisExerciseWithStudentSubmissionsDTO.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/data/PyrisExtendedCourseDTO.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/data/PyrisFeedbackDTO.java (72%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/data/PyrisImageMessageContentDTO.java (73%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/data/PyrisJsonMessageContentDTO.java (79%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/data/PyrisLectureDTO.java (81%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/data/PyrisLectureUnitDTO.java (77%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/data/PyrisMessageContentBaseDTO.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/data/PyrisMessageDTO.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/data/PyrisProgrammingExerciseDTO.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/data/PyrisResultDTO.java (78%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/data/PyrisStudentSubmissionDTO.java (74%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/data/PyrisSubmissionDTO.java (84%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/data/PyrisTextMessageContentDTO.java (73%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/data/PyrisUserDTO.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java (55%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureIngestionExecutionDTO.java (54%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/status/PyrisStageDTO.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/dto/status/PyrisStageState.java (79%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/job/CompetencyExtractionJob.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/job/CourseChatJob.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/job/ExerciseChatJob.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/job/IngestionWebhookJob.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/pyris/job/PyrisJob.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/vcs/AbstractVersionControlService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/vcs/VcsTokenManagementService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/vcs/VcsTokenRenewalService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/vcs/VcsUserManagementService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/vcs/VersionControlRepositoryPermission.java (56%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/vcs/VersionControlServerHealthIndicator.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/connectors/vcs/VersionControlService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/export/CourseExamExportService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/export/DataExportCommunicationDataService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/export/DataExportCreationService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/export/DataExportExamCreationService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/export/DataExportExerciseCreationService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/export/DataExportQuizExerciseCreationService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/export/DataExportScienceEventService.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/export/DataExportService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/export/DataExportUtil.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/feature/Feature.java (76%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/feature/FeatureToggle.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/feature/FeatureToggleAspect.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/feature/FeatureToggleInfoContributor.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/feature/FeatureToggleService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/ldap/LdapConfig.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/ldap/LdapUserDto.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/ldap/LdapUserService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/messaging/DistributedInstanceMessageSendService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/messaging/InstanceMessageReceiveService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/messaging/InstanceMessageSendService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/messaging/MainInstanceMessageSendService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/messaging/MessageTopic.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/user/AuthorityService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/user/PasswordService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/user/UserCreationService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/user/UserManagementInfoContributor.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/user/UserService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service => core}/util/CommonsMultipartFile.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service => core}/util/ExamExerciseStartPreparationStatus.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{service => core}/util/HttpRequestUtils.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{service => core}/util/RoundingUtil.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{service => core}/util/TimeLogUtil.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{service => core}/util/TimeUtil.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service => core}/util/Tuple.java (74%) rename src/main/java/de/tum/cit/aet/artemis/{service => core}/util/UrlUtils.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/exam => exam/service}/ExamAccessService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/exam => exam/service}/ExamDateService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/exam => exam/service}/ExamDeletionService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/exam => exam/service}/ExamImportService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/exam => exam/service}/ExamLiveEventsService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/exam => exam/service}/ExamQuizQuestionsGenerator.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{service/exam => exam/service}/ExamQuizService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/exam => exam/service}/ExamRegistrationService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/exam => exam/service}/ExamService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/exam => exam/service}/ExamSessionService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/exam => exam/service}/ExamSubmissionService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/exam => exam/service}/ExamUserService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/exam => exam/service}/ImageExtractor.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/exam => exam/service}/StudentExamAccessService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/exam => exam/service}/StudentExamService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/export => exercise/service}/ExerciseWithSubmissionsExportService.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{service/scheduled => exercise/service}/IExerciseScheduleService.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{service/metrics => exercise/service}/LearningMetricsService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/export => exercise/service}/SubmissionExportService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/team/strategies => exercise/service/team}/CreateOnlyStrategy.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{service/team/strategies => exercise/service/team}/PurgeExistingStrategy.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/service/team/TeamImportStrategy.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{service => exercise/service/team}/TeamService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{service/export => fileupload/service}/FileUploadExerciseWithSubmissionsExportService.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{service/export => fileupload/service}/FileUploadSubmissionExportService.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{service => }/iris/dto/IrisChatWebsocketDTO.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{service => }/iris/dto/IrisCombinedChatSubSettingsDTO.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{service => }/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{service => }/iris/dto/IrisCombinedHestiaSubSettingsDTO.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{service => }/iris/dto/IrisCombinedLectureIngestionSubSettingsDTO.java (78%) rename src/main/java/de/tum/cit/aet/artemis/{service => }/iris/dto/IrisCombinedSettingsDTO.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{service => }/iris/exception/IrisException.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{service => }/iris/exception/IrisForbiddenException.java (78%) rename src/main/java/de/tum/cit/aet/artemis/{service => }/iris/exception/IrisInternalPyrisErrorException.java (84%) rename src/main/java/de/tum/cit/aet/artemis/{service => }/iris/exception/IrisRateLimitExceededException.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{service/iris => iris/service}/IrisCompetencyGenerationService.java (80%) rename src/main/java/de/tum/cit/aet/artemis/{service/iris => iris/service}/IrisDefaultTemplateService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/iris => iris/service}/IrisMessageService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/iris => iris/service}/IrisRateLimitService.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{service/iris => iris/service}/IrisSessionService.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{service/iris => iris/service}/session/AbstractIrisChatSessionService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{service/iris => iris/service}/session/IrisButtonBasedFeatureInterface.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{service/iris => iris/service}/session/IrisChatBasedFeatureInterface.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{service/iris => iris/service}/session/IrisCourseChatSessionService.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{service/iris => iris/service}/session/IrisExerciseChatSessionService.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{service/iris => iris/service}/session/IrisHestiaSessionService.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{service/iris => iris/service}/session/IrisRateLimitedFeatureInterface.java (72%) rename src/main/java/de/tum/cit/aet/artemis/{service/iris => iris/service}/session/IrisSubFeatureInterface.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{service/iris => iris/service}/settings/IrisSettingsService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/iris => iris/service}/settings/IrisSubSettingsService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/iris => iris/service}/websocket/IrisChatWebsocketService.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{service/iris => iris/service}/websocket/IrisWebsocketService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{service/scheduled => modeling/service}/ModelingExerciseScheduleService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{service/export => modeling/service}/ModelingExerciseWithSubmissionsExportService.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{service/export => modeling/service}/ModelingSubmissionExportService.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/CompassService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/assessment/Context.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/controller/FeedbackSelector.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/controller/ModelClusterFactory.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/strategy/NameSimilarity.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/Similarity.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/UMLContainerElement.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/UMLDiagram.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/UMLElement.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/activity/UMLActivity.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/activity/UMLActivityDiagram.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/activity/UMLActivityElement.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/activity/UMLActivityNode.java (79%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/activity/UMLControlFlow.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/bpmn/BPMNAnnotation.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/bpmn/BPMNCallActivity.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/bpmn/BPMNDataObject.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/bpmn/BPMNDataStore.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/bpmn/BPMNDiagram.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/bpmn/BPMNEndEvent.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/bpmn/BPMNFlow.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/bpmn/BPMNGateway.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/bpmn/BPMNGroup.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/bpmn/BPMNIntermediateEvent.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/bpmn/BPMNPool.java (81%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/bpmn/BPMNStartEvent.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/bpmn/BPMNSubprocess.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/bpmn/BPMNSwimlane.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/bpmn/BPMNTask.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/bpmn/BPMNTransaction.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/classdiagram/UMLAttribute.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/classdiagram/UMLClass.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/classdiagram/UMLClassDiagram.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/classdiagram/UMLMethod.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/classdiagram/UMLPackage.java (77%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/classdiagram/UMLRelationship.java (90%) create mode 100644 src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/communication/Direction.java rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/communication/UMLCommunicationDiagram.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/communication/UMLCommunicationLink.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/communication/UMLMessage.java (81%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/component/UMLComponent.java (73%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/component/UMLComponentDiagram.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/component/UMLComponentInterface.java (84%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/component/UMLComponentRelationship.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/deployment/UMLArtifact.java (76%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/deployment/UMLDeploymentComponent.java (72%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/deployment/UMLDeploymentDiagram.java (76%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/deployment/UMLDeploymentInterface.java (73%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/deployment/UMLNode.java (76%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/flowchart/Flowchart.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/flowchart/FlowchartDecision.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/flowchart/FlowchartFlowline.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/flowchart/FlowchartFunctionCall.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/flowchart/FlowchartInputOutput.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/flowchart/FlowchartProcess.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/flowchart/FlowchartTerminal.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/object/UMLObject.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/object/UMLObjectAttribute.java (75%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/object/UMLObjectDiagram.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/object/UMLObjectLink.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/object/UMLObjectMethod.java (78%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/parsers/UMLModelParser.java (84%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/parsers/v2/ActivityDiagramParser.java (84%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/parsers/v2/ClassDiagramParser.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/parsers/v2/CommunicationDiagramParser.java (78%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/parsers/v2/ComponentDiagramParser.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/parsers/v2/DeploymentDiagramParser.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/parsers/v2/FlowchartParser.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/parsers/v2/ObjectDiagramParser.java (84%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/parsers/v2/PetriNetParser.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/parsers/v2/SyntaxTreeParser.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/parsers/v2/UMLModelV2Parser.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/parsers/v2/UseCaseDiagramParser.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/parsers/v3/ActivityDiagramParser.java (84%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/parsers/v3/BPMNDiagramParser.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/parsers/v3/ClassDiagramParser.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/parsers/v3/CommunicationDiagramParser.java (78%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/parsers/v3/ComponentDiagramParser.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/parsers/v3/DeploymentDiagramParser.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/parsers/v3/FlowchartParser.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/parsers/v3/ObjectDiagramParser.java (84%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/parsers/v3/PetriNetParser.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/parsers/v3/SyntaxTreeParser.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/parsers/v3/UMLModelV3Parser.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/parsers/v3/UseCaseDiagramParser.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/petrinet/PetriNet.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/petrinet/PetriNetArc.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/petrinet/PetriNetPlace.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/petrinet/PetriNetTransition.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/syntaxtree/SyntaxTree.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/syntaxtree/SyntaxTreeLink.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/syntaxtree/SyntaxTreeNonterminal.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/syntaxtree/SyntaxTreeTerminal.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/usecase/UMLActor.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/usecase/UMLSystemBoundary.java (78%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/usecase/UMLUseCase.java (77%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/usecase/UMLUseCaseAssociation.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/umlmodel/usecase/UMLUseCaseDiagram.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/utils/CompassConfiguration.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/utils/JSONMapping.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/compass/utils/SimilarityUtils.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{service/plagiarism => plagiarism/service}/ContinuousPlagiarismControlPostContentProvider.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{service/plagiarism => plagiarism/service}/ContinuousPlagiarismControlService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/plagiarism => plagiarism/service}/ModelingPlagiarismDetectionService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{service/plagiarism => plagiarism/service}/PlagiarismAnswerPostService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/plagiarism => plagiarism/service}/PlagiarismCaseService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/plagiarism => plagiarism/service}/PlagiarismDetectionConfigHelper.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{service/plagiarism => plagiarism/service}/PlagiarismDetectionService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/plagiarism => plagiarism/service}/PlagiarismPostService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/plagiarism => plagiarism/service}/PlagiarismService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/plagiarism => plagiarism/service}/PlagiarismWebsocketService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/plagiarism => plagiarism/service}/ProgrammingLanguageNotSupportedForPlagiarismDetectionException.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{service/plagiarism => plagiarism/service}/ProgrammingPlagiarismDetectionService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{service/plagiarism => plagiarism/service}/TextPlagiarismDetectionService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{service/plagiarism => plagiarism/service}/cache/PlagiarismCacheService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{service/scheduled => programming/service}/AutomaticProgrammingExerciseCleanupService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/programming => programming/service}/AuxiliaryRepositoryService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/programming => programming/service}/CommitHistoryService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{service/programming => programming/service}/DefaultTemplateUpgradeService.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{service/programming => programming/service}/JavaTemplateUpgradeService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/programming => programming/service}/ProgrammingAssessmentService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{service/programming => programming/service}/ProgrammingExerciseCodeReviewFeedbackService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/export => programming/service}/ProgrammingExerciseExportService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/programming => programming/service}/ProgrammingExerciseFeedbackCreationService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/programming => programming/service}/ProgrammingExerciseGradingService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/programming => programming/service}/ProgrammingExerciseImportBasicService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/programming => programming/service}/ProgrammingExerciseImportFromFileService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/programming => programming/service}/ProgrammingExerciseImportService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{service/programming => programming/service}/ProgrammingExerciseParticipationService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/programming => programming/service}/ProgrammingExerciseRepositoryService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/scheduled => programming/service}/ProgrammingExerciseScheduleService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/programming => programming/service}/ProgrammingExerciseService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/programming => programming/service}/ProgrammingExerciseTestCaseService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/programming => programming/service}/ProgrammingLanguageFeature.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{service/programming => programming/service}/ProgrammingLanguageFeatureService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{service/programming => programming/service}/ProgrammingMessagingService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{service/programming => programming/service}/ProgrammingSubmissionService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/programming => programming/service}/ProgrammingTriggerService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/programming => programming/service}/RepositoryAccessService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/programming => programming/service}/RepositoryParticipationService.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{service/programming => programming/service}/RepositoryService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/programming => programming/service}/TemplateUpgradePolicyService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{service/programming => programming/service}/TemplateUpgradeService.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/CodeHintService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/ExerciseHintService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/ProgrammingExerciseGitDiffReportService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/ProgrammingExerciseTaskService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/TestwiseCoverageService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/behavioral/BehavioralBlackboard.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/behavioral/BehavioralSolutionEntryGenerationException.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/behavioral/BehavioralTestCaseService.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/behavioral/GroupedFile.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/behavioral/knowledgesource/AddUncoveredLinesAsPotentialCodeBlocks.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/behavioral/knowledgesource/BehavioralKnowledgeSource.java (68%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/behavioral/knowledgesource/CombineChangeBlocks.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/behavioral/knowledgesource/CreateCommonChangeBlocks.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/behavioral/knowledgesource/CreateSolutionEntries.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/behavioral/knowledgesource/DropRemovedGitDiffEntries.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/behavioral/knowledgesource/ExtractChangedLines.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/behavioral/knowledgesource/ExtractCoveredLines.java (84%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/behavioral/knowledgesource/FindCommonLines.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/behavioral/knowledgesource/GroupGitDiffAndCoverageEntriesByFilePathAndTestCase.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/behavioral/knowledgesource/InsertFileContents.java (76%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/structural/StructuralAttribute.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/structural/StructuralClass.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/structural/StructuralClassElements.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/structural/StructuralConstructor.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/structural/StructuralElement.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/structural/StructuralMethod.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/structural/StructuralSolutionEntryGenerationException.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/hestia/structural/StructuralTestCaseService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/util => programming/service}/structureoraclegenerator/JavaClassDiff.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/util => programming/service}/structureoraclegenerator/JavaClassDiffSerializer.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/util => programming/service}/structureoraclegenerator/OracleGenerator.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/util => programming/service}/structureoraclegenerator/SerializerUtil.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/quiz => quiz/service}/QuizBatchService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/quiz => quiz/service}/QuizExerciseImportService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/quiz => quiz/service}/QuizExerciseService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/export => quiz/service}/QuizExerciseWithSubmissionsExportService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{service/quiz => quiz/service}/QuizMessagingService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{service/quiz => quiz/service}/QuizPoolService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/quiz => quiz/service}/QuizResultService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/quiz => quiz/service}/QuizScheduleService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{service/quiz => quiz/service}/QuizService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/quiz => quiz/service}/QuizStatisticService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/quiz => quiz/service}/QuizSubmissionService.java (99%) delete mode 100644 src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/communication/Direction.java delete mode 100644 src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/chat/PyrisChatPipelineExecutionBaseDataDTO.java delete mode 100644 src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/chat/exercise/PyrisExerciseChatPipelineExecutionDTO.java rename src/main/java/de/tum/cit/aet/artemis/{service/export => text/service}/TextExerciseWithSubmissionsExportService.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{service/export => text/service}/TextSubmissionExportService.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{service/tutorialgroups => tutorialgroup/service}/TutorialGroupChannelManagementService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/tutorialgroups => tutorialgroup/service}/TutorialGroupFreePeriodService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/tutorialgroups => tutorialgroup/service}/TutorialGroupScheduleService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/tutorialgroups => tutorialgroup/service}/TutorialGroupService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service/tutorialgroups => tutorialgroup/service}/TutorialGroupsConfigurationService.java (98%) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/BonusStrategy.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/BonusStrategy.java index 7c2846426677..cf48d2bc8681 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/BonusStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/BonusStrategy.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.assessment.domain; -import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; +import static de.tum.cit.aet.artemis.core.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; import org.apache.commons.lang3.NotImplementedException; diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/ParticipantScore.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/ParticipantScore.java index 0c7072f686ef..ac96d36b65b6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/ParticipantScore.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/ParticipantScore.java @@ -26,10 +26,10 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; -import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; /** * Participant scores store the last (rated) result for each student/team and exercise combination. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java index bc8f5491d292..b4ace69e94b3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java @@ -2,8 +2,8 @@ import static de.tum.cit.aet.artemis.core.config.Constants.PROGRAMMING_GRACE_PERIOD_SECONDS; import static de.tum.cit.aet.artemis.core.config.Constants.SIZE_OF_UNSIGNED_TINYINT; -import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; -import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundToNDecimalPlaces; +import static de.tum.cit.aet.artemis.core.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; +import static de.tum.cit.aet.artemis.core.util.RoundingUtil.roundToNDecimalPlaces; import java.time.Instant; import java.time.ZonedDateTime; @@ -43,6 +43,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; +import de.tum.cit.aet.artemis.assessment.listener.ResultListener; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.domain.User; @@ -56,7 +57,6 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.service.ExerciseDateService; -import de.tum.cit.aet.artemis.service.listeners.ResultListener; import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/listeners/ResultListener.java b/src/main/java/de/tum/cit/aet/artemis/assessment/listener/ResultListener.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/service/listeners/ResultListener.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/listener/ResultListener.java index 87eba14d00b1..49ff2094e180 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/listeners/ResultListener.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/listener/ResultListener.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.listeners; +package de.tum.cit.aet.artemis.assessment.listener; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -13,9 +13,9 @@ import de.tum.cit.aet.artemis.assessment.domain.ParticipantScore; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; +import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; -import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; /** * Listener for updates on {@link Result} entities to update the {@link ParticipantScore}. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java index 761696c04007..bbf7c0865e7e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java @@ -22,10 +22,10 @@ import de.tum.cit.aet.artemis.assessment.domain.ParticipantScore; import de.tum.cit.aet.artemis.assessment.dto.ScoreDistribution; +import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; -import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementOverviewExerciseStatisticsDTO; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseScoresAggregatedInformation; diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java index 2696451b1844..09fe121ea5ce 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java @@ -32,10 +32,10 @@ import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.core.util.RoundingUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.service.util.RoundingUtil; import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; import de.tum.cit.aet.artemis.web.rest.dto.ResultWithPointsPerGradingCriterionDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ParticipantScoreScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreScheduleService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/scheduled/ParticipantScoreScheduleService.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreScheduleService.java index 47b597662ee2..8c23327d2e2b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ParticipantScoreScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreScheduleService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.scheduled; +package de.tum.cit.aet.artemis.assessment.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import static de.tum.cit.aet.artemis.core.config.StartupDelayConfig.PARTICIPATION_SCORES_SCHEDULE_DELAY_SEC; @@ -32,21 +32,22 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.domain.StudentScore; import de.tum.cit.aet.artemis.assessment.domain.TeamScore; +import de.tum.cit.aet.artemis.assessment.listener.ResultListener; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.TeamScoreRepository; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.util.RoundingUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; -import de.tum.cit.aet.artemis.service.util.RoundingUtil; /** * Scheduled service for the calculation of the participant scores. @@ -57,7 +58,7 @@ * This method is fast, but not 100% reliable. Therefore, a cron job regularly checks for invalid participant scores and updates them. * In all cases, using asynchronous scheduled tasks speeds up all requests that modify results. * - * @see de.tum.cit.aet.artemis.service.listeners.ResultListener + * @see ResultListener */ @Service @Profile(PROFILE_SCHEDULING) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ExerciseBaseDTO.java b/src/main/java/de/tum/cit/aet/artemis/athena/dto/ExerciseBaseDTO.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ExerciseBaseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/athena/dto/ExerciseBaseDTO.java index b0cb0e3d5e0a..6f54dc3653fc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ExerciseBaseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/dto/ExerciseBaseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto.athena; +package de.tum.cit.aet.artemis.athena.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/FeedbackBaseDTO.java b/src/main/java/de/tum/cit/aet/artemis/athena/dto/FeedbackBaseDTO.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/athena/FeedbackBaseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/athena/dto/FeedbackBaseDTO.java index 6231d5906be8..bd68a1ba9e78 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/FeedbackBaseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/dto/FeedbackBaseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto.athena; +package de.tum.cit.aet.artemis.athena.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingExerciseDTO.java b/src/main/java/de/tum/cit/aet/artemis/athena/dto/ModelingExerciseDTO.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingExerciseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/athena/dto/ModelingExerciseDTO.java index 275101725722..97b5725fe289 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingExerciseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/dto/ModelingExerciseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto.athena; +package de.tum.cit.aet.artemis.athena.dto; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingFeedbackDTO.java b/src/main/java/de/tum/cit/aet/artemis/athena/dto/ModelingFeedbackDTO.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingFeedbackDTO.java rename to src/main/java/de/tum/cit/aet/artemis/athena/dto/ModelingFeedbackDTO.java index 1404c78a9899..e4dd2926a0eb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingFeedbackDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/dto/ModelingFeedbackDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto.athena; +package de.tum.cit.aet.artemis.athena.dto; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingSubmissionDTO.java b/src/main/java/de/tum/cit/aet/artemis/athena/dto/ModelingSubmissionDTO.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingSubmissionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/athena/dto/ModelingSubmissionDTO.java index edd99e513251..9afcc3290407 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ModelingSubmissionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/dto/ModelingSubmissionDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto.athena; +package de.tum.cit.aet.artemis.athena.dto; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingExerciseDTO.java b/src/main/java/de/tum/cit/aet/artemis/athena/dto/ProgrammingExerciseDTO.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingExerciseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/athena/dto/ProgrammingExerciseDTO.java index ded0ce80fe9b..77416182b631 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingExerciseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/dto/ProgrammingExerciseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto.athena; +package de.tum.cit.aet.artemis.athena.dto; import static de.tum.cit.aet.artemis.core.config.Constants.ATHENA_PROGRAMMING_EXERCISE_REPOSITORY_API_PATH; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingFeedbackDTO.java b/src/main/java/de/tum/cit/aet/artemis/athena/dto/ProgrammingFeedbackDTO.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingFeedbackDTO.java rename to src/main/java/de/tum/cit/aet/artemis/athena/dto/ProgrammingFeedbackDTO.java index cb35b06e47d5..6b74ea95445f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingFeedbackDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/dto/ProgrammingFeedbackDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto.athena; +package de.tum.cit.aet.artemis.athena.dto; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingSubmissionDTO.java b/src/main/java/de/tum/cit/aet/artemis/athena/dto/ProgrammingSubmissionDTO.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingSubmissionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/athena/dto/ProgrammingSubmissionDTO.java index 0ecc04c7e615..d57c8f73bc2d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/ProgrammingSubmissionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/dto/ProgrammingSubmissionDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto.athena; +package de.tum.cit.aet.artemis.athena.dto; import static de.tum.cit.aet.artemis.core.config.Constants.ATHENA_PROGRAMMING_EXERCISE_REPOSITORY_API_PATH; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/SubmissionBaseDTO.java b/src/main/java/de/tum/cit/aet/artemis/athena/dto/SubmissionBaseDTO.java similarity index 74% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/athena/SubmissionBaseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/athena/dto/SubmissionBaseDTO.java index e20d9c1d7443..567a8253ef82 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/SubmissionBaseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/dto/SubmissionBaseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto.athena; +package de.tum.cit.aet.artemis.athena.dto; /** * Interface used to type the SubmissionDTOs for Athena: ProgrammingSubmissionDTO and TextSubmissionDTO diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextExerciseDTO.java b/src/main/java/de/tum/cit/aet/artemis/athena/dto/TextExerciseDTO.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextExerciseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/athena/dto/TextExerciseDTO.java index 474c29ba87c9..beb92b701927 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextExerciseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/dto/TextExerciseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto.athena; +package de.tum.cit.aet.artemis.athena.dto; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextFeedbackDTO.java b/src/main/java/de/tum/cit/aet/artemis/athena/dto/TextFeedbackDTO.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextFeedbackDTO.java rename to src/main/java/de/tum/cit/aet/artemis/athena/dto/TextFeedbackDTO.java index e1dcf3b8665b..e482f3e935a2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextFeedbackDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/dto/TextFeedbackDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto.athena; +package de.tum.cit.aet.artemis.athena.dto; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextSubmissionDTO.java b/src/main/java/de/tum/cit/aet/artemis/athena/dto/TextSubmissionDTO.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextSubmissionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/athena/dto/TextSubmissionDTO.java index dfad0479731c..e7636f1eda5f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/athena/TextSubmissionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/dto/TextSubmissionDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto.athena; +package de.tum.cit.aet.artemis.athena.dto; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AthenaScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaScheduleService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/scheduled/AthenaScheduleService.java rename to src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaScheduleService.java index fd3eff465d5c..8f66ef26f3e6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AthenaScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaScheduleService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.scheduled; +package de.tum.cit.aet.artemis.athena.service; import static de.tum.cit.aet.artemis.core.config.StartupDelayConfig.ATHENA_SCHEDULE_DELAY_SEC; @@ -21,12 +21,12 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaSubmissionSendingService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseLifecycle; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.ExerciseLifecycleService; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.service.connectors.athena.AthenaSubmissionSendingService; @Service @Profile("athena & scheduling") diff --git a/src/main/java/de/tum/cit/aet/artemis/service/science/ScienceEventService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/ScienceEventService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/science/ScienceEventService.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/service/ScienceEventService.java index 72820723fff7..9104a2c9718b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/science/ScienceEventService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/ScienceEventService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.science; +package de.tum.cit.aet.artemis.atlas.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyJolService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyJolService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyJolService.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyJolService.java index aa7eee90e4c3..41de1362b552 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyJolService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyJolService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.competency; +package de.tum.cit.aet.artemis.atlas.service.competency; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static java.util.stream.Collectors.toMap; @@ -20,7 +20,7 @@ import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.competency.CompetencyJolRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.service.iris.session.IrisCourseChatSessionService; +import de.tum.cit.aet.artemis.iris.service.session.IrisCourseChatSessionService; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolPairDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyProgressService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyProgressService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyProgressService.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyProgressService.java index fe7a7b3798bf..bcdf467cd723 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyProgressService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyProgressService.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.service.competency; +package de.tum.cit.aet.artemis.atlas.service.competency; import static de.tum.cit.aet.artemis.core.config.Constants.MIN_SCORE_GREEN; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.util.TimeUtil.toRelativeTime; +import static de.tum.cit.aet.artemis.core.util.TimeUtil.toRelativeTime; import java.time.Instant; import java.util.List; @@ -25,10 +25,12 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.util.RoundingUtil; import de.tum.cit.aet.artemis.exercise.domain.DifficultyLevel; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; @@ -36,8 +38,6 @@ import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.service.ParticipantScoreService; -import de.tum.cit.aet.artemis.service.learningpath.LearningPathService; -import de.tum.cit.aet.artemis.service.util.RoundingUtil; import de.tum.cit.aet.artemis.web.rest.dto.CourseCompetencyProgressDTO; import de.tum.cit.aet.artemis.web.rest.dto.metrics.CompetencyExerciseMasteryCalculationDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyRelationService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyRelationService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyRelationService.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyRelationService.java index ee3f23b8b405..026242e78aa3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyRelationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyRelationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.competency; +package de.tum.cit.aet.artemis.atlas.service.competency; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyService.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java index 44301838626e..28447962aa87 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/CompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.competency; +package de.tum.cit.aet.artemis.atlas.service.competency; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -18,12 +18,12 @@ import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; +import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.service.LectureUnitService; -import de.tum.cit.aet.artemis.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/CourseCompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/competency/CourseCompetencyService.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java index 240629dae143..d36be45e2f06 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/CourseCompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.competency; +package de.tum.cit.aet.artemis.atlas.service.competency; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -28,6 +28,7 @@ import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; +import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.Exercise; @@ -35,7 +36,6 @@ import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.service.LectureUnitService; -import de.tum.cit.aet.artemis.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyRelationDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/KnowledgeAreaService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/KnowledgeAreaService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/competency/KnowledgeAreaService.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/KnowledgeAreaService.java index e700a0cc54ad..c6593b4e443d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/KnowledgeAreaService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/KnowledgeAreaService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.competency; +package de.tum.cit.aet.artemis.atlas.service.competency; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/PrerequisiteService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/competency/PrerequisiteService.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java index a8ec89493a08..215a074a4dc8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/PrerequisiteService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.competency; +package de.tum.cit.aet.artemis.atlas.service.competency; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -18,12 +18,12 @@ import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; +import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.service.LectureUnitService; -import de.tum.cit.aet.artemis.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/competency/StandardizedCompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/StandardizedCompetencyService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/competency/StandardizedCompetencyService.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/StandardizedCompetencyService.java index f5f9356501ac..d421219573f8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/competency/StandardizedCompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/StandardizedCompetencyService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.competency; +package de.tum.cit.aet.artemis.atlas.service.competency; import static de.tum.cit.aet.artemis.atlas.domain.competency.StandardizedCompetency.FIRST_VERSION; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNavigationService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathNavigationService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNavigationService.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathNavigationService.java index 4eea542c7d7d..b892742e9110 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNavigationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathNavigationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.learningpath; +package de.tum.cit.aet.artemis.atlas.service.learningpath; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -12,9 +12,9 @@ import de.tum.cit.aet.artemis.atlas.domain.LearningObject; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; +import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathRecommendationService.RecommendationState; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.service.LearningObjectService; -import de.tum.cit.aet.artemis.service.learningpath.LearningPathRecommendationService.RecommendationState; import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationObjectDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationObjectDTO.LearningObjectType; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNgxService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathNgxService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNgxService.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathNgxService.java index 063c31372777..96285229efcb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathNgxService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathNgxService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.learningpath; +package de.tum.cit.aet.artemis.atlas.service.learningpath; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathRecommendationService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathRecommendationService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathRecommendationService.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathRecommendationService.java index f3342ec3a4a7..c72414fc35ab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathRecommendationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathRecommendationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.learningpath; +package de.tum.cit.aet.artemis.atlas.service.learningpath; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -31,6 +31,7 @@ import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.DifficultyLevel; import de.tum.cit.aet.artemis.exercise.domain.Exercise; @@ -38,7 +39,6 @@ import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.service.LearningObjectService; import de.tum.cit.aet.artemis.service.ParticipantScoreService; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; /** * Service Implementation for the recommendation of competencies and learning objects in learning paths. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathService.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathService.java index 4bb933378b3e..86ad4d09b8be 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/learningpath/LearningPathService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.learningpath; +package de.tum.cit.aet.artemis.atlas.service.learningpath; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -26,6 +26,7 @@ import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.LearningPathRepository; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -37,7 +38,6 @@ import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.domain.LectureUnitCompletion; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyGraphEdgeDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyGraphNodeDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java index 0e983efb10bc..9a6c4a704879 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java @@ -29,7 +29,7 @@ import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/AnswerMessageService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/metis/AnswerMessageService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java index 4cc588de7396..32d941e58b25 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/AnswerMessageService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.metis; +package de.tum.cit.aet.artemis.communication.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -20,6 +20,9 @@ import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; +import de.tum.cit.aet.artemis.communication.service.conversation.ConversationService; +import de.tum.cit.aet.artemis.communication.service.conversation.auth.ChannelAuthorizationService; +import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -29,9 +32,6 @@ import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; -import de.tum.cit.aet.artemis.service.metis.conversation.auth.ChannelAuthorizationService; -import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/ConversationMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/metis/ConversationMessagingService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java index ff2181ea76b0..9dc83c2b91e7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/ConversationMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.metis; +package de.tum.cit.aet.artemis.communication.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -42,6 +42,11 @@ import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.SingleUserNotificationRepository; +import de.tum.cit.aet.artemis.communication.service.conversation.ConversationService; +import de.tum.cit.aet.artemis.communication.service.conversation.auth.ChannelAuthorizationService; +import de.tum.cit.aet.artemis.communication.service.notifications.ConversationNotificationService; +import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; +import de.tum.cit.aet.artemis.communication.service.similarity.PostSimilarityComparisonStrategy; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -52,11 +57,6 @@ import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; -import de.tum.cit.aet.artemis.service.metis.conversation.auth.ChannelAuthorizationService; -import de.tum.cit.aet.artemis.service.metis.similarity.PostSimilarityComparisonStrategy; -import de.tum.cit.aet.artemis.service.notifications.ConversationNotificationService; -import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/NotificationScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/NotificationScheduleService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/scheduled/NotificationScheduleService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/NotificationScheduleService.java index 88a7e0fcd54a..bfcccdcc1dfa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/NotificationScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/NotificationScheduleService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.scheduled; +package de.tum.cit.aet.artemis.communication.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import static de.tum.cit.aet.artemis.core.config.StartupDelayConfig.NOTIFICATION_SCHEDULE_DELAY_SEC; @@ -16,14 +16,15 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; +import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.ScheduleService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseLifecycle; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; -import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; @Service @Profile(PROFILE_SCHEDULING) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/PostingService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/PostingService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/metis/PostingService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/PostingService.java index 287f26525304..9c908e5c5dfd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/PostingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/PostingService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.metis; +package de.tum.cit.aet.artemis.communication.service; import java.util.HashMap; import java.util.HashSet; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/PushNotificationDeviceConfigurationCleanupService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/PushNotificationDeviceConfigurationCleanupService.java index 9a6a969fec3c..f75237d763e5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/PushNotificationDeviceConfigurationCleanupService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.scheduled; +package de.tum.cit.aet.artemis.communication.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/ReactionService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/ReactionService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/metis/ReactionService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/ReactionService.java index 128666be36c1..4e447c71c838 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/ReactionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/ReactionService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.metis; +package de.tum.cit.aet.artemis.communication.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -14,13 +14,13 @@ import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.communication.repository.ReactionRepository; +import de.tum.cit.aet.artemis.communication.service.conversation.ConversationService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; -import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismAnswerPostService; -import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismPostService; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismAnswerPostService; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismPostService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/WeeklyEmailSummaryScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/WeeklyEmailSummaryScheduleService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/scheduled/WeeklyEmailSummaryScheduleService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/WeeklyEmailSummaryScheduleService.java index 042087298e9d..22672b6568b6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/WeeklyEmailSummaryScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/WeeklyEmailSummaryScheduleService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.scheduled; +package de.tum.cit.aet.artemis.communication.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import static de.tum.cit.aet.artemis.core.config.StartupDelayConfig.EMAIL_SUMMARY_SCHEDULE_DELAY_SEC; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ChannelService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ChannelService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java index c3e813e65703..588bf2150940 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ChannelService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.metis.conversation; +package de.tum.cit.aet.artemis.communication.service.conversation; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -20,13 +20,13 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.communication.service.conversation.errors.ChannelNameDuplicateException; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.lecture.domain.Lecture; -import de.tum.cit.aet.artemis.service.metis.conversation.errors.ChannelNameDuplicateException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationDTOService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationDTOService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationDTOService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationDTOService.java index 0493552deb06..6c57f0e6dcf2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationDTOService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationDTOService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.metis.conversation; +package de.tum.cit.aet.artemis.communication.service.conversation; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -20,12 +20,12 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.OneToOneChat; import de.tum.cit.aet.artemis.communication.dto.ConversationSummary; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; +import de.tum.cit.aet.artemis.communication.service.conversation.auth.ChannelAuthorizationService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.service.dto.UserPublicInfoDTO; -import de.tum.cit.aet.artemis.service.metis.conversation.auth.ChannelAuthorizationService; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ConversationDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationService.java index 54a578cd3fb1..2ee0f5fde9cd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/ConversationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.metis.conversation; +package de.tum.cit.aet.artemis.communication.service.conversation; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/GroupChatService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/GroupChatService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/GroupChatService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/GroupChatService.java index 9aae93a17d08..fb15a3a2bd04 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/GroupChatService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/GroupChatService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.metis.conversation; +package de.tum.cit.aet.artemis.communication.service.conversation; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/OneToOneChatService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/OneToOneChatService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/OneToOneChatService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/OneToOneChatService.java index 6119d0ff29c1..b8dbe3ea3e6a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/OneToOneChatService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/OneToOneChatService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.metis.conversation; +package de.tum.cit.aet.artemis.communication.service.conversation; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ChannelAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/ChannelAuthorizationService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ChannelAuthorizationService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/ChannelAuthorizationService.java index 7725f13ad39b..3c73fd2273e1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ChannelAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/ChannelAuthorizationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.metis.conversation.auth; +package de.tum.cit.aet.artemis.communication.service.conversation.auth; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ConversationAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/ConversationAuthorizationService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ConversationAuthorizationService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/ConversationAuthorizationService.java index 060cd2f6347e..eb725cd9b380 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/ConversationAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/ConversationAuthorizationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.metis.conversation.auth; +package de.tum.cit.aet.artemis.communication.service.conversation.auth; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/GroupChatAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/GroupChatAuthorizationService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/GroupChatAuthorizationService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/GroupChatAuthorizationService.java index d856d32cac81..4cdf724911b1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/GroupChatAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/GroupChatAuthorizationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.metis.conversation.auth; +package de.tum.cit.aet.artemis.communication.service.conversation.auth; import static de.tum.cit.aet.artemis.communication.ConversationSettings.MAX_GROUP_CHATS_PER_USER_PER_COURSE; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/OneToOneChatAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/OneToOneChatAuthorizationService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/OneToOneChatAuthorizationService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/OneToOneChatAuthorizationService.java index 41dc18a5bfb8..49d2da19f5aa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/auth/OneToOneChatAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/OneToOneChatAuthorizationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.metis.conversation.auth; +package de.tum.cit.aet.artemis.communication.service.conversation.auth; import static de.tum.cit.aet.artemis.communication.ConversationSettings.MAX_ONE_TO_ONE_CHATS_PER_USER_PER_COURSE; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/errors/ChannelNameDuplicateException.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/errors/ChannelNameDuplicateException.java similarity index 84% rename from src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/errors/ChannelNameDuplicateException.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/errors/ChannelNameDuplicateException.java index aa542428e1ad..9927dc37b315 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/conversation/errors/ChannelNameDuplicateException.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/errors/ChannelNameDuplicateException.java @@ -1,6 +1,6 @@ -package de.tum.cit.aet.artemis.service.metis.conversation.errors; +package de.tum.cit.aet.artemis.communication.service.conversation.errors; -import static de.tum.cit.aet.artemis.service.metis.conversation.ChannelService.CHANNEL_ENTITY_NAME; +import static de.tum.cit.aet.artemis.communication.service.conversation.ChannelService.CHANNEL_ENTITY_NAME; import java.io.Serial; import java.util.HashMap; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/LinkPreviewService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/linkpreview/LinkPreviewService.java similarity index 80% rename from src/main/java/de/tum/cit/aet/artemis/service/linkpreview/LinkPreviewService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/linkpreview/LinkPreviewService.java index df432161a5ef..00a6b1692d9d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/LinkPreviewService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/linkpreview/LinkPreviewService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.linkpreview; +package de.tum.cit.aet.artemis.communication.service.linkpreview; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -7,10 +7,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.service.linkpreview.ogparser.Content; -import de.tum.cit.aet.artemis.service.linkpreview.ogparser.OgParser; -import de.tum.cit.aet.artemis.service.linkpreview.ogparser.OpenGraph; -import de.tum.cit.aet.artemis.service.linkpreview.ogparser.htmlparser.OgMetaElementHtmlParser; +import de.tum.cit.aet.artemis.communication.service.linkpreview.ogparser.Content; +import de.tum.cit.aet.artemis.communication.service.linkpreview.ogparser.OgParser; +import de.tum.cit.aet.artemis.communication.service.linkpreview.ogparser.OpenGraph; +import de.tum.cit.aet.artemis.communication.service.linkpreview.ogparser.htmlparser.OgMetaElementHtmlParser; import de.tum.cit.aet.artemis.web.rest.dto.LinkPreviewDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/Content.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/linkpreview/ogparser/Content.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/Content.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/linkpreview/ogparser/Content.java index 21b9cfdc260b..55b411668e99 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/Content.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/linkpreview/ogparser/Content.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.linkpreview.ogparser; +package de.tum.cit.aet.artemis.communication.service.linkpreview.ogparser; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/OgParser.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/linkpreview/ogparser/OgParser.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/OgParser.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/linkpreview/ogparser/OgParser.java index f958749a4ca4..ef16a75c2d01 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/OgParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/linkpreview/ogparser/OgParser.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.service.linkpreview.ogparser; +package de.tum.cit.aet.artemis.communication.service.linkpreview.ogparser; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import de.tum.cit.aet.artemis.service.linkpreview.ogparser.htmlparser.OgMetaElement; -import de.tum.cit.aet.artemis.service.linkpreview.ogparser.htmlparser.OgMetaElementHtmlParser; +import de.tum.cit.aet.artemis.communication.service.linkpreview.ogparser.htmlparser.OgMetaElement; +import de.tum.cit.aet.artemis.communication.service.linkpreview.ogparser.htmlparser.OgMetaElementHtmlParser; /** * Parses the Open Graph meta tags of a website. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/OpenGraph.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/linkpreview/ogparser/OpenGraph.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/OpenGraph.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/linkpreview/ogparser/OpenGraph.java index d0871384309e..10b1b9edce16 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/OpenGraph.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/linkpreview/ogparser/OpenGraph.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.linkpreview.ogparser; +package de.tum.cit.aet.artemis.communication.service.linkpreview.ogparser; import java.util.List; import java.util.Map; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/htmlparser/OgMetaElement.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/linkpreview/ogparser/htmlparser/OgMetaElement.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/htmlparser/OgMetaElement.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/linkpreview/ogparser/htmlparser/OgMetaElement.java index 6ccf48d35918..8ccd94fa8b56 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/htmlparser/OgMetaElement.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/linkpreview/ogparser/htmlparser/OgMetaElement.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.linkpreview.ogparser.htmlparser; +package de.tum.cit.aet.artemis.communication.service.linkpreview.ogparser.htmlparser; /** * Represents single og meta element. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/htmlparser/OgMetaElementHtmlParser.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/linkpreview/ogparser/htmlparser/OgMetaElementHtmlParser.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/htmlparser/OgMetaElementHtmlParser.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/linkpreview/ogparser/htmlparser/OgMetaElementHtmlParser.java index 22540c9bc2b8..326c193f01ac 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/linkpreview/ogparser/htmlparser/OgMetaElementHtmlParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/linkpreview/ogparser/htmlparser/OgMetaElementHtmlParser.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.linkpreview.ogparser.htmlparser; +package de.tum.cit.aet.artemis.communication.service.linkpreview.ogparser.htmlparser; import java.io.IOException; import java.util.Collections; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/ConversationNotificationService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/ConversationNotificationService.java index 7cac3fddb776..1e13dce59c5a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/ConversationNotificationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.notifications; +package de.tum.cit.aet.artemis.communication.service.notifications; import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_NEW_MESSAGE; import static de.tum.cit.aet.artemis.communication.domain.notification.ConversationNotificationFactory.createConversationMessageNotification; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/GeneralInstantNotificationService.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/GeneralInstantNotificationService.java index 722fb75678e6..ece51407e55a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/GeneralInstantNotificationService.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.service.notifications; +package de.tum.cit.aet.artemis.communication.service.notifications; +import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsCommunicationChannel.EMAIL; +import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsCommunicationChannel.PUSH; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel.EMAIL; -import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel.PUSH; import java.util.Set; @@ -15,9 +15,9 @@ import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; +import de.tum.cit.aet.artemis.communication.service.notifications.push_notifications.ApplePushNotificationService; +import de.tum.cit.aet.artemis.communication.service.notifications.push_notifications.FirebasePushNotificationService; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.service.notifications.push_notifications.ApplePushNotificationService; -import de.tum.cit.aet.artemis.service.notifications.push_notifications.FirebasePushNotificationService; /** * A Handler for InstantNotifications such as MailService and PushNotifications. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/GroupNotificationScheduleService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationScheduleService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/GroupNotificationScheduleService.java index 0d39a0dc197b..3ac3ac002d77 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/GroupNotificationScheduleService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.notifications; +package de.tum.cit.aet.artemis.communication.service.notifications; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -9,9 +9,9 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.service.ExerciseDateService; -import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/GroupNotificationService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/GroupNotificationService.java index fdf59de395d4..e6b2d350fdfb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/GroupNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/GroupNotificationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.notifications; +package de.tum.cit.aet.artemis.communication.service.notifications; import static de.tum.cit.aet.artemis.communication.domain.GroupNotificationType.EDITOR; import static de.tum.cit.aet.artemis.communication.domain.GroupNotificationType.INSTRUCTOR; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/InstantNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/InstantNotificationService.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/notifications/InstantNotificationService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/InstantNotificationService.java index aa25b283be71..8581b83432eb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/InstantNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/InstantNotificationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.notifications; +package de.tum.cit.aet.artemis.communication.service.notifications; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailSendingService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MailSendingService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/notifications/MailSendingService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MailSendingService.java index e7f5db5360dd..7a923380a802 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailSendingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MailSendingService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.notifications; +package de.tum.cit.aet.artemis.communication.service.notifications; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MailService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/notifications/MailService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MailService.java index 2297653f2041..536d42d27dd0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/MailService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MailService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.notifications; +package de.tum.cit.aet.artemis.communication.service.notifications; import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXERCISE_SUBMISSION_ASSESSED; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationTargetFactory.extractNotificationUrl; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsCommunicationChannel.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/NotificationSettingsCommunicationChannel.java similarity index 72% rename from src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsCommunicationChannel.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/NotificationSettingsCommunicationChannel.java index 08b869d690b5..52f1312ec34b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsCommunicationChannel.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/NotificationSettingsCommunicationChannel.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.notifications; +package de.tum.cit.aet.artemis.communication.service.notifications; /** * Enumeration for the communication channels used in the notification system and settings diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/NotificationSettingsService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/NotificationSettingsService.java index 7c83fadaeba0..62f4912b9332 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/NotificationSettingsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/NotificationSettingsService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.notifications; +package de.tum.cit.aet.artemis.communication.service.notifications; import static de.tum.cit.aet.artemis.communication.domain.NotificationType.ATTACHMENT_CHANGE; import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_ADD_USER_CHANNEL; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/SingleUserNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/SingleUserNotificationService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/notifications/SingleUserNotificationService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/SingleUserNotificationService.java index b639135683f4..86c74fef604e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/SingleUserNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/SingleUserNotificationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.notifications; +package de.tum.cit.aet.artemis.communication.service.notifications; import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_NEW_REPLY_MESSAGE; import static de.tum.cit.aet.artemis.communication.domain.NotificationType.CONVERSATION_USER_MENTIONED; @@ -35,8 +35,8 @@ import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.NEW_REPLY_FOR_LECTURE_POST_TITLE; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.findCorrespondingNotificationTitleOrThrow; import static de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotificationFactory.createNotification; +import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsCommunicationChannel.WEBAPP; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel.WEBAPP; import java.util.Objects; import java.util.Set; @@ -57,6 +57,7 @@ import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotification; import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; import de.tum.cit.aet.artemis.communication.repository.SingleUserNotificationRepository; +import de.tum.cit.aet.artemis.communication.service.conversation.ConversationService; import de.tum.cit.aet.artemis.core.domain.DataExport; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -70,7 +71,6 @@ import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/TutorialGroupNotificationService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/TutorialGroupNotificationService.java index 223876edadc9..48e227585072 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/TutorialGroupNotificationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.notifications; +package de.tum.cit.aet.artemis.communication.service.notifications; import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_DELETED; import static de.tum.cit.aet.artemis.communication.domain.NotificationType.TUTORIAL_GROUP_UPDATED; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/ApplePushNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/push_notifications/ApplePushNotificationService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/ApplePushNotificationService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/push_notifications/ApplePushNotificationService.java index 38b764a1d9ca..f166257f3cc4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/ApplePushNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/push_notifications/ApplePushNotificationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.notifications.push_notifications; +package de.tum.cit.aet.artemis.communication.service.notifications.push_notifications; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/FirebasePushNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/push_notifications/FirebasePushNotificationService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/FirebasePushNotificationService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/push_notifications/FirebasePushNotificationService.java index cc4749213472..edf777e45149 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/FirebasePushNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/push_notifications/FirebasePushNotificationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.notifications.push_notifications; +package de.tum.cit.aet.artemis.communication.service.notifications.push_notifications; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/FirebaseRelayNotificationRequests.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/push_notifications/FirebaseRelayNotificationRequests.java similarity index 58% rename from src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/FirebaseRelayNotificationRequests.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/push_notifications/FirebaseRelayNotificationRequests.java index 867b29a80893..8ee27cb2c804 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/FirebaseRelayNotificationRequests.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/push_notifications/FirebaseRelayNotificationRequests.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.notifications.push_notifications; +package de.tum.cit.aet.artemis.communication.service.notifications.push_notifications; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/PushNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/push_notifications/PushNotificationService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/PushNotificationService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/push_notifications/PushNotificationService.java index b294b92b7655..3892421894ee 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/PushNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/push_notifications/PushNotificationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.notifications.push_notifications; +package de.tum.cit.aet.artemis.communication.service.notifications.push_notifications; import java.nio.charset.StandardCharsets; import java.security.InvalidAlgorithmParameterException; @@ -43,9 +43,9 @@ import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfiguration; import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceType; import de.tum.cit.aet.artemis.communication.repository.PushNotificationDeviceConfigurationRepository; +import de.tum.cit.aet.artemis.communication.service.notifications.InstantNotificationService; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.service.notifications.InstantNotificationService; /** * Wraps the sending of iOS and Android Notifications to the Relay Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/RelayNotificationRequest.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/push_notifications/RelayNotificationRequest.java similarity index 56% rename from src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/RelayNotificationRequest.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/push_notifications/RelayNotificationRequest.java index 926033b0e813..3cbe5695ccc8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/RelayNotificationRequest.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/push_notifications/RelayNotificationRequest.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.notifications.push_notifications; +package de.tum.cit.aet.artemis.communication.service.notifications.push_notifications; public record RelayNotificationRequest(String initializationVector, String payloadCipherText, String token) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/similarity/PostSimilarityComparisonStrategy.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/similarity/PostSimilarityComparisonStrategy.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/service/metis/similarity/PostSimilarityComparisonStrategy.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/similarity/PostSimilarityComparisonStrategy.java index ac20deadd5d0..93ca9de0c9f9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/similarity/PostSimilarityComparisonStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/similarity/PostSimilarityComparisonStrategy.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.metis.similarity; +package de.tum.cit.aet.artemis.communication.service.similarity; import de.tum.cit.aet.artemis.communication.domain.Post; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metis/similarity/TitleJaccardSimilarityCompareStrategy.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/similarity/TitleJaccardSimilarityCompareStrategy.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/metis/similarity/TitleJaccardSimilarityCompareStrategy.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/similarity/TitleJaccardSimilarityCompareStrategy.java index cf957b3c4136..53e7285cd41b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metis/similarity/TitleJaccardSimilarityCompareStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/similarity/TitleJaccardSimilarityCompareStrategy.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.metis.similarity; +package de.tum.cit.aet.artemis.communication.service.similarity; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/aop/logging/LoggingAspect.java b/src/main/java/de/tum/cit/aet/artemis/core/aop/logging/LoggingAspect.java index d9eb0b2e7cb2..1c2e306b46d6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/aop/logging/LoggingAspect.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/aop/logging/LoggingAspect.java @@ -15,7 +15,7 @@ import org.springframework.core.env.Profiles; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCAuthException; -import de.tum.cit.aet.artemis.service.connectors.vcs.AbstractVersionControlService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.AbstractVersionControlService; import tech.jhipster.config.JHipsterConstants; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/theia/TheiaInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/core/component/TheiaInfoContributor.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/service/theia/TheiaInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/core/component/TheiaInfoContributor.java index 25f61abee9c6..2310b0ca2882 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/theia/TheiaInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/component/TheiaInfoContributor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.theia; +package de.tum.cit.aet.artemis.core.component; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_THEIA; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/CacheConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/CacheConfiguration.java index 1fceb0e11d08..ac3118103cdd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/CacheConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/CacheConfiguration.java @@ -50,8 +50,8 @@ import com.hazelcast.spring.cache.HazelcastCacheManager; import com.hazelcast.spring.context.SpringManagedContext; +import de.tum.cit.aet.artemis.core.service.connectors.localci.LocalCIPriorityQueueComparator; import de.tum.cit.aet.artemis.service.HazelcastPathSerializer; -import de.tum.cit.aet.artemis.service.connectors.localci.LocalCIPriorityQueueComparator; import tech.jhipster.config.JHipsterProperties; import tech.jhipster.config.cache.PrefixedKeyGenerator; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java b/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java index 0a6aab6e1912..bf7464a9d0dd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java @@ -5,7 +5,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.service.programming.ProgrammingSubmissionService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingSubmissionService; /** * Application constants. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java b/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java index 8ed477b34c83..483944677fa2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java @@ -39,6 +39,8 @@ import de.tum.cit.aet.artemis.core.repository.StatisticsRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.connectors.localci.SharedQueueManagementService; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildAgentInformation; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; @@ -46,8 +48,6 @@ import de.tum.cit.aet.artemis.exercise.dto.ExerciseTypeMetricsEntry; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.service.connectors.localci.SharedQueueManagementService; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.MultiGauge; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/RestTemplateConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/RestTemplateConfiguration.java index 8a9b54674bd3..6d4c79ff08f4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/RestTemplateConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/RestTemplateConfiguration.java @@ -19,8 +19,8 @@ import de.tum.cit.aet.artemis.core.config.auth.AthenaAuthorizationInterceptor; import de.tum.cit.aet.artemis.core.config.auth.PyrisAuthorizationInterceptor; -import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabAuthorizationInterceptor; -import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsAuthorizationInterceptor; +import de.tum.cit.aet.artemis.core.service.connectors.gitlab.GitLabAuthorizationInterceptor; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsAuthorizationInterceptor; /** * For now only provides a basic {@link org.springframework.web.client.RestTemplate RestTemplate} bean. Can be extended diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/SecurityConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/SecurityConfiguration.java index 2bbbcd3a6622..d534dc86bc52 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/SecurityConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/SecurityConfiguration.java @@ -37,10 +37,10 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.jwt.JWTConfigurer; import de.tum.cit.aet.artemis.core.security.jwt.TokenProvider; +import de.tum.cit.aet.artemis.core.service.user.PasswordService; import de.tum.cit.aet.artemis.core.web.filter.SpaWebFilter; import de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.service.user.PasswordService; @Configuration @EnableWebSecurity diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/migration/entries/MigrationEntry20240614_140000.java b/src/main/java/de/tum/cit/aet/artemis/core/config/migration/entries/MigrationEntry20240614_140000.java index 073a144d4ec9..7371408c2df6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/migration/entries/MigrationEntry20240614_140000.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/migration/entries/MigrationEntry20240614_140000.java @@ -8,10 +8,10 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.core.config.migration.MigrationEntry; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; public class MigrationEntry20240614_140000 extends MigrationEntry { diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketBrokerHealthIndicator.java b/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketBrokerHealthIndicator.java index a5f2c027d5e5..04905f107345 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketBrokerHealthIndicator.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketBrokerHealthIndicator.java @@ -13,7 +13,7 @@ import org.springframework.messaging.simp.broker.BrokerAvailabilityEvent; import org.springframework.stereotype.Component; -import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; +import de.tum.cit.aet.artemis.core.service.connectors.ConnectorHealth; @Profile(PROFILE_CORE) @Component diff --git a/src/main/java/de/tum/cit/aet/artemis/core/domain/User.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/User.java index 593b27e0098b..919dcc6c22bc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/domain/User.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/User.java @@ -43,6 +43,7 @@ import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfiguration; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsTokenRenewalService; import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; import de.tum.cit.aet.artemis.lecture.domain.LectureUnitCompletion; @@ -146,7 +147,7 @@ public class User extends AbstractAuditingEntity implements Participant { * The expiry date of the VCS access token. * This is used for checking if a access token needs to be renewed. * - * @see de.tum.cit.aet.artemis.service.connectors.vcs.VcsTokenRenewalService + * @see VcsTokenRenewalService * @see UserRepository#getUsersWithAccessTokenExpirationDateBefore */ @Nullable diff --git a/src/main/java/de/tum/cit/aet/artemis/core/exception/VersionControlException.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/VersionControlException.java index a3f46eb2f698..289c7ab8da72 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/exception/VersionControlException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/VersionControlException.java @@ -8,7 +8,7 @@ * declaring "throws Exception" themselves (Although in the end, we just throw an unchecked RuntimeException). */ -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; /** * Generic exception thrown if there are any errors while communicating with the {@link VersionControlService VersionControlService} diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/LdapUserRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/LdapUserRepository.java index 11cca2f537cf..46df9dc0fbc1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/LdapUserRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/LdapUserRepository.java @@ -4,7 +4,7 @@ import org.springframework.data.ldap.repository.LdapRepository; import org.springframework.stereotype.Repository; -import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; +import de.tum.cit.aet.artemis.core.service.ldap.LdapUserDto; @Repository @Profile("ldap | ldap-only") diff --git a/src/main/java/de/tum/cit/aet/artemis/core/security/ArtemisAuthenticationProviderImpl.java b/src/main/java/de/tum/cit/aet/artemis/core/security/ArtemisAuthenticationProviderImpl.java index ea999d1f63f9..96206b74dac9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/security/ArtemisAuthenticationProviderImpl.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/security/ArtemisAuthenticationProviderImpl.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.core.security; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.service.user.PasswordService; -import de.tum.cit.aet.artemis.service.user.UserCreationService; +import de.tum.cit.aet.artemis.core.service.user.PasswordService; +import de.tum.cit.aet.artemis.core.service.user.UserCreationService; public abstract class ArtemisAuthenticationProviderImpl implements ArtemisAuthenticationProvider { diff --git a/src/main/java/de/tum/cit/aet/artemis/core/security/ArtemisInternalAuthenticationProvider.java b/src/main/java/de/tum/cit/aet/artemis/core/security/ArtemisInternalAuthenticationProvider.java index 60b50e50b88b..85efaef56a0a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/security/ArtemisInternalAuthenticationProvider.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/security/ArtemisInternalAuthenticationProvider.java @@ -13,8 +13,8 @@ import org.springframework.stereotype.Component; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.service.user.PasswordService; -import de.tum.cit.aet.artemis.service.user.UserCreationService; +import de.tum.cit.aet.artemis.core.service.user.PasswordService; +import de.tum.cit.aet.artemis.core.service.user.UserCreationService; @Profile(PROFILE_CORE) @Component diff --git a/src/main/java/de/tum/cit/aet/artemis/service/archival/ArchivalReportEntry.java b/src/main/java/de/tum/cit/aet/artemis/core/service/ArchivalReportEntry.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/archival/ArchivalReportEntry.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/ArchivalReportEntry.java index 9c0c8f9b2d15..a9df9a4688cd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/archival/ArchivalReportEntry.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/ArchivalReportEntry.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.archival; +package de.tum.cit.aet.artemis.core.service; import jakarta.annotation.Nullable; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/DataExportScheduleService.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/DataExportScheduleService.java index 870fdf587a5c..8bc915518edd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/DataExportScheduleService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.scheduled; +package de.tum.cit.aet.artemis.core.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; @@ -16,15 +16,15 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.service.notifications.MailService; import de.tum.cit.aet.artemis.core.domain.DataExport; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.DataExportRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.export.DataExportCreationService; +import de.tum.cit.aet.artemis.core.service.export.DataExportService; +import de.tum.cit.aet.artemis.core.service.user.UserService; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.service.export.DataExportCreationService; -import de.tum.cit.aet.artemis.service.export.DataExportService; -import de.tum.cit.aet.artemis.service.notifications.MailService; -import de.tum.cit.aet.artemis.service.user.UserService; /** * Service responsible for scheduling data exports. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/ScheduleService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/scheduled/ScheduleService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/ScheduleService.java index 696d489aa0fc..08526db540f7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/ScheduleService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.scheduled; +package de.tum.cit.aet.artemis.core.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -16,6 +16,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.util.Tuple; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseLifecycle; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; @@ -24,7 +25,6 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.ExerciseLifecycleService; import de.tum.cit.aet.artemis.service.ParticipationLifecycleService; -import de.tum.cit.aet.artemis.service.util.Tuple; @Profile(PROFILE_CORE) @Service @@ -180,7 +180,7 @@ public void cancelScheduledTaskForParticipationLifecycle(Long exerciseId, Long p * @param exerciseId of the exercise the participation belongs to. * @param participationId of the participation itself. */ - void cancelAllScheduledParticipationTasks(Long exerciseId, Long participationId) { + public void cancelAllScheduledParticipationTasks(Long exerciseId, Long participationId) { for (final ParticipationLifecycle lifecycle : ParticipationLifecycle.values()) { cancelScheduledTaskForParticipationLifecycle(exerciseId, participationId, lifecycle); } diff --git a/src/main/java/de/tum/cit/aet/artemis/service/telemetry/TelemetryService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/TelemetryService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/telemetry/TelemetryService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/TelemetryService.java index a4a502facf41..a92471563f82 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/telemetry/TelemetryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/TelemetryService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.telemetry; +package de.tum.cit.aet.artemis.core.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/UserScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/UserScheduleService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/scheduled/UserScheduleService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/UserScheduleService.java index b3dcc7752d03..1491df4c49f7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/UserScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/UserScheduleService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.scheduled; +package de.tum.cit.aet.artemis.core.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; @@ -20,7 +20,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsUserManagementService; @Service @Profile(PROFILE_SCHEDULING) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/AbstractGitService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/AbstractGitService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/AbstractGitService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/AbstractGitService.java index 37526e3d6d80..9bad67b8c215 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/AbstractGitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/AbstractGitService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors; +package de.tum.cit.aet.artemis.core.service.connectors; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/BuildScriptGenerationService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/BuildScriptGenerationService.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/BuildScriptGenerationService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/BuildScriptGenerationService.java index bdd761d51204..ee56e45ecbc8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/BuildScriptGenerationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/BuildScriptGenerationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors; +package de.tum.cit.aet.artemis.core.service.connectors; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/BuildScriptProviderService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/BuildScriptProviderService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/BuildScriptProviderService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/BuildScriptProviderService.java index 748b9c213ecd..fc6953f585e4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/BuildScriptProviderService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/BuildScriptProviderService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors; +package de.tum.cit.aet.artemis.core.service.connectors; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -18,12 +18,12 @@ import org.springframework.core.io.Resource; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusTemplateService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.service.ResourceLoaderService; -import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; /** * Service for providing build scripts for programming exercises diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ConnectorHealth.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ConnectorHealth.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/ConnectorHealth.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ConnectorHealth.java index e78d702703b9..5d809e5e60a6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ConnectorHealth.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ConnectorHealth.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors; +package de.tum.cit.aet.artemis.core.service.connectors; import java.util.Map; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/GenericBuildScriptGenerationService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/GenericBuildScriptGenerationService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/GenericBuildScriptGenerationService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/GenericBuildScriptGenerationService.java index 0ced441ad48e..3a4be9d743d7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/GenericBuildScriptGenerationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/GenericBuildScriptGenerationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors; +package de.tum.cit.aet.artemis.core.service.connectors; import java.io.IOException; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/GitService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/GitService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/GitService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/GitService.java index 81c595bfb9f0..fbdf11e917b4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/GitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/GitService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors; +package de.tum.cit.aet.artemis.core.service.connectors; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -73,6 +73,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.GitException; +import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.programming.domain.File; @@ -86,7 +87,6 @@ import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.ZipFileService; -import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.web.rest.dto.CommitInfoDTO; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/HazelcastHealthIndicator.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/HazelcastHealthIndicator.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/HazelcastHealthIndicator.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/HazelcastHealthIndicator.java index bd09e2bafe0f..75cfc0921842 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/HazelcastHealthIndicator.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/HazelcastHealthIndicator.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors; +package de.tum.cit.aet.artemis.core.service.connectors; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/SAML2Service.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/SAML2Service.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/SAML2Service.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/SAML2Service.java index 0af0a594c4fc..dca5cdae6fcd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/SAML2Service.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/SAML2Service.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors; +package de.tum.cit.aet.artemis.core.service.connectors; import java.util.Collection; import java.util.HashSet; @@ -21,15 +21,15 @@ import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticatedPrincipal; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.service.notifications.MailService; import de.tum.cit.aet.artemis.core.config.SAML2Properties; import de.tum.cit.aet.artemis.core.domain.Authority; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.UserNotActivatedException; -import de.tum.cit.aet.artemis.service.notifications.MailService; -import de.tum.cit.aet.artemis.service.user.UserCreationService; -import de.tum.cit.aet.artemis.service.user.UserService; +import de.tum.cit.aet.artemis.core.service.user.UserCreationService; +import de.tum.cit.aet.artemis.core.service.user.UserService; import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/Action.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/Action.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/Action.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/Action.java index 1ebf15fbeccc..eeae69a1dc36 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/Action.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/Action.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.aeolus; +package de.tum.cit.aet.artemis.core.service.connectors.aeolus; import java.util.List; import java.util.Map; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/ActionDeserializer.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/ActionDeserializer.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/ActionDeserializer.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/ActionDeserializer.java index 52dd84efe0bc..65f3b7754bf5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/ActionDeserializer.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/ActionDeserializer.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.aeolus; +package de.tum.cit.aet.artemis.core.service.connectors.aeolus; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusBuildPlanService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusBuildPlanService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusBuildPlanService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusBuildPlanService.java index d310369cb97d..1ccf4ae08b41 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusBuildPlanService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusBuildPlanService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.aeolus; +package de.tum.cit.aet.artemis.core.service.connectors.aeolus; import static de.tum.cit.aet.artemis.core.config.Constants.ASSIGNMENT_REPO_NAME; import static de.tum.cit.aet.artemis.core.config.Constants.SOLUTION_REPO_NAME; @@ -29,13 +29,13 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.dto.AeolusGenerationResponseDTO; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.programming.domain.AeolusTarget; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.service.InternalUrlService; -import de.tum.cit.aet.artemis.service.connectors.aeolus.dto.AeolusGenerationResponseDTO; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; /** * Service for publishing custom build plans using Aeolus diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusBuildScriptGenerationService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusBuildScriptGenerationService.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusBuildScriptGenerationService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusBuildScriptGenerationService.java index a283bd67652a..27d88267b614 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusBuildScriptGenerationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusBuildScriptGenerationService.java @@ -1,15 +1,15 @@ -package de.tum.cit.aet.artemis.service.connectors.aeolus; +package de.tum.cit.aet.artemis.core.service.connectors.aeolus; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; import com.fasterxml.jackson.core.JsonProcessingException; +import de.tum.cit.aet.artemis.core.service.connectors.BuildScriptGenerationService; +import de.tum.cit.aet.artemis.core.service.connectors.BuildScriptProviderService; import de.tum.cit.aet.artemis.programming.domain.AeolusTarget; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.service.connectors.BuildScriptGenerationService; -import de.tum.cit.aet.artemis.service.connectors.BuildScriptProviderService; /** * Service for generating build scripts for programming exercises using Aeolus diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusRepository.java similarity index 84% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusRepository.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusRepository.java index 277244eee434..8d561ea05f15 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.aeolus; +package de.tum.cit.aet.artemis.core.service.connectors.aeolus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusResult.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusResult.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusResult.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusResult.java index efbd34ffc648..a0018d15d680 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusResult.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusResult.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.aeolus; +package de.tum.cit.aet.artemis.core.service.connectors.aeolus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusTemplateService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusTemplateService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusTemplateService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusTemplateService.java index aad04f07b150..3401c65462a8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/AeolusTemplateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusTemplateService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.aeolus; +package de.tum.cit.aet.artemis.core.service.connectors.aeolus; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -20,12 +20,12 @@ import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import de.tum.cit.aet.artemis.core.config.ProgrammingLanguageConfiguration; +import de.tum.cit.aet.artemis.core.service.connectors.BuildScriptProviderService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.service.ResourceLoaderService; -import de.tum.cit.aet.artemis.service.connectors.BuildScriptProviderService; /** * Handles the request to {@link de.tum.cit.aet.artemis.web.rest.AeolusTemplateResource} and Artemis internal diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/DockerConfig.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/DockerConfig.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/DockerConfig.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/DockerConfig.java index 4b2b8acad6cc..d1041ce52958 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/DockerConfig.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/DockerConfig.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.aeolus; +package de.tum.cit.aet.artemis.core.service.connectors.aeolus; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/PlatformAction.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/PlatformAction.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/PlatformAction.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/PlatformAction.java index 45e4f825137a..3ea5281e3b08 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/PlatformAction.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/PlatformAction.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.aeolus; +package de.tum.cit.aet.artemis.core.service.connectors.aeolus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/ScriptAction.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/ScriptAction.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/ScriptAction.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/ScriptAction.java index de85ce94e735..75ac2b33818e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/ScriptAction.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/ScriptAction.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.aeolus; +package de.tum.cit.aet.artemis.core.service.connectors.aeolus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/Windfile.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/Windfile.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/Windfile.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/Windfile.java index 005b2decc510..d374e49af20a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/Windfile.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/Windfile.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.aeolus; +package de.tum.cit.aet.artemis.core.service.connectors.aeolus; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/WindfileMetadata.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/WindfileMetadata.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/WindfileMetadata.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/WindfileMetadata.java index 1fde5dd261be..5201b52bcc63 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/WindfileMetadata.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/WindfileMetadata.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.aeolus; +package de.tum.cit.aet.artemis.core.service.connectors.aeolus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/dto/AeolusGenerationResponseDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/dto/AeolusGenerationResponseDTO.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/dto/AeolusGenerationResponseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/dto/AeolusGenerationResponseDTO.java index bd54de18b26a..60a41b7c9b4d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/aeolus/dto/AeolusGenerationResponseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/dto/AeolusGenerationResponseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.aeolus.dto; +package de.tum.cit.aet.artemis.core.service.connectors.aeolus.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/apollon/ApollonConversionService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/apollon/ApollonConversionService.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/apollon/ApollonConversionService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/apollon/ApollonConversionService.java index 70d185f9d156..40d7a53358d4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/apollon/ApollonConversionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/apollon/ApollonConversionService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.apollon; +package de.tum.cit.aet.artemis.core.service.connectors.apollon; import java.io.IOException; import java.io.InputStream; @@ -12,7 +12,7 @@ import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; -import de.tum.cit.aet.artemis.service.connectors.apollon.dto.ApollonModelDTO; +import de.tum.cit.aet.artemis.core.service.connectors.apollon.dto.ApollonModelDTO; @Service @Profile("apollon") diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/apollon/ApollonHealthIndicator.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/apollon/ApollonHealthIndicator.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/apollon/ApollonHealthIndicator.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/apollon/ApollonHealthIndicator.java index cd1081f9c33f..0eeb3dd66fae 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/apollon/ApollonHealthIndicator.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/apollon/ApollonHealthIndicator.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.apollon; +package de.tum.cit.aet.artemis.core.service.connectors.apollon; import java.util.Map; @@ -13,7 +13,7 @@ import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; -import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; +import de.tum.cit.aet.artemis.core.service.connectors.ConnectorHealth; @Component @Profile("apollon") diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/apollon/dto/ApollonModelDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/apollon/dto/ApollonModelDTO.java similarity index 74% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/apollon/dto/ApollonModelDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/apollon/dto/ApollonModelDTO.java index 61465a4003f9..73946354bda7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/apollon/dto/ApollonModelDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/apollon/dto/ApollonModelDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.apollon.dto; +package de.tum.cit.aet.artemis.core.service.connectors.apollon.dto; import java.io.Serializable; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaConnector.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaConnector.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaConnector.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaConnector.java index 0f1347b94050..86d6c656735f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaConnector.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaConnector.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.athena; +package de.tum.cit.aet.artemis.core.service.connectors.athena; import jakarta.validation.constraints.NotNull; @@ -12,7 +12,7 @@ import org.springframework.web.client.RestTemplate; import de.tum.cit.aet.artemis.core.exception.NetworkingException; -import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; /** * Connector to Athena, a remote Artemis service that can create semi-automatic feedback suggestions for tutors. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaDTOConverterService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaDTOConverterService.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaDTOConverterService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaDTOConverterService.java index 4098738d8071..a140b16db80a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaDTOConverterService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaDTOConverterService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.athena; +package de.tum.cit.aet.artemis.core.service.connectors.athena; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -9,24 +9,24 @@ import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.repository.TextBlockRepository; +import de.tum.cit.aet.artemis.athena.dto.ExerciseBaseDTO; +import de.tum.cit.aet.artemis.athena.dto.FeedbackBaseDTO; +import de.tum.cit.aet.artemis.athena.dto.ModelingExerciseDTO; +import de.tum.cit.aet.artemis.athena.dto.ModelingFeedbackDTO; +import de.tum.cit.aet.artemis.athena.dto.ModelingSubmissionDTO; +import de.tum.cit.aet.artemis.athena.dto.ProgrammingExerciseDTO; +import de.tum.cit.aet.artemis.athena.dto.ProgrammingFeedbackDTO; +import de.tum.cit.aet.artemis.athena.dto.ProgrammingSubmissionDTO; +import de.tum.cit.aet.artemis.athena.dto.SubmissionBaseDTO; +import de.tum.cit.aet.artemis.athena.dto.TextExerciseDTO; +import de.tum.cit.aet.artemis.athena.dto.TextFeedbackDTO; +import de.tum.cit.aet.artemis.athena.dto.TextSubmissionDTO; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.service.dto.athena.ExerciseBaseDTO; -import de.tum.cit.aet.artemis.service.dto.athena.FeedbackBaseDTO; -import de.tum.cit.aet.artemis.service.dto.athena.ModelingExerciseDTO; -import de.tum.cit.aet.artemis.service.dto.athena.ModelingFeedbackDTO; -import de.tum.cit.aet.artemis.service.dto.athena.ModelingSubmissionDTO; -import de.tum.cit.aet.artemis.service.dto.athena.ProgrammingExerciseDTO; -import de.tum.cit.aet.artemis.service.dto.athena.ProgrammingFeedbackDTO; -import de.tum.cit.aet.artemis.service.dto.athena.ProgrammingSubmissionDTO; -import de.tum.cit.aet.artemis.service.dto.athena.SubmissionBaseDTO; -import de.tum.cit.aet.artemis.service.dto.athena.TextExerciseDTO; -import de.tum.cit.aet.artemis.service.dto.athena.TextFeedbackDTO; -import de.tum.cit.aet.artemis.service.dto.athena.TextSubmissionDTO; import de.tum.cit.aet.artemis.text.domain.TextBlock; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaFeedbackSendingService.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaFeedbackSendingService.java index aa2557c7e2dd..cdb108c43512 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaFeedbackSendingService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.athena; +package de.tum.cit.aet.artemis.core.service.connectors.athena; import java.util.List; @@ -13,12 +13,12 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.athena.dto.ExerciseBaseDTO; +import de.tum.cit.aet.artemis.athena.dto.FeedbackBaseDTO; +import de.tum.cit.aet.artemis.athena.dto.SubmissionBaseDTO; import de.tum.cit.aet.artemis.core.exception.NetworkingException; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; -import de.tum.cit.aet.artemis.service.dto.athena.ExerciseBaseDTO; -import de.tum.cit.aet.artemis.service.dto.athena.FeedbackBaseDTO; -import de.tum.cit.aet.artemis.service.dto.athena.SubmissionBaseDTO; /** * Service for publishing feedback to the Athena service for further processing diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaFeedbackSuggestionsService.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaFeedbackSuggestionsService.java index 33e6875cde20..86817faf0da1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaFeedbackSuggestionsService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.athena; +package de.tum.cit.aet.artemis.core.service.connectors.athena; import java.util.List; import java.util.Objects; @@ -12,16 +12,16 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.athena.dto.ExerciseBaseDTO; +import de.tum.cit.aet.artemis.athena.dto.ModelingFeedbackDTO; +import de.tum.cit.aet.artemis.athena.dto.ProgrammingFeedbackDTO; +import de.tum.cit.aet.artemis.athena.dto.SubmissionBaseDTO; +import de.tum.cit.aet.artemis.athena.dto.TextFeedbackDTO; import de.tum.cit.aet.artemis.core.exception.NetworkingException; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.service.dto.athena.ExerciseBaseDTO; -import de.tum.cit.aet.artemis.service.dto.athena.ModelingFeedbackDTO; -import de.tum.cit.aet.artemis.service.dto.athena.ProgrammingFeedbackDTO; -import de.tum.cit.aet.artemis.service.dto.athena.SubmissionBaseDTO; -import de.tum.cit.aet.artemis.service.dto.athena.TextFeedbackDTO; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaHealthIndicator.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaHealthIndicator.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaHealthIndicator.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaHealthIndicator.java index 16ff1df9e9cb..2b1123a06460 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaHealthIndicator.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaHealthIndicator.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.athena; +package de.tum.cit.aet.artemis.core.service.connectors.athena; import java.util.HashMap; import java.util.Map; @@ -13,7 +13,7 @@ import com.fasterxml.jackson.databind.JsonNode; -import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; +import de.tum.cit.aet.artemis.core.service.connectors.ConnectorHealth; /** * Service determining the health of the Athena service and its assessment modules. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaModuleService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaModuleService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaModuleService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaModuleService.java index fd1867ec1a4d..83582c126f34 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaModuleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaModuleService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.athena; +package de.tum.cit.aet.artemis.core.service.connectors.athena; import java.time.ZonedDateTime; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaRepositoryExportService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaRepositoryExportService.java index c364f4789c27..1c7af447a2af 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaRepositoryExportService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.athena; +package de.tum.cit.aet.artemis.core.service.connectors.athena; import java.io.File; import java.io.IOException; @@ -18,8 +18,8 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseExportService; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.export.ProgrammingExerciseExportService; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryExportOptionsDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.ServiceUnavailableException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaSubmissionSelectionService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaSubmissionSelectionService.java index 77474e36675a..fbc987ad5b62 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaSubmissionSelectionService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.athena; +package de.tum.cit.aet.artemis.core.service.connectors.athena; import java.util.List; import java.util.Optional; @@ -15,9 +15,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +import de.tum.cit.aet.artemis.athena.dto.ExerciseBaseDTO; import de.tum.cit.aet.artemis.core.exception.NetworkingException; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.service.dto.athena.ExerciseBaseDTO; /** * Service for selecting the "best" submission to assess right now using Athena, e.g. by the highest information gain. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaSubmissionSendingService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaSubmissionSendingService.java index 559260b61b53..e3a962cac848 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaSubmissionSendingService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.athena; +package de.tum.cit.aet.artemis.core.service.connectors.athena; import java.time.ZonedDateTime; import java.util.HashSet; @@ -17,12 +17,12 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.athena.dto.ExerciseBaseDTO; +import de.tum.cit.aet.artemis.athena.dto.SubmissionBaseDTO; import de.tum.cit.aet.artemis.core.exception.NetworkingException; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.service.dto.athena.ExerciseBaseDTO; -import de.tum.cit.aet.artemis.service.dto.athena.SubmissionBaseDTO; /** * Service for sending submissions to the Athena service for further processing diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractBuildPlanCreator.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/AbstractBuildPlanCreator.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractBuildPlanCreator.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/AbstractBuildPlanCreator.java index 03a521b07b4a..d0ff049c960b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractBuildPlanCreator.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/AbstractBuildPlanCreator.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.ci; +package de.tum.cit.aet.artemis.core.service.connectors.ci; import java.net.URL; import java.util.Map; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractContinuousIntegrationResultService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/AbstractContinuousIntegrationResultService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractContinuousIntegrationResultService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/AbstractContinuousIntegrationResultService.java index 0e7bbde5261d..165933c1cf93 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractContinuousIntegrationResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/AbstractContinuousIntegrationResultService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.ci; +package de.tum.cit.aet.artemis.core.service.connectors.ci; import java.time.ZonedDateTime; import java.util.List; @@ -14,10 +14,10 @@ import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseFeedbackCreationService; +import de.tum.cit.aet.artemis.programming.service.hestia.TestwiseCoverageService; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; import de.tum.cit.aet.artemis.service.dto.BuildJobDTOInterface; -import de.tum.cit.aet.artemis.service.hestia.TestwiseCoverageService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseFeedbackCreationService; public abstract class AbstractContinuousIntegrationResultService implements ContinuousIntegrationResultService { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractContinuousIntegrationService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/AbstractContinuousIntegrationService.java similarity index 63% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractContinuousIntegrationService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/AbstractContinuousIntegrationService.java index da8babc5e104..c218c26d1cdc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/AbstractContinuousIntegrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/AbstractContinuousIntegrationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.ci; +package de.tum.cit.aet.artemis.core.service.connectors.ci; public abstract class AbstractContinuousIntegrationService implements ContinuousIntegrationService { } diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/CIPermission.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/CIPermission.java similarity index 56% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/CIPermission.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/CIPermission.java index e86ac5c850d3..46477e07efaf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/CIPermission.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/CIPermission.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.ci; +package de.tum.cit.aet.artemis.core.service.connectors.ci; public enum CIPermission { READ, EDIT, CREATE, CREATEREPOSITORY, ADMIN diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/CIUserManagementService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/CIUserManagementService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/CIUserManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/CIUserManagementService.java index 6ccd4468c29a..e22076ad816c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/CIUserManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/CIUserManagementService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.ci; +package de.tum.cit.aet.artemis.core.service.connectors.ci; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationResultService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationResultService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationResultService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationResultService.java index 6287023111c3..571c72f332a6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationResultService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.ci; +package de.tum.cit.aet.artemis.core.service.connectors.ci; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationServerHealthIndicator.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationServerHealthIndicator.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationServerHealthIndicator.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationServerHealthIndicator.java index ec2109254e17..1e13a3d80d98 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationServerHealthIndicator.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationServerHealthIndicator.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.ci; +package de.tum.cit.aet.artemis.core.service.connectors.ci; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationService.java index e0fdef59706b..da094436c5f8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.ci; +package de.tum.cit.aet.artemis.core.service.connectors.ci; import static de.tum.cit.aet.artemis.core.config.Constants.ASSIGNMENT_DIRECTORY; import static de.tum.cit.aet.artemis.core.config.Constants.ASSIGNMENT_REPO_NAME; @@ -12,11 +12,11 @@ import com.fasterxml.jackson.core.JsonProcessingException; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.core.service.connectors.ConnectorHealth; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationTriggerService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationTriggerService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationTriggerService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationTriggerService.java index 46035da88e4c..1054a0807701 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationTriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationTriggerService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.ci; +package de.tum.cit.aet.artemis.core.service.connectors.ci; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationUpdateService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationUpdateService.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationUpdateService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationUpdateService.java index 8fa373f0389c..f22090f97896 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/ContinuousIntegrationUpdateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationUpdateService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.ci; +package de.tum.cit.aet.artemis.core.service.connectors.ci; /** * This service manages the update of the Build plan on the Continuous Integration Service depending on the current VCS and CI profiles. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/BuildLogParseUtils.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/BuildLogParseUtils.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/BuildLogParseUtils.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/BuildLogParseUtils.java index 44e2e6bbb6fd..0719a2da091d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/BuildLogParseUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/BuildLogParseUtils.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.ci.notification; +package de.tum.cit.aet.artemis.core.service.connectors.ci.notification; import java.time.ZonedDateTime; import java.time.format.DateTimeParseException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/CommitDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/CommitDTO.java similarity index 79% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/CommitDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/CommitDTO.java index aa1e4c80dbdb..296ce19ca590 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/CommitDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/CommitDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.ci.notification.dto; +package de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestCaseDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestCaseDTO.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestCaseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestCaseDTO.java index 581c1bdcc518..922a926a58c9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestCaseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestCaseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.ci.notification.dto; +package de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto; import java.util.Collections; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestCaseDetailMessageDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestCaseDetailMessageDTO.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestCaseDetailMessageDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestCaseDetailMessageDTO.java index 091ba71eab95..2215fa65b40f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestCaseDetailMessageDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestCaseDetailMessageDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.ci.notification.dto; +package de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestResultsDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestResultsDTO.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestResultsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestResultsDTO.java index 76b285270669..b8d4a7f6234f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestResultsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestResultsDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.ci.notification.dto; +package de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto; import java.time.ZonedDateTime; import java.util.List; @@ -13,9 +13,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.BuildLogParseUtils; import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; -import de.tum.cit.aet.artemis.service.connectors.ci.notification.BuildLogParseUtils; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; import de.tum.cit.aet.artemis.service.dto.BuildJobDTOInterface; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestSuiteDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestSuiteDTO.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestSuiteDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestSuiteDTO.java index a2f86201e566..fa3df22792f3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestSuiteDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestSuiteDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.ci.notification.dto; +package de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestwiseCoverageReportDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestwiseCoverageReportDTO.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestwiseCoverageReportDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestwiseCoverageReportDTO.java index 370432441f0e..df644b67e1a8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ci/notification/dto/TestwiseCoverageReportDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestwiseCoverageReportDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.ci.notification.dto; +package de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/AbstractGitLabAuthorizationInterceptor.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/AbstractGitLabAuthorizationInterceptor.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/AbstractGitLabAuthorizationInterceptor.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/AbstractGitLabAuthorizationInterceptor.java index 968e1afb78ff..8e9eb4885bd9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/AbstractGitLabAuthorizationInterceptor.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/AbstractGitLabAuthorizationInterceptor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.gitlab; +package de.tum.cit.aet.artemis.core.service.connectors.gitlab; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabAuthorizationInterceptor.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabAuthorizationInterceptor.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabAuthorizationInterceptor.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabAuthorizationInterceptor.java index d3b1f94ea2a5..b64293dab66a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabAuthorizationInterceptor.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabAuthorizationInterceptor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.gitlab; +package de.tum.cit.aet.artemis.core.service.connectors.gitlab; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabException.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabException.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabException.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabException.java index ed8855feda30..c601b64220f1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.gitlab; +package de.tum.cit.aet.artemis.core.service.connectors.gitlab; import de.tum.cit.aet.artemis.core.exception.VersionControlException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java index b10c583ee26b..680a75d9cd7b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.gitlab; +package de.tum.cit.aet.artemis.core.service.connectors.gitlab; import java.time.Duration; import java.time.Instant; @@ -25,8 +25,8 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.service.connectors.gitlab.dto.GitLabPersonalAccessTokenListResponseDTO; -import de.tum.cit.aet.artemis.service.connectors.vcs.VcsTokenManagementService; +import de.tum.cit.aet.artemis.core.service.connectors.gitlab.dto.GitLabPersonalAccessTokenListResponseDTO; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsTokenManagementService; /** * Provides VCS access token services for GitLab via means of personal access tokens. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabService.java index 6ccef972866e..3964ea0d15f5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.gitlab; +package de.tum.cit.aet.artemis.core.service.connectors.gitlab; import static org.gitlab4j.api.models.AccessLevel.DEVELOPER; import static org.gitlab4j.api.models.AccessLevel.MAINTAINER; @@ -49,6 +49,12 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.connectors.ConnectorHealth; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.core.service.connectors.gitlab.dto.GitLabPushNotificationDTO; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.AbstractVersionControlService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlRepositoryPermission; +import de.tum.cit.aet.artemis.core.util.UrlUtils; import de.tum.cit.aet.artemis.programming.domain.Commit; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; @@ -59,12 +65,6 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.service.UriService; -import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; -import de.tum.cit.aet.artemis.service.connectors.GitService; -import de.tum.cit.aet.artemis.service.connectors.gitlab.dto.GitLabPushNotificationDTO; -import de.tum.cit.aet.artemis.service.connectors.vcs.AbstractVersionControlService; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlRepositoryPermission; -import de.tum.cit.aet.artemis.service.util.UrlUtils; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabUserDoesNotExistException.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabUserDoesNotExistException.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabUserDoesNotExistException.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabUserDoesNotExistException.java index b20bd749bc01..5c4d5de11e65 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabUserDoesNotExistException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabUserDoesNotExistException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.gitlab; +package de.tum.cit.aet.artemis.core.service.connectors.gitlab; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabUserManagementService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabUserManagementService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabUserManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabUserManagementService.java index ca13cb55c337..505d11352d77 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabUserManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabUserManagementService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.gitlab; +package de.tum.cit.aet.artemis.core.service.connectors.gitlab; import static org.gitlab4j.api.models.AccessLevel.MAINTAINER; import static org.gitlab4j.api.models.AccessLevel.OWNER; @@ -23,10 +23,10 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsTokenManagementService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsUserManagementService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.service.connectors.vcs.VcsTokenManagementService; -import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitlabInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitlabInfoContributor.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitlabInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitlabInfoContributor.java index 18036c18f781..b3db946103e1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitlabInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitlabInfoContributor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.gitlab; +package de.tum.cit.aet.artemis.core.service.connectors.gitlab; import java.net.URL; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabCommitDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabCommitDTO.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabCommitDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabCommitDTO.java index 384757ebd0fe..8b007b97d792 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabCommitDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabCommitDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.gitlab.dto; +package de.tum.cit.aet.artemis.core.service.connectors.gitlab.dto; import java.time.ZonedDateTime; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java index 9043692c6d13..e88d664c60a6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.gitlab.dto; +package de.tum.cit.aet.artemis.core.service.connectors.gitlab.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java index 9d0a131bf4a1..40aa71673169 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.gitlab.dto; +package de.tum.cit.aet.artemis.core.service.connectors.gitlab.dto; import java.util.Date; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java index a8fb0ff8a0f9..e499845aecfe 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.gitlab.dto; +package de.tum.cit.aet.artemis.core.service.connectors.gitlab.dto; import java.util.Date; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabProjectDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabProjectDTO.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabProjectDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabProjectDTO.java index 3e09f332644d..e0cadeb0b27a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabProjectDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabProjectDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.gitlab.dto; +package de.tum.cit.aet.artemis.core.service.connectors.gitlab.dto; import java.net.URL; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java index 0c8d22a7a113..147a0fe9dba9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.gitlab.dto; +package de.tum.cit.aet.artemis.core.service.connectors.gitlab.dto; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabRepositoryDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabRepositoryDTO.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabRepositoryDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabRepositoryDTO.java index 1ef5f4656dd1..766cf4c412c9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlab/dto/GitLabRepositoryDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabRepositoryDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.gitlab.dto; +package de.tum.cit.aet.artemis.core.service.connectors.gitlab.dto; import java.net.URL; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java similarity index 71% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java index e8665aab65c0..3e28ed189bbc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java @@ -1,9 +1,9 @@ -package de.tum.cit.aet.artemis.service.connectors.gitlabci; +package de.tum.cit.aet.artemis.core.service.connectors.gitlabci; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.cit.aet.artemis.service.connectors.gitlab.AbstractGitLabAuthorizationInterceptor; +import de.tum.cit.aet.artemis.core.service.connectors.gitlab.AbstractGitLabAuthorizationInterceptor; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIBuildPlanService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIBuildPlanService.java index dd5aef54f3ad..e0755675f8d6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIBuildPlanService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.gitlabci; +package de.tum.cit.aet.artemis.core.service.connectors.gitlabci; import java.io.IOException; import java.nio.charset.Charset; @@ -12,12 +12,12 @@ import org.springframework.stereotype.Service; import org.springframework.util.StreamUtils; +import de.tum.cit.aet.artemis.core.service.connectors.ci.AbstractBuildPlanCreator; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.ResourceLoaderService; -import de.tum.cit.aet.artemis.service.connectors.ci.AbstractBuildPlanCreator; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIInfoContributor.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIInfoContributor.java index cb7e46f9a480..2cf558b4865f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIInfoContributor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.gitlabci; +package de.tum.cit.aet.artemis.core.service.connectors.gitlabci; import java.net.URL; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java index 8e48c8c24338..2c4691528ae6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.gitlabci; +package de.tum.cit.aet.artemis.core.service.connectors.gitlabci; import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.EMPTY; import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.JAVA; @@ -11,8 +11,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeature; -import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeatureService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeature; +import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeatureService; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIResultService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIResultService.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIResultService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIResultService.java index 026d213baef3..2f0be2f70ab6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIResultService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.gitlabci; +package de.tum.cit.aet.artemis.core.service.connectors.gitlabci; import java.time.ZonedDateTime; import java.util.List; @@ -9,6 +9,8 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.core.service.connectors.ci.AbstractContinuousIntegrationResultService; +import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestResultsDTO; import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.BuildLogStatisticsEntry; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; @@ -18,12 +20,10 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseFeedbackCreationService; +import de.tum.cit.aet.artemis.programming.service.hestia.TestwiseCoverageService; import de.tum.cit.aet.artemis.service.BuildLogEntryService; -import de.tum.cit.aet.artemis.service.connectors.ci.AbstractContinuousIntegrationResultService; -import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestResultsDTO; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; -import de.tum.cit.aet.artemis.service.hestia.TestwiseCoverageService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseFeedbackCreationService; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIService.java index 76412480c226..6ba65793177c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.gitlabci; +package de.tum.cit.aet.artemis.core.service.connectors.gitlabci; import static de.tum.cit.aet.artemis.core.config.Constants.NEW_RESULT_RESOURCE_API_PATH; @@ -26,6 +26,10 @@ import de.tum.cit.aet.artemis.core.config.ProgrammingLanguageConfiguration; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.GitLabCIException; +import de.tum.cit.aet.artemis.core.service.connectors.ConnectorHealth; +import de.tum.cit.aet.artemis.core.service.connectors.ci.AbstractContinuousIntegrationService; +import de.tum.cit.aet.artemis.core.service.connectors.ci.CIPermission; +import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestResultsDTO; import de.tum.cit.aet.artemis.programming.domain.BuildPlan; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; @@ -36,10 +40,6 @@ import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.UriService; -import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; -import de.tum.cit.aet.artemis.service.connectors.ci.AbstractContinuousIntegrationService; -import de.tum.cit.aet.artemis.service.connectors.ci.CIPermission; -import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestResultsDTO; import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCITriggerService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCITriggerService.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCITriggerService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCITriggerService.java index bd6adeefbd67..78a9c5f90b2c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCITriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCITriggerService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.gitlabci; +package de.tum.cit.aet.artemis.core.service.connectors.gitlabci; import org.gitlab4j.api.GitLabApi; import org.gitlab4j.api.GitLabApiException; @@ -8,12 +8,12 @@ import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.GitLabCIException; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationTriggerService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.UriService; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIUserManagementService.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIUserManagementService.java index 02d07c3e9e65..203bb13c3e69 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIUserManagementService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.gitlabci; +package de.tum.cit.aet.artemis.core.service.connectors.gitlabci; import java.util.Set; @@ -10,7 +10,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; -import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; +import de.tum.cit.aet.artemis.core.service.connectors.ci.CIUserManagementService; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsAuthorizationInterceptor.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsAuthorizationInterceptor.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsAuthorizationInterceptor.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsAuthorizationInterceptor.java index 3ba7db75f85e..5a2b4dec91fa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsAuthorizationInterceptor.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsAuthorizationInterceptor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.jenkins; +package de.tum.cit.aet.artemis.core.service.connectors.jenkins; import java.io.IOException; import java.net.URL; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsEndpoints.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsEndpoints.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsEndpoints.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsEndpoints.java index 0e293b407a90..cd172d05da46 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsEndpoints.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsEndpoints.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.service.connectors.jenkins; +package de.tum.cit.aet.artemis.core.service.connectors.jenkins; import java.util.Arrays; import java.util.List; import org.springframework.web.util.UriComponentsBuilder; -import de.tum.cit.aet.artemis.service.util.UrlUtils; +import de.tum.cit.aet.artemis.core.util.UrlUtils; public enum JenkinsEndpoints { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsInfoContributor.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsInfoContributor.java index 1d039908a6d9..ebcafbed9dba 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsInfoContributor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.jenkins; +package de.tum.cit.aet.artemis.core.service.connectors.jenkins; import java.net.URL; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsInternalUrlService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsInternalUrlService.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsInternalUrlService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsInternalUrlService.java index 366e062f07b5..46c237897405 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsInternalUrlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsInternalUrlService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.jenkins; +package de.tum.cit.aet.artemis.core.service.connectors.jenkins; import java.net.URL; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java index db1c2b2f1236..44a1fe9cdd32 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.jenkins; +package de.tum.cit.aet.artemis.core.service.connectors.jenkins; import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.C; import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.EMPTY; @@ -22,8 +22,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeature; -import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeatureService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeature; +import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeatureService; @Service @Profile("jenkins") diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsResultService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsResultService.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsResultService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsResultService.java index 3c978fdf0657..dcb97669082f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsResultService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.jenkins; +package de.tum.cit.aet.artemis.core.service.connectors.jenkins; import static de.tum.cit.aet.artemis.programming.domain.BuildLogStatisticsEntry.BuildJobPartDuration; @@ -11,6 +11,8 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.core.service.connectors.ci.AbstractContinuousIntegrationResultService; +import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestResultsDTO; import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; @@ -19,12 +21,10 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseFeedbackCreationService; +import de.tum.cit.aet.artemis.programming.service.hestia.TestwiseCoverageService; import de.tum.cit.aet.artemis.service.BuildLogEntryService; -import de.tum.cit.aet.artemis.service.connectors.ci.AbstractContinuousIntegrationResultService; -import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestResultsDTO; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; -import de.tum.cit.aet.artemis.service.hestia.TestwiseCoverageService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseFeedbackCreationService; @Profile("jenkins") @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsService.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsService.java index c146994a7340..1707eecde82a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.jenkins; +package de.tum.cit.aet.artemis.core.service.connectors.jenkins; import java.io.IOException; import java.net.URL; @@ -21,6 +21,14 @@ import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.JenkinsException; +import de.tum.cit.aet.artemis.core.service.connectors.ConnectorHealth; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.Windfile; +import de.tum.cit.aet.artemis.core.service.connectors.ci.AbstractContinuousIntegrationService; +import de.tum.cit.aet.artemis.core.service.connectors.ci.CIPermission; +import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestResultsDTO; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.build_plan.JenkinsBuildPlanService; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs.JenkinsJobService; import de.tum.cit.aet.artemis.programming.domain.BuildPlanType; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; @@ -29,14 +37,6 @@ import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; -import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; -import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; -import de.tum.cit.aet.artemis.service.connectors.ci.AbstractContinuousIntegrationService; -import de.tum.cit.aet.artemis.service.connectors.ci.CIPermission; -import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestResultsDTO; -import de.tum.cit.aet.artemis.service.connectors.jenkins.build_plan.JenkinsBuildPlanService; -import de.tum.cit.aet.artemis.service.connectors.jenkins.jobs.JenkinsJobService; import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; @Profile("jenkins") diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsTriggerService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsTriggerService.java similarity index 77% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsTriggerService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsTriggerService.java index 97901927321b..1b2b98a2999d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsTriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsTriggerService.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.service.connectors.jenkins; +package de.tum.cit.aet.artemis.core.service.connectors.jenkins; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationTriggerService; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.build_plan.JenkinsBuildPlanService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; -import de.tum.cit.aet.artemis.service.connectors.jenkins.build_plan.JenkinsBuildPlanService; @Profile("jenkins") @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsUserManagementService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsUserManagementService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsUserManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsUserManagementService.java index 4cadc7c6db73..c21b7397baf4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsUserManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsUserManagementService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.jenkins; +package de.tum.cit.aet.artemis.core.service.connectors.jenkins; import java.io.IOException; import java.net.URL; @@ -32,13 +32,13 @@ import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.JenkinsException; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.connectors.ci.CIUserManagementService; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.dto.JenkinsUserDTO; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs.JenkinsJobPermission; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs.JenkinsJobPermissionsService; +import de.tum.cit.aet.artemis.core.service.user.PasswordService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; -import de.tum.cit.aet.artemis.service.connectors.jenkins.dto.JenkinsUserDTO; -import de.tum.cit.aet.artemis.service.connectors.jenkins.jobs.JenkinsJobPermission; -import de.tum.cit.aet.artemis.service.connectors.jenkins.jobs.JenkinsJobPermissionsService; -import de.tum.cit.aet.artemis.service.user.PasswordService; @Service @Profile("jenkins") diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsXmlConfigBuilder.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsXmlConfigBuilder.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsXmlConfigBuilder.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsXmlConfigBuilder.java index f10faaca50e2..f76d41292dfa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsXmlConfigBuilder.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsXmlConfigBuilder.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.jenkins; +package de.tum.cit.aet.artemis.core.service.connectors.jenkins; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsXmlFileUtils.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsXmlFileUtils.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsXmlFileUtils.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsXmlFileUtils.java index 27d2cd0c9d39..f2beba765245 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/JenkinsXmlFileUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsXmlFileUtils.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.jenkins; +package de.tum.cit.aet.artemis.core.service.connectors.jenkins; import java.io.IOException; import java.io.StringReader; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanCreator.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsBuildPlanCreator.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanCreator.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsBuildPlanCreator.java index 7cdb14e79834..58324873b24b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanCreator.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsBuildPlanCreator.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.jenkins.build_plan; +package de.tum.cit.aet.artemis.core.service.connectors.jenkins.build_plan; import java.io.IOException; import java.io.InputStream; @@ -19,12 +19,12 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationBuildPlanException; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsXmlConfigBuilder; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsXmlFileUtils; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.service.ResourceLoaderService; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsXmlConfigBuilder; -import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsXmlFileUtils; @Profile("jenkins") @Component diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanLinkInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsBuildPlanLinkInfoContributor.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanLinkInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsBuildPlanLinkInfoContributor.java index 082ad62e9085..0a3f734a943c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanLinkInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsBuildPlanLinkInfoContributor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.jenkins.build_plan; +package de.tum.cit.aet.artemis.core.service.connectors.jenkins.build_plan; import java.net.URL; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java index 1fe65f1a4a60..8c87bbd139e7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.jenkins.build_plan; +package de.tum.cit.aet.artemis.core.service.connectors.jenkins.build_plan; import static de.tum.cit.aet.artemis.core.config.Constants.NEW_RESULT_RESOURCE_API_PATH; @@ -40,6 +40,17 @@ import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationBuildPlanException; import de.tum.cit.aet.artemis.core.exception.JenkinsException; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusBuildPlanService; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusRepository; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.Windfile; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestResultsDTO; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsEndpoints; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsInternalUrlService; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsXmlConfigBuilder; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsXmlFileUtils; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs.JenkinsJobPermissionsService; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs.JenkinsJobService; import de.tum.cit.aet.artemis.programming.domain.AeolusTarget; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; @@ -51,17 +62,6 @@ import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusBuildPlanService; -import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusRepository; -import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestResultsDTO; -import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsEndpoints; -import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsInternalUrlService; -import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsXmlConfigBuilder; -import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsXmlFileUtils; -import de.tum.cit.aet.artemis.service.connectors.jenkins.jobs.JenkinsJobPermissionsService; -import de.tum.cit.aet.artemis.service.connectors.jenkins.jobs.JenkinsJobService; @Service @Profile("jenkins") diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanUtils.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsBuildPlanUtils.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanUtils.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsBuildPlanUtils.java index ba2e3570ca12..cae75ba9206c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsBuildPlanUtils.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.jenkins.build_plan; +package de.tum.cit.aet.artemis.core.service.connectors.jenkins.build_plan; import org.w3c.dom.Document; import org.w3c.dom.Node; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java index 2281abef560f..10351d3eaadb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.jenkins.build_plan; +package de.tum.cit.aet.artemis.core.service.connectors.jenkins.build_plan; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -18,13 +18,13 @@ import de.tum.cit.aet.artemis.core.config.ProgrammingLanguageConfiguration; import de.tum.cit.aet.artemis.core.exception.JenkinsException; +import de.tum.cit.aet.artemis.core.service.connectors.ci.AbstractBuildPlanCreator; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.service.ResourceLoaderService; -import de.tum.cit.aet.artemis.service.connectors.ci.AbstractBuildPlanCreator; @Profile(PROFILE_CORE) @Component diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/dto/JenkinsUserDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/dto/JenkinsUserDTO.java similarity index 80% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/dto/JenkinsUserDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/dto/JenkinsUserDTO.java index fca8fa4dcfc4..0b79dc3e1ef6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/dto/JenkinsUserDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/dto/JenkinsUserDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.jenkins.dto; +package de.tum.cit.aet.artemis.core.service.connectors.jenkins.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermission.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/jobs/JenkinsJobPermission.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermission.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/jobs/JenkinsJobPermission.java index b17494a844e1..4104474493db 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermission.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/jobs/JenkinsJobPermission.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.jenkins.jobs; +package de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/jobs/JenkinsJobPermissionsService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/jobs/JenkinsJobPermissionsService.java index ac908d8d0a94..59e0cf691068 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/jobs/JenkinsJobPermissionsService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.jenkins.jobs; +package de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs; import java.io.IOException; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtils.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtils.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtils.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtils.java index 3d0d6243c436..346f2b964a76 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtils.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.jenkins.jobs; +package de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/jobs/JenkinsJobService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/jobs/JenkinsJobService.java index 2fbf0f6cbf10..f825d8dce938 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/jobs/JenkinsJobService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.jenkins.jobs; +package de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs; import java.io.IOException; @@ -17,7 +17,7 @@ import com.offbytwo.jenkins.model.JobWithDetails; import de.tum.cit.aet.artemis.core.exception.JenkinsException; -import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsXmlFileUtils; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsXmlFileUtils; @Service @Profile("jenkins") diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ldap/LdapAuthenticationProvider.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ldap/LdapAuthenticationProvider.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/ldap/LdapAuthenticationProvider.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ldap/LdapAuthenticationProvider.java index 9956e9739e69..9cec5e1ead11 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/ldap/LdapAuthenticationProvider.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ldap/LdapAuthenticationProvider.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.ldap; +package de.tum.cit.aet.artemis.core.service.connectors.ldap; import java.util.HashSet; import java.util.Locale; @@ -23,12 +23,12 @@ import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProvider; import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProviderImpl; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; -import de.tum.cit.aet.artemis.service.ldap.LdapUserService; -import de.tum.cit.aet.artemis.service.user.AuthorityService; -import de.tum.cit.aet.artemis.service.user.PasswordService; -import de.tum.cit.aet.artemis.service.user.UserCreationService; -import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.core.service.ldap.LdapUserDto; +import de.tum.cit.aet.artemis.core.service.ldap.LdapUserService; +import de.tum.cit.aet.artemis.core.service.user.AuthorityService; +import de.tum.cit.aet.artemis.core.service.user.PasswordService; +import de.tum.cit.aet.artemis.core.service.user.UserCreationService; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; @Component @Profile("ldap-only") diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIBuildConfigurationService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIBuildConfigurationService.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIBuildConfigurationService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIBuildConfigurationService.java index d317d08b3925..4bee089aef73 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIBuildConfigurationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIBuildConfigurationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci; +package de.tum.cit.aet.artemis.core.service.connectors.localci; import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_WORKING_DIRECTORY; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; @@ -9,11 +9,11 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.exception.LocalCIException; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.ScriptAction; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.Windfile; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; -import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; -import de.tum.cit.aet.artemis.service.connectors.aeolus.ScriptAction; -import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; @Service @Profile(PROFILE_LOCALCI) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIInfoContributor.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIInfoContributor.java index 6c2762923cd2..4b7ae67af1ce 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIInfoContributor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci; +package de.tum.cit.aet.artemis.core.service.connectors.localci; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIPriorityQueueComparator.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIPriorityQueueComparator.java similarity index 80% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIPriorityQueueComparator.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIPriorityQueueComparator.java index 0c5f8e63070f..51e10055dae3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIPriorityQueueComparator.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIPriorityQueueComparator.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.service.connectors.localci; +package de.tum.cit.aet.artemis.core.service.connectors.localci; import java.util.Comparator; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; /** * This comparator allows to prioritize build jobs in the shared build queue diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java index 95c9058c600d..a14853b00c5b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci; +package de.tum.cit.aet.artemis.core.service.connectors.localci; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.ASSEMBLER; @@ -24,8 +24,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeature; -import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeatureService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeature; +import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeatureService; /** * Sets the features provided for the different programming languages when using the local CI system. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIQueueWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIQueueWebsocketService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIQueueWebsocketService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIQueueWebsocketService.java index fcfc729581e4..26d71fb4e108 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIQueueWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIQueueWebsocketService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci; +package de.tum.cit.aet.artemis.core.service.connectors.localci; import java.util.List; @@ -19,8 +19,8 @@ import com.hazelcast.map.listener.EntryRemovedListener; import com.hazelcast.map.listener.EntryUpdatedListener; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; import de.tum.cit.aet.artemis.web.websocket.localci.LocalCIWebsocketMessagingService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIResultProcessingService.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultProcessingService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIResultProcessingService.java index e2df43d29beb..223badb8a5f6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIResultProcessingService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci; +package de.tum.cit.aet.artemis.core.service.connectors.localci; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; @@ -24,6 +24,10 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildResult; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.ResultQueueItem; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; @@ -34,14 +38,10 @@ import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseGradingService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingMessagingService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; import de.tum.cit.aet.artemis.service.BuildLogEntryService; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildResult; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.ResultQueueItem; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseGradingService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingMessagingService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingTriggerService; import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; import de.tum.cit.aet.artemis.web.websocket.programmingSubmission.BuildTriggerWebsocketError; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIResultService.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIResultService.java index b435f04e3a7b..c0be363c97e8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIResultService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci; +package de.tum.cit.aet.artemis.core.service.connectors.localci; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; @@ -8,6 +8,8 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.exception.LocalCIException; +import de.tum.cit.aet.artemis.core.service.connectors.ci.AbstractContinuousIntegrationResultService; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildResult; import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; @@ -15,11 +17,9 @@ import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.service.connectors.ci.AbstractContinuousIntegrationResultService; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildResult; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseFeedbackCreationService; +import de.tum.cit.aet.artemis.programming.service.hestia.TestwiseCoverageService; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; -import de.tum.cit.aet.artemis.service.hestia.TestwiseCoverageService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseFeedbackCreationService; /** * Service implementation for integrated CI. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIService.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIService.java index c380766100c3..920fdc32f639 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCIService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci; +package de.tum.cit.aet.artemis.core.service.connectors.localci; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; @@ -17,19 +17,19 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.core.exception.LocalCIException; +import de.tum.cit.aet.artemis.core.service.connectors.BuildScriptProviderService; +import de.tum.cit.aet.artemis.core.service.connectors.ConnectorHealth; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.Windfile; +import de.tum.cit.aet.artemis.core.service.connectors.ci.AbstractContinuousIntegrationService; +import de.tum.cit.aet.artemis.core.service.connectors.ci.CIPermission; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; -import de.tum.cit.aet.artemis.service.connectors.BuildScriptProviderService; -import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; -import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; -import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; -import de.tum.cit.aet.artemis.service.connectors.ci.AbstractContinuousIntegrationService; -import de.tum.cit.aet.artemis.service.connectors.ci.CIPermission; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.web.rest.dto.BuildPlanCheckoutDirectoriesDTO; import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCITriggerService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCITriggerService.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCITriggerService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCITriggerService.java index 201564a67b7e..278301c5a6ac 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/LocalCITriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCITriggerService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci; +package de.tum.cit.aet.artemis.core.service.connectors.localci; import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_WORKING_DIRECTORY; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; @@ -25,6 +25,16 @@ import de.tum.cit.aet.artemis.core.config.ProgrammingLanguageConfiguration; import de.tum.cit.aet.artemis.core.exception.LocalCIException; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusResult; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.Windfile; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationTriggerService; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildConfig; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.JobTimingInfo; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.RepositoryInfo; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; @@ -37,18 +47,8 @@ import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeature; import de.tum.cit.aet.artemis.service.ExerciseDateService; -import de.tum.cit.aet.artemis.service.connectors.GitService; -import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusResult; -import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; -import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildConfig; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.JobTimingInfo; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.RepositoryInfo; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeature; /** * Service for triggering builds on the local CI system. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/SharedQueueManagementService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/SharedQueueManagementService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/SharedQueueManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/SharedQueueManagementService.java index a684749fcd05..db744d9aaaac 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/SharedQueueManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/SharedQueueManagementService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci; +package de.tum.cit.aet.artemis.core.service.connectors.localci; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; @@ -31,12 +31,12 @@ import com.hazelcast.topic.ITopic; import de.tum.cit.aet.artemis.core.dto.SortingOrder; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.DockerImageBuild; import de.tum.cit.aet.artemis.programming.domain.BuildJob; import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.DockerImageBuild; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.FinishedBuildJobPageableSearchDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildAgentDockerService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildAgentDockerService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildAgentDockerService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildAgentDockerService.java index 9376b51f8969..c5393ce17556 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildAgentDockerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildAgentDockerService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; @@ -39,8 +39,8 @@ import com.hazelcast.map.IMap; import de.tum.cit.aet.artemis.core.exception.LocalCIException; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; /** * Service for Docker related operations in local CI diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildAgentSshKeyService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildAgentSshKeyService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildAgentSshKeyService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildAgentSshKeyService.java index 6524a0bffb46..fad6a056f835 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildAgentSshKeyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildAgentSshKeyService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobContainerService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobContainerService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobContainerService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobContainerService.java index 9ff87d7004df..890f39a0da9a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobContainerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobContainerService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent; import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_WORKING_DIRECTORY; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; @@ -43,9 +43,9 @@ import com.github.dockerjava.api.model.HostConfig; import de.tum.cit.aet.artemis.core.exception.LocalCIException; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService.RepositoryCheckoutPath; import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService.RepositoryCheckoutPath; /** * This service contains methods that are used to interact with the Docker containers when executing build jobs in the local CI system. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobExecutionService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobExecutionService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobExecutionService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobExecutionService.java index 5d1a62ecae30..3df43fa0277f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobExecutionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobExecutionService.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent; import static de.tum.cit.aet.artemis.core.config.Constants.CHECKED_OUT_REPOS_TEMP_DIR; import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_RESULTS_DIRECTORY; import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_WORKING_DIRECTORY; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; -import static de.tum.cit.aet.artemis.service.connectors.localci.buildagent.TestResultXmlParser.processTestResultFile; +import static de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent.TestResultXmlParser.processTestResultFile; import java.io.IOException; import java.net.URISyntaxException; @@ -35,17 +35,17 @@ import de.tum.cit.aet.artemis.core.exception.GitException; import de.tum.cit.aet.artemis.core.exception.LocalCIException; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildResult; +import de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.ReportParser; +import de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.exception.UnsupportedToolException; +import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCRepositoryUri; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildResult; -import de.tum.cit.aet.artemis.service.connectors.localci.scaparser.ReportParser; -import de.tum.cit.aet.artemis.service.connectors.localci.scaparser.exception.UnsupportedToolException; -import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; -import de.tum.cit.aet.artemis.service.util.TimeLogUtil; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobGitService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobGitService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobGitService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobGitService.java index 5d8763f11579..9dde4d3455b3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobGitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobGitService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; @@ -29,9 +29,9 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.exception.GitException; +import de.tum.cit.aet.artemis.core.service.connectors.AbstractGitService; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.service.connectors.AbstractGitService; @Profile(PROFILE_BUILDAGENT) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobManagementService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobManagementService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobManagementService.java index 349bfa4653af..8442a4d49a5d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildJobManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobManagementService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; @@ -32,9 +32,9 @@ import com.hazelcast.topic.ITopic; import de.tum.cit.aet.artemis.core.exception.LocalCIException; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildResult; import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildResult; /** * This service is responsible for adding build jobs to the Integrated Code Lifecycle executor service. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildLogsMap.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildLogsMap.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildLogsMap.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildLogsMap.java index 9a88c5c84828..472d67a1b78f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/BuildLogsMap.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildLogsMap.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/SharedQueueProcessingService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/SharedQueueProcessingService.java index 8e2c1564c49f..b1cec96e3afd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/SharedQueueProcessingService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; @@ -35,13 +35,13 @@ import com.hazelcast.map.IMap; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildResult; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.JobTimingInfo; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.ResultQueueItem; import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.BuildStatus; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildResult; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.JobTimingInfo; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.ResultQueueItem; /** * Includes functionality for processing build jobs from the shared build job queue. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/TestResultXmlParser.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/TestResultXmlParser.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/TestResultXmlParser.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/TestResultXmlParser.java index 5bca17491f2d..69da3be14937 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/TestResultXmlParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/TestResultXmlParser.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent; import java.io.IOException; import java.util.Collections; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildResult; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildResult; class TestResultXmlParser { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildAgentInformation.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/BuildAgentInformation.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildAgentInformation.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/BuildAgentInformation.java index 37a6ca414e08..ad39f7713dec 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildAgentInformation.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/BuildAgentInformation.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.dto; +package de.tum.cit.aet.artemis.core.service.connectors.localci.dto; import java.io.Serial; import java.io.Serializable; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildConfig.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/BuildConfig.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildConfig.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/BuildConfig.java index c0f82d17ee2f..0f0d22550d68 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildConfig.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/BuildConfig.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.dto; +package de.tum.cit.aet.artemis.core.service.connectors.localci.dto; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildJobQueueItem.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/BuildJobQueueItem.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildJobQueueItem.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/BuildJobQueueItem.java index c9047510d081..1611daed46be 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildJobQueueItem.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/BuildJobQueueItem.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.dto; +package de.tum.cit.aet.artemis.core.service.connectors.localci.dto; import java.io.Serial; import java.io.Serializable; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildResult.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/BuildResult.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildResult.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/BuildResult.java index 92ae4fd0a48f..87a9f78ac6e1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/BuildResult.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/BuildResult.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.dto; +package de.tum.cit.aet.artemis.core.service.connectors.localci.dto; import java.io.Serializable; import java.time.ZonedDateTime; @@ -11,8 +11,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestwiseCoverageReportDTO; import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestwiseCoverageReportDTO; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; import de.tum.cit.aet.artemis.service.dto.BuildJobDTOInterface; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/DockerImageBuild.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/DockerImageBuild.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/DockerImageBuild.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/DockerImageBuild.java index 6ad3e2f1a6b8..0f9b36d5477b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/DockerImageBuild.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/DockerImageBuild.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.dto; +package de.tum.cit.aet.artemis.core.service.connectors.localci.dto; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/JobTimingInfo.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/JobTimingInfo.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/JobTimingInfo.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/JobTimingInfo.java index 04e5da5fba60..c47d83ba77c4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/JobTimingInfo.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/JobTimingInfo.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.dto; +package de.tum.cit.aet.artemis.core.service.connectors.localci.dto; import java.io.Serializable; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/RepositoryInfo.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/RepositoryInfo.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/RepositoryInfo.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/RepositoryInfo.java index cfef44b7f9e7..9da01c70aa57 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/RepositoryInfo.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/RepositoryInfo.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.dto; +package de.tum.cit.aet.artemis.core.service.connectors.localci.dto; import java.io.Serializable; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/ResultBuildJob.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/ResultBuildJob.java similarity index 80% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/ResultBuildJob.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/ResultBuildJob.java index ba6fa3a7a011..ed4bca900f4b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/ResultBuildJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/ResultBuildJob.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.dto; +package de.tum.cit.aet.artemis.core.service.connectors.localci.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/ResultQueueItem.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/ResultQueueItem.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/ResultQueueItem.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/ResultQueueItem.java index d434d3156d13..0d2a111fca67 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/dto/ResultQueueItem.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/ResultQueueItem.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.dto; +package de.tum.cit.aet.artemis.core.service.connectors.localci.dto; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/ReportParser.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/ReportParser.java similarity index 80% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/ReportParser.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/ReportParser.java index 1975924741eb..6af13d52b2d9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/ReportParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/ReportParser.java @@ -1,7 +1,7 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.scaparser; +package de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser; -import static de.tum.cit.aet.artemis.service.connectors.localci.scaparser.utils.ReportUtils.createErrorReport; -import static de.tum.cit.aet.artemis.service.connectors.localci.scaparser.utils.ReportUtils.createFileTooLargeReport; +import static de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.utils.ReportUtils.createErrorReport; +import static de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.utils.ReportUtils.createFileTooLargeReport; import java.io.File; import java.io.IOException; @@ -9,11 +9,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.service.connectors.localci.scaparser.exception.ParserException; -import de.tum.cit.aet.artemis.service.connectors.localci.scaparser.exception.UnsupportedToolException; -import de.tum.cit.aet.artemis.service.connectors.localci.scaparser.strategy.ParserPolicy; -import de.tum.cit.aet.artemis.service.connectors.localci.scaparser.strategy.ParserStrategy; -import de.tum.cit.aet.artemis.service.connectors.localci.scaparser.utils.FileUtils; +import de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.exception.ParserException; +import de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.exception.UnsupportedToolException; +import de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.strategy.ParserPolicy; +import de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.strategy.ParserStrategy; +import de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.utils.FileUtils; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/exception/ParserException.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/exception/ParserException.java similarity index 79% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/exception/ParserException.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/exception/ParserException.java index 5601e277b322..c6ceda17f9e8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/exception/ParserException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/exception/ParserException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.scaparser.exception; +package de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.exception; /** * Exception thrown when an error occurs during parsing. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/exception/UnsupportedToolException.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/exception/UnsupportedToolException.java similarity index 79% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/exception/UnsupportedToolException.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/exception/UnsupportedToolException.java index e972aa9bf4b1..719c008d1bf2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/exception/UnsupportedToolException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/exception/UnsupportedToolException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.scaparser.exception; +package de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.exception; /** * Exception thrown if the static code analysis tool which created the report is not supported diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/CheckstyleParser.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/CheckstyleParser.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/CheckstyleParser.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/CheckstyleParser.java index 6d3fc06ecca6..ee2ed5574eab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/CheckstyleParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/CheckstyleParser.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.scaparser.strategy; +package de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.strategy; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/PMDCPDParser.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/PMDCPDParser.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/PMDCPDParser.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/PMDCPDParser.java index f6a25cf55c67..34cc1b0af6e1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/PMDCPDParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/PMDCPDParser.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.scaparser.strategy; +package de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.strategy; import java.io.File; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/PMDParser.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/PMDParser.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/PMDParser.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/PMDParser.java index 7e56619a2d20..84fad18e75d2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/PMDParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/PMDParser.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.scaparser.strategy; +package de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.strategy; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/ParserPolicy.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/ParserPolicy.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/ParserPolicy.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/ParserPolicy.java index 26562df56c8e..3736a684e1a9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/ParserPolicy.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/ParserPolicy.java @@ -1,9 +1,9 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.scaparser.strategy; +package de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.strategy; import java.nio.file.Path; +import de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.exception.UnsupportedToolException; import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; -import de.tum.cit.aet.artemis.service.connectors.localci.scaparser.exception.UnsupportedToolException; /** * Policy class for the parser strategies. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/ParserStrategy.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/ParserStrategy.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/ParserStrategy.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/ParserStrategy.java index 53d32420f87e..6f2f8d3f609f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/ParserStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/ParserStrategy.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.scaparser.strategy; +package de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.strategy; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/SpotbugsParser.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/SpotbugsParser.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/SpotbugsParser.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/SpotbugsParser.java index 70240010388b..8204bae132d6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/strategy/SpotbugsParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/SpotbugsParser.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.scaparser.strategy; +package de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.strategy; import java.io.File; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/utils/FileUtils.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/utils/FileUtils.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/utils/FileUtils.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/utils/FileUtils.java index 48ba06621347..fbf8198d3e80 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/utils/FileUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/utils/FileUtils.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.scaparser.utils; +package de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.utils; import java.io.File; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/utils/ReportUtils.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/utils/ReportUtils.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/utils/ReportUtils.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/utils/ReportUtils.java index b51396d6f871..329bf4b2b98a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localci/scaparser/utils/ReportUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/utils/ReportUtils.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localci.scaparser.utils; +package de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.utils; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCFetchFilter.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCFetchFilter.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCFetchFilter.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCFetchFilter.java index e6965304468c..13aa2fd715e8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCFetchFilter.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCFetchFilter.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localvc; +package de.tum.cit.aet.artemis.core.service.connectors.localvc; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCInfoContributor.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCInfoContributor.java index 6fc2056bc402..a5e069100e58 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCInfoContributor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localvc; +package de.tum.cit.aet.artemis.core.service.connectors.localvc; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPersonalAccessTokenManagementService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPersonalAccessTokenManagementService.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPersonalAccessTokenManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPersonalAccessTokenManagementService.java index 129900184328..54e12eacaa86 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPersonalAccessTokenManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPersonalAccessTokenManagementService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localvc; +package de.tum.cit.aet.artemis.core.service.connectors.localvc; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPostPushHook.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPostPushHook.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPostPushHook.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPostPushHook.java index dec418d03ce1..4f39de4b41f8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPostPushHook.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPostPushHook.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localvc; +package de.tum.cit.aet.artemis.core.service.connectors.localvc; import java.util.Collection; import java.util.Iterator; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPrePushHook.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPrePushHook.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPrePushHook.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPrePushHook.java index a10d464e6f11..6e14c6036e41 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPrePushHook.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPrePushHook.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localvc; +package de.tum.cit.aet.artemis.core.service.connectors.localvc; import java.io.IOException; import java.util.Collection; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPushFilter.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPushFilter.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPushFilter.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPushFilter.java index 1bf8e3f0c2ee..8eca72e33cf7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCPushFilter.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPushFilter.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localvc; +package de.tum.cit.aet.artemis.core.service.connectors.localvc; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCRepositoryUri.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCRepositoryUri.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCRepositoryUri.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCRepositoryUri.java index 3949ff489905..ba04918eee48 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCRepositoryUri.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCRepositoryUri.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localvc; +package de.tum.cit.aet.artemis.core.service.connectors.localvc; import java.net.URI; import java.net.URISyntaxException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCService.java index 516ad11a941c..d91d0ffccb63 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.localvc; +package de.tum.cit.aet.artemis.core.service.connectors.localvc; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; @@ -32,6 +32,10 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; +import de.tum.cit.aet.artemis.core.service.connectors.ConnectorHealth; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.AbstractVersionControlService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlRepositoryPermission; import de.tum.cit.aet.artemis.programming.domain.Commit; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; @@ -42,10 +46,6 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.service.UriService; -import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; -import de.tum.cit.aet.artemis.service.connectors.GitService; -import de.tum.cit.aet.artemis.service.connectors.vcs.AbstractVersionControlService; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlRepositoryPermission; /** * Implementation of VersionControlService for the local VC server. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCServletService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCServletService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCServletService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCServletService.java index cc40d6c4e00a..80f6242b2a37 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/localvc/LocalVCServletService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCServletService.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.service.connectors.localvc; +package de.tum.cit.aet.artemis.core.service.connectors.localvc; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; -import static de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCPersonalAccessTokenManagementService.TOKEN_PREFIX; -import static de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCPersonalAccessTokenManagementService.VCS_ACCESS_TOKEN_LENGTH; +import static de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCPersonalAccessTokenManagementService.TOKEN_PREFIX; +import static de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCPersonalAccessTokenManagementService.VCS_ACCESS_TOKEN_LENGTH; import java.io.IOException; import java.net.URL; @@ -45,6 +45,8 @@ import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationTriggerService; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.programming.domain.Commit; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; @@ -54,15 +56,13 @@ import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.ParticipationVCSAccessTokenRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.AuxiliaryRepositoryService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseParticipationService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingMessagingService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingSubmissionService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; +import de.tum.cit.aet.artemis.programming.service.RepositoryAccessService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; -import de.tum.cit.aet.artemis.service.programming.AuxiliaryRepositoryService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseParticipationService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingMessagingService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingSubmissionService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingTriggerService; -import de.tum.cit.aet.artemis.service.programming.RepositoryAccessService; -import de.tum.cit.aet.artemis.service.util.TimeLogUtil; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; import de.tum.cit.aet.artemis.web.rest.repository.RepositoryActionType; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/ExternalPasswordResetInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/ExternalPasswordResetInfoContributor.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/ExternalPasswordResetInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/ExternalPasswordResetInfoContributor.java index fbee555875c0..2603238486f2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/ExternalPasswordResetInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/ExternalPasswordResetInfoContributor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.lti; +package de.tum.cit.aet.artemis.core.service.connectors.lti; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/Lti13Service.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/Lti13Service.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/Lti13Service.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/Lti13Service.java index 869adab0933c..082040f39140 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/Lti13Service.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/Lti13Service.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.lti; +package de.tum.cit.aet.artemis.core.service.connectors.lti; import java.net.URI; import java.net.URISyntaxException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiDeepLinkingService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiDeepLinkingService.java index 2d13057142bd..044ebcc9eda6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiDeepLinkingService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.lti; +package de.tum.cit.aet.artemis.core.service.connectors.lti; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDynamicRegistrationService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiDynamicRegistrationService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDynamicRegistrationService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiDynamicRegistrationService.java index 536738ae572a..3bfc3dbdee42 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDynamicRegistrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiDynamicRegistrationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.lti; +package de.tum.cit.aet.artemis.core.service.connectors.lti; import java.util.UUID; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiNewResultService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiNewResultService.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiNewResultService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiNewResultService.java index df95d64c6fe3..f2fdfb2ec8b3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiNewResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiNewResultService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.lti; +package de.tum.cit.aet.artemis.core.service.connectors.lti; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiService.java index 20dcddb151ac..487ac18281d3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.lti; +package de.tum.cit.aet.artemis.core.service.connectors.lti; import java.util.Collections; import java.util.HashSet; @@ -33,10 +33,10 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.jwt.JWTCookieService; +import de.tum.cit.aet.artemis.core.service.connectors.ci.CIUserManagementService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsUserManagementService; +import de.tum.cit.aet.artemis.core.service.user.UserCreationService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; -import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; -import de.tum.cit.aet.artemis.service.user.UserCreationService; import tech.jhipster.security.RandomUtil; @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisConnectorException.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisConnectorException.java similarity index 70% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisConnectorException.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisConnectorException.java index 3857db946425..b7702b3acc9d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisConnectorException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisConnectorException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris; +package de.tum.cit.aet.artemis.core.service.connectors.pyris; public class PyrisConnectorException extends RuntimeException { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisConnectorService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisConnectorService.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisConnectorService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisConnectorService.java index de8775d7c5e3..08de05aabe3f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisConnectorService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisConnectorService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris; +package de.tum.cit.aet.artemis.core.service.connectors.pyris; import java.util.Arrays; import java.util.List; @@ -17,11 +17,11 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisModelDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; -import de.tum.cit.aet.artemis.service.iris.exception.IrisException; -import de.tum.cit.aet.artemis.service.iris.exception.IrisForbiddenException; -import de.tum.cit.aet.artemis.service.iris.exception.IrisInternalPyrisErrorException; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.PyrisModelDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; +import de.tum.cit.aet.artemis.iris.exception.IrisException; +import de.tum.cit.aet.artemis.iris.exception.IrisForbiddenException; +import de.tum.cit.aet.artemis.iris.exception.IrisInternalPyrisErrorException; import de.tum.cit.aet.artemis.web.rest.open.PublicPyrisStatusUpdateResource; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisDTOService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisDTOService.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisDTOService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisDTOService.java index 2dacc9bf3e6d..d8184493e2a9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisDTOService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisDTOService.java @@ -1,6 +1,6 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris; +package de.tum.cit.aet.artemis.core.service.connectors.pyris; -import static de.tum.cit.aet.artemis.service.util.TimeUtil.toInstant; +import static de.tum.cit.aet.artemis.core.util.TimeUtil.toInstant; import java.io.IOException; import java.util.List; @@ -15,20 +15,20 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisBuildLogEntryDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisFeedbackDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisMessageDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisProgrammingExerciseDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisResultDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisSubmissionDTO; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.Repository; +import de.tum.cit.aet.artemis.programming.service.RepositoryService; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.service.connectors.GitService; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisBuildLogEntryDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisFeedbackDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisMessageDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisProgrammingExerciseDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisResultDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisSubmissionDTO; -import de.tum.cit.aet.artemis.service.programming.RepositoryService; @Service @Profile("iris") diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisHealthIndicator.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisHealthIndicator.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisHealthIndicator.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisHealthIndicator.java index 298b3265727d..2c8dd7a2bf51 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisHealthIndicator.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisHealthIndicator.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris; +package de.tum.cit.aet.artemis.core.service.connectors.pyris; import java.net.URI; @@ -11,8 +11,8 @@ import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; -import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisHealthStatusDTO; +import de.tum.cit.aet.artemis.core.service.connectors.ConnectorHealth; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.PyrisHealthStatusDTO; @Component @Profile("iris") diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisJobService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisJobService.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisJobService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisJobService.java index 819a65e1db92..352d51b98d0b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisJobService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisJobService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris; +package de.tum.cit.aet.artemis.core.service.connectors.pyris; import java.security.SecureRandom; import java.util.concurrent.TimeUnit; @@ -15,10 +15,10 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.map.IMap; -import de.tum.cit.aet.artemis.service.connectors.pyris.job.CourseChatJob; -import de.tum.cit.aet.artemis.service.connectors.pyris.job.ExerciseChatJob; -import de.tum.cit.aet.artemis.service.connectors.pyris.job.IngestionWebhookJob; -import de.tum.cit.aet.artemis.service.connectors.pyris.job.PyrisJob; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.CourseChatJob; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.ExerciseChatJob; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.IngestionWebhookJob; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.PyrisJob; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisPipelineService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisPipelineService.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisPipelineService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisPipelineService.java index 1db53595a97b..c131cd9237e8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisPipelineService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisPipelineService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris; +package de.tum.cit.aet.artemis.core.service.connectors.pyris; import java.util.HashMap; import java.util.HashSet; @@ -18,23 +18,23 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyJol; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.PyrisPipelineExecutionDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.chat.course.PyrisCourseChatPipelineExecutionDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.chat.exercise.PyrisExerciseChatPipelineExecutionDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisCourseDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisExtendedCourseDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisUserDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.LearningMetricsService; import de.tum.cit.aet.artemis.iris.domain.session.IrisCourseChatSession; import de.tum.cit.aet.artemis.iris.domain.session.IrisExerciseChatSession; +import de.tum.cit.aet.artemis.iris.exception.IrisException; +import de.tum.cit.aet.artemis.iris.service.websocket.IrisChatWebsocketService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.course.PyrisCourseChatPipelineExecutionDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.exercise.PyrisExerciseChatPipelineExecutionDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisCourseDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisExtendedCourseDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisUserDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.cit.aet.artemis.service.iris.exception.IrisException; -import de.tum.cit.aet.artemis.service.iris.websocket.IrisChatWebsocketService; -import de.tum.cit.aet.artemis.service.metrics.LearningMetricsService; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisStatusUpdateService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisStatusUpdateService.java similarity index 75% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisStatusUpdateService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisStatusUpdateService.java index 36d71d69eba9..b9db16056a87 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisStatusUpdateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisStatusUpdateService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris; +package de.tum.cit.aet.artemis.core.service.connectors.pyris; import java.util.List; @@ -7,18 +7,18 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageState; -import de.tum.cit.aet.artemis.service.connectors.pyris.job.CompetencyExtractionJob; -import de.tum.cit.aet.artemis.service.connectors.pyris.job.CourseChatJob; -import de.tum.cit.aet.artemis.service.connectors.pyris.job.ExerciseChatJob; -import de.tum.cit.aet.artemis.service.connectors.pyris.job.IngestionWebhookJob; -import de.tum.cit.aet.artemis.service.iris.IrisCompetencyGenerationService; -import de.tum.cit.aet.artemis.service.iris.session.IrisCourseChatSessionService; -import de.tum.cit.aet.artemis.service.iris.session.IrisExerciseChatSessionService; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageState; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.CompetencyExtractionJob; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.CourseChatJob; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.ExerciseChatJob; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.IngestionWebhookJob; +import de.tum.cit.aet.artemis.iris.service.IrisCompetencyGenerationService; +import de.tum.cit.aet.artemis.iris.service.session.IrisCourseChatSessionService; +import de.tum.cit.aet.artemis.iris.service.session.IrisExerciseChatSessionService; @Service @Profile("iris") @@ -56,7 +56,7 @@ public void handleStatusUpdate(ExerciseChatJob job, PyrisChatStatusUpdateDTO sta /** * Handles the status update of a course chat job and forwards it to - * {@link de.tum.cit.aet.artemis.service.iris.session.IrisCourseChatSessionService#handleStatusUpdate(CourseChatJob, PyrisChatStatusUpdateDTO)} + * {@link de.tum.cit.aet.artemis.iris.service.session.IrisCourseChatSessionService#handleStatusUpdate(CourseChatJob, PyrisChatStatusUpdateDTO)} * * @param job the job that is updated * @param statusUpdate the status update @@ -69,7 +69,7 @@ public void handleStatusUpdate(CourseChatJob job, PyrisChatStatusUpdateDTO statu /** * Handles the status update of a competency extraction job and forwards it to - * {@link de.tum.cit.aet.artemis.service.iris.IrisCompetencyGenerationService#handleStatusUpdate(String, long, PyrisCompetencyStatusUpdateDTO)} + * {@link IrisCompetencyGenerationService#handleStatusUpdate(String, long, PyrisCompetencyStatusUpdateDTO)} * * @param job the job that is updated * @param statusUpdate the status update diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisWebhookService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisWebhookService.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisWebhookService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisWebhookService.java index 6e6105c0e256..7338848f0358 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/PyrisWebhookService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisWebhookService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris; +package de.tum.cit.aet.artemis.core.service.connectors.pyris; import java.io.IOException; import java.net.URI; @@ -15,16 +15,16 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureUnitWebhookDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; import de.tum.cit.aet.artemis.iris.domain.settings.IrisCourseSettings; +import de.tum.cit.aet.artemis.iris.exception.IrisInternalPyrisErrorException; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; +import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; import de.tum.cit.aet.artemis.lecture.domain.AttachmentType; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureUnitWebhookDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; -import de.tum.cit.aet.artemis.service.iris.exception.IrisInternalPyrisErrorException; -import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; @Service @Profile("iris") diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisErrorResponseDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisErrorResponseDTO.java similarity index 76% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisErrorResponseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisErrorResponseDTO.java index 6e0f8146d0f9..4c7f54b4db24 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisErrorResponseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisErrorResponseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisHealthStatusDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisHealthStatusDTO.java similarity index 78% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisHealthStatusDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisHealthStatusDTO.java index ff4ee3242a0a..31a023ccbd69 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisHealthStatusDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisHealthStatusDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisModelDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisModelDTO.java similarity index 72% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisModelDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisModelDTO.java index 0266d0ea1463..a8815239a47c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisModelDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisModelDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisPipelineExecutionDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisPipelineExecutionDTO.java similarity index 61% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisPipelineExecutionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisPipelineExecutionDTO.java index ce77a36164c0..e18466b9ffa0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisPipelineExecutionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisPipelineExecutionDTO.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisPipelineExecutionDTO(PyrisPipelineExecutionSettingsDTO settings, List initialStages) { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisPipelineExecutionSettingsDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisPipelineExecutionSettingsDTO.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisPipelineExecutionSettingsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisPipelineExecutionSettingsDTO.java index b5125836b73d..c4b7a31d3823 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/PyrisPipelineExecutionSettingsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisPipelineExecutionSettingsDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/PyrisChatPipelineExecutionBaseDataDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/PyrisChatPipelineExecutionBaseDataDTO.java new file mode 100644 index 000000000000..a3826373a215 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/PyrisChatPipelineExecutionBaseDataDTO.java @@ -0,0 +1,15 @@ +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.chat; + +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonInclude; + +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisMessageDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisUserDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; + +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public record PyrisChatPipelineExecutionBaseDataDTO(List chatHistory, PyrisUserDTO user, PyrisPipelineExecutionSettingsDTO settings, + List initialStages) { +} diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/chat/PyrisChatStatusUpdateDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/PyrisChatStatusUpdateDTO.java similarity index 60% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/chat/PyrisChatStatusUpdateDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/PyrisChatStatusUpdateDTO.java index 81684c6c2b9c..7dbfb317c36f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/chat/PyrisChatStatusUpdateDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/PyrisChatStatusUpdateDTO.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.chat; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisChatStatusUpdateDTO(String result, List stages, List suggestions) { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java similarity index 51% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java index d4d9426e2166..ab3a90694f5f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java @@ -1,14 +1,14 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.course; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.chat.course; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisExtendedCourseDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisMessageDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisUserDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisExtendedCourseDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisMessageDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisUserDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO; import de.tum.cit.aet.artemis.web.rest.dto.metrics.StudentMetricsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/exercise/PyrisExerciseChatPipelineExecutionDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/exercise/PyrisExerciseChatPipelineExecutionDTO.java new file mode 100644 index 000000000000..6b9b45bb7fa1 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/exercise/PyrisExerciseChatPipelineExecutionDTO.java @@ -0,0 +1,19 @@ +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.chat.exercise; + +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonInclude; + +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisCourseDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisMessageDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisProgrammingExerciseDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisSubmissionDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisUserDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; + +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public record PyrisExerciseChatPipelineExecutionDTO(PyrisSubmissionDTO submission, PyrisProgrammingExerciseDTO exercise, PyrisCourseDTO course, List chatHistory, + PyrisUserDTO user, PyrisPipelineExecutionSettingsDTO settings, List initialStages) { + +} diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionInputDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionInputDTO.java similarity index 75% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionInputDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionInputDTO.java index 225687aa01f2..ebd0108e6f18 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionInputDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionInputDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java index b6508de0ef40..ddb6f5eec857 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java @@ -1,9 +1,9 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency; import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.PyrisPipelineExecutionDTO; /** * DTO to execute the Iris competency extraction pipeline on Pyris diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java index acfc5b3078eb..daa9d8d390d5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyStatusUpdateDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/competency/PyrisCompetencyStatusUpdateDTO.java similarity index 78% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyStatusUpdateDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/competency/PyrisCompetencyStatusUpdateDTO.java index d3d3f65a886f..dfab26272d67 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyStatusUpdateDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/competency/PyrisCompetencyStatusUpdateDTO.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; /** * DTO for the Iris competency generation feature. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisBuildLogEntryDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisBuildLogEntryDTO.java similarity index 73% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisBuildLogEntryDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisBuildLogEntryDTO.java index dfd5afbdf995..084927701f5b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisBuildLogEntryDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisBuildLogEntryDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; import java.time.Instant; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisCompetencyDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisCompetencyDTO.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisCompetencyDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisCompetencyDTO.java index 907fbbf71b04..35f1d103f463 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisCompetencyDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisCompetencyDTO.java @@ -1,6 +1,6 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; -import static de.tum.cit.aet.artemis.service.util.TimeUtil.toInstant; +import static de.tum.cit.aet.artemis.core.util.TimeUtil.toInstant; import java.time.Instant; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisCourseDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisCourseDTO.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisCourseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisCourseDTO.java index 045035e3a533..e1d82cedbab3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisCourseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisCourseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExamDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisExamDTO.java similarity index 84% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExamDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisExamDTO.java index 0e7063438c16..b12b3f893c3c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExamDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisExamDTO.java @@ -1,6 +1,6 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; -import static de.tum.cit.aet.artemis.service.util.TimeUtil.toInstant; +import static de.tum.cit.aet.artemis.core.util.TimeUtil.toInstant; import java.time.Instant; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExerciseWithStudentSubmissionsDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisExerciseWithStudentSubmissionsDTO.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExerciseWithStudentSubmissionsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisExerciseWithStudentSubmissionsDTO.java index 20ef2752a33c..ade99fd328d9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExerciseWithStudentSubmissionsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisExerciseWithStudentSubmissionsDTO.java @@ -1,6 +1,6 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; -import static de.tum.cit.aet.artemis.service.util.TimeUtil.toInstant; +import static de.tum.cit.aet.artemis.core.util.TimeUtil.toInstant; import java.time.Instant; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExtendedCourseDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisExtendedCourseDTO.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExtendedCourseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisExtendedCourseDTO.java index 63f6c94fe5f2..d301c937683f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisExtendedCourseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisExtendedCourseDTO.java @@ -1,6 +1,6 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; -import static de.tum.cit.aet.artemis.service.util.TimeUtil.toInstant; +import static de.tum.cit.aet.artemis.core.util.TimeUtil.toInstant; import java.time.Instant; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisFeedbackDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisFeedbackDTO.java similarity index 72% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisFeedbackDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisFeedbackDTO.java index b429059cae0c..fa1bd7a631e4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisFeedbackDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisFeedbackDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisImageMessageContentDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisImageMessageContentDTO.java similarity index 73% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisImageMessageContentDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisImageMessageContentDTO.java index 244242784b48..59a19c269ee1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisImageMessageContentDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisImageMessageContentDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisJsonMessageContentDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisJsonMessageContentDTO.java similarity index 79% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisJsonMessageContentDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisJsonMessageContentDTO.java index d2fea0ae834c..b66e77da71f2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisJsonMessageContentDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisJsonMessageContentDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonRawValue; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisLectureDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisLectureDTO.java similarity index 81% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisLectureDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisLectureDTO.java index f0b8ddd26c7a..fa43b0296440 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisLectureDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisLectureDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; import java.time.ZonedDateTime; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisLectureUnitDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisLectureUnitDTO.java similarity index 77% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisLectureUnitDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisLectureUnitDTO.java index 45361e92755b..98a23882425e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisLectureUnitDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisLectureUnitDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; import java.time.Instant; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisMessageContentBaseDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisMessageContentBaseDTO.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisMessageContentBaseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisMessageContentBaseDTO.java index 776bfddc92ed..dde0e79420be 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisMessageContentBaseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisMessageContentBaseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonSubTypes; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisMessageDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisMessageDTO.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisMessageDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisMessageDTO.java index dd653253b1ad..8a2e278ee980 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisMessageDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisMessageDTO.java @@ -1,6 +1,6 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; -import static de.tum.cit.aet.artemis.service.util.TimeUtil.toInstant; +import static de.tum.cit.aet.artemis.core.util.TimeUtil.toInstant; import java.time.Instant; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisProgrammingExerciseDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisProgrammingExerciseDTO.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisProgrammingExerciseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisProgrammingExerciseDTO.java index 2a5866dd13bd..6674ef570521 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisProgrammingExerciseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisProgrammingExerciseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; import java.time.Instant; import java.util.Map; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisResultDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisResultDTO.java similarity index 78% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisResultDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisResultDTO.java index 896342ae47d1..5bead90a9361 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisResultDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisResultDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; import java.time.Instant; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisStudentSubmissionDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisStudentSubmissionDTO.java similarity index 74% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisStudentSubmissionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisStudentSubmissionDTO.java index 70920aa81b29..854939c43845 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisStudentSubmissionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisStudentSubmissionDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; import java.time.Instant; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisSubmissionDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisSubmissionDTO.java similarity index 84% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisSubmissionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisSubmissionDTO.java index 38c0af9ada3d..01c97ec21ac5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisSubmissionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisSubmissionDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; import java.time.Instant; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisTextMessageContentDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisTextMessageContentDTO.java similarity index 73% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisTextMessageContentDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisTextMessageContentDTO.java index 9beda63cf5c8..efd0dbe50ce4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisTextMessageContentDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisTextMessageContentDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisUserDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisUserDTO.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisUserDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisUserDTO.java index 4d2fd25c9d36..acc907932045 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/data/PyrisUserDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisUserDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java similarity index 55% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java index 09dedf5a24d5..91ad5329faca 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.lectureingestionwebhook; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.lectureingestionwebhook; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisLectureIngestionStatusUpdateDTO(String result, List stages) { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java index ba2f2c094798..2825c58e1dd4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.lectureingestionwebhook; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.lectureingestionwebhook; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureIngestionExecutionDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureIngestionExecutionDTO.java similarity index 54% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureIngestionExecutionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureIngestionExecutionDTO.java index de4c004112a4..976a75f99e1f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureIngestionExecutionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureIngestionExecutionDTO.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.lectureingestionwebhook; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.lectureingestionwebhook; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisWebhookLectureIngestionExecutionDTO(List pyrisLectureUnitWebhookDTOS, PyrisPipelineExecutionSettingsDTO settings, diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/status/PyrisStageDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/status/PyrisStageDTO.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/status/PyrisStageDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/status/PyrisStageDTO.java index 0a9ce350c4e1..0ff50f937a87 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/status/PyrisStageDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/status/PyrisStageDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.status; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/status/PyrisStageState.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/status/PyrisStageState.java similarity index 79% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/status/PyrisStageState.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/status/PyrisStageState.java index d072a96531aa..849866d00142 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/status/PyrisStageState.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/status/PyrisStageState.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.status; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/CompetencyExtractionJob.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/CompetencyExtractionJob.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/CompetencyExtractionJob.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/CompetencyExtractionJob.java index f9db80826a69..73d9de481fed 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/CompetencyExtractionJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/CompetencyExtractionJob.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.job; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.job; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/CourseChatJob.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/CourseChatJob.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/CourseChatJob.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/CourseChatJob.java index 56b373eef297..4a84793d8495 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/CourseChatJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/CourseChatJob.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.job; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.job; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/ExerciseChatJob.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/ExerciseChatJob.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/ExerciseChatJob.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/ExerciseChatJob.java index bcea3e5b9a8d..dc33a35033e9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/ExerciseChatJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/ExerciseChatJob.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.job; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.job; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/IngestionWebhookJob.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/IngestionWebhookJob.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/IngestionWebhookJob.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/IngestionWebhookJob.java index 47acb059d731..424bcb0d65c0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/IngestionWebhookJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/IngestionWebhookJob.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.job; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.job; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.domain.Exercise; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/PyrisJob.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/PyrisJob.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/PyrisJob.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/PyrisJob.java index 538a842a13ef..f49c49b546a7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/job/PyrisJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/PyrisJob.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.job; +package de.tum.cit.aet.artemis.core.service.connectors.pyris.job; import java.io.Serializable; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/AbstractVersionControlService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/AbstractVersionControlService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/AbstractVersionControlService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/AbstractVersionControlService.java index 29ab3a30c39a..aa54571d6d23 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/AbstractVersionControlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/AbstractVersionControlService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.vcs; +package de.tum.cit.aet.artemis.core.service.connectors.vcs; import java.io.IOException; import java.nio.file.Path; @@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Value; import de.tum.cit.aet.artemis.core.exception.VersionControlException; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; @@ -24,7 +25,6 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.service.UriService; -import de.tum.cit.aet.artemis.service.connectors.GitService; public abstract class AbstractVersionControlService implements VersionControlService { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenManagementService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VcsTokenManagementService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VcsTokenManagementService.java index f493e3fef615..5ff7bbfc6ed7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VcsTokenManagementService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.vcs; +package de.tum.cit.aet.artemis.core.service.connectors.vcs; import java.time.Duration; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VcsTokenRenewalService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VcsTokenRenewalService.java index 72ae7a92eaad..517e651be180 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VcsTokenRenewalService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.vcs; +package de.tum.cit.aet.artemis.core.service.connectors.vcs; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; @@ -16,7 +16,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabException; +import de.tum.cit.aet.artemis.core.service.connectors.gitlab.GitLabException; /** * Uses the scheduled task {@link #renewAllVcsAccessTokens} to periodically renew all VCS access tokens that have expired or that are about to expire. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsUserManagementService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VcsUserManagementService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsUserManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VcsUserManagementService.java index 2fd4cc6c1404..ce70288b282a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsUserManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VcsUserManagementService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.vcs; +package de.tum.cit.aet.artemis.core.service.connectors.vcs; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlRepositoryPermission.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VersionControlRepositoryPermission.java similarity index 56% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlRepositoryPermission.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VersionControlRepositoryPermission.java index 61a7e707d20e..09b11184ef9b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlRepositoryPermission.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VersionControlRepositoryPermission.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.vcs; +package de.tum.cit.aet.artemis.core.service.connectors.vcs; public enum VersionControlRepositoryPermission { REPO_READ, REPO_WRITE diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlServerHealthIndicator.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VersionControlServerHealthIndicator.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlServerHealthIndicator.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VersionControlServerHealthIndicator.java index e5b90a0c1a13..97806edb555e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlServerHealthIndicator.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VersionControlServerHealthIndicator.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.vcs; +package de.tum.cit.aet.artemis.core.service.connectors.vcs; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VersionControlService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VersionControlService.java index 2a573f3f770f..6884e240904b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/vcs/VersionControlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VersionControlService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.connectors.vcs; +package de.tum.cit.aet.artemis.core.service.connectors.vcs; import java.time.ZonedDateTime; import java.util.Set; @@ -7,12 +7,12 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.VersionControlException; +import de.tum.cit.aet.artemis.core.service.connectors.ConnectorHealth; import de.tum.cit.aet.artemis.programming.domain.Commit; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; public interface VersionControlService { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/CourseExamExportService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/export/CourseExamExportService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/export/CourseExamExportService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/export/CourseExamExportService.java index 35d9b2e89138..a7eed36bceb7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/CourseExamExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/export/CourseExamExportService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.export; +package de.tum.cit.aet.artemis.core.service.export; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -32,18 +32,23 @@ import de.tum.cit.aet.artemis.core.domain.CourseExamExportErrorCause; import de.tum.cit.aet.artemis.core.domain.CourseExamExportState; import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.service.ArchivalReportEntry; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; +import de.tum.cit.aet.artemis.fileupload.service.FileUploadExerciseWithSubmissionsExportService; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.service.ModelingExerciseWithSubmissionsExportService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseExportService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.service.QuizExerciseWithSubmissionsExportService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.ZipFileService; -import de.tum.cit.aet.artemis.service.archival.ArchivalReportEntry; import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.service.TextExerciseWithSubmissionsExportService; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCommunicationDataService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportCommunicationDataService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCommunicationDataService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportCommunicationDataService.java index 5f33def6cd74..40fb7ca5b51c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCommunicationDataService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportCommunicationDataService.java @@ -1,9 +1,9 @@ -package de.tum.cit.aet.artemis.service.export; +package de.tum.cit.aet.artemis.core.service.export; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.export.DataExportExerciseCreationService.CSV_FILE_EXTENSION; -import static de.tum.cit.aet.artemis.service.export.DataExportUtil.createDirectoryIfNotExistent; -import static de.tum.cit.aet.artemis.service.export.DataExportUtil.retrieveCourseDirPath; +import static de.tum.cit.aet.artemis.core.service.export.DataExportExerciseCreationService.CSV_FILE_EXTENSION; +import static de.tum.cit.aet.artemis.core.service.export.DataExportUtil.createDirectoryIfNotExistent; +import static de.tum.cit.aet.artemis.core.service.export.DataExportUtil.retrieveCourseDirPath; import java.io.IOException; import java.nio.file.Files; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCreationService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportCreationService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCreationService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportCreationService.java index 26462b3c4c2c..e4079b166d3e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportCreationService.java @@ -1,7 +1,7 @@ -package de.tum.cit.aet.artemis.service.export; +package de.tum.cit.aet.artemis.core.service.export; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.export.DataExportExerciseCreationService.CSV_FILE_EXTENSION; +import static de.tum.cit.aet.artemis.core.service.export.DataExportExerciseCreationService.CSV_FILE_EXTENSION; import java.io.IOException; import java.net.URISyntaxException; @@ -19,17 +19,17 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.service.notifications.MailService; +import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.core.domain.DataExport; import de.tum.cit.aet.artemis.core.domain.DataExportState; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ArtemisMailException; import de.tum.cit.aet.artemis.core.repository.DataExportRepository; +import de.tum.cit.aet.artemis.core.service.user.UserService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ResourceLoaderService; import de.tum.cit.aet.artemis.service.ZipFileService; -import de.tum.cit.aet.artemis.service.notifications.MailService; -import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; -import de.tum.cit.aet.artemis.service.user.UserService; /** * A service to create data exports for users diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExamCreationService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExamCreationService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExamCreationService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExamCreationService.java index 3a67ce95e96f..b0448125a6eb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExamCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExamCreationService.java @@ -1,9 +1,9 @@ -package de.tum.cit.aet.artemis.service.export; +package de.tum.cit.aet.artemis.core.service.export; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.export.DataExportExerciseCreationService.CSV_FILE_EXTENSION; -import static de.tum.cit.aet.artemis.service.export.DataExportUtil.createDirectoryIfNotExistent; -import static de.tum.cit.aet.artemis.service.export.DataExportUtil.retrieveCourseDirPath; +import static de.tum.cit.aet.artemis.core.service.export.DataExportExerciseCreationService.CSV_FILE_EXTENSION; +import static de.tum.cit.aet.artemis.core.service.export.DataExportUtil.createDirectoryIfNotExistent; +import static de.tum.cit.aet.artemis.core.service.export.DataExportUtil.retrieveCourseDirPath; import java.io.IOException; import java.nio.file.Files; @@ -25,8 +25,8 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exam.service.ExamService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.service.exam.ExamService; import de.tum.cit.aet.artemis.web.rest.dto.ExamScoresDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExerciseCreationService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExerciseCreationService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExerciseCreationService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExerciseCreationService.java index a02e6288fe87..e97f16931f58 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportExerciseCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExerciseCreationService.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.service.export; +package de.tum.cit.aet.artemis.core.service.export; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.export.DataExportQuizExerciseCreationService.TXT_FILE_EXTENSION; -import static de.tum.cit.aet.artemis.service.export.DataExportUtil.createDirectoryIfNotExistent; -import static de.tum.cit.aet.artemis.service.export.DataExportUtil.retrieveCourseDirPath; -import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundToNDecimalPlaces; +import static de.tum.cit.aet.artemis.core.service.export.DataExportQuizExerciseCreationService.TXT_FILE_EXTENSION; +import static de.tum.cit.aet.artemis.core.service.export.DataExportUtil.createDirectoryIfNotExistent; +import static de.tum.cit.aet.artemis.core.service.export.DataExportUtil.retrieveCourseDirPath; +import static de.tum.cit.aet.artemis.core.util.RoundingUtil.roundToNDecimalPlaces; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -32,6 +32,7 @@ import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.communication.domain.AnswerPost; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.connectors.apollon.ApollonConversionService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; @@ -42,13 +43,13 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseExportService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ResultService; -import de.tum.cit.aet.artemis.service.connectors.apollon.ApollonConversionService; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryExportOptionsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportQuizExerciseCreationService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportQuizExerciseCreationService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/export/DataExportQuizExerciseCreationService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportQuizExerciseCreationService.java index 74836b4d8251..343312727405 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportQuizExerciseCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportQuizExerciseCreationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.export; +package de.tum.cit.aet.artemis.core.service.export; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -20,6 +20,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.service.ArchivalReportEntry; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.quiz.domain.AnswerOption; @@ -35,7 +36,6 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizQuestionRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.service.DragAndDropQuizAnswerConversionService; -import de.tum.cit.aet.artemis.service.archival.ArchivalReportEntry; /** * A service to create the data export for quiz exercise participations. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportScienceEventService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportScienceEventService.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/service/export/DataExportScienceEventService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportScienceEventService.java index 599244448201..2a6f7b9a8b65 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportScienceEventService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportScienceEventService.java @@ -1,7 +1,7 @@ -package de.tum.cit.aet.artemis.service.export; +package de.tum.cit.aet.artemis.core.service.export; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.export.DataExportExerciseCreationService.CSV_FILE_EXTENSION; +import static de.tum.cit.aet.artemis.core.service.export.DataExportExerciseCreationService.CSV_FILE_EXTENSION; import java.io.IOException; import java.nio.file.Files; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/export/DataExportService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportService.java index 7c46934da4a6..6cdc5d644c6c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.export; +package de.tum.cit.aet.artemis.core.service.export; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportUtil.java b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportUtil.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/export/DataExportUtil.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportUtil.java index d3c5df9a1e72..91f441b4f61f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/DataExportUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportUtil.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.export; +package de.tum.cit.aet.artemis.core.service.export; import java.io.IOException; import java.nio.file.Files; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/feature/Feature.java b/src/main/java/de/tum/cit/aet/artemis/core/service/feature/Feature.java similarity index 76% rename from src/main/java/de/tum/cit/aet/artemis/service/feature/Feature.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/feature/Feature.java index 58f166fcecf6..239b0fcef406 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/feature/Feature.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/feature/Feature.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.feature; +package de.tum.cit.aet.artemis.core.service.feature; public enum Feature { ProgrammingExercises, PlagiarismChecks, Exports, TutorialGroups, LearningPaths, Science, StandardizedCompetencies, StudentCourseAnalyticsDashboard diff --git a/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggle.java b/src/main/java/de/tum/cit/aet/artemis/core/service/feature/FeatureToggle.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggle.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/feature/FeatureToggle.java index 68b6e28bd7ca..85bad89a9ba0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggle.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/feature/FeatureToggle.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.feature; +package de.tum.cit.aet.artemis.core.service.feature; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleAspect.java b/src/main/java/de/tum/cit/aet/artemis/core/service/feature/FeatureToggleAspect.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleAspect.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/feature/FeatureToggleAspect.java index bf81fea9c587..c228bbd11093 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleAspect.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/feature/FeatureToggleAspect.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.feature; +package de.tum.cit.aet.artemis.core.service.feature; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/core/service/feature/FeatureToggleInfoContributor.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/feature/FeatureToggleInfoContributor.java index 9c1a51613168..55fcb33c996c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/feature/FeatureToggleInfoContributor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.feature; +package de.tum.cit.aet.artemis.core.service.feature; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/feature/FeatureToggleService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/feature/FeatureToggleService.java index f48c796df2f7..0bd1cb22c239 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/feature/FeatureToggleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/feature/FeatureToggleService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.feature; +package de.tum.cit.aet.artemis.core.service.feature; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapConfig.java b/src/main/java/de/tum/cit/aet/artemis/core/service/ldap/LdapConfig.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapConfig.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/ldap/LdapConfig.java index 45d857301e7d..c32d570ba2f9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapConfig.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/ldap/LdapConfig.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.ldap; +package de.tum.cit.aet.artemis.core.service.ldap; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserDto.java b/src/main/java/de/tum/cit/aet/artemis/core/service/ldap/LdapUserDto.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserDto.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/ldap/LdapUserDto.java index 39da561f42a8..dd94e6d01f57 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserDto.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/ldap/LdapUserDto.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.ldap; +package de.tum.cit.aet.artemis.core.service.ldap; import static de.tum.cit.aet.artemis.core.config.Constants.TUM_LDAP_MAIN_EMAIL; import static de.tum.cit.aet.artemis.core.config.Constants.TUM_LDAP_MATRIKEL_NUMBER; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/ldap/LdapUserService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/ldap/LdapUserService.java index 0063d23b7013..cc13c192876a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ldap/LdapUserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/ldap/LdapUserService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.ldap; +package de.tum.cit.aet.artemis.core.service.ldap; import static de.tum.cit.aet.artemis.core.config.Constants.TUM_LDAP_EMAILS; import static de.tum.cit.aet.artemis.core.config.Constants.TUM_LDAP_MAIN_EMAIL; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/messaging/DistributedInstanceMessageSendService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/messaging/DistributedInstanceMessageSendService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/messaging/DistributedInstanceMessageSendService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/messaging/DistributedInstanceMessageSendService.java index 2b907df19023..c4cb88f85655 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/messaging/DistributedInstanceMessageSendService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/messaging/DistributedInstanceMessageSendService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.messaging; +package de.tum.cit.aet.artemis.core.service.messaging; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageReceiveService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/messaging/InstanceMessageReceiveService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageReceiveService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/messaging/InstanceMessageReceiveService.java index 90d90cd1b26b..cb1566339db9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageReceiveService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/messaging/InstanceMessageReceiveService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.messaging; +package de.tum.cit.aet.artemis.core.service.messaging; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; @@ -14,22 +14,22 @@ import com.hazelcast.core.HazelcastInstance; +import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; +import de.tum.cit.aet.artemis.athena.service.AthenaScheduleService; +import de.tum.cit.aet.artemis.communication.service.NotificationScheduleService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.UserScheduleService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.modeling.service.ModelingExerciseScheduleService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.service.quiz.QuizScheduleService; -import de.tum.cit.aet.artemis.service.scheduled.AthenaScheduleService; -import de.tum.cit.aet.artemis.service.scheduled.ModelingExerciseScheduleService; -import de.tum.cit.aet.artemis.service.scheduled.NotificationScheduleService; -import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; -import de.tum.cit.aet.artemis.service.scheduled.ProgrammingExerciseScheduleService; -import de.tum.cit.aet.artemis.service.scheduled.UserScheduleService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseScheduleService; +import de.tum.cit.aet.artemis.quiz.service.QuizScheduleService; /** * This service is only available on a node with the 'scheduling' profile. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageSendService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/messaging/InstanceMessageSendService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageSendService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/messaging/InstanceMessageSendService.java index aa5a1eee9baa..6ed6afd6b097 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/messaging/InstanceMessageSendService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/messaging/InstanceMessageSendService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.messaging; +package de.tum.cit.aet.artemis.core.service.messaging; /** * This interface offers a service that will send messages to the node that runs the scheduling. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/messaging/MainInstanceMessageSendService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/messaging/MainInstanceMessageSendService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/messaging/MainInstanceMessageSendService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/messaging/MainInstanceMessageSendService.java index ed5610072c73..f0d58955576a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/messaging/MainInstanceMessageSendService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/messaging/MainInstanceMessageSendService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.messaging; +package de.tum.cit.aet.artemis.core.service.messaging; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/messaging/MessageTopic.java b/src/main/java/de/tum/cit/aet/artemis/core/service/messaging/MessageTopic.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/messaging/MessageTopic.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/messaging/MessageTopic.java index 3229b0aed8df..54213c7dc829 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/messaging/MessageTopic.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/messaging/MessageTopic.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.messaging; +package de.tum.cit.aet.artemis.core.service.messaging; /** * Topic identifiers for Hazelcast messages between instances. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/user/AuthorityService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/user/AuthorityService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/user/AuthorityService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/user/AuthorityService.java index 15f30a43dff3..0a8d4f3ff4eb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/user/AuthorityService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/user/AuthorityService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.user; +package de.tum.cit.aet.artemis.core.service.user; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.domain.Authority.ADMIN_AUTHORITY; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/user/PasswordService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/user/PasswordService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/user/PasswordService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/user/PasswordService.java index e3b9c9a82af9..2ee432e3e970 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/user/PasswordService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/user/PasswordService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.user; +package de.tum.cit.aet.artemis.core.service.user; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/user/UserCreationService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserCreationService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/user/UserCreationService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/user/UserCreationService.java index 8e1f033248d8..4e94063cd94e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/user/UserCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserCreationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.user; +package de.tum.cit.aet.artemis.core.service.user; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.security.Role.EDITOR; @@ -32,8 +32,8 @@ import de.tum.cit.aet.artemis.core.repository.OrganizationRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; -import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; +import de.tum.cit.aet.artemis.core.service.connectors.ci.CIUserManagementService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsUserManagementService; import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; import tech.jhipster.security.RandomUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/user/UserManagementInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserManagementInfoContributor.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/user/UserManagementInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/user/UserManagementInfoContributor.java index 169b1082f29c..99f8b50846a2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/user/UserManagementInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserManagementInfoContributor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.user; +package de.tum.cit.aet.artemis.core.service.user; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/user/UserService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/user/UserService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java index a3a365a66374..c3f9c9ab1db2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/user/UserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.user; +package de.tum.cit.aet.artemis.core.service.user; import static de.tum.cit.aet.artemis.core.config.Constants.PASSWORD_MAX_LENGTH; import static de.tum.cit.aet.artemis.core.config.Constants.PASSWORD_MIN_LENGTH; @@ -49,18 +49,18 @@ import de.tum.cit.aet.artemis.core.repository.GuidedTourSettingsRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.connectors.ci.CIUserManagementService; +import de.tum.cit.aet.artemis.core.service.connectors.ldap.LdapAuthenticationProvider; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsUserManagementService; +import de.tum.cit.aet.artemis.core.service.ldap.LdapUserDto; +import de.tum.cit.aet.artemis.core.service.ldap.LdapUserService; +import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.programming.domain.ParticipationVCSAccessToken; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ParticipationVcsAccessTokenService; -import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; -import de.tum.cit.aet.artemis.service.connectors.ldap.LdapAuthenticationProvider; -import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.dto.UserDTO; -import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; -import de.tum.cit.aet.artemis.service.ldap.LdapUserService; -import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.EmailAlreadyUsedException; import de.tum.cit.aet.artemis.web.rest.errors.PasswordViolatesRequirementsException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/util/CommonsMultipartFile.java b/src/main/java/de/tum/cit/aet/artemis/core/util/CommonsMultipartFile.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/util/CommonsMultipartFile.java rename to src/main/java/de/tum/cit/aet/artemis/core/util/CommonsMultipartFile.java index c5ae95e20e47..f9796fd59a3b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/util/CommonsMultipartFile.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/util/CommonsMultipartFile.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.util; +package de.tum.cit.aet.artemis.core.util; import java.io.File; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/util/ExamExerciseStartPreparationStatus.java b/src/main/java/de/tum/cit/aet/artemis/core/util/ExamExerciseStartPreparationStatus.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/service/util/ExamExerciseStartPreparationStatus.java rename to src/main/java/de/tum/cit/aet/artemis/core/util/ExamExerciseStartPreparationStatus.java index 944965673139..03a04149395a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/util/ExamExerciseStartPreparationStatus.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/util/ExamExerciseStartPreparationStatus.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.util; +package de.tum.cit.aet.artemis.core.util; import java.io.Serial; import java.io.Serializable; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/util/HttpRequestUtils.java b/src/main/java/de/tum/cit/aet/artemis/core/util/HttpRequestUtils.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/util/HttpRequestUtils.java rename to src/main/java/de/tum/cit/aet/artemis/core/util/HttpRequestUtils.java index 1177bd531e21..a62008983772 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/util/HttpRequestUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/util/HttpRequestUtils.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.util; +package de.tum.cit.aet.artemis.core.util; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/util/RoundingUtil.java b/src/main/java/de/tum/cit/aet/artemis/core/util/RoundingUtil.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/util/RoundingUtil.java rename to src/main/java/de/tum/cit/aet/artemis/core/util/RoundingUtil.java index 7abf047829e6..1ecc54adc0a2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/util/RoundingUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/util/RoundingUtil.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.util; +package de.tum.cit.aet.artemis.core.util; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/util/TimeLogUtil.java b/src/main/java/de/tum/cit/aet/artemis/core/util/TimeLogUtil.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/util/TimeLogUtil.java rename to src/main/java/de/tum/cit/aet/artemis/core/util/TimeLogUtil.java index 29ac6f6d562b..c3b26d90d583 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/util/TimeLogUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/util/TimeLogUtil.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.util; +package de.tum.cit.aet.artemis.core.util; import org.apache.commons.lang.time.DurationFormatUtils; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/util/TimeUtil.java b/src/main/java/de/tum/cit/aet/artemis/core/util/TimeUtil.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/util/TimeUtil.java rename to src/main/java/de/tum/cit/aet/artemis/core/util/TimeUtil.java index 507c5659dbf3..6222cf87a40c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/util/TimeUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/util/TimeUtil.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.util; +package de.tum.cit.aet.artemis.core.util; import java.time.Instant; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/util/Tuple.java b/src/main/java/de/tum/cit/aet/artemis/core/util/Tuple.java similarity index 74% rename from src/main/java/de/tum/cit/aet/artemis/service/util/Tuple.java rename to src/main/java/de/tum/cit/aet/artemis/core/util/Tuple.java index dbf05330de0d..aac92784b327 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/util/Tuple.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/util/Tuple.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.util; +package de.tum.cit.aet.artemis.core.util; /** * Immutable tuple object. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/util/UrlUtils.java b/src/main/java/de/tum/cit/aet/artemis/core/util/UrlUtils.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/util/UrlUtils.java rename to src/main/java/de/tum/cit/aet/artemis/core/util/UrlUtils.java index 2901aca8e1aa..fdab2bec913f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/util/UrlUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/util/UrlUtils.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.util; +package de.tum.cit.aet.artemis.core.util; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java index c50d8d2cae62..d8f6494fd1ec 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java @@ -21,11 +21,11 @@ import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.core.service.connectors.localci.SharedQueueManagementService; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; import de.tum.cit.aet.artemis.programming.domain.BuildJob; import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; -import de.tum.cit.aet.artemis.service.connectors.localci.SharedQueueManagementService; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; import de.tum.cit.aet.artemis.service.dto.BuildJobResultCountDTO; import de.tum.cit.aet.artemis.service.dto.BuildJobsStatisticsDTO; import de.tum.cit.aet.artemis.service.dto.FinishedBuildJobDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java index b9485a4622b3..130f3cd46df6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java @@ -30,6 +30,7 @@ import de.tum.cit.aet.artemis.communication.domain.DefaultChannelType; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; @@ -40,7 +41,6 @@ import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; -import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminDataExportResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminDataExportResource.java index e6f27faa0629..a710dda545d8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminDataExportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminDataExportResource.java @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.service.export.DataExportService; +import de.tum.cit.aet.artemis.core.service.export.DataExportService; import de.tum.cit.aet.artemis.web.rest.dto.RequestDataExportDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java index 7912e4b77aa9..0a9f012c7b48 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java @@ -20,10 +20,10 @@ import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiDynamicRegistrationService; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.connectors.lti.LtiDynamicRegistrationService; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminModelingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminModelingExerciseResource.java index ee9def6c05a8..31c8003a3346 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminModelingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminModelingExerciseResource.java @@ -15,10 +15,10 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.modeling.repository.ModelClusterRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.service.ModelingExerciseService; -import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStandardizedCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStandardizedCompetencyResource.java index a0e93be6493e..ceb4e01f0ec4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStandardizedCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStandardizedCompetencyResource.java @@ -23,11 +23,11 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.atlas.domain.competency.StandardizedCompetency; +import de.tum.cit.aet.artemis.atlas.service.competency.KnowledgeAreaService; +import de.tum.cit.aet.artemis.atlas.service.competency.StandardizedCompetencyService; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.service.competency.KnowledgeAreaService; -import de.tum.cit.aet.artemis.service.competency.StandardizedCompetencyService; -import de.tum.cit.aet.artemis.service.feature.Feature; -import de.tum.cit.aet.artemis.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.core.service.feature.Feature; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaRequestDTO; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaResultDTO; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java index 96a70ab89a2c..bf40834fb398 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java @@ -34,11 +34,11 @@ import de.tum.cit.aet.artemis.core.repository.AuthorityRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.core.service.ldap.LdapUserService; +import de.tum.cit.aet.artemis.core.service.user.UserCreationService; +import de.tum.cit.aet.artemis.core.service.user.UserService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.dto.UserDTO; -import de.tum.cit.aet.artemis.service.ldap.LdapUserService; -import de.tum.cit.aet.artemis.service.user.UserCreationService; -import de.tum.cit.aet.artemis.service.user.UserService; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.UserPageableSearchDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EmailAlreadyUsedException; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/FeatureToggleResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/FeatureToggleResource.java index d26566e0ac0d..84a58f7918aa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/FeatureToggleResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/FeatureToggleResource.java @@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.service.feature.Feature; -import de.tum.cit.aet.artemis.service.feature.FeatureToggleService; +import de.tum.cit.aet.artemis.core.service.feature.Feature; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggleService; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/iris/AdminIrisSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/iris/AdminIrisSettingsResource.java index c7fe60071130..312d3215d11f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/iris/AdminIrisSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/iris/AdminIrisSettingsResource.java @@ -9,7 +9,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSettings; -import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; +import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; /** * REST controller for managing {@link IrisSettings}. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/filter/Lti13LaunchFilter.java b/src/main/java/de/tum/cit/aet/artemis/core/web/filter/Lti13LaunchFilter.java index 50b0004dc2c3..c2b340c20cda 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/filter/Lti13LaunchFilter.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/filter/Lti13LaunchFilter.java @@ -23,10 +23,10 @@ import de.tum.cit.aet.artemis.core.exception.LtiEmailAlreadyInUseException; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.connectors.lti.Lti13Service; import de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer; import de.tum.cit.aet.artemis.lti.dto.Claims; import de.tum.cit.aet.artemis.lti.dto.LtiAuthenticationResponse; -import de.tum.cit.aet.artemis.service.connectors.lti.Lti13Service; import uk.ac.ox.ctl.lti13.security.oauth2.client.lti.authentication.OidcAuthenticationToken; import uk.ac.ox.ctl.lti13.security.oauth2.client.lti.web.OAuth2LoginAuthenticationFilter; diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamLiveEvent.java b/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamLiveEvent.java index 3c321b729fb5..d6ba3fd0f752 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamLiveEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamLiveEvent.java @@ -17,7 +17,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener; import de.tum.cit.aet.artemis.core.domain.DomainObject; -import de.tum.cit.aet.artemis.service.exam.ExamLiveEventsService; +import de.tum.cit.aet.artemis.exam.service.ExamLiveEventsService; import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamLiveEventBaseDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/repository/StudentExamRepository.java b/src/main/java/de/tum/cit/aet/artemis/exam/repository/StudentExamRepository.java index b8581affc408..296088a80384 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/repository/StudentExamRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/repository/StudentExamRepository.java @@ -26,10 +26,10 @@ import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.StudentExam; +import de.tum.cit.aet.artemis.exam.service.ExamQuizQuestionsGenerator; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; -import de.tum.cit.aet.artemis.service.exam.ExamQuizQuestionsGenerator; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamAccessService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamAccessService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/exam/ExamAccessService.java rename to src/main/java/de/tum/cit/aet/artemis/exam/service/ExamAccessService.java index a6a8d5b7a214..9cbb9f7ee150 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamAccessService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamAccessService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.exam; +package de.tum.cit.aet.artemis.exam.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDateService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDateService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDateService.java rename to src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDateService.java index d6429fede9ba..e5e082f26524 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDateService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.exam; +package de.tum.cit.aet.artemis.exam.service; import static de.tum.cit.aet.artemis.core.config.Constants.EXAM_START_WAIT_TIME_MINUTES; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDeletionService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDeletionService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDeletionService.java rename to src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDeletionService.java index 88b833d00183..19328d79ee15 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamDeletionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDeletionService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.exam; +package de.tum.cit.aet.artemis.exam.service; import static de.tum.cit.aet.artemis.core.config.Constants.EXAM_EXERCISE_START_STATUS; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -22,6 +22,7 @@ import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -37,7 +38,6 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizPoolRepository; import de.tum.cit.aet.artemis.service.ExerciseDeletionService; import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamImportService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamImportService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/exam/ExamImportService.java rename to src/main/java/de/tum/cit/aet/artemis/exam/service/ExamImportService.java index 6dd0e914b085..97bbe50d5927 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamImportService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.exam; +package de.tum.cit.aet.artemis.exam.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -14,6 +14,7 @@ import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.exam.domain.Exam; @@ -30,15 +31,14 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseImportService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.quiz.service.QuizExerciseImportService; import de.tum.cit.aet.artemis.service.FileUploadExerciseImportService; import de.tum.cit.aet.artemis.service.ModelingExerciseImportService; import de.tum.cit.aet.artemis.service.TextExerciseImportService; -import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseImportService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseService; -import de.tum.cit.aet.artemis.service.quiz.QuizExerciseImportService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.web.rest.errors.ExamConfigurationException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamLiveEventsService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamLiveEventsService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/exam/ExamLiveEventsService.java rename to src/main/java/de/tum/cit/aet/artemis/exam/service/ExamLiveEventsService.java index e6edea0f2c8d..2d65b0624698 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamLiveEventsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamLiveEventsService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.exam; +package de.tum.cit.aet.artemis.exam.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizQuestionsGenerator.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamQuizQuestionsGenerator.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizQuestionsGenerator.java rename to src/main/java/de/tum/cit/aet/artemis/exam/service/ExamQuizQuestionsGenerator.java index d2ac32bfd321..c807686cb897 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizQuestionsGenerator.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamQuizQuestionsGenerator.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.exam; +package de.tum.cit.aet.artemis.exam.service; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamQuizService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizService.java rename to src/main/java/de/tum/cit/aet/artemis/exam/service/ExamQuizService.java index 55b3a14a0148..7fe387fb6bc4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamQuizService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamQuizService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.exam; +package de.tum.cit.aet.artemis.exam.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -21,8 +21,8 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; +import de.tum.cit.aet.artemis.quiz.service.QuizStatisticService; import de.tum.cit.aet.artemis.service.ResultService; -import de.tum.cit.aet.artemis.service.quiz.QuizStatisticService; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamRegistrationService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamRegistrationService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/exam/ExamRegistrationService.java rename to src/main/java/de/tum/cit/aet/artemis/exam/service/ExamRegistrationService.java index ea0b35f15a5e..7ee77ff89790 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamRegistrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamRegistrationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.exam; +package de.tum.cit.aet.artemis.exam.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -23,6 +23,7 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.service.user.UserService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.domain.StudentExam; @@ -33,7 +34,6 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.user.UserService; import de.tum.cit.aet.artemis.web.rest.dto.ExamUserDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/exam/ExamService.java rename to src/main/java/de/tum/cit/aet/artemis/exam/service/ExamService.java index b4bd0bfaefc2..f57c170efa80 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamService.java @@ -1,7 +1,7 @@ -package de.tum.cit.aet.artemis.service.exam; +package de.tum.cit.aet.artemis.exam.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; +import static de.tum.cit.aet.artemis.core.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; import static java.time.ZonedDateTime.now; import java.io.IOException; @@ -50,12 +50,17 @@ import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.communication.domain.NotificationType; +import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.core.service.export.CourseExamExportService; +import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.StudentExam; @@ -75,6 +80,7 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismCaseService.PlagiarismMapping; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; @@ -85,19 +91,13 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizSubmittedAnswerCount; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; +import de.tum.cit.aet.artemis.quiz.service.QuizPoolService; +import de.tum.cit.aet.artemis.quiz.service.QuizResultService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.BonusService; import de.tum.cit.aet.artemis.service.CourseScoreCalculationService; import de.tum.cit.aet.artemis.service.ExerciseDeletionService; import de.tum.cit.aet.artemis.service.TutorLeaderboardService; -import de.tum.cit.aet.artemis.service.connectors.GitService; -import de.tum.cit.aet.artemis.service.export.CourseExamExportService; -import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; -import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; -import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismCaseService.PlagiarismMapping; -import de.tum.cit.aet.artemis.service.quiz.QuizPoolService; -import de.tum.cit.aet.artemis.service.quiz.QuizResultService; -import de.tum.cit.aet.artemis.service.util.TimeLogUtil; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSessionService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSessionService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSessionService.java rename to src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSessionService.java index b2c75e67160e..65d363b99beb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSessionService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.exam; +package de.tum.cit.aet.artemis.exam.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSubmissionService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionService.java rename to src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSubmissionService.java index b480f6b8d3d3..9c99a94cf87f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSubmissionService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.exam; +package de.tum.cit.aet.artemis.exam.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamUserService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamUserService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/exam/ExamUserService.java rename to src/main/java/de/tum/cit/aet/artemis/exam/service/ExamUserService.java index 0063d6a24719..f9c989f19af1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ExamUserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamUserService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.exam; +package de.tum.cit.aet.artemis.exam.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/ImageExtractor.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ImageExtractor.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/exam/ImageExtractor.java rename to src/main/java/de/tum/cit/aet/artemis/exam/service/ImageExtractor.java index 62744c8cd4a5..eef235ba0cc9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/ImageExtractor.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ImageExtractor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.exam; +package de.tum.cit.aet.artemis.exam.service; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamAccessService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessService.java rename to src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamAccessService.java index f502a2c6d7e4..33a5e670b3c5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamAccessService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.exam; +package de.tum.cit.aet.artemis.exam.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamService.java rename to src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamService.java index 6a2f5de319bb..ac2b0772ca39 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/exam/StudentExamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamService.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.service.exam; +package de.tum.cit.aet.artemis.exam.service; import static de.tum.cit.aet.artemis.core.config.Constants.EXAM_EXERCISE_START_STATUS; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.util.TimeLogUtil.formatDurationFrom; +import static de.tum.cit.aet.artemis.core.util.TimeLogUtil.formatDurationFrom; import java.time.Instant; import java.time.ZonedDateTime; @@ -36,6 +36,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.util.ExamExerciseStartPreparationStatus; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; @@ -52,6 +53,8 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseParticipationService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; import de.tum.cit.aet.artemis.quiz.domain.DragAndDropSubmittedAnswer; import de.tum.cit.aet.artemis.quiz.domain.MultipleChoiceSubmittedAnswer; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; @@ -63,14 +66,11 @@ import de.tum.cit.aet.artemis.quiz.domain.compare.SAMapping; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; +import de.tum.cit.aet.artemis.quiz.service.QuizPoolService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.service.SubmissionVersionService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseParticipationService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingTriggerService; -import de.tum.cit.aet.artemis.service.quiz.QuizPoolService; -import de.tum.cit.aet.artemis.service.util.ExamExerciseStartPreparationStatus; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/ExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseWithSubmissionsExportService.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/export/ExerciseWithSubmissionsExportService.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseWithSubmissionsExportService.java index baba95795261..07fc2a6af0c6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/ExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseWithSubmissionsExportService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.export; +package de.tum.cit.aet.artemis.exercise.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -23,10 +23,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.core.service.ArchivalReportEntry; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.archival.ArchivalReportEntry; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; /** @@ -55,7 +55,8 @@ public abstract class ExerciseWithSubmissionsExportService { private final SubmissionExportService submissionExportService; - ExerciseWithSubmissionsExportService(FileService fileService, MappingJackson2HttpMessageConverter springMvcJacksonConverter, SubmissionExportService submissionExportService) { + protected ExerciseWithSubmissionsExportService(FileService fileService, MappingJackson2HttpMessageConverter springMvcJacksonConverter, + SubmissionExportService submissionExportService) { this.fileService = fileService; this.objectMapper = springMvcJacksonConverter.getObjectMapper(); this.submissionExportService = submissionExportService; @@ -69,7 +70,8 @@ public abstract class ExerciseWithSubmissionsExportService { * @param exportDir the directory where the content of the export is stored * @param pathsToBeZipped the paths that should be included in the zip file */ - void exportProblemStatementAndEmbeddedFilesAndExerciseDetails(Exercise exercise, List exportErrors, Path exportDir, List pathsToBeZipped) throws IOException { + protected void exportProblemStatementAndEmbeddedFilesAndExerciseDetails(Exercise exercise, List exportErrors, Path exportDir, List pathsToBeZipped) + throws IOException { exportProblemStatementWithEmbeddedFiles(exercise, exportErrors, exportDir, pathsToBeZipped); exportExerciseDetails(exercise, exportDir, pathsToBeZipped); } @@ -226,7 +228,7 @@ private void exportExerciseDetails(Exercise exercise, Path exportDir, List pathsToBeZipped.add(fileService.writeObjectToJsonFile(exercise, this.objectMapper, exerciseDetailsExportPath)); } - Path exportExerciseWithSubmissions(Exercise exercise, SubmissionExportOptionsDTO optionsDTO, Path exportDir, List exportErrors, + protected Path exportExerciseWithSubmissions(Exercise exercise, SubmissionExportOptionsDTO optionsDTO, Path exportDir, List exportErrors, List reportEntries) { List pathsToBeZipped = new ArrayList<>(); try { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/IExerciseScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/IExerciseScheduleService.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/service/scheduled/IExerciseScheduleService.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/service/IExerciseScheduleService.java index 956640feabae..a2872c960112 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/IExerciseScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/IExerciseScheduleService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.scheduled; +package de.tum.cit.aet.artemis.exercise.service; import de.tum.cit.aet.artemis.exercise.domain.Exercise; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/metrics/LearningMetricsService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/LearningMetricsService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/metrics/LearningMetricsService.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/service/LearningMetricsService.java index 27602983ea45..43b9ec039fe6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/metrics/LearningMetricsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/LearningMetricsService.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.service.metrics; +package de.tum.cit.aet.artemis.exercise.service; import static de.tum.cit.aet.artemis.core.config.Constants.MIN_SCORE_GREEN; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.util.TimeUtil.toRelativeTime; +import static de.tum.cit.aet.artemis.core.util.TimeUtil.toRelativeTime; import static java.util.function.Function.identity; import static java.util.stream.Collectors.averagingDouble; import static java.util.stream.Collectors.groupingBy; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/SubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionExportService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/export/SubmissionExportService.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionExportService.java index ef952935ad86..6184b02d5e87 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/SubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionExportService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.export; +package de.tum.cit.aet.artemis.exercise.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -26,6 +26,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.service.ArchivalReportEntry; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -33,7 +34,6 @@ import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ZipFileService; -import de.tum.cit.aet.artemis.service.archival.ArchivalReportEntry; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/team/strategies/CreateOnlyStrategy.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/CreateOnlyStrategy.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/team/strategies/CreateOnlyStrategy.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/service/team/CreateOnlyStrategy.java index cc92b0103bd1..5be6eb739c9b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/team/strategies/CreateOnlyStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/CreateOnlyStrategy.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.team.strategies; +package de.tum.cit.aet.artemis.exercise.service.team; import java.util.Collections; import java.util.List; @@ -10,7 +10,6 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; -import de.tum.cit.aet.artemis.service.team.TeamImportStrategy; public class CreateOnlyStrategy extends TeamImportStrategy { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/team/strategies/PurgeExistingStrategy.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/PurgeExistingStrategy.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/team/strategies/PurgeExistingStrategy.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/service/team/PurgeExistingStrategy.java index f5dffe49ffd5..1ee4564b1f41 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/team/strategies/PurgeExistingStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/PurgeExistingStrategy.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.team.strategies; +package de.tum.cit.aet.artemis.exercise.service.team; import java.util.List; @@ -6,7 +6,6 @@ import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.team.TeamImportStrategy; public class PurgeExistingStrategy extends TeamImportStrategy { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/team/TeamImportStrategy.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamImportStrategy.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/team/TeamImportStrategy.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamImportStrategy.java index be8a3121655f..e1f721404892 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/team/TeamImportStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamImportStrategy.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.team; +package de.tum.cit.aet.artemis.exercise.service.team; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TeamService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/TeamService.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamService.java index 8f37d3ccae47..d4055f5e863a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TeamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.exercise.service.team; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -19,17 +19,15 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlRepositoryPermission; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.dto.TeamImportStrategyType; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlRepositoryPermission; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.dto.TeamSearchUserDTO; -import de.tum.cit.aet.artemis.service.team.TeamImportStrategy; -import de.tum.cit.aet.artemis.service.team.strategies.CreateOnlyStrategy; -import de.tum.cit.aet.artemis.service.team.strategies.PurgeExistingStrategy; import de.tum.cit.aet.artemis.web.rest.TeamResource; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.StudentsAppearMultipleTimesException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseWithSubmissionsExportService.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadExerciseWithSubmissionsExportService.java rename to src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseWithSubmissionsExportService.java index 7e44275f2bfd..5c63b641cf4d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseWithSubmissionsExportService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.export; +package de.tum.cit.aet.artemis.fileupload.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -9,9 +9,10 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.service.ArchivalReportEntry; +import de.tum.cit.aet.artemis.exercise.service.ExerciseWithSubmissionsExportService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.archival.ArchivalReportEntry; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadSubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionExportService.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadSubmissionExportService.java rename to src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionExportService.java index 10593f69fb12..9cd7611d291e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/FileUploadSubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionExportService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.export; +package de.tum.cit.aet.artemis.fileupload.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -17,6 +17,7 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.service.SubmissionExportService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ZipFileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSettings.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSettings.java index 355dc4a9ebfc..5ca715a2f688 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSettings.java @@ -23,7 +23,7 @@ * {@link IrisCourseSettings} are used to specify settings on a course level. * {@link IrisExerciseSettings} are used to specify settings on an exercise level. *

- * Also see {@link de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService} for more information. + * Also see {@link de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService} for more information. */ @Entity @Table(name = "iris_settings") diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSubSettings.java b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSubSettings.java index 0af311fd9b64..16588cf448a5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSubSettings.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/domain/settings/IrisSubSettings.java @@ -29,7 +29,7 @@ * {@link IrisHestiaSubSettings} are used to specify settings for the Hestia integration. * {@link IrisCompetencyGenerationSubSettings} are used to specify settings for the competency generation feature. *

- * Also see {@link de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService} for more information. + * Also see {@link de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService} for more information. */ @Entity @Table(name = "iris_sub_settings") diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisChatWebsocketDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisChatWebsocketDTO.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisChatWebsocketDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisChatWebsocketDTO.java index eff447e2cedc..bc3adb766b19 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisChatWebsocketDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisChatWebsocketDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.iris.dto; +package de.tum.cit.aet.artemis.iris.dto; import java.util.List; import java.util.Objects; @@ -7,9 +7,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; +import de.tum.cit.aet.artemis.iris.service.IrisRateLimitService; /** * A DTO for sending status updates of Iris to the client via the websocket diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedChatSubSettingsDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedChatSubSettingsDTO.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedChatSubSettingsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedChatSubSettingsDTO.java index d0b8dfb70adc..72d8e599ed70 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedChatSubSettingsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedChatSubSettingsDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.iris.dto; +package de.tum.cit.aet.artemis.iris.dto; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java index 745e47c085d2..18ffcbc17b50 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.iris.dto; +package de.tum.cit.aet.artemis.iris.dto; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedHestiaSubSettingsDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedHestiaSubSettingsDTO.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedHestiaSubSettingsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedHestiaSubSettingsDTO.java index b2d73bcdc987..c70ce4825a92 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedHestiaSubSettingsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedHestiaSubSettingsDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.iris.dto; +package de.tum.cit.aet.artemis.iris.dto; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedLectureIngestionSubSettingsDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedLectureIngestionSubSettingsDTO.java similarity index 78% rename from src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedLectureIngestionSubSettingsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedLectureIngestionSubSettingsDTO.java index 6698b1fb134e..284d3fd0a23b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedLectureIngestionSubSettingsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedLectureIngestionSubSettingsDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.iris.dto; +package de.tum.cit.aet.artemis.iris.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedSettingsDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedSettingsDTO.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedSettingsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedSettingsDTO.java index ae59dd858343..9353757c782e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/dto/IrisCombinedSettingsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisCombinedSettingsDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.iris.dto; +package de.tum.cit.aet.artemis.iris.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/exception/IrisException.java b/src/main/java/de/tum/cit/aet/artemis/iris/exception/IrisException.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/iris/exception/IrisException.java rename to src/main/java/de/tum/cit/aet/artemis/iris/exception/IrisException.java index 3d4a329658ed..71c05f954df6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/exception/IrisException.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/exception/IrisException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.iris.exception; +package de.tum.cit.aet.artemis.iris.exception; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/exception/IrisForbiddenException.java b/src/main/java/de/tum/cit/aet/artemis/iris/exception/IrisForbiddenException.java similarity index 78% rename from src/main/java/de/tum/cit/aet/artemis/service/iris/exception/IrisForbiddenException.java rename to src/main/java/de/tum/cit/aet/artemis/iris/exception/IrisForbiddenException.java index 86029e0e6eff..f079f7322c7c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/exception/IrisForbiddenException.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/exception/IrisForbiddenException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.iris.exception; +package de.tum.cit.aet.artemis.iris.exception; import java.util.Map; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/exception/IrisInternalPyrisErrorException.java b/src/main/java/de/tum/cit/aet/artemis/iris/exception/IrisInternalPyrisErrorException.java similarity index 84% rename from src/main/java/de/tum/cit/aet/artemis/service/iris/exception/IrisInternalPyrisErrorException.java rename to src/main/java/de/tum/cit/aet/artemis/iris/exception/IrisInternalPyrisErrorException.java index 1964cd3a230f..fc1a4cff7fa1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/exception/IrisInternalPyrisErrorException.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/exception/IrisInternalPyrisErrorException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.iris.exception; +package de.tum.cit.aet.artemis.iris.exception; import java.util.Map; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/exception/IrisRateLimitExceededException.java b/src/main/java/de/tum/cit/aet/artemis/iris/exception/IrisRateLimitExceededException.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/service/iris/exception/IrisRateLimitExceededException.java rename to src/main/java/de/tum/cit/aet/artemis/iris/exception/IrisRateLimitExceededException.java index 6bd7e59d33b8..55f9fa70eb15 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/exception/IrisRateLimitExceededException.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/exception/IrisRateLimitExceededException.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.service.iris.exception; +package de.tum.cit.aet.artemis.iris.exception; import java.util.Map; import org.zalando.problem.Status; -import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; +import de.tum.cit.aet.artemis.iris.service.IrisRateLimitService; /** * Exception that is thrown when the rate limit of Iris is exceeded. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisCompetencyGenerationService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisCompetencyGenerationService.java similarity index 80% rename from src/main/java/de/tum/cit/aet/artemis/service/iris/IrisCompetencyGenerationService.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/IrisCompetencyGenerationService.java index ff3696e3a55a..d2e6cca94dab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisCompetencyGenerationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisCompetencyGenerationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.iris; +package de.tum.cit.aet.artemis.iris.service; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; @@ -6,13 +6,13 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisJobService; -import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisPipelineService; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionPipelineExecutionDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyRecommendationDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.job.CompetencyExtractionJob; -import de.tum.cit.aet.artemis.service.iris.websocket.IrisWebsocketService; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisJobService; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisPipelineService; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionPipelineExecutionDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency.PyrisCompetencyRecommendationDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.CompetencyExtractionJob; +import de.tum.cit.aet.artemis.iris.service.websocket.IrisWebsocketService; /** * Service to handle the Competency generation subsytem of Iris. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisDefaultTemplateService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisDefaultTemplateService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/iris/IrisDefaultTemplateService.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/IrisDefaultTemplateService.java index 4804fd994b99..489e3dae1fe4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisDefaultTemplateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisDefaultTemplateService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.iris; +package de.tum.cit.aet.artemis.iris.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisMessageService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisMessageService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/iris/IrisMessageService.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/IrisMessageService.java index 16312bf21089..1b0464695140 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisMessageService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisMessageService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.iris; +package de.tum.cit.aet.artemis.iris.service; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisRateLimitService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisRateLimitService.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/service/iris/IrisRateLimitService.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/IrisRateLimitService.java index 07cb5846dddb..baa166e621be 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisRateLimitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisRateLimitService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.iris; +package de.tum.cit.aet.artemis.iris.service; import java.time.ZonedDateTime; import java.util.Objects; @@ -7,9 +7,9 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.iris.exception.IrisRateLimitExceededException; import de.tum.cit.aet.artemis.iris.repository.IrisMessageRepository; -import de.tum.cit.aet.artemis.service.iris.exception.IrisRateLimitExceededException; -import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; +import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; /** * Service for the rate limit of the iris chatbot. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisSessionService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisSessionService.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/service/iris/IrisSessionService.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/IrisSessionService.java index 4dcb9709a23b..bb39e66c7755 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/IrisSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisSessionService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.iris; +package de.tum.cit.aet.artemis.iris.service; import jakarta.annotation.Nullable; import jakarta.ws.rs.BadRequestException; @@ -13,12 +13,12 @@ import de.tum.cit.aet.artemis.iris.domain.session.IrisExerciseChatSession; import de.tum.cit.aet.artemis.iris.domain.session.IrisHestiaSession; import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; -import de.tum.cit.aet.artemis.service.iris.session.IrisChatBasedFeatureInterface; -import de.tum.cit.aet.artemis.service.iris.session.IrisCourseChatSessionService; -import de.tum.cit.aet.artemis.service.iris.session.IrisExerciseChatSessionService; -import de.tum.cit.aet.artemis.service.iris.session.IrisHestiaSessionService; -import de.tum.cit.aet.artemis.service.iris.session.IrisRateLimitedFeatureInterface; -import de.tum.cit.aet.artemis.service.iris.session.IrisSubFeatureInterface; +import de.tum.cit.aet.artemis.iris.service.session.IrisChatBasedFeatureInterface; +import de.tum.cit.aet.artemis.iris.service.session.IrisCourseChatSessionService; +import de.tum.cit.aet.artemis.iris.service.session.IrisExerciseChatSessionService; +import de.tum.cit.aet.artemis.iris.service.session.IrisHestiaSessionService; +import de.tum.cit.aet.artemis.iris.service.session.IrisRateLimitedFeatureInterface; +import de.tum.cit.aet.artemis.iris.service.session.IrisSubFeatureInterface; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/AbstractIrisChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/AbstractIrisChatSessionService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/iris/session/AbstractIrisChatSessionService.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/session/AbstractIrisChatSessionService.java index 23fb66cf2b6c..f732529aae72 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/AbstractIrisChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/AbstractIrisChatSessionService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.iris.session; +package de.tum.cit.aet.artemis.iris.service.session; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisButtonBasedFeatureInterface.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisButtonBasedFeatureInterface.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisButtonBasedFeatureInterface.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisButtonBasedFeatureInterface.java index b1adf5d2f4b0..2ef4eb20b103 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisButtonBasedFeatureInterface.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisButtonBasedFeatureInterface.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.iris.session; +package de.tum.cit.aet.artemis.iris.service.session; import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisChatBasedFeatureInterface.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisChatBasedFeatureInterface.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisChatBasedFeatureInterface.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisChatBasedFeatureInterface.java index 8ae3123cbe38..852d43e589d7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisChatBasedFeatureInterface.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisChatBasedFeatureInterface.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.iris.session; +package de.tum.cit.aet.artemis.iris.service.session; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisCourseChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisCourseChatSessionService.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisCourseChatSessionService.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisCourseChatSessionService.java index 17298ffe5ade..0d5bf3de1201 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisCourseChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisCourseChatSessionService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.iris.session; +package de.tum.cit.aet.artemis.iris.service.session; import java.time.LocalDate; import java.time.ZoneId; @@ -15,6 +15,9 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisPipelineService; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.CourseChatJob; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessageSender; import de.tum.cit.aet.artemis.iris.domain.message.IrisTextMessageContent; @@ -22,14 +25,11 @@ import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; import de.tum.cit.aet.artemis.iris.repository.IrisCourseChatSessionRepository; import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; +import de.tum.cit.aet.artemis.iris.service.IrisMessageService; +import de.tum.cit.aet.artemis.iris.service.IrisRateLimitService; +import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; +import de.tum.cit.aet.artemis.iris.service.websocket.IrisChatWebsocketService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisPipelineService; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.job.CourseChatJob; -import de.tum.cit.aet.artemis.service.iris.IrisMessageService; -import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; -import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; -import de.tum.cit.aet.artemis.service.iris.websocket.IrisChatWebsocketService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisExerciseChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisExerciseChatSessionService.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisExerciseChatSessionService.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisExerciseChatSessionService.java index d096aebc035c..27121ae92395 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisExerciseChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisExerciseChatSessionService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.iris.session; +package de.tum.cit.aet.artemis.iris.service.session; import java.util.Objects; import java.util.Optional; @@ -10,6 +10,9 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisPipelineService; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.ExerciseChatJob; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessageSender; @@ -17,19 +20,16 @@ import de.tum.cit.aet.artemis.iris.domain.session.IrisExerciseChatSession; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; +import de.tum.cit.aet.artemis.iris.service.IrisMessageService; +import de.tum.cit.aet.artemis.iris.service.IrisRateLimitService; +import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; +import de.tum.cit.aet.artemis.iris.service.websocket.IrisChatWebsocketService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisPipelineService; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.job.ExerciseChatJob; -import de.tum.cit.aet.artemis.service.iris.IrisMessageService; -import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; -import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; -import de.tum.cit.aet.artemis.service.iris.websocket.IrisChatWebsocketService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisHestiaSessionService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisHestiaSessionService.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisHestiaSessionService.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisHestiaSessionService.java index 701a5f25863b..deee3f3d4af9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisHestiaSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisHestiaSessionService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.iris.session; +package de.tum.cit.aet.artemis.iris.service.session; import java.time.ZonedDateTime; @@ -11,15 +11,15 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisConnectorService; import de.tum.cit.aet.artemis.iris.domain.session.IrisHestiaSession; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; import de.tum.cit.aet.artemis.iris.repository.IrisHestiaSessionRepository; import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; +import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisConnectorService; -import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; /** * Service to handle the Hestia integration of Iris. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisRateLimitedFeatureInterface.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisRateLimitedFeatureInterface.java similarity index 72% rename from src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisRateLimitedFeatureInterface.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisRateLimitedFeatureInterface.java index 0321d07c291f..70d2676bb860 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisRateLimitedFeatureInterface.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisRateLimitedFeatureInterface.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.iris.session; +package de.tum.cit.aet.artemis.iris.service.session; import de.tum.cit.aet.artemis.core.domain.User; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisSubFeatureInterface.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisSubFeatureInterface.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisSubFeatureInterface.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisSubFeatureInterface.java index 309a3cd04b2e..d5cf48872ff8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/session/IrisSubFeatureInterface.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisSubFeatureInterface.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.iris.session; +package de.tum.cit.aet.artemis.iris.service.session; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSettingsService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSettingsService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSettingsService.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSettingsService.java index b6cfedbefa28..064a3bdfd2dd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSettingsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSettingsService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.iris.settings; +package de.tum.cit.aet.artemis.iris.service.settings; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import static de.tum.cit.aet.artemis.iris.domain.settings.IrisSettingsType.COURSE; @@ -30,10 +30,10 @@ import de.tum.cit.aet.artemis.iris.domain.settings.IrisSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; +import de.tum.cit.aet.artemis.iris.dto.IrisCombinedSettingsDTO; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; +import de.tum.cit.aet.artemis.iris.service.IrisDefaultTemplateService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.iris.IrisDefaultTemplateService; -import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedSettingsDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenAlertException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSubSettingsService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSubSettingsService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSubSettingsService.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSubSettingsService.java index 342bd134ca85..12c6e4ed5fec 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/settings/IrisSubSettingsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSubSettingsService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.iris.settings; +package de.tum.cit.aet.artemis.iris.service.settings; import java.util.ArrayList; import java.util.Comparator; @@ -21,11 +21,11 @@ import de.tum.cit.aet.artemis.iris.domain.settings.IrisSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSettingsType; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettings; +import de.tum.cit.aet.artemis.iris.dto.IrisCombinedChatSubSettingsDTO; +import de.tum.cit.aet.artemis.iris.dto.IrisCombinedCompetencyGenerationSubSettingsDTO; +import de.tum.cit.aet.artemis.iris.dto.IrisCombinedHestiaSubSettingsDTO; +import de.tum.cit.aet.artemis.iris.dto.IrisCombinedLectureIngestionSubSettingsDTO; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedChatSubSettingsDTO; -import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedCompetencyGenerationSubSettingsDTO; -import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedHestiaSubSettingsDTO; -import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedLectureIngestionSubSettingsDTO; /** * Service for handling {@link IrisSubSettings} objects. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/websocket/IrisChatWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/websocket/IrisChatWebsocketService.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/service/iris/websocket/IrisChatWebsocketService.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/websocket/IrisChatWebsocketService.java index 04f9883aeb37..e66000260e37 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/websocket/IrisChatWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/websocket/IrisChatWebsocketService.java @@ -1,15 +1,15 @@ -package de.tum.cit.aet.artemis.service.iris.websocket; +package de.tum.cit.aet.artemis.iris.service.websocket; import java.util.List; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; import de.tum.cit.aet.artemis.iris.domain.session.IrisChatSession; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; -import de.tum.cit.aet.artemis.service.iris.dto.IrisChatWebsocketDTO; +import de.tum.cit.aet.artemis.iris.dto.IrisChatWebsocketDTO; +import de.tum.cit.aet.artemis.iris.service.IrisRateLimitService; @Service @Profile("iris") diff --git a/src/main/java/de/tum/cit/aet/artemis/service/iris/websocket/IrisWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/websocket/IrisWebsocketService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/iris/websocket/IrisWebsocketService.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/websocket/IrisWebsocketService.java index be68e264680e..16af32c5d504 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/iris/websocket/IrisWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/websocket/IrisWebsocketService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.iris.websocket; +package de.tum.cit.aet.artemis.iris.service.websocket; import java.util.concurrent.ExecutionException; diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/config/CustomLti13Configurer.java b/src/main/java/de/tum/cit/aet/artemis/lti/config/CustomLti13Configurer.java index 1ed660170a40..f33d4d2aee47 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/config/CustomLti13Configurer.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/config/CustomLti13Configurer.java @@ -8,9 +8,9 @@ import org.springframework.stereotype.Component; import de.tum.cit.aet.artemis.core.security.jwt.JWTFilter; +import de.tum.cit.aet.artemis.core.service.connectors.lti.Lti13Service; import de.tum.cit.aet.artemis.core.web.filter.Lti13LaunchFilter; import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; -import de.tum.cit.aet.artemis.service.connectors.lti.Lti13Service; import uk.ac.ox.ctl.lti13.Lti13Configurer; import uk.ac.ox.ctl.lti13.security.oauth2.client.lti.authentication.OidcLaunchFlowAuthenticationProvider; import uk.ac.ox.ctl.lti13.security.oauth2.client.lti.web.HttpSessionOAuth2AuthorizationRequestRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ModelingExerciseScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseScheduleService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/scheduled/ModelingExerciseScheduleService.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseScheduleService.java index 9c13de35a02d..268d7d07477d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ModelingExerciseScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseScheduleService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.scheduled; +package de.tum.cit.aet.artemis.modeling.service; import static de.tum.cit.aet.artemis.core.config.Constants.EXAM_END_WAIT_TIME_FOR_COMPASS_MINUTES; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; @@ -26,11 +26,13 @@ import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.ScheduleService; +import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.ExerciseLifecycle; +import de.tum.cit.aet.artemis.exercise.service.IExerciseScheduleService; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; -import de.tum.cit.aet.artemis.service.compass.CompassService; -import de.tum.cit.aet.artemis.service.exam.ExamDateService; +import de.tum.cit.aet.artemis.modeling.service.compass.CompassService; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; import tech.jhipster.config.JHipsterConstants; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseWithSubmissionsExportService.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/service/export/ModelingExerciseWithSubmissionsExportService.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseWithSubmissionsExportService.java index 88c08eebd4d8..bee312650586 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseWithSubmissionsExportService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.export; +package de.tum.cit.aet.artemis.modeling.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -9,9 +9,10 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.service.ArchivalReportEntry; +import de.tum.cit.aet.artemis.exercise.service.ExerciseWithSubmissionsExportService; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.archival.ArchivalReportEntry; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingSubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionExportService.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/service/export/ModelingSubmissionExportService.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionExportService.java index 3dfd0caa9c25..6e095a637c99 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/ModelingSubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionExportService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.export; +package de.tum.cit.aet.artemis.modeling.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -14,6 +14,7 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.service.SubmissionExportService; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ZipFileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/CompassService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/CompassService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/CompassService.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/CompassService.java index 8fc785b13ccf..051ab4dfda68 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/CompassService.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/CompassService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.compass; +package de.tum.cit.aet.artemis.modeling.service.compass; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -17,6 +17,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.modeling.domain.ModelCluster; import de.tum.cit.aet.artemis.modeling.domain.ModelElement; @@ -25,10 +26,9 @@ import de.tum.cit.aet.artemis.modeling.repository.ModelClusterRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelElementRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; -import de.tum.cit.aet.artemis.service.compass.controller.FeedbackSelector; -import de.tum.cit.aet.artemis.service.compass.controller.ModelClusterFactory; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.modeling.service.compass.controller.FeedbackSelector; +import de.tum.cit.aet.artemis.modeling.service.compass.controller.ModelClusterFactory; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/assessment/Context.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/assessment/Context.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/assessment/Context.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/assessment/Context.java index 6e67f36cd6ec..c38449592b3d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/assessment/Context.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/assessment/Context.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.compass.assessment; +package de.tum.cit.aet.artemis.modeling.service.compass.assessment; import java.io.Serializable; import java.util.Objects; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/controller/FeedbackSelector.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/controller/FeedbackSelector.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/controller/FeedbackSelector.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/controller/FeedbackSelector.java index 9787930960e7..08326fa1ae46 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/controller/FeedbackSelector.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/controller/FeedbackSelector.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.compass.controller; +package de.tum.cit.aet.artemis.modeling.service.compass.controller; import java.math.BigDecimal; import java.math.RoundingMode; @@ -15,7 +15,7 @@ import de.tum.cit.aet.artemis.assessment.domain.GradingInstruction; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.modeling.domain.ModelElement; -import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.modeling.service.compass.utils.CompassConfiguration; public class FeedbackSelector { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/controller/ModelClusterFactory.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/controller/ModelClusterFactory.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/controller/ModelClusterFactory.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/controller/ModelClusterFactory.java index 22f78d5eb69f..4f5219942919 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/controller/ModelClusterFactory.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/controller/ModelClusterFactory.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.compass.controller; +package de.tum.cit.aet.artemis.modeling.service.compass.controller; import static com.google.gson.JsonParser.parseString; @@ -21,13 +21,13 @@ import de.tum.cit.aet.artemis.modeling.domain.ModelElement; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; -import de.tum.cit.aet.artemis.service.compass.assessment.Context; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLMethod; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; -import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.modeling.service.compass.assessment.Context; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLAttribute; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLMethod; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.utils.CompassConfiguration; public class ModelClusterFactory { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/strategy/NameSimilarity.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/strategy/NameSimilarity.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/strategy/NameSimilarity.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/strategy/NameSimilarity.java index ea57085e0619..ddbbcfa6243b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/strategy/NameSimilarity.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/strategy/NameSimilarity.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.compass.strategy; +package de.tum.cit.aet.artemis.modeling.service.compass.strategy; import java.util.Objects; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/Similarity.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/Similarity.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/Similarity.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/Similarity.java index 59b32e2f67e7..a79bc4d73839 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/Similarity.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/Similarity.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel; /** * Similarity is implemented by classes of which an object can calculate the similarity between itself and another similarity object. This interface should be implemented using the diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/UMLContainerElement.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/UMLContainerElement.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/UMLContainerElement.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/UMLContainerElement.java index 3a9e4ead7adb..0a26ae357498 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/UMLContainerElement.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/UMLContainerElement.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel; import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLNode; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.deployment.UMLNode; public abstract class UMLContainerElement extends UMLElement implements Serializable { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/UMLDiagram.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/UMLDiagram.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/UMLDiagram.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/UMLDiagram.java index 58a427d3ded4..9232198124de 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/UMLDiagram.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/UMLDiagram.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/UMLElement.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/UMLElement.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/UMLElement.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/UMLElement.java index 87ae38e2dac4..a8c7f4c76e44 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/UMLElement.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/UMLElement.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel; import java.io.Serializable; import java.util.List; @@ -6,7 +6,7 @@ import jakarta.annotation.Nullable; -import de.tum.cit.aet.artemis.service.compass.assessment.Context; +import de.tum.cit.aet.artemis.modeling.service.compass.assessment.Context; public abstract class UMLElement implements Similarity, Serializable { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLActivity.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/activity/UMLActivity.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLActivity.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/activity/UMLActivity.java index 464336fa7f39..bfeb2d0ab270 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLActivity.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/activity/UMLActivity.java @@ -1,13 +1,13 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.activity; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity; import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class UMLActivity extends UMLActivityElement implements Serializable { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLActivityDiagram.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/activity/UMLActivityDiagram.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLActivityDiagram.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/activity/UMLActivityDiagram.java index ecc73c2b6cba..80a47b78edd8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLActivityDiagram.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/activity/UMLActivityDiagram.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.activity; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class UMLActivityDiagram extends UMLDiagram implements Serializable { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLActivityElement.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/activity/UMLActivityElement.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLActivityElement.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/activity/UMLActivityElement.java index a1829029a05f..9b2b54959cef 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLActivityElement.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/activity/UMLActivityElement.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.activity; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity; import java.io.Serializable; import java.util.Objects; import jakarta.annotation.Nullable; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public abstract class UMLActivityElement extends UMLElement implements Serializable { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLActivityNode.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/activity/UMLActivityNode.java similarity index 79% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLActivityNode.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/activity/UMLActivityNode.java index aadf420d1150..ec50f04e7494 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLActivityNode.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/activity/UMLActivityNode.java @@ -1,13 +1,13 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.activity; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity; import java.io.Serializable; import java.util.Objects; import com.google.common.base.CaseFormat; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class UMLActivityNode extends UMLActivityElement implements Serializable { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLControlFlow.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/activity/UMLControlFlow.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLControlFlow.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/activity/UMLControlFlow.java index a885f0b8b197..e80194a1b970 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/activity/UMLControlFlow.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/activity/UMLControlFlow.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.activity; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity; import java.io.Serializable; import java.util.Objects; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class UMLControlFlow extends UMLElement implements Serializable { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNAnnotation.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNAnnotation.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNAnnotation.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNAnnotation.java index 2da145a7fa3a..a14896a1f49b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNAnnotation.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNAnnotation.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Objects; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; /** * Represents a BPMN annotation diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNCallActivity.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNCallActivity.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNCallActivity.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNCallActivity.java index 1451df7cd2a4..da37935a45d6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNCallActivity.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNCallActivity.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Objects; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; /** * Represents a BPMN call activity diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNDataObject.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNDataObject.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNDataObject.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNDataObject.java index abad8d8d8e0e..5da15e8aa5a4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNDataObject.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNDataObject.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Objects; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; /** * Represents a BPMN data object diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNDataStore.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNDataStore.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNDataStore.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNDataStore.java index 9d26f952c3ae..0523ac193f33 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNDataStore.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNDataStore.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Objects; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; /** * Represents a BPMN data store diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNDiagram.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNDiagram.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNDiagram.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNDiagram.java index 1cd545536963..425dc1edcac0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNDiagram.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNDiagram.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn; import java.util.ArrayList; import java.util.List; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; /** * Represents a BPMN diagram diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNEndEvent.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNEndEvent.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNEndEvent.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNEndEvent.java index 3f536afb5758..2d18e222e39b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNEndEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNEndEvent.java @@ -1,13 +1,13 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Arrays; import java.util.Objects; import java.util.Optional; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; /** * Represents a BPMN end event diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNFlow.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNFlow.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNFlow.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNFlow.java index 48143010ba11..e586fc4dc985 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNFlow.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNFlow.java @@ -1,13 +1,13 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Arrays; import java.util.Objects; import java.util.Optional; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; /** * Represents a BPMN flow diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNGateway.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNGateway.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNGateway.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNGateway.java index 88cd96233362..c212a833ca81 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNGateway.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNGateway.java @@ -1,13 +1,13 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Arrays; import java.util.Objects; import java.util.Optional; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; /** * Represents a BPMN gateway diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNGroup.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNGroup.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNGroup.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNGroup.java index e09cfb9a9fae..ab970cdfebc4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNGroup.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNGroup.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Objects; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLContainerElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLContainerElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; /** * Represents a BPMN group diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNIntermediateEvent.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNIntermediateEvent.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNIntermediateEvent.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNIntermediateEvent.java index 1ee22375d837..0f2677c3252f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNIntermediateEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNIntermediateEvent.java @@ -1,13 +1,13 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Arrays; import java.util.Objects; import java.util.Optional; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; /** * Represents a BPMN intermediate event diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNPool.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNPool.java similarity index 81% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNPool.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNPool.java index 7b50613f5a83..153be2af820f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNPool.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNPool.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Objects; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLContainerElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLContainerElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; /** * Represents a BPMN pool diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNStartEvent.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNStartEvent.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNStartEvent.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNStartEvent.java index dcb49a19da9e..e7d82c9b0d10 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNStartEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNStartEvent.java @@ -1,13 +1,13 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Arrays; import java.util.Objects; import java.util.Optional; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; /** * Represents a BPMN start event diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNSubprocess.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNSubprocess.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNSubprocess.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNSubprocess.java index b23ecdea1023..0769616b73b7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNSubprocess.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNSubprocess.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Objects; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; /** * Represents a BPMN subprocess diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNSwimlane.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNSwimlane.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNSwimlane.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNSwimlane.java index 4931f28ac007..bf3abd010791 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNSwimlane.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNSwimlane.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Objects; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLContainerElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLContainerElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; /** * Represents a BPMN swimlane diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNTask.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNTask.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNTask.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNTask.java index 33f1e80bd368..a81560567ee1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNTask.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNTask.java @@ -1,13 +1,13 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Arrays; import java.util.Objects; import java.util.Optional; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; /** * Represents a BPMN task diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNTransaction.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNTransaction.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNTransaction.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNTransaction.java index 911594343fd5..5df6507ae6db 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/bpmn/BPMNTransaction.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/bpmn/BPMNTransaction.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn; import java.io.Serializable; import java.util.Objects; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; /** * Represents a BPMN transaction diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLAttribute.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/classdiagram/UMLAttribute.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLAttribute.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/classdiagram/UMLAttribute.java index b5870a7a0654..04213df92266 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLAttribute.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/classdiagram/UMLAttribute.java @@ -1,14 +1,14 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram; import java.io.Serializable; import java.util.Objects; import jakarta.validation.constraints.NotNull; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.utils.CompassConfiguration; public class UMLAttribute extends UMLElement implements Serializable { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLClass.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/classdiagram/UMLClass.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLClass.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/classdiagram/UMLClass.java index 0005b49a8744..e2c12ceadd73 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLClass.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/classdiagram/UMLClass.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram; import java.io.Serializable; import java.util.List; @@ -8,10 +8,10 @@ import com.google.common.base.CaseFormat; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.utils.CompassConfiguration; public class UMLClass extends UMLElement implements Serializable { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLClassDiagram.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/classdiagram/UMLClassDiagram.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLClassDiagram.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/classdiagram/UMLClassDiagram.java index 22b89c4925df..e353ad0b9668 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLClassDiagram.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/classdiagram/UMLClassDiagram.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class UMLClassDiagram extends UMLDiagram implements Serializable { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLMethod.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/classdiagram/UMLMethod.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLMethod.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/classdiagram/UMLMethod.java index b6593b04a67d..1175a39fa63d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLMethod.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/classdiagram/UMLMethod.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram; import java.io.Serializable; import java.util.Collections; @@ -7,10 +7,10 @@ import jakarta.validation.constraints.NotNull; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.utils.CompassConfiguration; public class UMLMethod extends UMLElement implements Serializable { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLPackage.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/classdiagram/UMLPackage.java similarity index 77% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLPackage.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/classdiagram/UMLPackage.java index 132f0452b237..5af35eb4dd4c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLPackage.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/classdiagram/UMLPackage.java @@ -1,13 +1,13 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram; import java.io.Serializable; import java.util.List; import java.util.Objects; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLContainerElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLContainerElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class UMLPackage extends UMLContainerElement implements Serializable { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLRelationship.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/classdiagram/UMLRelationship.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLRelationship.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/classdiagram/UMLRelationship.java index 5fcda9494038..9ef76e211998 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/classdiagram/UMLRelationship.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/classdiagram/UMLRelationship.java @@ -1,17 +1,17 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram; -import static de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity.nameEqualsSimilarity; -import static de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration.RELATION_MULTIPLICITY_WEIGHT; -import static de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration.RELATION_ROLE_WEIGHT; +import static de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity.nameEqualsSimilarity; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.CompassConfiguration.RELATION_MULTIPLICITY_WEIGHT; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.CompassConfiguration.RELATION_ROLE_WEIGHT; import java.io.Serializable; import java.util.Objects; import com.google.common.base.CaseFormat; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.utils.CompassConfiguration; public class UMLRelationship extends UMLElement implements Serializable { diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/communication/Direction.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/communication/Direction.java new file mode 100644 index 000000000000..64ac765d627f --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/communication/Direction.java @@ -0,0 +1,5 @@ +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.communication; + +public enum Direction { + SOURCE, TARGET +} diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/communication/UMLCommunicationDiagram.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/communication/UMLCommunicationDiagram.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/communication/UMLCommunicationDiagram.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/communication/UMLCommunicationDiagram.java index b6360d705fef..d52305a2a214 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/communication/UMLCommunicationDiagram.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/communication/UMLCommunicationDiagram.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.communication; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.communication; import java.util.ArrayList; import java.util.List; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObject; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.object.UMLObject; public class UMLCommunicationDiagram extends UMLDiagram { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/communication/UMLCommunicationLink.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/communication/UMLCommunicationLink.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/communication/UMLCommunicationLink.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/communication/UMLCommunicationLink.java index 0a777bd9ae0a..200ab095e11e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/communication/UMLCommunicationLink.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/communication/UMLCommunicationLink.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.communication; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.communication; import java.util.List; import java.util.Objects; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObject; -import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.object.UMLObject; +import de.tum.cit.aet.artemis.modeling.service.compass.utils.CompassConfiguration; public class UMLCommunicationLink extends UMLElement { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/communication/UMLMessage.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/communication/UMLMessage.java similarity index 81% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/communication/UMLMessage.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/communication/UMLMessage.java index 789febe5fb73..13f29a96c3f9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/communication/UMLMessage.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/communication/UMLMessage.java @@ -1,6 +1,6 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.communication; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.communication; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; public class UMLMessage { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/component/UMLComponent.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/component/UMLComponent.java similarity index 73% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/component/UMLComponent.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/component/UMLComponent.java index 8b6979607162..6628f7bb3f6f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/component/UMLComponent.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/component/UMLComponent.java @@ -1,13 +1,13 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.component; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component; import java.util.Objects; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLContainerElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; -import de.tum.cit.aet.artemis.service.compass.utils.SimilarityUtils; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLContainerElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.modeling.service.compass.utils.SimilarityUtils; public class UMLComponent extends UMLContainerElement { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/component/UMLComponentDiagram.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/component/UMLComponentDiagram.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/component/UMLComponentDiagram.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/component/UMLComponentDiagram.java index dd77470f9737..693d4a5f1ad9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/component/UMLComponentDiagram.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/component/UMLComponentDiagram.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.component; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component; import java.util.ArrayList; import java.util.List; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class UMLComponentDiagram extends UMLDiagram { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/component/UMLComponentInterface.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/component/UMLComponentInterface.java similarity index 84% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/component/UMLComponentInterface.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/component/UMLComponentInterface.java index 9be195be5f84..1980e6020126 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/component/UMLComponentInterface.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/component/UMLComponentInterface.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.component; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component; import java.util.Objects; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; -import de.tum.cit.aet.artemis.service.compass.utils.SimilarityUtils; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.modeling.service.compass.utils.SimilarityUtils; public class UMLComponentInterface extends UMLElement { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/component/UMLComponentRelationship.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/component/UMLComponentRelationship.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/component/UMLComponentRelationship.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/component/UMLComponentRelationship.java index ab566bcebf1b..e997ff368b73 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/component/UMLComponentRelationship.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/component/UMLComponentRelationship.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.component; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component; import java.util.Objects; import com.google.common.base.CaseFormat; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.utils.CompassConfiguration; public class UMLComponentRelationship extends UMLElement { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLArtifact.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/deployment/UMLArtifact.java similarity index 76% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLArtifact.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/deployment/UMLArtifact.java index d5aac39ce959..59a775cce97b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLArtifact.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/deployment/UMLArtifact.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.deployment; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.deployment; import java.util.Objects; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; -import de.tum.cit.aet.artemis.service.compass.utils.SimilarityUtils; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.modeling.service.compass.utils.SimilarityUtils; public class UMLArtifact extends UMLElement { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLDeploymentComponent.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/deployment/UMLDeploymentComponent.java similarity index 72% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLDeploymentComponent.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/deployment/UMLDeploymentComponent.java index 487dc61a5ba6..d37d353ffcb0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLDeploymentComponent.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/deployment/UMLDeploymentComponent.java @@ -1,6 +1,6 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.deployment; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.deployment; -import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponent; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponent; public class UMLDeploymentComponent extends UMLComponent { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLDeploymentDiagram.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/deployment/UMLDeploymentDiagram.java similarity index 76% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLDeploymentDiagram.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/deployment/UMLDeploymentDiagram.java index 7bb21bcac647..37617df10807 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLDeploymentDiagram.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/deployment/UMLDeploymentDiagram.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.deployment; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.deployment; import java.util.List; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponent; -import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentInterface; -import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentRelationship; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponent; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponentDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponentInterface; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponentRelationship; public class UMLDeploymentDiagram extends UMLComponentDiagram { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLDeploymentInterface.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/deployment/UMLDeploymentInterface.java similarity index 73% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLDeploymentInterface.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/deployment/UMLDeploymentInterface.java index b925a4e68f4b..623ea4ae905f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLDeploymentInterface.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/deployment/UMLDeploymentInterface.java @@ -1,6 +1,6 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.deployment; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.deployment; -import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentInterface; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponentInterface; public class UMLDeploymentInterface extends UMLComponentInterface { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLNode.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/deployment/UMLNode.java similarity index 76% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLNode.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/deployment/UMLNode.java index b566d3c3d960..f49cd379eef7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/deployment/UMLNode.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/deployment/UMLNode.java @@ -1,13 +1,13 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.deployment; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.deployment; import java.util.Objects; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLContainerElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; -import de.tum.cit.aet.artemis.service.compass.utils.SimilarityUtils; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLContainerElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.modeling.service.compass.utils.SimilarityUtils; public class UMLNode extends UMLContainerElement { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/Flowchart.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/flowchart/Flowchart.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/Flowchart.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/flowchart/Flowchart.java index de12e9398251..7a8765e33d71 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/Flowchart.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/flowchart/Flowchart.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart; import java.util.ArrayList; import java.util.List; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class Flowchart extends UMLDiagram { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartDecision.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/flowchart/FlowchartDecision.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartDecision.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/flowchart/FlowchartDecision.java index e94ce136269d..a7baa732f492 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartDecision.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/flowchart/FlowchartDecision.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class FlowchartDecision extends UMLElement { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartFlowline.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/flowchart/FlowchartFlowline.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartFlowline.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/flowchart/FlowchartFlowline.java index 9bad1b870bf7..d2bc40ba0ef4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartFlowline.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/flowchart/FlowchartFlowline.java @@ -1,9 +1,9 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart; import java.util.Objects; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class FlowchartFlowline extends UMLElement { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartFunctionCall.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/flowchart/FlowchartFunctionCall.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartFunctionCall.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/flowchart/FlowchartFunctionCall.java index aa89c2d69da7..8afe07580518 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartFunctionCall.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/flowchart/FlowchartFunctionCall.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class FlowchartFunctionCall extends UMLElement { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartInputOutput.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/flowchart/FlowchartInputOutput.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartInputOutput.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/flowchart/FlowchartInputOutput.java index 9e0e853a294f..30ca63da807c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartInputOutput.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/flowchart/FlowchartInputOutput.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class FlowchartInputOutput extends UMLElement { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartProcess.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/flowchart/FlowchartProcess.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartProcess.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/flowchart/FlowchartProcess.java index fc68349cace2..6bf1a98da15b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartProcess.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/flowchart/FlowchartProcess.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class FlowchartProcess extends UMLElement { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartTerminal.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/flowchart/FlowchartTerminal.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartTerminal.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/flowchart/FlowchartTerminal.java index 00e87d928386..b421b8f54f97 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/flowchart/FlowchartTerminal.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/flowchart/FlowchartTerminal.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class FlowchartTerminal extends UMLElement { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObject.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/object/UMLObject.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObject.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/object/UMLObject.java index c983bf2d9dad..ac9c099d5e53 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObject.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/object/UMLObject.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.object; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.object; import java.util.List; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class UMLObject extends UMLElement { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObjectAttribute.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/object/UMLObjectAttribute.java similarity index 75% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObjectAttribute.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/object/UMLObjectAttribute.java index d9a63e57d7ef..f2267596815e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObjectAttribute.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/object/UMLObjectAttribute.java @@ -1,6 +1,6 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.object; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.object; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLAttribute; public class UMLObjectAttribute extends UMLAttribute { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObjectDiagram.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/object/UMLObjectDiagram.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObjectDiagram.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/object/UMLObjectDiagram.java index da397ef29c30..bbe9a3b49252 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObjectDiagram.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/object/UMLObjectDiagram.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.object; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.object; import java.util.ArrayList; import java.util.List; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class UMLObjectDiagram extends UMLDiagram { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObjectLink.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/object/UMLObjectLink.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObjectLink.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/object/UMLObjectLink.java index 1e0089a80ced..e87772ad8542 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObjectLink.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/object/UMLObjectLink.java @@ -1,9 +1,9 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.object; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.object; import java.util.Objects; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class UMLObjectLink extends UMLElement { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObjectMethod.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/object/UMLObjectMethod.java similarity index 78% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObjectMethod.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/object/UMLObjectMethod.java index aaf715838d6b..9a780f5e27e4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/object/UMLObjectMethod.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/object/UMLObjectMethod.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.object; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.object; import java.util.List; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLMethod; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLMethod; public class UMLObjectMethod extends UMLMethod { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/UMLModelParser.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/UMLModelParser.java similarity index 84% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/UMLModelParser.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/UMLModelParser.java index 0396faae9694..42a4ccca1359 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/UMLModelParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/UMLModelParser.java @@ -1,7 +1,7 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.DIAGRAM_VERSION; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_ENDPOINT_ID; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.DIAGRAM_VERSION; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_ENDPOINT_ID; import java.io.IOException; import java.util.HashMap; @@ -10,10 +10,10 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v2.UMLModelV2Parser; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v3.UMLModelV3Parser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.v2.UMLModelV2Parser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.v3.UMLModelV3Parser; public class UMLModelParser { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/ActivityDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/ActivityDiagramParser.java similarity index 84% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/ActivityDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/ActivityDiagramParser.java index 0598e4379479..9eb7c635c929 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/ActivityDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/ActivityDiagramParser.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v2; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.v2; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_OWNER; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_OWNER; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; import java.io.IOException; import java.util.ArrayList; @@ -20,12 +20,12 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityNode; -import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLControlFlow; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLActivity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLActivityDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLActivityElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLActivityNode; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLControlFlow; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; public class ActivityDiagramParser { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/ClassDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/ClassDiagramParser.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/ClassDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/ClassDiagramParser.java index e51483bc6432..479d69aa4afb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/ClassDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/ClassDiagramParser.java @@ -1,17 +1,17 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v2; - -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ATTRIBUTES; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_METHODS; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_OWNER; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_ENDPOINT_ID; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_MULTIPLICITY; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_ROLE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TYPE; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.v2; + +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_ATTRIBUTES; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_METHODS; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_OWNER; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_ENDPOINT_ID; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_MULTIPLICITY; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_ROLE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_TYPE; import java.io.IOException; import java.util.ArrayList; @@ -30,14 +30,14 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClass; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClassDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLMethod; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLPackage; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLAttribute; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLClass; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLClassDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLMethod; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLPackage; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLRelationship; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; public class ClassDiagramParser { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/CommunicationDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/CommunicationDiagramParser.java similarity index 78% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/CommunicationDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/CommunicationDiagramParser.java index a46993ff5580..62124d8bd3b1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/CommunicationDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/CommunicationDiagramParser.java @@ -1,9 +1,9 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v2; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.v2; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_MESSAGES; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_MESSAGES; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; import java.io.IOException; import java.util.ArrayList; @@ -15,12 +15,12 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.communication.Direction; -import de.tum.cit.aet.artemis.service.compass.umlmodel.communication.UMLCommunicationDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.communication.UMLCommunicationLink; -import de.tum.cit.aet.artemis.service.compass.umlmodel.communication.UMLMessage; -import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.communication.Direction; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.communication.UMLCommunicationDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.communication.UMLCommunicationLink; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.communication.UMLMessage; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.object.UMLObject; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; public class CommunicationDiagramParser { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/ComponentDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/ComponentDiagramParser.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/ComponentDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/ComponentDiagramParser.java index 535ebb3d6683..d23f1636d79d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/ComponentDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/ComponentDiagramParser.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v2; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.v2; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_OWNER; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TYPE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_OWNER; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_TYPE; import java.io.IOException; import java.util.ArrayList; @@ -22,12 +22,12 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponent; -import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentInterface; -import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentRelationship; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponent; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponentDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponentInterface; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponentRelationship; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; public class ComponentDiagramParser { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/DeploymentDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/DeploymentDiagramParser.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/DeploymentDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/DeploymentDiagramParser.java index f539b6d43e95..c725da6ac1ad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/DeploymentDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/DeploymentDiagramParser.java @@ -1,9 +1,9 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v2; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.v2; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.STEREOTYPE_NAME; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.STEREOTYPE_NAME; import java.io.IOException; import java.util.ArrayList; @@ -16,13 +16,13 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentRelationship; -import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLArtifact; -import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLDeploymentComponent; -import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLDeploymentDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLDeploymentInterface; -import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLNode; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponentRelationship; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.deployment.UMLArtifact; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.deployment.UMLDeploymentComponent; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.deployment.UMLDeploymentDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.deployment.UMLDeploymentInterface; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.deployment.UMLNode; public class DeploymentDiagramParser { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/FlowchartParser.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/FlowchartParser.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/FlowchartParser.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/FlowchartParser.java index 47e2c1566f60..ebfab2849c47 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/FlowchartParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/FlowchartParser.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v2; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.v2; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; import java.io.IOException; import java.util.ArrayList; @@ -17,15 +17,15 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.Flowchart; -import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartDecision; -import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartFlowline; -import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartFunctionCall; -import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartInputOutput; -import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartProcess; -import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartTerminal; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart.Flowchart; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart.FlowchartDecision; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart.FlowchartFlowline; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart.FlowchartFunctionCall; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart.FlowchartInputOutput; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart.FlowchartProcess; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart.FlowchartTerminal; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; public class FlowchartParser { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/ObjectDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/ObjectDiagramParser.java similarity index 84% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/ObjectDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/ObjectDiagramParser.java index b91efc300289..caf3f77db7b5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/ObjectDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/ObjectDiagramParser.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v2; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.v2; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ATTRIBUTES; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_METHODS; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_ATTRIBUTES; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_METHODS; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; import java.io.IOException; import java.util.ArrayList; @@ -21,14 +21,14 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLMethod; -import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObjectAttribute; -import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObjectDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObjectLink; -import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObjectMethod; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLAttribute; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLMethod; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.object.UMLObject; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.object.UMLObjectAttribute; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.object.UMLObjectDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.object.UMLObjectLink; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.object.UMLObjectMethod; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; public class ObjectDiagramParser { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/PetriNetParser.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/PetriNetParser.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/PetriNetParser.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/PetriNetParser.java index 80f2d844e3e0..489bd21e3126 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/PetriNetParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/PetriNetParser.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v2; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.v2; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; import java.io.IOException; import java.util.ArrayList; @@ -17,12 +17,12 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; -import de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet.PetriNet; -import de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet.PetriNetArc; -import de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet.PetriNetPlace; -import de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet.PetriNetTransition; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.petrinet.PetriNet; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.petrinet.PetriNetArc; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.petrinet.PetriNetPlace; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.petrinet.PetriNetTransition; public class PetriNetParser { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/SyntaxTreeParser.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/SyntaxTreeParser.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/SyntaxTreeParser.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/SyntaxTreeParser.java index 9db0efaab28c..3acd13fb4e7e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/SyntaxTreeParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/SyntaxTreeParser.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v2; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.v2; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; import java.io.IOException; import java.util.ArrayList; @@ -17,12 +17,12 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; -import de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree.SyntaxTree; -import de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeLink; -import de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeNonterminal; -import de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeTerminal; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.syntaxtree.SyntaxTree; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.syntaxtree.SyntaxTreeLink; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.syntaxtree.SyntaxTreeNonterminal; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.syntaxtree.SyntaxTreeTerminal; public class SyntaxTreeParser { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/UMLModelV2Parser.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/UMLModelV2Parser.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/UMLModelV2Parser.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/UMLModelV2Parser.java index 936dfbfe3fc4..a9e3bd7ff482 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/UMLModelV2Parser.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/UMLModelV2Parser.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v2; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.v2; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.DIAGRAM_TYPE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENTS; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIPS; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.DIAGRAM_TYPE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENTS; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIPS; import java.io.IOException; @@ -12,7 +12,7 @@ import com.google.gson.JsonObject; import de.tum.cit.aet.artemis.modeling.domain.DiagramType; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLDiagram; public class UMLModelV2Parser { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/UseCaseDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/UseCaseDiagramParser.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/UseCaseDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/UseCaseDiagramParser.java index f085a1fa5c4b..07bfea2d4f77 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v2/UseCaseDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v2/UseCaseDiagramParser.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v2; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.v2; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_OWNER; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TYPE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_OWNER; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_TYPE; import java.io.IOException; import java.util.ArrayList; @@ -22,13 +22,13 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; -import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLActor; -import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLSystemBoundary; -import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLUseCase; -import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLUseCaseAssociation; -import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLUseCaseDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.usecase.UMLActor; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.usecase.UMLSystemBoundary; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.usecase.UMLUseCase; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.usecase.UMLUseCaseAssociation; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.usecase.UMLUseCaseDiagram; public class UseCaseDiagramParser { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/ActivityDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/ActivityDiagramParser.java similarity index 84% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/ActivityDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/ActivityDiagramParser.java index 51df237ed9a0..794f05b2ca6a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/ActivityDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/ActivityDiagramParser.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v3; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.v3; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_OWNER; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_OWNER; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; import java.io.IOException; import java.util.ArrayList; @@ -18,12 +18,12 @@ import com.google.common.base.CaseFormat; import com.google.gson.JsonObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityNode; -import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLControlFlow; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLActivity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLActivityDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLActivityElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLActivityNode; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLControlFlow; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; public class ActivityDiagramParser { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/BPMNDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/BPMNDiagramParser.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/BPMNDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/BPMNDiagramParser.java index 87048fe8dc8c..147cd2d53106 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/BPMNDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/BPMNDiagramParser.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v3; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.v3; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_OWNER; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_OWNER; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; import java.io.IOException; import java.util.ArrayList; @@ -15,25 +15,25 @@ import com.google.gson.JsonObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLContainerElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNAnnotation; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNCallActivity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNDataObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNDataStore; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNEndEvent; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNFlow; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNGateway; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNGroup; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNIntermediateEvent; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNPool; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNStartEvent; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNSubprocess; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNSwimlane; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNTask; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNTransaction; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLContainerElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNAnnotation; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNCallActivity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNDataObject; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNDataStore; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNEndEvent; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNFlow; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNGateway; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNGroup; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNIntermediateEvent; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNPool; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNStartEvent; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNSubprocess; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNSwimlane; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNTask; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNTransaction; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; public class BPMNDiagramParser { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/ClassDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/ClassDiagramParser.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/ClassDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/ClassDiagramParser.java index db0faebd9812..284c9b0ab046 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/ClassDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/ClassDiagramParser.java @@ -1,17 +1,17 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v3; - -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ATTRIBUTES; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_METHODS; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_OWNER; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_ENDPOINT_ID; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_MULTIPLICITY; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_ROLE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TYPE; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.v3; + +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_ATTRIBUTES; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_METHODS; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_OWNER; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_ENDPOINT_ID; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_MULTIPLICITY; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_ROLE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_TYPE; import java.io.IOException; import java.util.ArrayList; @@ -29,14 +29,14 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClass; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClassDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLMethod; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLPackage; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLAttribute; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLClass; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLClassDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLMethod; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLPackage; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLRelationship; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; public class ClassDiagramParser { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/CommunicationDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/CommunicationDiagramParser.java similarity index 78% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/CommunicationDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/CommunicationDiagramParser.java index b0900211eca3..f37f40d78055 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/CommunicationDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/CommunicationDiagramParser.java @@ -1,9 +1,9 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v3; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.v3; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_MESSAGES; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_MESSAGES; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; import java.io.IOException; import java.util.ArrayList; @@ -13,12 +13,12 @@ import com.google.gson.JsonObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.communication.Direction; -import de.tum.cit.aet.artemis.service.compass.umlmodel.communication.UMLCommunicationDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.communication.UMLCommunicationLink; -import de.tum.cit.aet.artemis.service.compass.umlmodel.communication.UMLMessage; -import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.communication.Direction; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.communication.UMLCommunicationDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.communication.UMLCommunicationLink; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.communication.UMLMessage; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.object.UMLObject; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; public class CommunicationDiagramParser { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/ComponentDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/ComponentDiagramParser.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/ComponentDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/ComponentDiagramParser.java index 71513cfb41ff..4fbfa2c33158 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/ComponentDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/ComponentDiagramParser.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v3; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.v3; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_OWNER; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TYPE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_OWNER; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_TYPE; import java.io.IOException; import java.util.ArrayList; @@ -20,12 +20,12 @@ import com.google.common.base.CaseFormat; import com.google.gson.JsonObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponent; -import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentInterface; -import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentRelationship; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponent; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponentDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponentInterface; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponentRelationship; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; public class ComponentDiagramParser { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/DeploymentDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/DeploymentDiagramParser.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/DeploymentDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/DeploymentDiagramParser.java index a45153ff8c0d..0a7fb3bbf607 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/DeploymentDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/DeploymentDiagramParser.java @@ -1,9 +1,9 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v3; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.v3; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.STEREOTYPE_NAME; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.STEREOTYPE_NAME; import java.io.IOException; import java.util.ArrayList; @@ -14,13 +14,13 @@ import com.google.gson.JsonObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentRelationship; -import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLArtifact; -import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLDeploymentComponent; -import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLDeploymentDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLDeploymentInterface; -import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLNode; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponentRelationship; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.deployment.UMLArtifact; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.deployment.UMLDeploymentComponent; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.deployment.UMLDeploymentDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.deployment.UMLDeploymentInterface; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.deployment.UMLNode; public class DeploymentDiagramParser { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/FlowchartParser.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/FlowchartParser.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/FlowchartParser.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/FlowchartParser.java index 9dbf73fb09c3..0f38ab3eb04d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/FlowchartParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/FlowchartParser.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v3; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.v3; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; import java.io.IOException; import java.util.ArrayList; @@ -15,15 +15,15 @@ import com.google.gson.JsonObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.Flowchart; -import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartDecision; -import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartFlowline; -import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartFunctionCall; -import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartInputOutput; -import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartProcess; -import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartTerminal; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart.Flowchart; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart.FlowchartDecision; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart.FlowchartFlowline; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart.FlowchartFunctionCall; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart.FlowchartInputOutput; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart.FlowchartProcess; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart.FlowchartTerminal; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; public class FlowchartParser { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/ObjectDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/ObjectDiagramParser.java similarity index 84% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/ObjectDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/ObjectDiagramParser.java index 95bede561eb8..f576fc20bb8c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/ObjectDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/ObjectDiagramParser.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v3; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.v3; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ATTRIBUTES; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_METHODS; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_ATTRIBUTES; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_METHODS; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; import java.io.IOException; import java.util.ArrayList; @@ -20,14 +20,14 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLMethod; -import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObjectAttribute; -import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObjectDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObjectLink; -import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObjectMethod; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLAttribute; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLMethod; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.object.UMLObject; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.object.UMLObjectAttribute; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.object.UMLObjectDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.object.UMLObjectLink; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.object.UMLObjectMethod; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; public class ObjectDiagramParser { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/PetriNetParser.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/PetriNetParser.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/PetriNetParser.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/PetriNetParser.java index fde51e7a4f3c..f47a1095e513 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/PetriNetParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/PetriNetParser.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v3; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.v3; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; import java.io.IOException; import java.util.ArrayList; @@ -15,12 +15,12 @@ import com.google.gson.JsonObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; -import de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet.PetriNet; -import de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet.PetriNetArc; -import de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet.PetriNetPlace; -import de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet.PetriNetTransition; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.petrinet.PetriNet; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.petrinet.PetriNetArc; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.petrinet.PetriNetPlace; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.petrinet.PetriNetTransition; public class PetriNetParser { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/SyntaxTreeParser.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/SyntaxTreeParser.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/SyntaxTreeParser.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/SyntaxTreeParser.java index 0764bbec5484..b2b541d52980 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/SyntaxTreeParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/SyntaxTreeParser.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v3; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.v3; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; import java.io.IOException; import java.util.ArrayList; @@ -15,12 +15,12 @@ import com.google.gson.JsonObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; -import de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree.SyntaxTree; -import de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeLink; -import de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeNonterminal; -import de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeTerminal; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.syntaxtree.SyntaxTree; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.syntaxtree.SyntaxTreeLink; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.syntaxtree.SyntaxTreeNonterminal; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.syntaxtree.SyntaxTreeTerminal; public class SyntaxTreeParser { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/UMLModelV3Parser.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/UMLModelV3Parser.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/UMLModelV3Parser.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/UMLModelV3Parser.java index 1c0e9d6e6c4e..ff8473ec896f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/UMLModelV3Parser.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/UMLModelV3Parser.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v3; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.v3; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.DIAGRAM_TYPE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENTS; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIPS; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.DIAGRAM_TYPE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENTS; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIPS; import java.io.IOException; @@ -11,7 +11,7 @@ import com.google.gson.JsonObject; import de.tum.cit.aet.artemis.modeling.domain.DiagramType; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLDiagram; public class UMLModelV3Parser { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/UseCaseDiagramParser.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/UseCaseDiagramParser.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/UseCaseDiagramParser.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/UseCaseDiagramParser.java index 99205e5559e5..e2ca99ed4d18 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/parsers/v3/UseCaseDiagramParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/parsers/v3/UseCaseDiagramParser.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.v3; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.v3; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_ID; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_NAME; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_OWNER; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.ELEMENT_TYPE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; -import static de.tum.cit.aet.artemis.service.compass.utils.JSONMapping.RELATIONSHIP_TYPE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_ID; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_NAME; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_OWNER; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.ELEMENT_TYPE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_SOURCE; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_TARGET; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.JSONMapping.RELATIONSHIP_TYPE; import java.io.IOException; import java.util.ArrayList; @@ -20,13 +20,13 @@ import com.google.common.base.CaseFormat; import com.google.gson.JsonObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; -import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLActor; -import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLSystemBoundary; -import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLUseCase; -import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLUseCaseAssociation; -import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLUseCaseDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.usecase.UMLActor; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.usecase.UMLSystemBoundary; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.usecase.UMLUseCase; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.usecase.UMLUseCaseAssociation; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.usecase.UMLUseCaseDiagram; public class UseCaseDiagramParser { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/petrinet/PetriNet.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/petrinet/PetriNet.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/petrinet/PetriNet.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/petrinet/PetriNet.java index b5a5ea20cd0e..8fc892c61250 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/petrinet/PetriNet.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/petrinet/PetriNet.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.petrinet; import java.util.ArrayList; import java.util.List; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class PetriNet extends UMLDiagram { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/petrinet/PetriNetArc.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/petrinet/PetriNetArc.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/petrinet/PetriNetArc.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/petrinet/PetriNetArc.java index 8dff38cc9d68..a4c64fe08aaa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/petrinet/PetriNetArc.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/petrinet/PetriNetArc.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.petrinet; import java.util.Objects; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class PetriNetArc extends UMLElement { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/petrinet/PetriNetPlace.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/petrinet/PetriNetPlace.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/petrinet/PetriNetPlace.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/petrinet/PetriNetPlace.java index a88ef7eeb1ef..ae941624b1e5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/petrinet/PetriNetPlace.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/petrinet/PetriNetPlace.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.petrinet; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class PetriNetPlace extends UMLElement { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/petrinet/PetriNetTransition.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/petrinet/PetriNetTransition.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/petrinet/PetriNetTransition.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/petrinet/PetriNetTransition.java index dc3b2adc71c9..cf16410e1bb4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/petrinet/PetriNetTransition.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/petrinet/PetriNetTransition.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.petrinet; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class PetriNetTransition extends UMLElement { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/syntaxtree/SyntaxTree.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/syntaxtree/SyntaxTree.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/syntaxtree/SyntaxTree.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/syntaxtree/SyntaxTree.java index a61dc2008a92..481178858b34 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/syntaxtree/SyntaxTree.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/syntaxtree/SyntaxTree.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.syntaxtree; import java.util.ArrayList; import java.util.List; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class SyntaxTree extends UMLDiagram { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeLink.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/syntaxtree/SyntaxTreeLink.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeLink.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/syntaxtree/SyntaxTreeLink.java index 19b632c8347b..cc1f316e7562 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeLink.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/syntaxtree/SyntaxTreeLink.java @@ -1,9 +1,9 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.syntaxtree; import java.util.Objects; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class SyntaxTreeLink extends UMLElement { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeNonterminal.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/syntaxtree/SyntaxTreeNonterminal.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeNonterminal.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/syntaxtree/SyntaxTreeNonterminal.java index 2bd2a859d383..f7b01e045f66 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeNonterminal.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/syntaxtree/SyntaxTreeNonterminal.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.syntaxtree; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class SyntaxTreeNonterminal extends UMLElement { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeTerminal.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/syntaxtree/SyntaxTreeTerminal.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeTerminal.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/syntaxtree/SyntaxTreeTerminal.java index 7695b82b97f8..1f73b33203e5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/syntaxtree/SyntaxTreeTerminal.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/syntaxtree/SyntaxTreeTerminal.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.syntaxtree; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class SyntaxTreeTerminal extends UMLElement { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLActor.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/usecase/UMLActor.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLActor.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/usecase/UMLActor.java index 1c1702e87147..920b8d241ae0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLActor.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/usecase/UMLActor.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.usecase; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.usecase; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class UMLActor extends UMLElement { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLSystemBoundary.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/usecase/UMLSystemBoundary.java similarity index 78% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLSystemBoundary.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/usecase/UMLSystemBoundary.java index 67f2ee11eb41..2617f78b9137 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLSystemBoundary.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/usecase/UMLSystemBoundary.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.usecase; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.usecase; import java.util.Objects; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLContainerElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLContainerElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class UMLSystemBoundary extends UMLContainerElement { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLUseCase.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/usecase/UMLUseCase.java similarity index 77% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLUseCase.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/usecase/UMLUseCase.java index caf85d819f99..98a56d48c4cd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLUseCase.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/usecase/UMLUseCase.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.usecase; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.usecase; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; -import de.tum.cit.aet.artemis.service.compass.utils.SimilarityUtils; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.modeling.service.compass.utils.SimilarityUtils; public class UMLUseCase extends UMLElement { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLUseCaseAssociation.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/usecase/UMLUseCaseAssociation.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLUseCaseAssociation.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/usecase/UMLUseCaseAssociation.java index 6438efd1e893..5056d4c3daaf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLUseCaseAssociation.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/usecase/UMLUseCaseAssociation.java @@ -1,13 +1,13 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.usecase; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.usecase; import java.util.Objects; import com.google.common.base.CaseFormat; -import de.tum.cit.aet.artemis.service.compass.strategy.NameSimilarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.modeling.service.compass.strategy.NameSimilarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.utils.CompassConfiguration; public class UMLUseCaseAssociation extends UMLElement { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLUseCaseDiagram.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/usecase/UMLUseCaseDiagram.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLUseCaseDiagram.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/usecase/UMLUseCaseDiagram.java index 49117b354112..dfd46746820b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/usecase/UMLUseCaseDiagram.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/umlmodel/usecase/UMLUseCaseDiagram.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.usecase; +package de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.usecase; import java.util.ArrayList; import java.util.List; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class UMLUseCaseDiagram extends UMLDiagram { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/utils/CompassConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/utils/CompassConfiguration.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/utils/CompassConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/utils/CompassConfiguration.java index 841bb8237d4a..e788a028314f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/utils/CompassConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/utils/CompassConfiguration.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.compass.utils; +package de.tum.cit.aet.artemis.modeling.service.compass.utils; /** * All similarity related parameters diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/utils/JSONMapping.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/utils/JSONMapping.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/utils/JSONMapping.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/utils/JSONMapping.java index 388f29e4cfa7..f5c90632deac 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/utils/JSONMapping.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/utils/JSONMapping.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.compass.utils; +package de.tum.cit.aet.artemis.modeling.service.compass.utils; /** * JSON keywords diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/utils/SimilarityUtils.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/utils/SimilarityUtils.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/service/compass/utils/SimilarityUtils.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/utils/SimilarityUtils.java index 09edc665d37d..0ca2c6f51211 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/utils/SimilarityUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/compass/utils/SimilarityUtils.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.service.compass.utils; +package de.tum.cit.aet.artemis.modeling.service.compass.utils; import java.util.Objects; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; public class SimilarityUtils { diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/modeling/ModelingSubmissionElement.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/modeling/ModelingSubmissionElement.java index 70d3d987073a..8a2ad202932c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/modeling/ModelingSubmissionElement.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/domain/modeling/ModelingSubmissionElement.java @@ -2,8 +2,8 @@ import jakarta.persistence.Entity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmissionElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; @Entity // TODO: use @DiscriminatorValue(value = "M") or even better use integers (because they use less space in the database) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlPostContentProvider.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ContinuousPlagiarismControlPostContentProvider.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlPostContentProvider.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ContinuousPlagiarismControlPostContentProvider.java index 64f9ca0661f1..78f2c6524777 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlPostContentProvider.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ContinuousPlagiarismControlPostContentProvider.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.service; import java.util.Locale; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ContinuousPlagiarismControlService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlService.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ContinuousPlagiarismControlService.java index 880616ba00e8..0111e5129295 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ContinuousPlagiarismControlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ContinuousPlagiarismControlService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; @@ -16,6 +16,7 @@ import de.tum.cit.aet.artemis.communication.domain.DisplayPriority; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.core.exception.ArtemisMailException; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; @@ -28,7 +29,6 @@ import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.service.util.TimeLogUtil; import de.tum.cit.aet.artemis.text.domain.TextExercise; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ModelingPlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ModelingPlagiarismDetectionService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ModelingPlagiarismDetectionService.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ModelingPlagiarismDetectionService.java index a5cd4b3e032d..f028d12e7ca3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ModelingPlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ModelingPlagiarismDetectionService.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.service.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.service; import static com.google.gson.JsonParser.parseString; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.plagiarism.PlagiarismService.hasMinimumScore; +import static de.tum.cit.aet.artemis.plagiarism.service.PlagiarismService.hasMinimumScore; import java.io.IOException; import java.util.ArrayList; @@ -22,14 +22,14 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCheckState; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmission; import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingSubmissionElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; -import de.tum.cit.aet.artemis.service.plagiarism.cache.PlagiarismCacheService; +import de.tum.cit.aet.artemis.plagiarism.service.cache.PlagiarismCacheService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismAnswerPostService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismAnswerPostService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismAnswerPostService.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismAnswerPostService.java index 4d75591fad82..aa1efa7fde6e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismAnswerPostService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismAnswerPostService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -13,6 +13,7 @@ import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; +import de.tum.cit.aet.artemis.communication.service.PostingService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -22,7 +23,6 @@ import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.service.metis.PostingService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismCaseService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismCaseService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismCaseService.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismCaseService.java index 991115797ef7..fbfe26b233b1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismCaseService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -13,6 +13,7 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; @@ -22,7 +23,6 @@ import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismSubmissionRepository; -import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismVerdictDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismDetectionConfigHelper.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismDetectionConfigHelper.java index 3faae74e0217..43a4748cf72e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismDetectionConfigHelper.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.service; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismDetectionService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionService.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismDetectionService.java index 22ac6383ce77..e8d439d26c2a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismDetectionService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -19,7 +19,7 @@ import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeatureService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeatureService; import de.tum.cit.aet.artemis.text.domain.TextExercise; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismPostService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismPostService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismPostService.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismPostService.java index 78e3d40182cf..952da8956a4c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismPostService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismPostService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -13,6 +13,7 @@ import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; +import de.tum.cit.aet.artemis.communication.service.PostingService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -24,7 +25,6 @@ import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.service.metis.PostingService; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismService.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismService.java index e494e4fa97d0..1de15a374696 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static java.util.function.Predicate.isEqual; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismWebsocketService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismWebsocketService.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismWebsocketService.java index 2c16e2c70da0..d3de78038c53 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/PlagiarismWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismWebsocketService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingLanguageNotSupportedForPlagiarismDetectionException.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ProgrammingLanguageNotSupportedForPlagiarismDetectionException.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingLanguageNotSupportedForPlagiarismDetectionException.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ProgrammingLanguageNotSupportedForPlagiarismDetectionException.java index fc508d8482f7..c324ef183972 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingLanguageNotSupportedForPlagiarismDetectionException.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ProgrammingLanguageNotSupportedForPlagiarismDetectionException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.service; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ProgrammingPlagiarismDetectionService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ProgrammingPlagiarismDetectionService.java index 0916f19fc276..13e99c23fc06 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ProgrammingPlagiarismDetectionService.java @@ -1,7 +1,7 @@ -package de.tum.cit.aet.artemis.service.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.plagiarism.PlagiarismService.filterParticipationMinimumScore; +import static de.tum.cit.aet.artemis.plagiarism.service.PlagiarismService.filterParticipationMinimumScore; import java.io.File; import java.io.IOException; @@ -38,21 +38,21 @@ import de.jplag.reporting.reportobject.ReportObjectFactory; import de.jplag.swift.SwiftLanguage; import de.tum.cit.aet.artemis.core.exception.GitException; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCheckState; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.service.cache.PlagiarismCacheService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseExportService; +import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseGitDiffReportService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.UriService; -import de.tum.cit.aet.artemis.service.connectors.GitService; -import de.tum.cit.aet.artemis.service.export.ProgrammingExerciseExportService; -import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseGitDiffReportService; -import de.tum.cit.aet.artemis.service.plagiarism.cache.PlagiarismCacheService; -import de.tum.cit.aet.artemis.service.util.TimeLogUtil; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/TextPlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/TextPlagiarismDetectionService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/plagiarism/TextPlagiarismDetectionService.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/service/TextPlagiarismDetectionService.java index 52c52fb9c977..c6061b09608a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/TextPlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/TextPlagiarismDetectionService.java @@ -1,7 +1,7 @@ -package de.tum.cit.aet.artemis.service.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.plagiarism.PlagiarismService.hasMinimumScore; +import static de.tum.cit.aet.artemis.plagiarism.service.PlagiarismService.hasMinimumScore; import java.io.File; import java.io.IOException; @@ -24,15 +24,15 @@ import de.jplag.exceptions.ExitException; import de.jplag.options.JPlagOptions; import de.jplag.text.NaturalLanguage; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCheckState; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; -import de.tum.cit.aet.artemis.service.export.TextSubmissionExportService; -import de.tum.cit.aet.artemis.service.plagiarism.cache.PlagiarismCacheService; -import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.plagiarism.service.cache.PlagiarismCacheService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; +import de.tum.cit.aet.artemis.text.service.TextSubmissionExportService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/cache/PlagiarismCacheService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/cache/PlagiarismCacheService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/plagiarism/cache/PlagiarismCacheService.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/service/cache/PlagiarismCacheService.java index 43ccb42d0181..ecf82c050959 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/plagiarism/cache/PlagiarismCacheService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/cache/PlagiarismCacheService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.plagiarism.cache; +package de.tum.cit.aet.artemis.plagiarism.service.cache; import static de.tum.cit.aet.artemis.core.config.Constants.HAZELCAST_ACTIVE_PLAGIARISM_CHECKS_PER_COURSE_CACHE; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildJob.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildJob.java index 8bac217ad7ce..c97026c51ba3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildJob.java @@ -15,7 +15,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.domain.DomainObject; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; @Entity @Table(name = "build_job") diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java index f7cee71b5932..23448ac5b594 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java @@ -49,8 +49,8 @@ import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeature; import de.tum.cit.aet.artemis.service.ExerciseDateService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeature; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseBuildConfig.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseBuildConfig.java index 4533826d8d9a..e7bde4592ba4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseBuildConfig.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseBuildConfig.java @@ -19,8 +19,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import de.tum.cit.aet.artemis.core.domain.DomainObject; -import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; -import de.tum.cit.aet.artemis.service.connectors.vcs.AbstractVersionControlService; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.Windfile; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.AbstractVersionControlService; @Entity @Table(name = "programming_exercise_build_config") diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseStudentParticipation.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseStudentParticipation.java index 443d34b9609a..b6b72a8588ce 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseStudentParticipation.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseStudentParticipation.java @@ -8,10 +8,10 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.AbstractVersionControlService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.quiz.config.QuizView; -import de.tum.cit.aet.artemis.service.connectors.vcs.AbstractVersionControlService; @Entity @DiscriminatorValue(value = "PESP") diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/Repository.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/Repository.java index 5ede60e9bed7..faa0582a0dbc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/Repository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/Repository.java @@ -6,7 +6,7 @@ import org.eclipse.jgit.lib.BaseRepositoryBuilder; -import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; +import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCRepositoryUri; /** * This class represents repositories cloned from the VC system to Artemis to then be used in the online editor. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ExerciseHint.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ExerciseHint.java index 81793d454701..119abdf09c53 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ExerciseHint.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/hestia/ExerciseHint.java @@ -30,6 +30,7 @@ import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.service.hestia.ExerciseHintService; /** * An ExerciseHint. @@ -163,7 +164,7 @@ public void setExerciseHintActivations(Set exerciseHintA /** * Returns a threshold value that defines when this exercise hint is displayed to student participating in a programming exercise. - * The algorithm defining if the hint is display is described in {@link de.tum.cit.aet.artemis.service.hestia.ExerciseHintService#getAvailableExerciseHints} + * The algorithm defining if the hint is display is described in {@link ExerciseHintService#getAvailableExerciseHints} * * @return the display threshold value */ diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshGitCommand.java b/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshGitCommand.java index bda6f1d18d19..61555a3ae0f9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshGitCommand.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshGitCommand.java @@ -21,9 +21,9 @@ import org.eclipse.jgit.util.FS; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCPostPushHook; -import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCPrePushHook; -import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCServletService; +import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCPostPushHook; +import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCPrePushHook; +import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCServletService; public class SshGitCommand extends GitPackCommand { diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java index 5ef14ee4cd88..e822f5a0fd97 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java @@ -21,10 +21,10 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.DockerImageBuild; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.ResultBuildJob; import de.tum.cit.aet.artemis.programming.domain.BuildJob; import de.tum.cit.aet.artemis.programming.domain.BuildStatus; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.DockerImageBuild; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.ResultBuildJob; import de.tum.cit.aet.artemis.service.dto.BuildJobResultCountDTO; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AutomaticProgrammingExerciseCleanupService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/AutomaticProgrammingExerciseCleanupService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/scheduled/AutomaticProgrammingExerciseCleanupService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/AutomaticProgrammingExerciseCleanupService.java index adca63533235..7b01678ba452 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/AutomaticProgrammingExerciseCleanupService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/AutomaticProgrammingExerciseCleanupService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.scheduled; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import static java.time.ZonedDateTime.now; @@ -21,13 +21,13 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.service.connectors.GitService; @Service @Profile(PROFILE_SCHEDULING) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/AuxiliaryRepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/AuxiliaryRepositoryService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/programming/AuxiliaryRepositoryService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/AuxiliaryRepositoryService.java index ead7278df9ab..86bd37b4b77e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/AuxiliaryRepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/AuxiliaryRepositoryService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.programming; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -12,12 +12,12 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.programming.ProgrammingExerciseResourceErrorKeys; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/CommitHistoryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/CommitHistoryService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/programming/CommitHistoryService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/CommitHistoryService.java index 2b3a9ba3e4bf..25d620cdbb3b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/CommitHistoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/CommitHistoryService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.programming; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -18,12 +18,12 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.web.rest.GitDiffReportParserService; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/DefaultTemplateUpgradeService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/DefaultTemplateUpgradeService.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/service/programming/DefaultTemplateUpgradeService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/DefaultTemplateUpgradeService.java index a35bf7d0f843..3ac7c525ccb2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/DefaultTemplateUpgradeService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/DefaultTemplateUpgradeService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.programming; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/JavaTemplateUpgradeService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/JavaTemplateUpgradeService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/programming/JavaTemplateUpgradeService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/JavaTemplateUpgradeService.java index e1382a48ec33..fc8a5f79c135 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/JavaTemplateUpgradeService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/JavaTemplateUpgradeService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.programming; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -29,13 +29,13 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.programming.domain.File; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ResourceLoaderService; -import de.tum.cit.aet.artemis.service.connectors.GitService; /** * Service for upgrading of Java template files diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingAssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingAssessmentService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingAssessmentService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingAssessmentService.java index 36d91b6981f0..d2c328957389 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingAssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingAssessmentService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.programming; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -17,8 +17,12 @@ import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaFeedbackSendingService; +import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiNewResultService; +import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; @@ -30,10 +34,6 @@ import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.service.SubmissionService; -import de.tum.cit.aet.artemis.service.connectors.athena.AthenaFeedbackSendingService; -import de.tum.cit.aet.artemis.service.connectors.lti.LtiNewResultService; -import de.tum.cit.aet.artemis.service.exam.ExamDateService; -import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseCodeReviewFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseCodeReviewFeedbackService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java index 68a652a8705f..68d1a59af78b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseCodeReviewFeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.programming; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static java.time.ZonedDateTime.now; @@ -19,14 +19,14 @@ import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; +import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaFeedbackSuggestionsService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.service.SubmissionService; -import de.tum.cit.aet.artemis.service.connectors.athena.AthenaFeedbackSuggestionsService; -import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/ProgrammingExerciseExportService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseExportService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/export/ProgrammingExerciseExportService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseExportService.java index ed0f2535f8d9..1a9ac21bc68c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/ProgrammingExerciseExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseExportService.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.service.export; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService.RepositoryCheckoutPath; -import static de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsXmlFileUtils.getDocumentBuilderFactory; +import static de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService.RepositoryCheckoutPath; +import static de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsXmlFileUtils.getDocumentBuilderFactory; import java.io.File; import java.io.IOException; @@ -54,10 +54,13 @@ import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.exception.GitException; +import de.tum.cit.aet.artemis.core.service.ArchivalReportEntry; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseWithSubmissionsExportService; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; @@ -68,12 +71,10 @@ import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ZipFileService; -import de.tum.cit.aet.artemis.service.archival.ArchivalReportEntry; -import de.tum.cit.aet.artemis.service.connectors.GitService; -import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryExportOptionsDTO; /** @@ -181,7 +182,8 @@ private Path exportProgrammingExerciseMaterialWithStudentReposOptional(Programmi } @Override - void exportProblemStatementAndEmbeddedFilesAndExerciseDetails(Exercise exercise, List exportErrors, Path exportDir, List pathsToBeZipped) throws IOException { + protected void exportProblemStatementAndEmbeddedFilesAndExerciseDetails(Exercise exercise, List exportErrors, Path exportDir, List pathsToBeZipped) + throws IOException { if (exercise instanceof ProgrammingExercise programmingExercise) { // Used for a save typecast, this should always be true since this class only works with programming exercises. programmingExerciseTaskService.replaceTestIdsWithNames(programmingExercise); diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseFeedbackCreationService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseFeedbackCreationService.java index 5765c26bfdae..c6183b702dff 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseFeedbackCreationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.programming; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.FEEDBACK_DETAIL_TEXT_DATABASE_MAX_LENGTH; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -44,11 +44,11 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; +import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; -import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; /** * Service for creating feedback for programming exercises. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseGradingService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseGradingService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java index 6b9f70875a52..a2f8a3ba6ac6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseGradingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.programming; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.config.Constants.TEST_CASES_DUPLICATE_NOTIFICATION; @@ -35,11 +35,14 @@ import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.VersionControlException; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationResultService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; @@ -67,10 +70,7 @@ import de.tum.cit.aet.artemis.service.FeedbackService; import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.service.SubmissionPolicyService; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationResultService; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; -import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseGradingStatisticsDTO; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportBasicService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportBasicService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportBasicService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportBasicService.java index 390cd1a263a2..4d8438aff9fe 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportBasicService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportBasicService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.programming; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -15,6 +15,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismDetectionConfig; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; @@ -36,11 +38,9 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.programming.service.hestia.ExerciseHintService; +import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; -import de.tum.cit.aet.artemis.service.hestia.ExerciseHintService; -import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; -import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportFromFileService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportFromFileService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportFromFileService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportFromFileService.java index 00b5c8878aab..1b74ff8261ac 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportFromFileService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportFromFileService.java @@ -1,7 +1,7 @@ -package de.tum.cit.aet.artemis.service.programming; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.export.ProgrammingExerciseExportService.BUILD_PLAN_FILE_NAME; +import static de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseExportService.BUILD_PLAN_FILE_NAME; import java.io.IOException; import java.net.URISyntaxException; @@ -28,6 +28,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; @@ -38,7 +39,6 @@ import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; import de.tum.cit.aet.artemis.service.ZipFileService; -import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportService.java index e85d0c0ac0db..f537f5964000 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.programming; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.ASSIGNMENT_REPO_NAME; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -23,6 +23,10 @@ import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationTriggerService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.programming.domain.BuildPlanType; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -32,13 +36,9 @@ import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.UriService; -import de.tum.cit.aet.artemis.service.connectors.GitService; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; -import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseParticipationService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseParticipationService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseParticipationService.java index 20243122db3e..544da138ae04 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseParticipationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.programming; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -22,6 +22,9 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlRepositoryPermission; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; @@ -42,9 +45,6 @@ import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.connectors.GitService; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlRepositoryPermission; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.web.rest.dto.CommitInfoDTO; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseRepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseRepositoryService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseRepositoryService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseRepositoryService.java index d3103b08f455..8dffbc00451c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseRepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseRepositoryService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.programming; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.config.Constants.SETUP_COMMIT_MESSAGE; @@ -26,6 +26,9 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; @@ -36,9 +39,6 @@ import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ResourceLoaderService; -import de.tum.cit.aet.artemis.service.connectors.GitService; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; -import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.web.rest.SubmissionPolicyResource; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ProgrammingExerciseScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseScheduleService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/scheduled/ProgrammingExerciseScheduleService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseScheduleService.java index 7dc35dbaeeba..3ed69627c737 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/scheduled/ProgrammingExerciseScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseScheduleService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.scheduled; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import static de.tum.cit.aet.artemis.core.config.StartupDelayConfig.PROGRAMMING_EXERCISE_SCHEDULE_DELAY_SEC; @@ -38,15 +38,21 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.ScheduleService; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.core.util.Tuple; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.ExerciseLifecycle; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.IExerciseScheduleService; import de.tum.cit.aet.artemis.programming.domain.ParticipationLifecycle; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; @@ -54,13 +60,6 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.service.ExerciseDateService; -import de.tum.cit.aet.artemis.service.connectors.GitService; -import de.tum.cit.aet.artemis.service.exam.ExamDateService; -import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseGradingService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseParticipationService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingTriggerService; -import de.tum.cit.aet.artemis.service.util.Tuple; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; import tech.jhipster.config.JHipsterConstants; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java index c060c9f2e6cf..c8830c026466 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.programming; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.programming.domain.BuildPlanType.SOLUTION; @@ -43,11 +43,24 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; +import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.connectors.BuildScriptGenerationService; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.Windfile; +import de.tum.cit.aet.artemis.core.service.connectors.ci.CIPermission; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationTriggerService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; @@ -70,26 +83,13 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseGitDiffReportRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; +import de.tum.cit.aet.artemis.programming.service.structureoraclegenerator.OracleGenerator; import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.service.ExerciseSpecificationService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.SubmissionPolicyService; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; -import de.tum.cit.aet.artemis.service.connectors.BuildScriptGenerationService; -import de.tum.cit.aet.artemis.service.connectors.GitService; -import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; -import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; -import de.tum.cit.aet.artemis.service.connectors.ci.CIPermission; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; -import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; -import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; -import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; -import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; -import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; -import de.tum.cit.aet.artemis.service.util.structureoraclegenerator.OracleGenerator; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseTestCaseService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseTestCaseService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseTestCaseService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseTestCaseService.java index 08c2aecd89d0..08bde48ed041 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseTestCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseTestCaseService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.programming; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -23,7 +23,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; +import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseTestCaseDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingLanguageFeature.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingLanguageFeature.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingLanguageFeature.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingLanguageFeature.java index d6f46e1cf4bd..88bee465e155 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingLanguageFeature.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingLanguageFeature.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.programming; +package de.tum.cit.aet.artemis.programming.service; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingLanguageFeatureService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingLanguageFeatureService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingLanguageFeatureService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingLanguageFeatureService.java index 9de5197d1919..e6049a4221d2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingLanguageFeatureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingLanguageFeatureService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.programming; +package de.tum.cit.aet.artemis.programming.service; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingMessagingService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingMessagingService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingMessagingService.java index af2ade3d137f..ebc269d71a51 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingMessagingService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.programming; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.BUILD_RUN_COMPLETE_FOR_PROGRAMMING_EXERCISE; import static de.tum.cit.aet.artemis.core.config.Constants.BUILD_RUN_STARTED_FOR_PROGRAMMING_EXERCISE; @@ -16,6 +16,8 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; +import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiNewResultService; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -26,8 +28,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.service.connectors.lti.LtiNewResultService; -import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionDTO; import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; import de.tum.cit.aet.artemis.web.websocket.programmingSubmission.BuildTriggerWebsocketError; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingSubmissionService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingSubmissionService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingSubmissionService.java index 8395e16f75bd..64dddf1903e1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingSubmissionService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.programming; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.config.Constants.PROGRAMMING_GRACE_PERIOD_SECONDS; @@ -33,6 +33,12 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaSubmissionSelectionService; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationTriggerService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.exam.service.ExamDateService; +import de.tum.cit.aet.artemis.exam.service.ExamSubmissionService; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; @@ -55,19 +61,13 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.repository.SubmissionPolicyRepository; +import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseGitDiffReportService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.FeedbackService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.SubmissionService; -import de.tum.cit.aet.artemis.service.connectors.GitService; -import de.tum.cit.aet.artemis.service.connectors.athena.AthenaSubmissionSelectionService; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; -import de.tum.cit.aet.artemis.service.exam.ExamDateService; -import de.tum.cit.aet.artemis.service.exam.ExamSubmissionService; -import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseGitDiffReportService; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; // TODO: this class has too many dependencies to other services. We should reduce this diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingTriggerService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingTriggerService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingTriggerService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingTriggerService.java index 3934b4b75336..9f5b8e30f102 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/ProgrammingTriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingTriggerService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.programming; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.config.Constants.TRIGGER_INSTRUCTOR_BUILD; @@ -22,6 +22,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationTriggerService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; @@ -39,7 +40,6 @@ import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; import de.tum.cit.aet.artemis.web.websocket.programmingSubmission.BuildTriggerWebsocketError; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryAccessService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryAccessService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryAccessService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryAccessService.java index 385abb17e36d..9aa86ce51997 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryAccessService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryAccessService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.programming; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -8,11 +8,11 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; -import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.repository.RepositoryActionType; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryParticipationService.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryParticipationService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryParticipationService.java index 74877e5eb2c8..422268ec7d8f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryParticipationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.programming; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -9,12 +9,12 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.Repository; -import de.tum.cit.aet.artemis.service.connectors.GitService; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.repository.RepositoryActionType; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryService.java index 39e0ee26ca3c..08c19fd93a13 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/RepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.programming; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -35,6 +35,7 @@ import org.springframework.util.FileSystemUtils; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.programming.domain.File; import de.tum.cit.aet.artemis.programming.domain.FileType; @@ -45,7 +46,6 @@ import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.web.rest.dto.FileMove; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/TemplateUpgradePolicyService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/TemplateUpgradePolicyService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/programming/TemplateUpgradePolicyService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/TemplateUpgradePolicyService.java index e05744eb721b..5ddd9dac7e8d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/TemplateUpgradePolicyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/TemplateUpgradePolicyService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.programming; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/programming/TemplateUpgradeService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/TemplateUpgradeService.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/service/programming/TemplateUpgradeService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/TemplateUpgradeService.java index 4d55aed77310..5072fa05f97e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/programming/TemplateUpgradeService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/TemplateUpgradeService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.programming; +package de.tum.cit.aet.artemis.programming.service; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/CodeHintService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/CodeHintService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/CodeHintService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/CodeHintService.java index b639cad30d82..eaa7d872e92d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/CodeHintService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/CodeHintService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.hestia; +package de.tum.cit.aet.artemis.programming.service.hestia; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -13,6 +13,7 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.iris.domain.session.IrisHestiaSession; +import de.tum.cit.aet.artemis.iris.service.session.IrisHestiaSessionService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; @@ -20,7 +21,6 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.CodeHintRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; -import de.tum.cit.aet.artemis.service.iris.session.IrisHestiaSessionService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ExerciseHintService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ExerciseHintService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/ExerciseHintService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ExerciseHintService.java index a669824ee7bd..6cde0f4035a2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ExerciseHintService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ExerciseHintService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.hestia; +package de.tum.cit.aet.artemis.programming.service.hestia; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseGitDiffReportService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseGitDiffReportService.java index 802694efb8bd..7e2a85f71dd0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseGitDiffReportService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.hestia; +package de.tum.cit.aet.artemis.programming.service.hestia; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -21,6 +21,7 @@ import org.springframework.util.FileSystemUtils; import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; @@ -36,7 +37,6 @@ import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseGitDiffReportRepository; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.web.rest.GitDiffReportParserService; import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseTaskService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseTaskService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseTaskService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseTaskService.java index 65d7be3cf1a3..24ed52858fe1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/ProgrammingExerciseTaskService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseTaskService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.hestia; +package de.tum.cit.aet.artemis.programming.service.hestia; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/TestwiseCoverageService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/TestwiseCoverageService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/TestwiseCoverageService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/TestwiseCoverageService.java index 0fef56e1fae0..db06c48deac9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/TestwiseCoverageService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/TestwiseCoverageService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.hestia; +package de.tum.cit.aet.artemis.programming.service.hestia; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -20,6 +20,8 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestwiseCoverageReportDTO; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; @@ -30,9 +32,7 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageFileReportRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageReportRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.TestwiseCoverageReportEntryRepository; -import de.tum.cit.aet.artemis.service.connectors.GitService; -import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestwiseCoverageReportDTO; -import de.tum.cit.aet.artemis.service.programming.RepositoryService; +import de.tum.cit.aet.artemis.programming.service.RepositoryService; import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralBlackboard.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/BehavioralBlackboard.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralBlackboard.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/BehavioralBlackboard.java index c51761294bc2..dd1417117e6b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralBlackboard.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/BehavioralBlackboard.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.hestia.behavioral; +package de.tum.cit.aet.artemis.programming.service.hestia.behavioral; import java.util.List; import java.util.Map; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralSolutionEntryGenerationException.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/BehavioralSolutionEntryGenerationException.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralSolutionEntryGenerationException.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/BehavioralSolutionEntryGenerationException.java index db7f08d10eec..118662864564 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralSolutionEntryGenerationException.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/BehavioralSolutionEntryGenerationException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.hestia.behavioral; +package de.tum.cit.aet.artemis.programming.service.hestia.behavioral; /** * Exception used for the generation of solution entries for behavioral test cases diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralTestCaseService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/BehavioralTestCaseService.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralTestCaseService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/BehavioralTestCaseService.java index 669a2de17422..bc5e679389c2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/BehavioralTestCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/BehavioralTestCaseService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.hestia.behavioral; +package de.tum.cit.aet.artemis.programming.service.hestia.behavioral; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -14,26 +14,26 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; -import de.tum.cit.aet.artemis.service.connectors.GitService; -import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseGitDiffReportService; -import de.tum.cit.aet.artemis.service.hestia.TestwiseCoverageService; -import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.AddUncoveredLinesAsPotentialCodeBlocks; -import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.BehavioralKnowledgeSource; -import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.CombineChangeBlocks; -import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.CreateCommonChangeBlocks; -import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.CreateSolutionEntries; -import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.DropRemovedGitDiffEntries; -import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.ExtractChangedLines; -import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.ExtractCoveredLines; -import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.FindCommonLines; -import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.GroupGitDiffAndCoverageEntriesByFilePathAndTestCase; -import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.InsertFileContents; -import de.tum.cit.aet.artemis.service.programming.RepositoryService; +import de.tum.cit.aet.artemis.programming.service.RepositoryService; +import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseGitDiffReportService; +import de.tum.cit.aet.artemis.programming.service.hestia.TestwiseCoverageService; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource.AddUncoveredLinesAsPotentialCodeBlocks; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource.BehavioralKnowledgeSource; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource.CombineChangeBlocks; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource.CreateCommonChangeBlocks; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource.CreateSolutionEntries; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource.DropRemovedGitDiffEntries; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource.ExtractChangedLines; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource.ExtractCoveredLines; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource.FindCommonLines; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource.GroupGitDiffAndCoverageEntriesByFilePathAndTestCase; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource.InsertFileContents; /** * Service for handling Solution Entries of behavioral Test Cases. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/GroupedFile.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/GroupedFile.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/GroupedFile.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/GroupedFile.java index 92017c67268e..62eab75c4b1f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/GroupedFile.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/GroupedFile.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.hestia.behavioral; +package de.tum.cit.aet.artemis.programming.service.hestia.behavioral; import java.util.Collection; import java.util.Objects; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/AddUncoveredLinesAsPotentialCodeBlocks.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/AddUncoveredLinesAsPotentialCodeBlocks.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/AddUncoveredLinesAsPotentialCodeBlocks.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/AddUncoveredLinesAsPotentialCodeBlocks.java index 084f6472cb29..3bacd3966662 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/AddUncoveredLinesAsPotentialCodeBlocks.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/AddUncoveredLinesAsPotentialCodeBlocks.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource; +package de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource; import java.util.TreeSet; import java.util.regex.Pattern; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; -import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile.ChangeBlock; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.GroupedFile.ChangeBlock; /** * For each {@link GroupedFile}: diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/BehavioralKnowledgeSource.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/BehavioralKnowledgeSource.java similarity index 68% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/BehavioralKnowledgeSource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/BehavioralKnowledgeSource.java index 8192466eb087..a96c534a2623 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/BehavioralKnowledgeSource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/BehavioralKnowledgeSource.java @@ -1,7 +1,7 @@ -package de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource; +package de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralSolutionEntryGenerationException; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralSolutionEntryGenerationException; public abstract class BehavioralKnowledgeSource { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/CombineChangeBlocks.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/CombineChangeBlocks.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/CombineChangeBlocks.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/CombineChangeBlocks.java index fc3ad124e28f..d7f1b0c8f764 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/CombineChangeBlocks.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/CombineChangeBlocks.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource; +package de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource; import java.util.ArrayList; import java.util.TreeSet; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.GroupedFile; /** * For each {@link GroupedFile}: diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/CreateCommonChangeBlocks.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/CreateCommonChangeBlocks.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/CreateCommonChangeBlocks.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/CreateCommonChangeBlocks.java index 3d157ad9fad4..5da770d0d9bb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/CreateCommonChangeBlocks.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/CreateCommonChangeBlocks.java @@ -1,14 +1,14 @@ -package de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource; +package de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource; import java.util.TreeSet; import java.util.stream.IntStream; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.GroupedFile; /** * For each {@link GroupedFile}: - * Takes the common lines (intersection of covered and changed lines) and creates {@link de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile.ChangeBlock}s + * Takes the common lines (intersection of covered and changed lines) and creates {@link GroupedFile.ChangeBlock}s * from them. Each ChangeBlock represents one continuous block of common lines. */ public class CreateCommonChangeBlocks extends BehavioralKnowledgeSource { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/CreateSolutionEntries.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/CreateSolutionEntries.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/CreateSolutionEntries.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/CreateSolutionEntries.java index 48a33ec87f7d..90219039cbb1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/CreateSolutionEntries.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/CreateSolutionEntries.java @@ -1,12 +1,12 @@ -package de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource; +package de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource; import java.util.ArrayList; import java.util.Arrays; import java.util.stream.Collectors; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.GroupedFile; /** * For each {@link GroupedFile}: diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/DropRemovedGitDiffEntries.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/DropRemovedGitDiffEntries.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/DropRemovedGitDiffEntries.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/DropRemovedGitDiffEntries.java index 96ccd9fc8504..679565d2c0e6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/DropRemovedGitDiffEntries.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/DropRemovedGitDiffEntries.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource; +package de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource; import java.util.HashSet; import java.util.stream.Collectors; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralBlackboard; /** * Remove all {@link ProgrammingExerciseGitDiffEntry} from the diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/ExtractChangedLines.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/ExtractChangedLines.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/ExtractChangedLines.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/ExtractChangedLines.java index 3531cf19e9bc..3b259d17c21c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/ExtractChangedLines.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/ExtractChangedLines.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource; +package de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource; import java.util.stream.Collectors; import java.util.stream.IntStream; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.GroupedFile; /** * For each {@link GroupedFile}: diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/ExtractCoveredLines.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/ExtractCoveredLines.java similarity index 84% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/ExtractCoveredLines.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/ExtractCoveredLines.java index f53e6159a2e3..19894d567205 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/ExtractCoveredLines.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/ExtractCoveredLines.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource; +package de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource; import java.util.stream.Collectors; import java.util.stream.IntStream; import de.tum.cit.aet.artemis.programming.domain.hestia.TestwiseCoverageReportEntry; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.GroupedFile; /** * For each {@link GroupedFile}: diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/FindCommonLines.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/FindCommonLines.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/FindCommonLines.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/FindCommonLines.java index a151e02a8251..cf90f0b9af83 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/FindCommonLines.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/FindCommonLines.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource; +package de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource; import java.util.ArrayList; import java.util.List; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.GroupedFile; /** * For each {@link GroupedFile}: diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/GroupGitDiffAndCoverageEntriesByFilePathAndTestCase.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/GroupGitDiffAndCoverageEntriesByFilePathAndTestCase.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/GroupGitDiffAndCoverageEntriesByFilePathAndTestCase.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/GroupGitDiffAndCoverageEntriesByFilePathAndTestCase.java index b015e8016f4e..c04311732a2b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/GroupGitDiffAndCoverageEntriesByFilePathAndTestCase.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/GroupGitDiffAndCoverageEntriesByFilePathAndTestCase.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource; +package de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource; import java.util.Collections; import java.util.HashSet; @@ -12,8 +12,8 @@ import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageFileReport; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; import de.tum.cit.aet.artemis.programming.domain.hestia.TestwiseCoverageReportEntry; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.GroupedFile; /** * Knowledge source that takes care of creating the {@link GroupedFile}s used by all other knowledge sources. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/InsertFileContents.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/InsertFileContents.java similarity index 76% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/InsertFileContents.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/InsertFileContents.java index 185563af2aac..43296df40286 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/behavioral/knowledgesource/InsertFileContents.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/knowledgesource/InsertFileContents.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource; +package de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralSolutionEntryGenerationException; -import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralSolutionEntryGenerationException; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.GroupedFile; /** * For each {@link GroupedFile}: diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralAttribute.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralAttribute.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralAttribute.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralAttribute.java index 7c72f85f4ece..e1b776cf2b1e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralAttribute.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralAttribute.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.hestia.structural; +package de.tum.cit.aet.artemis.programming.service.hestia.structural; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralClass.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralClass.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralClass.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralClass.java index 3da0641aee0e..4cea7c67c954 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralClass.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralClass.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.hestia.structural; +package de.tum.cit.aet.artemis.programming.service.hestia.structural; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralClassElements.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralClassElements.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralClassElements.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralClassElements.java index 325844bcfc78..a5d6535b5090 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralClassElements.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralClassElements.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.hestia.structural; +package de.tum.cit.aet.artemis.programming.service.hestia.structural; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralConstructor.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralConstructor.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralConstructor.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralConstructor.java index 80da91e90777..6f01793c4595 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralConstructor.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralConstructor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.hestia.structural; +package de.tum.cit.aet.artemis.programming.service.hestia.structural; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralElement.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralElement.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralElement.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralElement.java index 8983b1f68d89..c62e54e7c02b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralElement.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralElement.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.hestia.structural; +package de.tum.cit.aet.artemis.programming.service.hestia.structural; import java.util.Collections; import java.util.HashSet; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralMethod.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralMethod.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralMethod.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralMethod.java index 0b2a49f2916e..66fa6eed3bee 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralMethod.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralMethod.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.hestia.structural; +package de.tum.cit.aet.artemis.programming.service.hestia.structural; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralSolutionEntryGenerationException.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralSolutionEntryGenerationException.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralSolutionEntryGenerationException.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralSolutionEntryGenerationException.java index a89b580e7b32..3b9614b9e2aa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralSolutionEntryGenerationException.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralSolutionEntryGenerationException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.hestia.structural; +package de.tum.cit.aet.artemis.programming.service.hestia.structural; /** * Exception used for the generation of solution entries for structural test cases diff --git a/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralTestCaseService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralTestCaseService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralTestCaseService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralTestCaseService.java index ca0f55065696..34c87ec5ee2c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/hestia/structural/StructuralTestCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralTestCaseService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.hestia.structural; +package de.tum.cit.aet.artemis.programming.service.hestia.structural; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -28,6 +28,7 @@ import com.thoughtworks.qdox.model.JavaClass; import com.thoughtworks.qdox.model.JavaType; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.domain.Repository; @@ -36,7 +37,6 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; -import de.tum.cit.aet.artemis.service.connectors.GitService; /** * Service for handling Solution Entries of structural Test Cases. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/util/structureoraclegenerator/JavaClassDiff.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/structureoraclegenerator/JavaClassDiff.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/util/structureoraclegenerator/JavaClassDiff.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/structureoraclegenerator/JavaClassDiff.java index fff3db4d9b27..b4bbcf819f91 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/util/structureoraclegenerator/JavaClassDiff.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/structureoraclegenerator/JavaClassDiff.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.util.structureoraclegenerator; +package de.tum.cit.aet.artemis.programming.service.structureoraclegenerator; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/util/structureoraclegenerator/JavaClassDiffSerializer.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/structureoraclegenerator/JavaClassDiffSerializer.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/util/structureoraclegenerator/JavaClassDiffSerializer.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/structureoraclegenerator/JavaClassDiffSerializer.java index 3106219c2546..1f4992defce7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/util/structureoraclegenerator/JavaClassDiffSerializer.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/structureoraclegenerator/JavaClassDiffSerializer.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.util.structureoraclegenerator; +package de.tum.cit.aet.artemis.programming.service.structureoraclegenerator; import java.util.HashSet; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/util/structureoraclegenerator/OracleGenerator.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/structureoraclegenerator/OracleGenerator.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/util/structureoraclegenerator/OracleGenerator.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/structureoraclegenerator/OracleGenerator.java index 6336bbfd367e..dae3b1848340 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/util/structureoraclegenerator/OracleGenerator.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/structureoraclegenerator/OracleGenerator.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.util.structureoraclegenerator; +package de.tum.cit.aet.artemis.programming.service.structureoraclegenerator; import java.io.IOException; import java.nio.file.FileSystems; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/util/structureoraclegenerator/SerializerUtil.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/structureoraclegenerator/SerializerUtil.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/util/structureoraclegenerator/SerializerUtil.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/structureoraclegenerator/SerializerUtil.java index 5076e8b0e1b6..cf233d3c6d80 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/util/structureoraclegenerator/SerializerUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/structureoraclegenerator/SerializerUtil.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.util.structureoraclegenerator; +package de.tum.cit.aet.artemis.programming.service.structureoraclegenerator; import java.util.List; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizBatchService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizBatchService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizBatchService.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizBatchService.java index fa8141d19397..02e3f06f53a2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizBatchService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizBatchService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.quiz; +package de.tum.cit.aet.artemis.quiz.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseImportService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseImportService.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseImportService.java index 34721018f303..8880a8806636 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseImportService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.quiz; +package de.tum.cit.aet.artemis.quiz.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -22,6 +22,8 @@ import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.quiz.domain.AnswerOption; import de.tum.cit.aet.artemis.quiz.domain.DragAndDropMapping; @@ -40,8 +42,6 @@ import de.tum.cit.aet.artemis.service.FeedbackService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; -import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseService.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseService.java index 003290c6deed..174d25d1c0c4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.quiz; +package de.tum.cit.aet.artemis.quiz.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -36,6 +36,7 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; +import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; import de.tum.cit.aet.artemis.quiz.domain.DragItem; @@ -53,7 +54,6 @@ import de.tum.cit.aet.artemis.service.ExerciseSpecificationService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/QuizExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseWithSubmissionsExportService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/export/QuizExerciseWithSubmissionsExportService.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseWithSubmissionsExportService.java index acd45b7e9e2c..bc3bb76ab41d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/QuizExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseWithSubmissionsExportService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.export; +package de.tum.cit.aet.artemis.quiz.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -15,12 +15,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.core.service.ArchivalReportEntry; +import de.tum.cit.aet.artemis.core.service.export.DataExportQuizExerciseCreationService; import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.archival.ArchivalReportEntry; /** * Service responsible for exporting quiz exercises with their submissions. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizMessagingService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizMessagingService.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizMessagingService.java index 8ac0fa42a0f6..fddf18b0eab3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizMessagingService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.quiz; +package de.tum.cit.aet.artemis.quiz.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.quiz.domain.QuizAction.START_BATCH; @@ -15,11 +15,11 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.quiz.domain.QuizAction; import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizPoolService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizPoolService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizPoolService.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizPoolService.java index 08e17698cecd..bf95c530e330 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizPoolService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizPoolService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.quiz; +package de.tum.cit.aet.artemis.quiz.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -20,6 +20,7 @@ import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.service.ExamQuizQuestionsGenerator; import de.tum.cit.aet.artemis.quiz.domain.QuizGroup; import de.tum.cit.aet.artemis.quiz.domain.QuizPool; import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; @@ -27,7 +28,6 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizGroupRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizPoolRepository; import de.tum.cit.aet.artemis.quiz.repository.ShortAnswerMappingRepository; -import de.tum.cit.aet.artemis.service.exam.ExamQuizQuestionsGenerator; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizResultService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizResultService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizResultService.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizResultService.java index 0afc6ed90cb7..a927bb8cad88 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizResultService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.quiz; +package de.tum.cit.aet.artemis.quiz.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -18,6 +18,7 @@ import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -28,7 +29,6 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.service.ResultService; -import de.tum.cit.aet.artemis.service.util.TimeLogUtil; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizScheduleService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizScheduleService.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizScheduleService.java index 8c1681f06d1f..992771d4ca14 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizScheduleService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.quiz; +package de.tum.cit.aet.artemis.quiz.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import static de.tum.cit.aet.artemis.core.config.StartupDelayConfig.QUIZ_EXERCISE_SCHEDULE_DELAY_SEC; @@ -19,6 +19,8 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.ScheduleService; +import de.tum.cit.aet.artemis.core.util.Tuple; import de.tum.cit.aet.artemis.exercise.domain.ExerciseLifecycle; import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; @@ -26,8 +28,6 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizBatchRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.service.scheduled.ScheduleService; -import de.tum.cit.aet.artemis.service.util.Tuple; @Profile(PROFILE_SCHEDULING) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizService.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizService.java index 9ad9de23308c..414fe824bc86 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.quiz; +package de.tum.cit.aet.artemis.quiz.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizStatisticService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizStatisticService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizStatisticService.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizStatisticService.java index e1211bae043a..eb7af35b4b2d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizStatisticService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizStatisticService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.quiz; +package de.tum.cit.aet.artemis.quiz.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -14,6 +14,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiNewResultService; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; @@ -24,7 +25,6 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizQuestionStatisticRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.service.connectors.lti.LtiNewResultService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizSubmissionService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizSubmissionService.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizSubmissionService.java index 088ac21245e1..c4e0ded3d387 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/quiz/QuizSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizSubmissionService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.quiz; +package de.tum.cit.aet.artemis.quiz.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -16,6 +16,7 @@ import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.QuizSubmissionException; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; @@ -33,7 +34,6 @@ import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.SubmissionVersionService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.service.util.TimeLogUtil; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AssessmentDashboardService.java b/src/main/java/de/tum/cit/aet/artemis/service/AssessmentDashboardService.java index d32a65b64513..ce301379025b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AssessmentDashboardService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AssessmentDashboardService.java @@ -18,11 +18,11 @@ import de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntry; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.service.util.TimeLogUtil; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorParticipationStatus; import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/service/AssessmentService.java index f0ef11b057a2..96bfe95f2c8e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AssessmentService.java @@ -17,19 +17,19 @@ import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiNewResultService; import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.service.connectors.lti.LtiNewResultService; -import de.tum.cit.aet.artemis.service.exam.ExamDateService; -import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingAssessmentService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingAssessmentService; import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateBaseDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java b/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java index e55ce4b73b00..6b50575b2263 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java @@ -16,6 +16,8 @@ import org.springframework.web.multipart.MultipartFile; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisWebhookService; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; @@ -24,8 +26,6 @@ import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.SlideRepository; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; -import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisWebhookService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AuthorizationCheckService.java b/src/main/java/de/tum/cit/aet/artemis/service/AuthorizationCheckService.java index a6f929708d99..9152a7029f75 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AuthorizationCheckService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AuthorizationCheckService.java @@ -29,13 +29,13 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; -import de.tum.cit.aet.artemis.service.exam.ExamDateService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/BuildLogEntryService.java b/src/main/java/de/tum/cit/aet/artemis/service/BuildLogEntryService.java index 121bdadde0f4..d84d33f15bb2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/BuildLogEntryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/BuildLogEntryService.java @@ -23,12 +23,12 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.BuildLogEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ConsistencyCheckService.java b/src/main/java/de/tum/cit/aet/artemis/service/ConsistencyCheckService.java index e41b1917a42c..b6f3c38355af 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ConsistencyCheckService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ConsistencyCheckService.java @@ -9,10 +9,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.service.dto.ConsistencyErrorDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationService.java b/src/main/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationService.java index a49b206880a0..18c2aafa56ac 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; +import static de.tum.cit.aet.artemis.core.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -38,9 +38,9 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismCaseService.PlagiarismMapping; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.dto.MaxAndReachablePoints; -import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismCaseService.PlagiarismMapping; import de.tum.cit.aet.artemis.web.rest.dto.BonusSourceResultDTO; import de.tum.cit.aet.artemis.web.rest.dto.CourseForDashboardDTO; import de.tum.cit.aet.artemis.web.rest.dto.CourseScoresDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java b/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java index dcf4546582fc..8028c7857008 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java @@ -3,7 +3,7 @@ import static de.tum.cit.aet.artemis.assessment.domain.ComplaintType.COMPLAINT; import static de.tum.cit.aet.artemis.assessment.domain.ComplaintType.MORE_FEEDBACK; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; +import static de.tum.cit.aet.artemis.core.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; import java.nio.file.Files; import java.nio.file.Path; @@ -53,10 +53,12 @@ import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; +import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.domain.notification.GroupNotification; import de.tum.cit.aet.artemis.communication.repository.GroupNotificationRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; +import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.DomainObject; @@ -67,15 +69,20 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.export.CourseExamExportService; +import de.tum.cit.aet.artemis.core.service.user.UserService; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; +import de.tum.cit.aet.artemis.exam.service.ExamDeletionService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; @@ -83,16 +90,9 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.dto.StudentDTO; -import de.tum.cit.aet.artemis.service.exam.ExamDeletionService; -import de.tum.cit.aet.artemis.service.export.CourseExamExportService; -import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; -import de.tum.cit.aet.artemis.service.learningpath.LearningPathService; -import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; -import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupChannelManagementService; -import de.tum.cit.aet.artemis.service.user.UserService; -import de.tum.cit.aet.artemis.service.util.TimeLogUtil; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupNotificationRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; +import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupChannelManagementService; import de.tum.cit.aet.artemis.web.rest.dto.CourseContentCount; import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementDetailViewDTO; import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/EmailSummaryService.java b/src/main/java/de/tum/cit/aet/artemis/service/EmailSummaryService.java index 4e728fe1e318..0e016dad1989 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/EmailSummaryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/EmailSummaryService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service; +import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.NOTIFICATION__WEEKLY_SUMMARY__BASIC_WEEKLY_SUMMARY; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__WEEKLY_SUMMARY__BASIC_WEEKLY_SUMMARY; import java.time.Duration; import java.time.ZonedDateTime; @@ -13,12 +13,12 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.communication.service.notifications.MailService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.service.notifications.MailService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDateService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDateService.java index 237773e5459f..2dfd214616d5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDateService.java @@ -11,11 +11,11 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.ParticipationInterface; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.service.exam.ExamDateService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDeletionService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDeletionService.java index 7641e52037e3..b1665e3efe71 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDeletionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDeletionService.java @@ -15,8 +15,11 @@ import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; @@ -27,12 +30,9 @@ import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; -import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseService; -import de.tum.cit.aet.artemis.service.quiz.QuizExerciseService; -import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.quiz.service.QuizExerciseService; import de.tum.cit.aet.artemis.text.domain.TextExercise; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleService.java index 6c8a6f9bf4fb..e017774f8838 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleService.java @@ -14,12 +14,12 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.util.Tuple; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseLifecycle; import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizMode; -import de.tum.cit.aet.artemis.service.util.Tuple; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseScoresChartService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseScoresChartService.java index 4968ede0a026..66e215b7d6cd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseScoresChartService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseScoresChartService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; +import static de.tum.cit.aet.artemis.core.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; import java.util.List; import java.util.Map; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseService.java index cc2ba142b207..81febb9f773e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseService.java @@ -2,7 +2,7 @@ import static de.tum.cit.aet.artemis.core.config.Constants.EXAM_START_WAIT_TIME_MINUTES; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; +import static de.tum.cit.aet.artemis.core.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; import static java.time.ZonedDateTime.now; import java.util.ArrayList; @@ -42,10 +42,12 @@ import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.exam.service.ExamLiveEventsService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; import de.tum.cit.aet.artemis.exercise.domain.Submission; @@ -60,9 +62,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; -import de.tum.cit.aet.artemis.service.exam.ExamLiveEventsService; -import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; -import de.tum.cit.aet.artemis.service.quiz.QuizBatchService; +import de.tum.cit.aet.artemis.quiz.service.QuizBatchService; import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementOverviewExerciseStatisticsDTO; import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseSpecificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseSpecificationService.java index 72bc1854b164..b985a8816a61 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseSpecificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ExerciseSpecificationService.java @@ -24,6 +24,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise_; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseService; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; @Profile(PROFILE_CORE) @@ -108,7 +109,7 @@ else if (isCourseFilter) { * * @param programmingLanguage the language to filter for * @return a Specification that can get passed to the @{@link ProgrammingExerciseRepository} - * @see de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseService#getAllWithSCAOnPageWithSize(SearchTermPageableSearchDTO, boolean, boolean, ProgrammingLanguage, + * @see ProgrammingExerciseService#getAllWithSCAOnPageWithSize(SearchTermPageableSearchDTO, boolean, boolean, ProgrammingLanguage, * User) */ public Specification createSCAFilter(ProgrammingLanguage programmingLanguage) { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/FileService.java b/src/main/java/de/tum/cit/aet/artemis/service/FileService.java index 43bb2668a84a..cf29fe55abfd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/FileService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/FileService.java @@ -64,7 +64,7 @@ import com.ibm.icu.text.CharsetDetector; import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; -import de.tum.cit.aet.artemis.service.util.CommonsMultipartFile; +import de.tum.cit.aet.artemis.core.util.CommonsMultipartFile; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseImportService.java index 3fd3334a073a..0d28f09792c2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseImportService.java @@ -14,11 +14,11 @@ import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; -import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadSubmissionService.java index d427e2e1330d..59115a1abb1a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/FileUploadSubmissionService.java @@ -26,6 +26,8 @@ import de.tum.cit.aet.artemis.core.exception.EmptyFileException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaSubmissionSelectionService; +import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; @@ -36,8 +38,6 @@ import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadSubmissionRepository; -import de.tum.cit.aet.artemis.service.connectors.athena.AthenaSubmissionSelectionService; -import de.tum.cit.aet.artemis.service.exam.ExamDateService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LectureImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/LectureImportService.java index 419c56b1e458..c7759cc37e55 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LectureImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LectureImportService.java @@ -17,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisWebhookService; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; @@ -29,7 +30,6 @@ import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; -import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisWebhookService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LectureService.java b/src/main/java/de/tum/cit/aet/artemis/service/LectureService.java index 18bad73f8614..a2121367f871 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LectureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LectureService.java @@ -13,19 +13,19 @@ import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisWebhookService; import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; -import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisWebhookService; -import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.web.rest.util.PageUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitService.java b/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitService.java index ce309c9ca287..c924f0315e2f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitService.java @@ -23,7 +23,9 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisWebhookService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; @@ -36,8 +38,6 @@ import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.SlideRepository; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; -import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisWebhookService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseImportService.java index b92d147964a5..f0f982c95d07 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseImportService.java @@ -20,14 +20,14 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; -import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseService.java index 9f5acd44d0b6..e6ced8ccaf98 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseService.java @@ -11,12 +11,12 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.modeling.domain.ModelCluster; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.repository.ModelClusterRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelElementRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; -import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.web.rest.util.PageUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ModelingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/ModelingSubmissionService.java index dbcb8bb2c319..f856118aa90d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ModelingSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ModelingSubmissionService.java @@ -25,6 +25,8 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaSubmissionSelectionService; +import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -36,9 +38,7 @@ import de.tum.cit.aet.artemis.modeling.domain.SimilarElementCount; import de.tum.cit.aet.artemis.modeling.repository.ModelElementRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; -import de.tum.cit.aet.artemis.service.compass.CompassService; -import de.tum.cit.aet.artemis.service.connectors.athena.AthenaSubmissionSelectionService; -import de.tum.cit.aet.artemis.service.exam.ExamDateService; +import de.tum.cit.aet.artemis.modeling.service.compass.CompassService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipantScoreService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipantScoreService.java index a0717d75f08c..fb169ac714b4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipantScoreService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipantScoreService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; +import static de.tum.cit.aet.artemis.core.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -20,6 +20,7 @@ import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.domain.ParticipantScore; +import de.tum.cit.aet.artemis.assessment.listener.ResultListener; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.TeamScoreRepository; @@ -73,7 +74,7 @@ public ParticipantScoreService(UserRepository userRepository, StudentScoreReposi * Currently, both this server based calculation method and the traditional client side calculation method is used * side-by-side in exam-scores.component.ts. *

- * The goal is to switch completely to this much faster server based calculation if the {@link de.tum.cit.aet.artemis.service.listeners.ResultListener} + * The goal is to switch completely to this much faster server based calculation if the {@link ResultListener} * has been battle tested enough. * * @param exam the exam with registered students, exercise groups and exercises for which to calculate the scores @@ -99,7 +100,7 @@ public List calculateExamScores(Exam exam) { * Currently, both this server based calculation method and the traditional client side calculation method is used * side-by-side in course-scores.component.ts. *

- * The goal is to switch completely to this much faster server based calculation if the {@link de.tum.cit.aet.artemis.service.listeners.ResultListener} + * The goal is to switch completely to this much faster server based calculation if the {@link ResultListener} * has been battle tested enough. * * @param course the course with exercises for which to calculate the course scores diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java index add112135856..2bf704c2bb0f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java @@ -23,9 +23,14 @@ import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.TeamScoreRepository; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.VersionControlException; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.core.service.connectors.localci.SharedQueueManagementService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.Submission; @@ -48,11 +53,6 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageReportRepository; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; -import de.tum.cit.aet.artemis.service.connectors.GitService; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.service.connectors.localci.SharedQueueManagementService; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationVcsAccessTokenService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationVcsAccessTokenService.java index ea4901867284..50dfc327bd9b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationVcsAccessTokenService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationVcsAccessTokenService.java @@ -8,11 +8,11 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCPersonalAccessTokenManagementService; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ParticipationVCSAccessToken; import de.tum.cit.aet.artemis.programming.repository.ParticipationVCSAccessTokenRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCPersonalAccessTokenManagementService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationService.java b/src/main/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationService.java index a970b230cbfc..7ee49da5d3ee 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; +import static de.tum.cit.aet.artemis.core.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; import java.util.Map; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/service/ResultService.java index 2074b375b0e4..c5b7d57caf02 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ResultService.java @@ -39,6 +39,8 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.ResultBuildJob; +import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiNewResultService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; @@ -55,9 +57,7 @@ import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.ResultBuildJob; -import de.tum.cit.aet.artemis.service.connectors.lti.LtiNewResultService; -import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; +import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; import de.tum.cit.aet.artemis.web.rest.dto.feedback.FeedbackDetailDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/StaticCodeAnalysisService.java b/src/main/java/de/tum/cit/aet/artemis/service/StaticCodeAnalysisService.java index 1308067c1bf9..5d424c4bbb5a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/StaticCodeAnalysisService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/StaticCodeAnalysisService.java @@ -19,7 +19,7 @@ import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisCategory; import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisDefaultCategory; import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; -import de.tum.cit.aet.artemis.service.programming.ProgrammingTriggerService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java b/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java index 4da1c1f1ad26..b2d44147c3b4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; +import static de.tum.cit.aet.artemis.core.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; import java.time.DayOfWeek; import java.time.LocalDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionPolicyService.java b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionPolicyService.java index e5e7e8f1d06c..fc7626ae379a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionPolicyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionPolicyService.java @@ -22,7 +22,7 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.repository.SubmissionPolicyRepository; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseParticipationService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseParticipationService; import de.tum.cit.aet.artemis.web.rest.SubmissionPolicyResource; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java index 6643d258156f..348048e4c4b3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java @@ -33,6 +33,8 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaSubmissionSelectionService; +import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; @@ -44,8 +46,6 @@ import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.service.connectors.athena.AthenaSubmissionSelectionService; -import de.tum.cit.aet.artemis.service.exam.ExamDateService; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionWithComplaintDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextAssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextAssessmentService.java index bdc32c6b3b25..871dd95939fa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextAssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextAssessmentService.java @@ -17,13 +17,13 @@ import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiNewResultService; +import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.service.connectors.lti.LtiNewResultService; -import de.tum.cit.aet.artemis.service.exam.ExamDateService; -import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseFeedbackService.java index c0d07bd63ce4..b685e42d98ff 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseFeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseFeedbackService.java @@ -17,9 +17,9 @@ import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaFeedbackSuggestionsService; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.service.connectors.athena.AthenaFeedbackSuggestionsService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseImportService.java index f48b40b74dec..29c9415ef006 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseImportService.java @@ -26,11 +26,11 @@ import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.repository.TextBlockRepository; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; -import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; import de.tum.cit.aet.artemis.text.domain.TextBlock; import de.tum.cit.aet.artemis.text.domain.TextBlockType; import de.tum.cit.aet.artemis.text.domain.TextExercise; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseService.java index c1e5618f387d..1ffb266e7314 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseService.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/TextSubmissionService.java index bbdcee00b87c..a069d50746d7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/TextSubmissionService.java @@ -19,14 +19,14 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaSubmissionSelectionService; +import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.service.connectors.athena.AthenaSubmissionSelectionService; -import de.tum.cit.aet.artemis.service.exam.ExamDateService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/communication/Direction.java b/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/communication/Direction.java deleted file mode 100644 index 07919f1be88f..000000000000 --- a/src/main/java/de/tum/cit/aet/artemis/service/compass/umlmodel/communication/Direction.java +++ /dev/null @@ -1,5 +0,0 @@ -package de.tum.cit.aet.artemis.service.compass.umlmodel.communication; - -public enum Direction { - SOURCE, TARGET -} diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/chat/PyrisChatPipelineExecutionBaseDataDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/chat/PyrisChatPipelineExecutionBaseDataDTO.java deleted file mode 100644 index 75ad6e5a6e21..000000000000 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/chat/PyrisChatPipelineExecutionBaseDataDTO.java +++ /dev/null @@ -1,15 +0,0 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat; - -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonInclude; - -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisMessageDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisUserDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; - -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public record PyrisChatPipelineExecutionBaseDataDTO(List chatHistory, PyrisUserDTO user, PyrisPipelineExecutionSettingsDTO settings, - List initialStages) { -} diff --git a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/chat/exercise/PyrisExerciseChatPipelineExecutionDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/chat/exercise/PyrisExerciseChatPipelineExecutionDTO.java deleted file mode 100644 index f690c82e62fc..000000000000 --- a/src/main/java/de/tum/cit/aet/artemis/service/connectors/pyris/dto/chat/exercise/PyrisExerciseChatPipelineExecutionDTO.java +++ /dev/null @@ -1,19 +0,0 @@ -package de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.exercise; - -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonInclude; - -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisCourseDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisMessageDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisProgrammingExerciseDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisSubmissionDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.data.PyrisUserDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; - -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public record PyrisExerciseChatPipelineExecutionDTO(PyrisSubmissionDTO submission, PyrisProgrammingExerciseDTO exercise, PyrisCourseDTO course, List chatHistory, - PyrisUserDTO user, PyrisPipelineExecutionSettingsDTO settings, List initialStages) { - -} diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/AbstractBuildResultNotificationDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/AbstractBuildResultNotificationDTO.java index f0e5175e7e48..a3dd75a7f71d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/AbstractBuildResultNotificationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/AbstractBuildResultNotificationDTO.java @@ -9,9 +9,9 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestwiseCoverageReportDTO; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestwiseCoverageReportDTO; @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/icl/ArtemisGitServletService.java b/src/main/java/de/tum/cit/aet/artemis/service/icl/ArtemisGitServletService.java index dffcf76ea558..add1d6c1f712 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/icl/ArtemisGitServletService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/icl/ArtemisGitServletService.java @@ -10,11 +10,11 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCFetchFilter; -import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCPostPushHook; -import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCPrePushHook; -import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCPushFilter; -import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCServletService; +import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCFetchFilter; +import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCPostPushHook; +import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCPrePushHook; +import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCPushFilter; +import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCServletService; /** * This class configures the JGit Servlet, which is used to receive Git push and fetch requests for local VC. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/icl/GitPublickeyAuthenticatorService.java b/src/main/java/de/tum/cit/aet/artemis/service/icl/GitPublickeyAuthenticatorService.java index 6534fe2103a8..c29cd74b06eb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/icl/GitPublickeyAuthenticatorService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/icl/GitPublickeyAuthenticatorService.java @@ -17,10 +17,10 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.connectors.localci.SharedQueueManagementService; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildAgentInformation; import de.tum.cit.aet.artemis.programming.icl.ssh.HashUtils; import de.tum.cit.aet.artemis.programming.icl.ssh.SshConstants; -import de.tum.cit.aet.artemis.service.connectors.localci.SharedQueueManagementService; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; @Profile(PROFILE_LOCALVC) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitCommandFactoryService.java b/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitCommandFactoryService.java index 5ab405c64213..aeac76d8348f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitCommandFactoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitCommandFactoryService.java @@ -7,8 +7,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCServletService; import de.tum.cit.aet.artemis.programming.icl.ssh.SshGitCommand; -import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCServletService; @Profile(PROFILE_LOCALVC) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitLocationResolverService.java b/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitLocationResolverService.java index c35c37bc6ada..6ac7100effe5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitLocationResolverService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitLocationResolverService.java @@ -20,11 +20,11 @@ import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCForbiddenException; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; +import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCRepositoryUri; +import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCServletService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.icl.ssh.SshConstants; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; -import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCServletService; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; import de.tum.cit.aet.artemis.web.rest.repository.RepositoryActionType; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/TextExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseWithSubmissionsExportService.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/service/export/TextExerciseWithSubmissionsExportService.java rename to src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseWithSubmissionsExportService.java index a554f8ea4a52..fa28171624e0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/TextExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseWithSubmissionsExportService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.export; +package de.tum.cit.aet.artemis.text.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -9,8 +9,9 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.service.ArchivalReportEntry; +import de.tum.cit.aet.artemis.exercise.service.ExerciseWithSubmissionsExportService; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.archival.ArchivalReportEntry; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/export/TextSubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionExportService.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/export/TextSubmissionExportService.java rename to src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionExportService.java index 04ea7eb5b6ce..6a14e66519f8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/export/TextSubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionExportService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.export; +package de.tum.cit.aet.artemis.text.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -14,6 +14,7 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.service.SubmissionExportService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ZipFileService; import de.tum.cit.aet.artemis.text.domain.TextSubmission; diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroup.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroup.java index f7558b8af135..ce7ce59f01bf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroup.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroup.java @@ -30,6 +30,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupService; import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; @Entity @@ -124,7 +125,7 @@ public class TutorialGroup extends DomainObject { /** * This field represents the average attendance of this tutorial group *

- * For more information on how this is calculated check out {@link de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupService#setAverageAttendance} + * For more information on how this is calculated check out {@link TutorialGroupService#setAverageAttendance} */ @Transient private Integer averageAttendance; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupChannelManagementService.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupChannelManagementService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupChannelManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupChannelManagementService.java index 7df495bce16f..8f111a075e9d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupChannelManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupChannelManagementService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static jakarta.persistence.Persistence.getPersistenceUtil; @@ -16,10 +16,10 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; +import de.tum.cit.aet.artemis.communication.service.conversation.ConversationService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; -import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRegistrationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupFreePeriodService.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupFreePeriodService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupFreePeriodService.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupFreePeriodService.java index b4f9d7c69efc..397d3dddee9b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupFreePeriodService.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupFreePeriodService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupScheduleService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupScheduleService.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupScheduleService.java index b1f067397ce8..2d0b30a59d8f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupScheduleService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.web.rest.util.DateUtil.getFirstDateOfWeekDay; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupService.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupService.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupService.java index fdf12c933b01..8fe575d3cada 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupService.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupResource.TutorialGroupImportErrors.MULTIPLE_REGISTRATIONS; @@ -33,14 +33,14 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.communication.service.conversation.ConversationDTOService; +import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; -import de.tum.cit.aet.artemis.service.metis.conversation.ConversationDTOService; -import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistrationType; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupsConfigurationService.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupsConfigurationService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupsConfigurationService.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupsConfigurationService.java index 41f4cb4b421d..4a7bc625b296 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/tutorialgroups/TutorialGroupsConfigurationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupsConfigurationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AccountResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AccountResource.java index f99d6ada28f3..cc127fe2e259 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AccountResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AccountResource.java @@ -34,15 +34,15 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCPersonalAccessTokenManagementService; +import de.tum.cit.aet.artemis.core.service.user.UserCreationService; +import de.tum.cit.aet.artemis.core.service.user.UserService; import de.tum.cit.aet.artemis.programming.icl.ssh.HashUtils; import de.tum.cit.aet.artemis.service.AccountService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCPersonalAccessTokenManagementService; import de.tum.cit.aet.artemis.service.dto.PasswordChangeDTO; import de.tum.cit.aet.artemis.service.dto.UserDTO; -import de.tum.cit.aet.artemis.service.user.UserCreationService; -import de.tum.cit.aet.artemis.service.user.UserService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EmailAlreadyUsedException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AeolusTemplateResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AeolusTemplateResource.java index fc5f743d2856..81b9d980c71d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AeolusTemplateResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AeolusTemplateResource.java @@ -19,11 +19,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.service.connectors.BuildScriptProviderService; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.Windfile; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProjectType; -import de.tum.cit.aet.artemis.service.connectors.BuildScriptProviderService; -import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; -import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; /** * Service for retrieving aeolus template files based on the programming language, project type, and diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonConversionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonConversionResource.java index 34fde3a6dfd0..5853c710a2e0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonConversionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonConversionResource.java @@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.service.connectors.apollon.ApollonConversionService; -import de.tum.cit.aet.artemis.service.connectors.apollon.dto.ApollonModelDTO; +import de.tum.cit.aet.artemis.core.service.connectors.apollon.ApollonConversionService; +import de.tum.cit.aet.artemis.core.service.connectors.apollon.dto.ApollonModelDTO; /** * REST controller for managing ApollonDiagram. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AthenaResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AthenaResource.java index 64be2a94c0c5..72a345ef0ebf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AthenaResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AthenaResource.java @@ -17,6 +17,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.athena.dto.ModelingFeedbackDTO; +import de.tum.cit.aet.artemis.athena.dto.ProgrammingFeedbackDTO; +import de.tum.cit.aet.artemis.athena.dto.TextFeedbackDTO; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.exception.NetworkingException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -25,6 +28,9 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.core.security.annotations.ManualConfig; +import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaFeedbackSuggestionsService; +import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaModuleService; +import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaRepositoryExportService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; import de.tum.cit.aet.artemis.exercise.domain.Submission; @@ -34,12 +40,6 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.connectors.athena.AthenaFeedbackSuggestionsService; -import de.tum.cit.aet.artemis.service.connectors.athena.AthenaModuleService; -import de.tum.cit.aet.artemis.service.connectors.athena.AthenaRepositoryExportService; -import de.tum.cit.aet.artemis.service.dto.athena.ModelingFeedbackDTO; -import de.tum.cit.aet.artemis.service.dto.athena.ProgrammingFeedbackDTO; -import de.tum.cit.aet.artemis.service.dto.athena.TextFeedbackDTO; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AttachmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AttachmentResource.java index f8ca459c5dd3..a5a6acfe8701 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AttachmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AttachmentResource.java @@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -39,7 +40,6 @@ import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; import tech.jhipster.web.util.ResponseUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/BonusResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/BonusResource.java index 7206b6118567..c0e9e9706b55 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/BonusResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/BonusResource.java @@ -33,10 +33,10 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.ManualConfig; +import de.tum.cit.aet.artemis.exam.service.ExamAccessService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.BonusService; import de.tum.cit.aet.artemis.service.CourseScoreCalculationService; -import de.tum.cit.aet.artemis.service.exam.ExamAccessService; import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java index 72f6ab064705..5fc6c51edac0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java @@ -60,6 +60,7 @@ import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; +import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; @@ -70,6 +71,12 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaModuleService; +import de.tum.cit.aet.artemis.core.service.connectors.ci.CIUserManagementService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsUserManagementService; +import de.tum.cit.aet.artemis.core.service.feature.Feature; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; @@ -91,17 +98,10 @@ import de.tum.cit.aet.artemis.service.GradingScaleService; import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; import de.tum.cit.aet.artemis.service.SubmissionService; -import de.tum.cit.aet.artemis.service.connectors.athena.AthenaModuleService; -import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; -import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.service.dto.UserPublicInfoDTO; -import de.tum.cit.aet.artemis.service.feature.Feature; -import de.tum.cit.aet.artemis.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.service.learningpath.LearningPathService; -import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupsConfigurationService; -import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupsConfigurationService; import de.tum.cit.aet.artemis.web.rest.dto.CourseForDashboardDTO; import de.tum.cit.aet.artemis.web.rest.dto.CourseForImportDTO; import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementDetailViewDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java index d610740c45d9..132b3d0c984a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java @@ -28,7 +28,7 @@ import de.tum.cit.aet.artemis.core.repository.DataExportRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.service.export.DataExportService; +import de.tum.cit.aet.artemis.core.service.export.DataExportService; import de.tum.cit.aet.artemis.web.rest.dto.DataExportDTO; import de.tum.cit.aet.artemis.web.rest.dto.RequestDataExportDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamLockResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamLockResource.java index 7ccc4648e565..67aebbd1b301 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamLockResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamLockResource.java @@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.service.exam.ExamAccessService; -import de.tum.cit.aet.artemis.service.exam.ExamService; +import de.tum.cit.aet.artemis.exam.service.ExamAccessService; +import de.tum.cit.aet.artemis.exam.service.ExamService; // only available for external version control services @Profile("!localvc & core") diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java index 429981edbe38..4bc8992c72de 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.web.rest; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.util.TimeLogUtil.formatDurationFrom; +import static de.tum.cit.aet.artemis.core.util.TimeLogUtil.formatDurationFrom; import static java.time.ZonedDateTime.now; import java.io.File; @@ -54,6 +54,7 @@ import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; @@ -65,11 +66,25 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.feature.Feature; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.domain.SuspiciousSessionsAnalysisOptions; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.service.ExamAccessService; +import de.tum.cit.aet.artemis.exam.service.ExamDateService; +import de.tum.cit.aet.artemis.exam.service.ExamDeletionService; +import de.tum.cit.aet.artemis.exam.service.ExamImportService; +import de.tum.cit.aet.artemis.exam.service.ExamLiveEventsService; +import de.tum.cit.aet.artemis.exam.service.ExamRegistrationService; +import de.tum.cit.aet.artemis.exam.service.ExamService; +import de.tum.cit.aet.artemis.exam.service.ExamSessionService; +import de.tum.cit.aet.artemis.exam.service.ExamUserService; +import de.tum.cit.aet.artemis.exam.service.StudentExamService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; @@ -78,21 +93,6 @@ import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; -import de.tum.cit.aet.artemis.service.exam.ExamAccessService; -import de.tum.cit.aet.artemis.service.exam.ExamDateService; -import de.tum.cit.aet.artemis.service.exam.ExamDeletionService; -import de.tum.cit.aet.artemis.service.exam.ExamImportService; -import de.tum.cit.aet.artemis.service.exam.ExamLiveEventsService; -import de.tum.cit.aet.artemis.service.exam.ExamRegistrationService; -import de.tum.cit.aet.artemis.service.exam.ExamService; -import de.tum.cit.aet.artemis.service.exam.ExamSessionService; -import de.tum.cit.aet.artemis.service.exam.ExamUserService; -import de.tum.cit.aet.artemis.service.exam.StudentExamService; -import de.tum.cit.aet.artemis.service.feature.Feature; -import de.tum.cit.aet.artemis.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; -import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; -import de.tum.cit.aet.artemis.service.util.TimeLogUtil; import de.tum.cit.aet.artemis.web.rest.dto.CourseWithIdDTO; import de.tum.cit.aet.artemis.web.rest.dto.ExamChecklistDTO; import de.tum.cit.aet.artemis.web.rest.dto.ExamInformationDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java index 0f30353f962e..5e7def08f226 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java @@ -25,10 +25,10 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; +import de.tum.cit.aet.artemis.exam.service.ExamAccessService; +import de.tum.cit.aet.artemis.exam.service.ExamUserService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.exam.ExamAccessService; -import de.tum.cit.aet.artemis.service.exam.ExamUserService; import de.tum.cit.aet.artemis.web.rest.dto.ExamUserAttendanceCheckDTO; import de.tum.cit.aet.artemis.web.rest.dto.ExamUserDTO; import de.tum.cit.aet.artemis.web.rest.dto.ExamUsersNotFoundDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java index 225847b89ac2..70651846f040 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java @@ -34,10 +34,10 @@ import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; +import de.tum.cit.aet.artemis.exam.service.ExamAccessService; +import de.tum.cit.aet.artemis.exam.service.ExamImportService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.service.ExerciseDeletionService; -import de.tum.cit.aet.artemis.service.exam.ExamAccessService; -import de.tum.cit.aet.artemis.service.exam.ExamImportService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java index c82cf358d1b6..aa9cce780835 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java @@ -35,26 +35,26 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.service.ExamAccessService; +import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.iris.dto.IrisCombinedSettingsDTO; +import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismCaseService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.hestia.ExerciseHintService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.quiz.service.QuizBatchService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDeletionService; import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.TutorParticipationService; -import de.tum.cit.aet.artemis.service.exam.ExamAccessService; -import de.tum.cit.aet.artemis.service.exam.ExamDateService; -import de.tum.cit.aet.artemis.service.hestia.ExerciseHintService; -import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedSettingsDTO; -import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; -import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismCaseService; -import de.tum.cit.aet.artemis.service.quiz.QuizBatchService; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorParticipationStatus; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseDetailsDTO; import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java index a77ad78be239..d0bfe6a30588 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java @@ -28,8 +28,11 @@ import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; +import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -38,22 +41,19 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.feature.Feature; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; +import de.tum.cit.aet.artemis.fileupload.service.FileUploadSubmissionExportService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.ExerciseDeletionService; import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.service.FileUploadExerciseImportService; import de.tum.cit.aet.artemis.service.FileUploadExerciseService; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; -import de.tum.cit.aet.artemis.service.export.FileUploadSubmissionExportService; -import de.tum.cit.aet.artemis.service.feature.Feature; -import de.tum.cit.aet.artemis.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; -import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java index 5b2d00344c3f..3623d0fd2590 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java @@ -29,6 +29,7 @@ import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.EmptyFileException; @@ -36,6 +37,7 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.exam.service.ExamSubmissionService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -50,8 +52,6 @@ import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.FileUploadSubmissionService; import de.tum.cit.aet.artemis.service.ResultService; -import de.tum.cit.aet.artemis.service.exam.ExamSubmissionService; -import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/GuidedTourSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/GuidedTourSettingsResource.java index 7bac1979cc83..5ca35c110cc9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/GuidedTourSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/GuidedTourSettingsResource.java @@ -19,7 +19,7 @@ import de.tum.cit.aet.artemis.core.domain.GuidedTourSetting; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.service.user.UserService; +import de.tum.cit.aet.artemis.core.service.user.UserService; /** * Rest controller for managing GuidedTourSetting diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java index f188854683d7..eb1a29f83db0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java @@ -26,6 +26,10 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; import de.tum.cit.aet.artemis.atlas.repository.LearningPathRepository; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathNavigationService; +import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathRecommendationService; +import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -33,15 +37,11 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; +import de.tum.cit.aet.artemis.core.service.feature.Feature; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.LearningObjectService; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; -import de.tum.cit.aet.artemis.service.feature.Feature; -import de.tum.cit.aet.artemis.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.service.learningpath.LearningPathNavigationService; -import de.tum.cit.aet.artemis.service.learningpath.LearningPathRecommendationService; -import de.tum.cit.aet.artemis.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyNameDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyProgressForLearningPathDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java index c4ac51d184e9..de0d9e85e440 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java @@ -28,6 +28,7 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -46,7 +47,6 @@ import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.service.LectureImportService; import de.tum.cit.aet.artemis.service.LectureService; -import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java index 2f87f57bbb67..6b2da625b209 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java @@ -29,10 +29,10 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiDeepLinkingService; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.connectors.lti.LtiDeepLinkingService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.PaginationUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/MetricsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/MetricsResource.java index 1f542d574357..cc8a498f27d8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/MetricsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/MetricsResource.java @@ -13,7 +13,7 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; -import de.tum.cit.aet.artemis.service.metrics.LearningMetricsService; +import de.tum.cit.aet.artemis.exercise.service.LearningMetricsService; import de.tum.cit.aet.artemis.web.rest.dto.metrics.StudentMetricsDTO; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java index 989d91a5bc55..8fb144e27271 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java @@ -29,8 +29,11 @@ import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; +import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -39,27 +42,24 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.feature.Feature; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.SubmissionExportService; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismDetectionConfigHelper; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismDetectionService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.ExerciseDeletionService; import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.service.ModelingExerciseImportService; import de.tum.cit.aet.artemis.service.ModelingExerciseService; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; -import de.tum.cit.aet.artemis.service.export.SubmissionExportService; -import de.tum.cit.aet.artemis.service.feature.Feature; -import de.tum.cit.aet.artemis.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; -import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; -import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionConfigHelper; -import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionService; -import de.tum.cit.aet.artemis.service.util.TimeLogUtil; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java index a44e77437f05..7bd414b1fd50 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java @@ -34,6 +34,7 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.exam.service.ExamSubmissionService; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; @@ -43,11 +44,10 @@ import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ModelingSubmissionService; import de.tum.cit.aet.artemis.service.ResultService; -import de.tum.cit.aet.artemis.service.exam.ExamSubmissionService; -import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationResource.java index d6896e632334..f9a87fa7ab41 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationResource.java @@ -24,13 +24,13 @@ import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.communication.repository.NotificationRepository; import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsCommunicationChannel; +import de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel; -import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService; -import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupService; -import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; +import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupService; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.PaginationUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java index 91785828748d..44bba926ef05 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java @@ -22,11 +22,11 @@ import de.tum.cit.aet.artemis.communication.domain.NotificationSetting; import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService; -import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java index 47eb7628226d..5bb0c8d041a2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.listener.ResultListener; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -54,7 +55,7 @@ public ParticipantScoreResource(AuthorizationCheckService authorizationCheckServ * Currently both this server based calculation method and the traditional client side calculation method is used * side-by-side in course-scores.component.ts. *

- * The goal is to switch completely to this much faster server based calculation if the {@link de.tum.cit.aet.artemis.service.listeners.ResultListener} + * The goal is to switch completely to this much faster server based calculation if the {@link ResultListener} * has been battle tested enough. * * @param courseId the id of the course for which to calculate the course scores @@ -80,7 +81,7 @@ public ResponseEntity> getScoresOfCourse(@PathVariable Long cours * Currently both this server based calculation method and the traditional client side calculation method is used * side-by-side in exam-scores.component.ts. *

- * The goal is to switch completely to this much faster server based calculation if the {@link de.tum.cit.aet.artemis.service.listeners.ResultListener} + * The goal is to switch completely to this much faster server based calculation if the {@link ResultListener} * has been battle tested enough. * * @param examId the id of the exam for which to calculate the exam scores diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java index 0301d5774f3d..54bf3245571f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java @@ -56,6 +56,11 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.core.service.feature.Feature; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggleService; +import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; @@ -74,26 +79,21 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseCodeReviewFeedbackService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseParticipationService; import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; +import de.tum.cit.aet.artemis.quiz.service.QuizBatchService; +import de.tum.cit.aet.artemis.quiz.service.QuizSubmissionService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.GradingScaleService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.TextExerciseFeedbackService; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.service.feature.Feature; -import de.tum.cit.aet.artemis.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.service.feature.FeatureToggleService; -import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseCodeReviewFeedbackService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseParticipationService; -import de.tum.cit.aet.artemis.service.quiz.QuizBatchService; -import de.tum.cit.aet.artemis.service.quiz.QuizSubmissionService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/PlantUmlResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/PlantUmlResource.java index 00221a647098..dc45d82563fc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/PlantUmlResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/PlantUmlResource.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.web.rest; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.util.TimeLogUtil.formatDurationFrom; +import static de.tum.cit.aet.artemis.core.util.TimeLogUtil.formatDurationFrom; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java index e245059477f7..57e90c5c469e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java @@ -38,8 +38,12 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; +import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationScheduleService; +import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; @@ -54,6 +58,8 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastInstructorInExercise; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; +import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; import de.tum.cit.aet.artemis.quiz.domain.DragItem; @@ -63,25 +69,19 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.quiz.repository.QuizBatchRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.quiz.service.QuizBatchService; +import de.tum.cit.aet.artemis.quiz.service.QuizExerciseImportService; +import de.tum.cit.aet.artemis.quiz.service.QuizExerciseService; +import de.tum.cit.aet.artemis.quiz.service.QuizMessagingService; +import de.tum.cit.aet.artemis.quiz.service.QuizResultService; +import de.tum.cit.aet.artemis.quiz.service.QuizStatisticService; +import de.tum.cit.aet.artemis.quiz.service.QuizSubmissionService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.ExerciseDeletionService; import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; -import de.tum.cit.aet.artemis.service.exam.ExamDateService; -import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; -import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; -import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; -import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; -import de.tum.cit.aet.artemis.service.quiz.QuizBatchService; -import de.tum.cit.aet.artemis.service.quiz.QuizExerciseImportService; -import de.tum.cit.aet.artemis.service.quiz.QuizExerciseService; -import de.tum.cit.aet.artemis.service.quiz.QuizMessagingService; -import de.tum.cit.aet.artemis.service.quiz.QuizResultService; -import de.tum.cit.aet.artemis.service.quiz.QuizStatisticService; -import de.tum.cit.aet.artemis.service.quiz.QuizSubmissionService; import de.tum.cit.aet.artemis.web.rest.dto.QuizBatchJoinDTO; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java index d1308ea3cbc0..c4632002eacf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java @@ -29,8 +29,8 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; +import de.tum.cit.aet.artemis.quiz.service.QuizBatchService; import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.quiz.QuizBatchService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java index a681596b9e3a..0ee8017e1c10 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java @@ -18,10 +18,10 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.exam.service.ExamAccessService; import de.tum.cit.aet.artemis.quiz.domain.QuizPool; +import de.tum.cit.aet.artemis.quiz.service.QuizPoolService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.exam.ExamAccessService; -import de.tum.cit.aet.artemis.service.quiz.QuizPoolService; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java index dbebe5059644..bee0972ef279 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java @@ -28,6 +28,7 @@ import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; +import de.tum.cit.aet.artemis.exam.service.ExamSubmissionService; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -36,10 +37,9 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; +import de.tum.cit.aet.artemis.quiz.service.QuizSubmissionService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.exam.ExamSubmissionService; -import de.tum.cit.aet.artemis.service.quiz.QuizSubmissionService; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java index 85ff47f1d8e9..60ffea494bd9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java @@ -37,6 +37,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; import de.tum.cit.aet.artemis.exam.domain.Exam; +import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; @@ -50,7 +51,6 @@ import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.ResultService; -import de.tum.cit.aet.artemis.service.exam.ExamDateService; import de.tum.cit.aet.artemis.web.rest.dto.ResultWithPointsPerGradingCriterionDTO; import de.tum.cit.aet.artemis.web.rest.dto.feedback.FeedbackDetailDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java index 5d07aa0fbd6d..69f37a8613b0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java @@ -2,7 +2,7 @@ import static de.tum.cit.aet.artemis.core.config.Constants.EXAM_START_WAIT_TIME_MINUTES; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.util.TimeLogUtil.formatDurationFrom; +import static de.tum.cit.aet.artemis.core.util.TimeLogUtil.formatDurationFrom; import static java.time.ZonedDateTime.now; import java.time.ZonedDateTime; @@ -41,6 +41,9 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.core.util.ExamExerciseStartPreparationStatus; +import de.tum.cit.aet.artemis.core.util.HttpRequestUtils; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExamSession; import de.tum.cit.aet.artemis.exam.domain.StudentExam; @@ -48,6 +51,14 @@ import de.tum.cit.aet.artemis.exam.repository.ExamLiveEventRepository; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exam.service.ExamAccessService; +import de.tum.cit.aet.artemis.exam.service.ExamDateService; +import de.tum.cit.aet.artemis.exam.service.ExamDeletionService; +import de.tum.cit.aet.artemis.exam.service.ExamLiveEventsService; +import de.tum.cit.aet.artemis.exam.service.ExamService; +import de.tum.cit.aet.artemis.exam.service.ExamSessionService; +import de.tum.cit.aet.artemis.exam.service.StudentExamAccessService; +import de.tum.cit.aet.artemis.exam.service.StudentExamService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; @@ -56,17 +67,6 @@ import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.service.exam.ExamAccessService; -import de.tum.cit.aet.artemis.service.exam.ExamDateService; -import de.tum.cit.aet.artemis.service.exam.ExamDeletionService; -import de.tum.cit.aet.artemis.service.exam.ExamLiveEventsService; -import de.tum.cit.aet.artemis.service.exam.ExamService; -import de.tum.cit.aet.artemis.service.exam.ExamSessionService; -import de.tum.cit.aet.artemis.service.exam.StudentExamAccessService; -import de.tum.cit.aet.artemis.service.exam.StudentExamService; -import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; -import de.tum.cit.aet.artemis.service.util.ExamExerciseStartPreparationStatus; -import de.tum.cit.aet.artemis.service.util.HttpRequestUtils; import de.tum.cit.aet.artemis.web.rest.dto.StudentExamWithGradeDTO; import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamAttendanceCheckEventDTO; import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamLiveEventBaseDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java index 869dd6ab66e8..33a6ccbddec0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java @@ -52,11 +52,11 @@ import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.exercise.service.team.TeamService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.SubmissionService; -import de.tum.cit.aet.artemis.service.TeamService; import de.tum.cit.aet.artemis.service.dto.TeamSearchUserDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java index 0ff1c8189bbf..fde8dfb1f683 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java @@ -43,6 +43,7 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaFeedbackSendingService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; @@ -54,7 +55,6 @@ import de.tum.cit.aet.artemis.service.TextAssessmentService; import de.tum.cit.aet.artemis.service.TextBlockService; import de.tum.cit.aet.artemis.service.TextSubmissionService; -import de.tum.cit.aet.artemis.service.connectors.athena.AthenaFeedbackSendingService; import de.tum.cit.aet.artemis.text.domain.TextBlock; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java index 25644b4ca70f..a60ac7eebac4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java @@ -39,8 +39,11 @@ import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.repository.TextBlockRepository; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; +import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -50,6 +53,11 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaModuleService; +import de.tum.cit.aet.artemis.core.service.feature.Feature; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -57,6 +65,8 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismDetectionConfigHelper; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismDetectionService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.ExerciseDateService; @@ -64,20 +74,10 @@ import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.service.TextExerciseImportService; import de.tum.cit.aet.artemis.service.TextExerciseService; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; -import de.tum.cit.aet.artemis.service.connectors.athena.AthenaModuleService; -import de.tum.cit.aet.artemis.service.export.TextSubmissionExportService; -import de.tum.cit.aet.artemis.service.feature.Feature; -import de.tum.cit.aet.artemis.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; -import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; -import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; -import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionConfigHelper; -import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionService; -import de.tum.cit.aet.artemis.service.util.TimeLogUtil; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.text.service.TextSubmissionExportService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java index 3efc838c931e..2da6d369201d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java @@ -28,18 +28,18 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.exam.service.ExamSubmissionService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.service.TextAssessmentService; import de.tum.cit.aet.artemis.service.TextSubmissionService; -import de.tum.cit.aet.artemis.service.exam.ExamSubmissionService; -import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/UserResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/UserResource.java index 6c68bb6ff45b..1693aee836e2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/UserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/UserResource.java @@ -27,11 +27,11 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.service.connectors.lti.LtiService; +import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiService; +import de.tum.cit.aet.artemis.core.service.user.UserCreationService; +import de.tum.cit.aet.artemis.core.service.user.UserService; import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.service.dto.UserInitializationDTO; -import de.tum.cit.aet.artemis.service.user.UserCreationService; -import de.tum.cit.aet.artemis.service.user.UserService; import tech.jhipster.web.util.PaginationUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java index ecc7584f4c57..42e80bdc2137 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java @@ -29,6 +29,8 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyService; +import de.tum.cit.aet.artemis.atlas.service.competency.CourseCompetencyService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -39,8 +41,6 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.LectureUnitService; -import de.tum.cit.aet.artemis.service.competency.CompetencyService; -import de.tum.cit.aet.artemis.service.competency.CourseCompetencyService; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java index 5bed0c105e3f..8d1d05c8eff0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java @@ -31,6 +31,10 @@ import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyJolService; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyRelationService; +import de.tum.cit.aet.artemis.atlas.service.competency.CourseCompetencyService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -41,15 +45,11 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionInputDTO; +import de.tum.cit.aet.artemis.core.service.feature.Feature; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.iris.service.IrisCompetencyGenerationService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.competency.CompetencyJolService; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; -import de.tum.cit.aet.artemis.service.competency.CompetencyRelationService; -import de.tum.cit.aet.artemis.service.competency.CourseCompetencyService; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionInputDTO; -import de.tum.cit.aet.artemis.service.feature.Feature; -import de.tum.cit.aet.artemis.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.service.iris.IrisCompetencyGenerationService; import de.tum.cit.aet.artemis.web.rest.dto.CourseCompetencyProgressDTO; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolPairDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java index b54ea29c9b54..90d25770ee78 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java @@ -29,6 +29,8 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; +import de.tum.cit.aet.artemis.atlas.service.competency.CourseCompetencyService; +import de.tum.cit.aet.artemis.atlas.service.competency.PrerequisiteService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -39,8 +41,6 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.LectureUnitService; -import de.tum.cit.aet.artemis.service.competency.CourseCompetencyService; -import de.tum.cit.aet.artemis.service.competency.PrerequisiteService; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/StandardizedCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/StandardizedCompetencyResource.java index 2627d8d8d79b..102e52e590d7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/StandardizedCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/StandardizedCompetencyResource.java @@ -18,10 +18,10 @@ import de.tum.cit.aet.artemis.atlas.repository.SourceRepository; import de.tum.cit.aet.artemis.atlas.repository.competency.KnowledgeAreaRepository; import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; +import de.tum.cit.aet.artemis.atlas.service.competency.StandardizedCompetencyService; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.service.competency.StandardizedCompetencyService; -import de.tum.cit.aet.artemis.service.feature.Feature; -import de.tum.cit.aet.artemis.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.core.service.feature.Feature; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaResultDTO; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.SourceDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDetailsDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDetailsDTO.java index 160b90e296f1..280a32c7cc14 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDetailsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDetailsDTO.java @@ -5,8 +5,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.iris.dto.IrisCombinedSettingsDTO; import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; -import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedSettingsDTO; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyNameDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyNameDTO.java index f331a0e6dec2..da8faef0f378 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyNameDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyNameDTO.java @@ -6,7 +6,7 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record CompetencyNameDTO(long id, String title, double masteryProgress) { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ExceptionTranslator.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ExceptionTranslator.java index 37d3ca7db3e0..0d18d1ecfe3f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ExceptionTranslator.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ExceptionTranslator.java @@ -34,7 +34,7 @@ import org.zalando.problem.violations.ConstraintViolationProblem; import de.tum.cit.aet.artemis.core.exception.UsernameAlreadyUsedException; -import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabException; +import de.tum.cit.aet.artemis.core.service.connectors.gitlab.GitLabException; import tech.jhipster.web.util.HeaderUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CodeHintResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CodeHintResource.java index d18fc6c450dc..1c872d2cdbb4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CodeHintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CodeHintResource.java @@ -21,13 +21,13 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; +import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CodeHintRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; -import de.tum.cit.aet.artemis.service.hestia.CodeHintService; -import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; +import de.tum.cit.aet.artemis.programming.service.hestia.CodeHintService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CoverageReportResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CoverageReportResource.java index 390a4db20a0f..00cf8f313898 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CoverageReportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CoverageReportResource.java @@ -13,7 +13,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageReport; -import de.tum.cit.aet.artemis.service.hestia.TestwiseCoverageService; +import de.tum.cit.aet.artemis.programming.service.hestia.TestwiseCoverageService; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ExerciseHintResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ExerciseHintResource.java index f04ae73f77f1..aaf6e55e77b5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ExerciseHintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ExerciseHintResource.java @@ -32,8 +32,8 @@ import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintRepository; -import de.tum.cit.aet.artemis.service.hestia.CodeHintService; -import de.tum.cit.aet.artemis.service.hestia.ExerciseHintService; +import de.tum.cit.aet.artemis.programming.service.hestia.CodeHintService; +import de.tum.cit.aet.artemis.programming.service.hestia.ExerciseHintService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; import tech.jhipster.web.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java index 4d59b930b967..233dc14cc7e7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java @@ -27,11 +27,11 @@ import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.programming.service.CommitHistoryService; +import de.tum.cit.aet.artemis.programming.service.RepositoryService; +import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseGitDiffReportService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; -import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseGitDiffReportService; -import de.tum.cit.aet.artemis.service.programming.CommitHistoryService; -import de.tum.cit.aet.artemis.service.programming.RepositoryService; import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseGitDiffReportDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java index 2fe7852015a5..3519635a7a4e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java @@ -33,11 +33,11 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CodeHintRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralSolutionEntryGenerationException; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralTestCaseService; +import de.tum.cit.aet.artemis.programming.service.hestia.structural.StructuralSolutionEntryGenerationException; +import de.tum.cit.aet.artemis.programming.service.hestia.structural.StructuralTestCaseService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralSolutionEntryGenerationException; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralTestCaseService; -import de.tum.cit.aet.artemis.service.hestia.structural.StructuralSolutionEntryGenerationException; -import de.tum.cit.aet.artemis.service.hestia.structural.StructuralTestCaseService; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; import tech.jhipster.web.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java index b7495569d71a..b9f671697ea2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java @@ -18,8 +18,8 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; /** * REST controller for managing {@link ProgrammingExerciseTask}. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisCourseChatSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisCourseChatSessionResource.java index 80709c867c0d..f4bddf6a1e2b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisCourseChatSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisCourseChatSessionResource.java @@ -15,14 +15,14 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisHealthIndicator; import de.tum.cit.aet.artemis.iris.domain.session.IrisCourseChatSession; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; import de.tum.cit.aet.artemis.iris.repository.IrisCourseChatSessionRepository; -import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisHealthIndicator; -import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; -import de.tum.cit.aet.artemis.service.iris.IrisSessionService; -import de.tum.cit.aet.artemis.service.iris.session.IrisCourseChatSessionService; -import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; +import de.tum.cit.aet.artemis.iris.service.IrisRateLimitService; +import de.tum.cit.aet.artemis.iris.service.IrisSessionService; +import de.tum.cit.aet.artemis.iris.service.session.IrisCourseChatSessionService; +import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; /** * REST controller for managing {@link IrisCourseChatSession}. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisExerciseChatSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisExerciseChatSessionResource.java index f9566b1138d5..fb4c6afce51f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisExerciseChatSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisExerciseChatSessionResource.java @@ -15,16 +15,16 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisHealthIndicator; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.iris.domain.session.IrisExerciseChatSession; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; import de.tum.cit.aet.artemis.iris.repository.IrisExerciseChatSessionRepository; +import de.tum.cit.aet.artemis.iris.service.IrisRateLimitService; +import de.tum.cit.aet.artemis.iris.service.IrisSessionService; +import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisHealthIndicator; -import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; -import de.tum.cit.aet.artemis.service.iris.IrisSessionService; -import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisMessageResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisMessageResource.java index d02eb1d6913f..bfc47a0d0b94 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisMessageResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisMessageResource.java @@ -24,8 +24,8 @@ import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; import de.tum.cit.aet.artemis.iris.repository.IrisMessageRepository; import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; -import de.tum.cit.aet.artemis.service.iris.IrisMessageService; -import de.tum.cit.aet.artemis.service.iris.IrisSessionService; +import de.tum.cit.aet.artemis.iris.service.IrisMessageService; +import de.tum.cit.aet.artemis.iris.service.IrisSessionService; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisModelsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisModelsResource.java index 889c894025c0..72b9927563b0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisModelsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisModelsResource.java @@ -9,9 +9,9 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisConnectorException; -import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisConnectorService; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisModelDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisConnectorException; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisConnectorService; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.PyrisModelDTO; import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisResource.java index b78164d94017..22d3ab615050 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisResource.java @@ -9,8 +9,8 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisHealthIndicator; -import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisHealthIndicator; +import de.tum.cit.aet.artemis.iris.service.IrisRateLimitService; @Profile("iris") @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisSettingsResource.java index d292b71bd88f..2316efab7623 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisSettingsResource.java @@ -18,10 +18,10 @@ import de.tum.cit.aet.artemis.iris.domain.settings.IrisCourseSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisExerciseSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSettings; +import de.tum.cit.aet.artemis.iris.dto.IrisCombinedSettingsDTO; +import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedSettingsDTO; -import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; /** * REST controller for managing {@link IrisSettings}. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisStatusDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisStatusDTO.java index 3459e93aa319..db97200bddd9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisStatusDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisStatusDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; +import de.tum.cit.aet.artemis.iris.service.IrisRateLimitService; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record IrisStatusDTO(boolean active, IrisRateLimitService.IrisRateLimitInformation rateLimitInfo) { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java index 8147b91c7824..c80d55a495aa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java @@ -29,6 +29,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.lecture.domain.Attachment; @@ -41,8 +43,6 @@ import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.LectureUnitProcessingService; import de.tum.cit.aet.artemis.service.SlideSplitterService; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; -import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.web.rest.dto.LectureUnitInformationDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java index ca0ad92eddcb..33320c876e4b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java @@ -22,20 +22,20 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.service.user.UserService; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.LectureUnitService; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; -import de.tum.cit.aet.artemis.service.user.UserService; import de.tum.cit.aet.artemis.web.rest.dto.lectureunit.LectureUnitForLearningPathNodeDetailsDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java index 724f48018579..94fefc5415b6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java @@ -28,6 +28,7 @@ import com.google.common.net.InternetDomainName; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.lecture.domain.Lecture; @@ -36,7 +37,6 @@ import de.tum.cit.aet.artemis.lecture.repository.OnlineUnitRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.LectureUnitService; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.web.rest.dto.OnlineResourceDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java index 3c7871e09dbb..0ed1ce470a08 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java @@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.lecture.domain.Lecture; @@ -25,7 +26,6 @@ import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java index 5c978c14534b..7072ecbc7c7d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java @@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.lecture.domain.Lecture; @@ -28,7 +29,6 @@ import de.tum.cit.aet.artemis.lecture.repository.VideoUnitRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.LectureUnitService; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildJobQueueResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildJobQueueResource.java index 1b746be829ff..ae0d041f9c33 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildJobQueueResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildJobQueueResource.java @@ -24,11 +24,11 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; +import de.tum.cit.aet.artemis.core.service.connectors.localci.SharedQueueManagementService; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; import de.tum.cit.aet.artemis.programming.domain.BuildJob; import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.connectors.localci.SharedQueueManagementService; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; import de.tum.cit.aet.artemis.service.dto.BuildJobResultCountDTO; import de.tum.cit.aet.artemis.service.dto.BuildJobsStatisticsDTO; import de.tum.cit.aet.artemis.service.dto.FinishedBuildJobDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildPlanResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildPlanResource.java index 3bf4e70619e5..5d8bd8b41704 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildPlanResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildPlanResource.java @@ -17,8 +17,8 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingTriggerService; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile("gitlabci | jenkins") diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/AnswerMessageResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/AnswerMessageResource.java index aed15bcc36bc..94ccd6ab2610 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/AnswerMessageResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/AnswerMessageResource.java @@ -19,9 +19,9 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.communication.domain.AnswerPost; +import de.tum.cit.aet.artemis.communication.service.AnswerMessageService; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.service.metis.AnswerMessageService; -import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java index 3b0c1b07eb80..cda2b04f9c50 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java @@ -31,13 +31,13 @@ import de.tum.cit.aet.artemis.communication.domain.CreatedConversationMessage; import de.tum.cit.aet.artemis.communication.domain.DisplayPriority; import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.service.ConversationMessagingService; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.metis.ConversationMessagingService; -import de.tum.cit.aet.artemis.service.util.TimeLogUtil; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import io.swagger.annotations.ApiParam; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ReactionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ReactionResource.java index 6af9d56cfb3f..55345388f256 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ReactionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ReactionResource.java @@ -20,8 +20,8 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.communication.domain.Reaction; +import de.tum.cit.aet.artemis.communication.service.ReactionService; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.service.metis.ReactionService; /** * REST controller for Reaction on Postings. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java index 238e5d8b5ded..d5a51af01d80 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.web.rest.metis.conversation; +import static de.tum.cit.aet.artemis.communication.service.conversation.ChannelService.CHANNEL_ENTITY_NAME; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.metis.conversation.ChannelService.CHANNEL_ENTITY_NAME; import java.net.URI; import java.net.URISyntaxException; @@ -35,18 +35,18 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; +import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; +import de.tum.cit.aet.artemis.communication.service.conversation.ConversationDTOService; +import de.tum.cit.aet.artemis.communication.service.conversation.ConversationService; +import de.tum.cit.aet.artemis.communication.service.conversation.auth.ChannelAuthorizationService; +import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.metis.conversation.ChannelService; -import de.tum.cit.aet.artemis.service.metis.conversation.ConversationDTOService; -import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; -import de.tum.cit.aet.artemis.service.metis.conversation.auth.ChannelAuthorizationService; -import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; -import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupChannelManagementService; +import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupChannelManagementService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenAlertException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java index e324ee1093ba..e7f153db103c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java @@ -27,6 +27,9 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; +import de.tum.cit.aet.artemis.communication.service.conversation.ConversationService; +import de.tum.cit.aet.artemis.communication.service.conversation.ConversationService.ConversationMemberSearchFilters; +import de.tum.cit.aet.artemis.communication.service.conversation.auth.ChannelAuthorizationService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -36,9 +39,6 @@ import de.tum.cit.aet.artemis.service.ConductAgreementService; import de.tum.cit.aet.artemis.service.dto.ResponsibleUserDTO; import de.tum.cit.aet.artemis.service.dto.UserPublicInfoDTO; -import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; -import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService.ConversationMemberSearchFilters; -import de.tum.cit.aet.artemis.service.metis.conversation.auth.ChannelAuthorizationService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ConversationDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/GroupChatResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/GroupChatResource.java index d6ca136bd168..39b365db9547 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/GroupChatResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/GroupChatResource.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.web.rest.metis.conversation; import static de.tum.cit.aet.artemis.communication.ConversationSettings.MAX_GROUP_CHAT_PARTICIPANTS; +import static de.tum.cit.aet.artemis.communication.service.conversation.GroupChatService.GROUP_CHAT_ENTITY_NAME; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.metis.conversation.GroupChatService.GROUP_CHAT_ENTITY_NAME; import java.net.URI; import java.net.URISyntaxException; @@ -24,14 +24,14 @@ import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.domain.conversation.GroupChat; import de.tum.cit.aet.artemis.communication.repository.conversation.GroupChatRepository; +import de.tum.cit.aet.artemis.communication.service.conversation.ConversationDTOService; +import de.tum.cit.aet.artemis.communication.service.conversation.ConversationService; +import de.tum.cit.aet.artemis.communication.service.conversation.GroupChatService; +import de.tum.cit.aet.artemis.communication.service.conversation.auth.GroupChatAuthorizationService; +import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.service.metis.conversation.ConversationDTOService; -import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; -import de.tum.cit.aet.artemis.service.metis.conversation.GroupChatService; -import de.tum.cit.aet.artemis.service.metis.conversation.auth.GroupChatAuthorizationService; -import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.GroupChatDTO; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/OneToOneChatResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/OneToOneChatResource.java index 686f31256707..6d1225dad5e3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/OneToOneChatResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/OneToOneChatResource.java @@ -19,14 +19,14 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.communication.domain.NotificationType; +import de.tum.cit.aet.artemis.communication.service.conversation.ConversationDTOService; +import de.tum.cit.aet.artemis.communication.service.conversation.ConversationService; +import de.tum.cit.aet.artemis.communication.service.conversation.OneToOneChatService; +import de.tum.cit.aet.artemis.communication.service.conversation.auth.OneToOneChatAuthorizationService; +import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.service.metis.conversation.ConversationDTOService; -import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; -import de.tum.cit.aet.artemis.service.metis.conversation.OneToOneChatService; -import de.tum.cit.aet.artemis.service.metis.conversation.auth.OneToOneChatAuthorizationService; -import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.OneToOneChatDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ogparser/LinkPreviewResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ogparser/LinkPreviewResource.java index d5831746bce4..7560cc73781d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ogparser/LinkPreviewResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ogparser/LinkPreviewResource.java @@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.communication.service.linkpreview.LinkPreviewService; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.service.linkpreview.LinkPreviewService; import de.tum.cit.aet.artemis.web.rest.dto.LinkPreviewDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicAccountResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicAccountResource.java index 91400fd6a239..b9d961173837 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicAccountResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicAccountResource.java @@ -25,14 +25,14 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.communication.service.notifications.MailService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.core.service.user.UserService; import de.tum.cit.aet.artemis.service.AccountService; import de.tum.cit.aet.artemis.service.dto.UserDTO; -import de.tum.cit.aet.artemis.service.notifications.MailService; -import de.tum.cit.aet.artemis.service.user.UserService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EmailAlreadyUsedException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicProgrammingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicProgrammingSubmissionResource.java index 19e03a8b217e..d17fd0f82fe0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicProgrammingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicProgrammingSubmissionResource.java @@ -19,17 +19,17 @@ import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationTriggerService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.programming.domain.Commit; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingMessagingService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingSubmissionService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingTriggerService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingMessagingService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingSubmissionService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPyrisStatusUpdateResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPyrisStatusUpdateResource.java index c1515f772aa3..ba934c8d0217 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPyrisStatusUpdateResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPyrisStatusUpdateResource.java @@ -13,16 +13,16 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; -import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisJobService; -import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisStatusUpdateService; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.job.CompetencyExtractionJob; -import de.tum.cit.aet.artemis.service.connectors.pyris.job.CourseChatJob; -import de.tum.cit.aet.artemis.service.connectors.pyris.job.ExerciseChatJob; -import de.tum.cit.aet.artemis.service.connectors.pyris.job.IngestionWebhookJob; -import de.tum.cit.aet.artemis.service.connectors.pyris.job.PyrisJob; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisJobService; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisStatusUpdateService; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.CompetencyExtractionJob; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.CourseChatJob; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.ExerciseChatJob; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.IngestionWebhookJob; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.PyrisJob; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicResultResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicResultResource.java index 76ef0f937e4c..1f5503e6cc8a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicResultResource.java @@ -19,15 +19,15 @@ import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseGradingService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingMessagingService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; +import de.tum.cit.aet.artemis.programming.service.hestia.TestwiseCoverageService; import de.tum.cit.aet.artemis.service.ResultService; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.service.hestia.TestwiseCoverageService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseGradingService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingMessagingService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingTriggerService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicUserJwtResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicUserJwtResource.java index f733a7263c06..2f0355f261ed 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicUserJwtResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicUserJwtResource.java @@ -33,7 +33,7 @@ import de.tum.cit.aet.artemis.core.security.UserNotActivatedException; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.core.security.jwt.JWTCookieService; -import de.tum.cit.aet.artemis.service.connectors.SAML2Service; +import de.tum.cit.aet.artemis.core.service.connectors.SAML2Service; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.vm.LoginVM; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismAnswerPostResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismAnswerPostResource.java index 971114a8201a..c13201e61609 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismAnswerPostResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismAnswerPostResource.java @@ -20,8 +20,8 @@ import de.tum.cit.aet.artemis.communication.domain.AnswerPost; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismAnswerPostService; -import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismAnswerPostService; /** * REST controller for managing AnswerPost. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java index d73baed640af..4c41d6411de6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java @@ -30,8 +30,8 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismDetectionConfig; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismCaseService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismCaseService; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismVerdictDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismPostResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismPostResource.java index 6fcb09a8d3a8..ff41b742588e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismPostResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismPostResource.java @@ -30,8 +30,8 @@ import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismPostService; -import de.tum.cit.aet.artemis.service.util.TimeLogUtil; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismPostService; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java index f7dbef2d8f55..b57b09459db5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java @@ -31,8 +31,8 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismService; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismComparisonStatusDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java index 954d333d48cc..a5329595ad2d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java @@ -27,6 +27,7 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.exam.service.ExamService; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; @@ -34,9 +35,8 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.programming.service.ProgrammingAssessmentService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.exam.ExamService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingAssessmentService; import de.tum.cit.aet.artemis.web.rest.AssessmentResource; import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java index f84babeacf69..2af618e108c3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.web.rest.programming; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.util.TimeLogUtil.formatDurationFrom; +import static de.tum.cit.aet.artemis.core.util.TimeLogUtil.formatDurationFrom; import java.io.File; import java.io.FileInputStream; @@ -41,6 +41,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import de.tum.cit.aet.artemis.assessment.domain.Visibility; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -50,6 +51,10 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaModuleService; +import de.tum.cit.aet.artemis.core.service.feature.Feature; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.exam.service.ExamAccessService; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -58,20 +63,15 @@ import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseExportService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseImportFromFileService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseImportService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeature; +import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeatureService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ConsistencyCheckService; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.SubmissionPolicyService; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; -import de.tum.cit.aet.artemis.service.connectors.athena.AthenaModuleService; -import de.tum.cit.aet.artemis.service.exam.ExamAccessService; -import de.tum.cit.aet.artemis.service.export.ProgrammingExerciseExportService; -import de.tum.cit.aet.artemis.service.feature.Feature; -import de.tum.cit.aet.artemis.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseImportFromFileService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseImportService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeature; -import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeatureService; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryExportOptionsDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java index 1d8ccc2b2319..c29a4140d546 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java @@ -24,8 +24,8 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseGradingService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseGradingService; import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseGradingStatisticsDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseLockResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseLockResource.java index a6bbd5127759..fed6e90c2cb8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseLockResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseLockResource.java @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastInstructorInExercise; -import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; // only available for external version control services @Profile("!localvc & core") diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java index 47d9d7b3ebb4..0b4e1e05eaba 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java @@ -28,6 +28,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exam.service.ExamService; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -38,13 +39,12 @@ import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseParticipationService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingSubmissionService; +import de.tum.cit.aet.artemis.programming.service.RepositoryService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.service.ResultService; -import de.tum.cit.aet.artemis.service.exam.ExamService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseParticipationService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingSubmissionService; -import de.tum.cit.aet.artemis.service.programming.RepositoryService; import de.tum.cit.aet.artemis.web.rest.dto.CommitInfoDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java index 07a21e6005d9..7e59c44ffc21 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java @@ -22,17 +22,17 @@ import de.jplag.exceptions.ExitException; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.service.feature.Feature; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismDetectionConfigHelper; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismDetectionService; +import de.tum.cit.aet.artemis.plagiarism.service.ProgrammingLanguageNotSupportedForPlagiarismDetectionException; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.feature.Feature; -import de.tum.cit.aet.artemis.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionConfigHelper; -import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionService; -import de.tum.cit.aet.artemis.service.plagiarism.ProgrammingLanguageNotSupportedForPlagiarismDetectionException; -import de.tum.cit.aet.artemis.service.util.TimeLogUtil; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java index dccf7a5d64cd..9d561f24288f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java @@ -53,8 +53,15 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaModuleService; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.core.service.feature.Feature; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismDetectionConfigHelper; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; @@ -64,23 +71,16 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.service.AuxiliaryRepositoryService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseRepositoryService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseTestCaseService; +import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.ExerciseDeletionService; import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; -import de.tum.cit.aet.artemis.service.connectors.GitService; -import de.tum.cit.aet.artemis.service.connectors.athena.AthenaModuleService; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; -import de.tum.cit.aet.artemis.service.feature.Feature; -import de.tum.cit.aet.artemis.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; -import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionConfigHelper; -import de.tum.cit.aet.artemis.service.programming.AuxiliaryRepositoryService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseRepositoryService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseTestCaseService; import de.tum.cit.aet.artemis.web.rest.dto.BuildLogStatisticsDTO; import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseResetOptionsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java index 54aec0df422e..c8ea95ee623c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java @@ -25,9 +25,9 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseTestCaseService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseTestCaseService; import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseTestCaseDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java index c2574b3b3763..e3559bbdae03 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java @@ -30,6 +30,9 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.core.service.feature.Feature; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; @@ -44,15 +47,12 @@ import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.service.ProgrammingMessagingService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingSubmissionService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.service.feature.Feature; -import de.tum.cit.aet.artemis.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.service.programming.ProgrammingMessagingService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingSubmissionService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingTriggerService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java index e5e2074dad71..c51fe0db94c5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java @@ -33,6 +33,11 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCServletService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.core.service.feature.Feature; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; @@ -47,19 +52,14 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.repository.SubmissionPolicyRepository; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseParticipationService; +import de.tum.cit.aet.artemis.programming.service.RepositoryAccessService; +import de.tum.cit.aet.artemis.programming.service.RepositoryParticipationService; +import de.tum.cit.aet.artemis.programming.service.RepositoryService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.service.connectors.GitService; -import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCServletService; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; -import de.tum.cit.aet.artemis.service.feature.Feature; -import de.tum.cit.aet.artemis.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseParticipationService; -import de.tum.cit.aet.artemis.service.programming.RepositoryAccessService; -import de.tum.cit.aet.artemis.service.programming.RepositoryParticipationService; -import de.tum.cit.aet.artemis.service.programming.RepositoryService; import de.tum.cit.aet.artemis.web.rest.dto.FileMove; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryResource.java index 1a5e06494cec..3979838a6e70 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryResource.java @@ -30,18 +30,18 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCServletService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.programming.domain.File; import de.tum.cit.aet.artemis.programming.domain.FileType; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.RepositoryAccessService; +import de.tum.cit.aet.artemis.programming.service.RepositoryService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.service.connectors.GitService; -import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCServletService; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; -import de.tum.cit.aet.artemis.service.programming.RepositoryAccessService; -import de.tum.cit.aet.artemis.service.programming.RepositoryService; import de.tum.cit.aet.artemis.web.rest.dto.FileMove; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTO; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTOType; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/TestRepositoryResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/TestRepositoryResource.java index a79d64bf3385..342d7dcffda1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/TestRepositoryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/TestRepositoryResource.java @@ -30,20 +30,20 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCServletService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.core.service.feature.Feature; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.programming.domain.FileType; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.RepositoryAccessService; +import de.tum.cit.aet.artemis.programming.service.RepositoryService; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.service.connectors.GitService; -import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCServletService; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; -import de.tum.cit.aet.artemis.service.feature.Feature; -import de.tum.cit.aet.artemis.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.service.programming.RepositoryAccessService; -import de.tum.cit.aet.artemis.service.programming.RepositoryService; import de.tum.cit.aet.artemis.web.rest.dto.FileMove; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceResource.java index 213c8a435c22..6bdd0ef8a394 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceResource.java @@ -11,10 +11,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.atlas.service.ScienceEventService; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.service.feature.Feature; -import de.tum.cit.aet.artemis.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.service.science.ScienceEventService; +import de.tum.cit.aet.artemis.core.service.feature.Feature; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.web.rest.dto.science.ScienceEventDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java index 34a1efcf5afa..92f7aae45bc9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java @@ -25,14 +25,14 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.service.feature.Feature; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.feature.Feature; -import de.tum.cit.aet.artemis.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupFreePeriodService; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupFreePeriod; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupFreePeriodRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupsConfigurationRepository; +import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupFreePeriodService; import de.tum.cit.aet.artemis.web.rest.dto.TutorialGroupFreePeriodDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java index 726bfb520cd6..85d1c3fcd0e0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java @@ -42,6 +42,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; +import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; +import de.tum.cit.aet.artemis.communication.service.notifications.TutorialGroupNotificationService; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -51,15 +53,10 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; +import de.tum.cit.aet.artemis.core.service.feature.Feature; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; -import de.tum.cit.aet.artemis.service.feature.Feature; -import de.tum.cit.aet.artemis.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; -import de.tum.cit.aet.artemis.service.notifications.TutorialGroupNotificationService; -import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupChannelManagementService; -import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupScheduleService; -import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupService; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistrationType; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSchedule; @@ -67,6 +64,9 @@ import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupNotificationRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupsConfigurationRepository; +import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupChannelManagementService; +import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupScheduleService; +import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java index d64dcc8fea5f..e8929ecedf0d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.web.rest.tutorialgroups; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupScheduleService.updateTutorialGroupSession; +import static de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupScheduleService.updateTutorialGroupSession; import static de.tum.cit.aet.artemis.web.rest.util.DateUtil.interpretInTimeZone; import java.net.URI; @@ -39,10 +39,9 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.feature.Feature; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.feature.Feature; -import de.tum.cit.aet.artemis.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupService; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupFreePeriod; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSessionStatus; @@ -52,6 +51,7 @@ import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupScheduleRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupSessionRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupsConfigurationRepository; +import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.tutorialgroups.errors.SessionOverlapsWithSessionException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java index 0c4b03582cfc..f5f125a7e52d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java @@ -27,12 +27,12 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.service.feature.Feature; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.feature.Feature; -import de.tum.cit.aet.artemis.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupChannelManagementService; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupsConfigurationRepository; +import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupChannelManagementService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java index 4fc35181c79d..d31304f774cf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java @@ -15,6 +15,7 @@ import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; @@ -23,7 +24,6 @@ import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.service.exam.ExamDateService; import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/localci/LocalCIWebsocketMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/localci/LocalCIWebsocketMessagingService.java index 0f89c2b20740..972166478f91 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/localci/LocalCIWebsocketMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/localci/LocalCIWebsocketMessagingService.java @@ -12,9 +12,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; /** * This service sends out websocket messages for the local continuous integration system. diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractArtemisIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractArtemisIntegrationTest.java index 4dab769f9cbb..90ba08d101b2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractArtemisIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractArtemisIntegrationTest.java @@ -24,14 +24,33 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.communication.service.notifications.ConversationNotificationService; +import de.tum.cit.aet.artemis.communication.service.notifications.GeneralInstantNotificationService; +import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; +import de.tum.cit.aet.artemis.communication.service.notifications.MailService; +import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; +import de.tum.cit.aet.artemis.communication.service.notifications.TutorialGroupNotificationService; +import de.tum.cit.aet.artemis.communication.service.notifications.push_notifications.ApplePushNotificationService; +import de.tum.cit.aet.artemis.communication.service.notifications.push_notifications.FirebasePushNotificationService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.ScheduleService; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.core.service.connectors.lti.Lti13Service; +import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.course.CourseUtilService; +import de.tum.cit.aet.artemis.exam.service.ExamAccessService; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.MockDelegate; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseGradingService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseParticipationService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseScheduleService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ModelingSubmissionService; import de.tum.cit.aet.artemis.service.TextBlockService; @@ -39,25 +58,6 @@ import de.tum.cit.aet.artemis.service.UriService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.ZipFileService; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; -import de.tum.cit.aet.artemis.service.connectors.GitService; -import de.tum.cit.aet.artemis.service.connectors.lti.Lti13Service; -import de.tum.cit.aet.artemis.service.exam.ExamAccessService; -import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; -import de.tum.cit.aet.artemis.service.notifications.ConversationNotificationService; -import de.tum.cit.aet.artemis.service.notifications.GeneralInstantNotificationService; -import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; -import de.tum.cit.aet.artemis.service.notifications.MailService; -import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; -import de.tum.cit.aet.artemis.service.notifications.TutorialGroupNotificationService; -import de.tum.cit.aet.artemis.service.notifications.push_notifications.ApplePushNotificationService; -import de.tum.cit.aet.artemis.service.notifications.push_notifications.FirebasePushNotificationService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseGradingService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseParticipationService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingTriggerService; -import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; -import de.tum.cit.aet.artemis.service.scheduled.ProgrammingExerciseScheduleService; -import de.tum.cit.aet.artemis.service.scheduled.ScheduleService; import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.HibernateQueryInterceptor; diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java index 40edd8bcba66..5d78b6b10592 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java @@ -32,6 +32,10 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.core.service.connectors.gitlab.GitLabService; +import de.tum.cit.aet.artemis.core.service.connectors.gitlabci.GitLabCIService; +import de.tum.cit.aet.artemis.core.service.connectors.gitlabci.GitLabCITriggerService; +import de.tum.cit.aet.artemis.core.service.user.PasswordService; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.programming.domain.AbstractBaseProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -39,10 +43,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabService; -import de.tum.cit.aet.artemis.service.connectors.gitlabci.GitLabCIService; -import de.tum.cit.aet.artemis.service.connectors.gitlabci.GitLabCITriggerService; -import de.tum.cit.aet.artemis.service.user.PasswordService; @ResourceLock("AbstractSpringIntegrationGitlabCIGitlabSamlTest") // NOTE: we use a common set of active profiles to reduce the number of application launches during testing. This significantly saves time and memory! diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java index 9217cd926ed2..16e9c3247636 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java @@ -17,9 +17,11 @@ import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.TestPropertySource; +import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; +import de.tum.cit.aet.artemis.exam.service.ExamLiveEventsService; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.programming.domain.AbstractBaseProgrammingExerciseParticipation; @@ -27,8 +29,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.service.exam.ExamLiveEventsService; -import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; /** * This SpringBootTest is used for tests that only require a minimal set of Active Spring Profiles. diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java index b25d6f90f9b0..759a36369087 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java @@ -29,11 +29,15 @@ import com.offbytwo.jenkins.JenkinsServer; +import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.connector.AeolusRequestMockProvider; import de.tum.cit.aet.artemis.connector.GitlabRequestMockProvider; import de.tum.cit.aet.artemis.connector.JenkinsRequestMockProvider; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.connectors.gitlab.GitLabService; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsService; +import de.tum.cit.aet.artemis.exam.service.ExamLiveEventsService; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.programming.domain.AbstractBaseProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.AeolusTarget; @@ -42,11 +46,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabService; -import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsService; -import de.tum.cit.aet.artemis.service.exam.ExamLiveEventsService; -import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingMessagingService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingMessagingService; import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; @ResourceLock("AbstractSpringIntegrationJenkinsGitlabTest") diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java index 411ff86656dc..436261b7f449 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java @@ -26,8 +26,13 @@ import com.github.dockerjava.api.DockerClient; +import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.connectors.localci.LocalCIService; +import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCService; +import de.tum.cit.aet.artemis.core.service.ldap.LdapUserService; +import de.tum.cit.aet.artemis.exam.service.ExamLiveEventsService; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.localvcci.LocalVCLocalCITestService; import de.tum.cit.aet.artemis.localvcci.TestBuildAgentConfiguration; @@ -42,13 +47,8 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.service.ProgrammingMessagingService; import de.tum.cit.aet.artemis.service.ResourceLoaderService; -import de.tum.cit.aet.artemis.service.connectors.localci.LocalCIService; -import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCService; -import de.tum.cit.aet.artemis.service.exam.ExamLiveEventsService; -import de.tum.cit.aet.artemis.service.ldap.LdapUserService; -import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingMessagingService; import de.tum.cit.aet.artemis.user.UserUtilService; // Must start up an actual web server such that the tests can communicate with the ArtemisGitServlet using JGit. diff --git a/src/test/java/de/tum/cit/aet/artemis/LtiQuizIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/LtiQuizIntegrationTest.java index b1e3ca9fb53f..3991acb2e4dc 100644 --- a/src/test/java/de/tum/cit/aet/artemis/LtiQuizIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/LtiQuizIntegrationTest.java @@ -39,8 +39,8 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; -import de.tum.cit.aet.artemis.service.quiz.QuizExerciseService; -import de.tum.cit.aet.artemis.service.quiz.QuizSubmissionService; +import de.tum.cit.aet.artemis.quiz.service.QuizExerciseService; +import de.tum.cit.aet.artemis.quiz.service.QuizSubmissionService; import de.tum.cit.aet.artemis.util.RequestUtilService; @Isolated diff --git a/src/test/java/de/tum/cit/aet/artemis/ManagementResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/ManagementResourceIntegrationTest.java index 7f2b5009135c..73208708d9b9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/ManagementResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/ManagementResourceIntegrationTest.java @@ -23,15 +23,15 @@ import de.tum.cit.aet.artemis.core.domain.PersistentAuditEvent; import de.tum.cit.aet.artemis.core.repository.PersistenceAuditEventRepository; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.core.service.feature.Feature; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggleService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.service.feature.Feature; -import de.tum.cit.aet.artemis.service.feature.FeatureToggleService; class ManagementResourceIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/MetricsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/MetricsIntegrationTest.java index dacdb3731526..cba7b706df96 100644 --- a/src/test/java/de/tum/cit/aet/artemis/MetricsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/MetricsIntegrationTest.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis; -import static de.tum.cit.aet.artemis.service.util.TimeUtil.toRelativeTime; +import static de.tum.cit.aet.artemis.core.util.TimeUtil.toRelativeTime; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -23,11 +23,11 @@ import org.springframework.test.util.ReflectionTestUtils; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseMetricsRepository; -import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.web.rest.dto.metrics.ExerciseInformationDTO; import de.tum.cit.aet.artemis.web.rest.dto.metrics.ResourceTimestampDTO; import de.tum.cit.aet.artemis.web.rest.dto.metrics.StudentMetricsDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java index 3f2ad777322e..e0a6faf86bef 100644 --- a/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java @@ -75,8 +75,8 @@ import de.tum.cit.aet.artemis.authorization.AuthorizationTestService; import de.tum.cit.aet.artemis.core.config.ApplicationConfiguration; import de.tum.cit.aet.artemis.core.config.ConditionalMetricsExclusionConfiguration; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.web.rest.repository.RepositoryResource; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java index 73551c3e2c37..c348fca88d52 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java @@ -19,6 +19,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.Exercise; @@ -26,7 +27,6 @@ import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.team.TeamUtilService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseScoresDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java index 07491542e0de..5be6122ff940 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java @@ -21,6 +21,7 @@ import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; @@ -37,7 +38,6 @@ import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.team.TeamUtilService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.web.rest.dto.score.ScoreDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/authentication/InternalAuthenticationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/InternalAuthenticationIntegrationTest.java index cd3005427bc0..464744ce5ad7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authentication/InternalAuthenticationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/InternalAuthenticationIntegrationTest.java @@ -34,11 +34,11 @@ import de.tum.cit.aet.artemis.core.repository.AuthorityRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.user.PasswordService; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.service.user.PasswordService; import de.tum.cit.aet.artemis.tutorialgroups.TutorialGroupUtilService; import de.tum.cit.aet.artemis.web.rest.vm.LoginVM; import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; diff --git a/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java index 0a30b1d877b3..08d93e2c2ab2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java @@ -27,12 +27,12 @@ import de.tum.cit.aet.artemis.core.repository.AuthorityRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.service.ldap.LdapUserDto; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.dto.StudentDTO; -import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; import de.tum.cit.aet.artemis.web.rest.vm.LoginVM; class LdapAuthenticationIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/authentication/UserJenkinsGitlabIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/UserJenkinsGitlabIntegrationTest.java index 5c0427782c03..a74888acb0d8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authentication/UserJenkinsGitlabIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/UserJenkinsGitlabIntegrationTest.java @@ -21,12 +21,12 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.connectors.gitlab.GitLabPersonalAccessTokenManagementService; +import de.tum.cit.aet.artemis.core.service.connectors.gitlab.GitLabUserManagementService; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsUserManagementService; +import de.tum.cit.aet.artemis.core.service.user.PasswordService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabPersonalAccessTokenManagementService; -import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabUserManagementService; -import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsUserManagementService; -import de.tum.cit.aet.artemis.service.user.PasswordService; import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.user.UserTestService; import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; diff --git a/src/test/java/de/tum/cit/aet/artemis/authentication/UserSaml2IntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/UserSaml2IntegrationTest.java index 908422d96031..ee9aff5d4e3d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authentication/UserSaml2IntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/UserSaml2IntegrationTest.java @@ -21,8 +21,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationGitlabCIGitlabSamlTest; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.service.connectors.SAML2Service; -import de.tum.cit.aet.artemis.service.user.PasswordService; +import de.tum.cit.aet.artemis.core.service.connectors.SAML2Service; +import de.tum.cit.aet.artemis.core.service.user.PasswordService; import de.tum.cit.aet.artemis.web.rest.open.PublicUserJwtResource; import de.tum.cit.aet.artemis.web.rest.vm.LoginVM; diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java index 48d2e21f1694..0c15f5a148e3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java @@ -35,6 +35,7 @@ import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.LearningPathRepository; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.Exercise; @@ -46,7 +47,6 @@ import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.service.LectureUnitService; -import de.tum.cit.aet.artemis.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; import de.tum.cit.aet.artemis.web.rest.LearningPathResource; diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathUtilService.java b/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathUtilService.java index edcd417e6384..b1ca5b684a7b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathUtilService.java @@ -10,10 +10,10 @@ import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.LearningPathRepository; +import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; -import de.tum.cit.aet.artemis.service.learningpath.LearningPathService; /** * Service responsible for initializing the database with specific testdata related to learning paths for use in integration tests. diff --git a/src/test/java/de/tum/cit/aet/artemis/connector/GitlabRequestMockProvider.java b/src/test/java/de/tum/cit/aet/artemis/connector/GitlabRequestMockProvider.java index cd0d99c67039..f131fac42556 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connector/GitlabRequestMockProvider.java +++ b/src/test/java/de/tum/cit/aet/artemis/connector/GitlabRequestMockProvider.java @@ -92,17 +92,17 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.connectors.gitlab.GitLabException; +import de.tum.cit.aet.artemis.core.service.connectors.gitlab.GitLabUserDoesNotExistException; +import de.tum.cit.aet.artemis.core.service.connectors.gitlab.GitLabUserManagementService; +import de.tum.cit.aet.artemis.core.service.connectors.gitlab.dto.GitLabPersonalAccessTokenListResponseDTO; +import de.tum.cit.aet.artemis.core.service.connectors.gitlab.dto.GitLabPersonalAccessTokenResponseDTO; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.UriService; -import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabException; -import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabUserDoesNotExistException; -import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabUserManagementService; -import de.tum.cit.aet.artemis.service.connectors.gitlab.dto.GitLabPersonalAccessTokenListResponseDTO; -import de.tum.cit.aet.artemis.service.connectors.gitlab.dto.GitLabPersonalAccessTokenResponseDTO; @Component @Profile("gitlab") diff --git a/src/test/java/de/tum/cit/aet/artemis/connector/IrisRequestMockProvider.java b/src/test/java/de/tum/cit/aet/artemis/connector/IrisRequestMockProvider.java index 46277ed2d979..f9970deb951c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connector/IrisRequestMockProvider.java +++ b/src/test/java/de/tum/cit/aet/artemis/connector/IrisRequestMockProvider.java @@ -27,11 +27,11 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisHealthStatusDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.PyrisModelDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.exercise.PyrisExerciseChatPipelineExecutionDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionPipelineExecutionDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.PyrisHealthStatusDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.PyrisModelDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.chat.exercise.PyrisExerciseChatPipelineExecutionDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionPipelineExecutionDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; @Component @Profile("iris") diff --git a/src/test/java/de/tum/cit/aet/artemis/connector/JenkinsRequestMockProvider.java b/src/test/java/de/tum/cit/aet/artemis/connector/JenkinsRequestMockProvider.java index ed5f802c00d4..162b8df92a0d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connector/JenkinsRequestMockProvider.java +++ b/src/test/java/de/tum/cit/aet/artemis/connector/JenkinsRequestMockProvider.java @@ -47,10 +47,10 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.dto.JenkinsUserDTO; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs.JenkinsJobPermissionsService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.service.connectors.jenkins.dto.JenkinsUserDTO; -import de.tum.cit.aet.artemis.service.connectors.jenkins.jobs.JenkinsJobPermissionsService; @Component @Profile("jenkins") diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusBuildScriptGenerationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusBuildScriptGenerationServiceTest.java index 2a52dd80d9bc..64209adad3bc 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusBuildScriptGenerationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusBuildScriptGenerationServiceTest.java @@ -18,16 +18,16 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; import de.tum.cit.aet.artemis.connector.AeolusRequestMockProvider; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusBuildPlanService; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusBuildScriptGenerationService; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.Windfile; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.WindfileMetadata; import de.tum.cit.aet.artemis.programming.domain.AeolusTarget; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProjectType; -import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusBuildPlanService; -import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusBuildScriptGenerationService; -import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; -import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; -import de.tum.cit.aet.artemis.service.connectors.aeolus.WindfileMetadata; class AeolusBuildScriptGenerationServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusServiceTest.java index 090a8a0190a9..7934f72cd649 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusServiceTest.java @@ -25,6 +25,14 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.connector.AeolusRequestMockProvider; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusBuildPlanService; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusBuildScriptGenerationService; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusRepository; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.ScriptAction; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.Windfile; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.WindfileMetadata; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.programming.domain.AeolusTarget; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -32,14 +40,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusBuildPlanService; -import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusBuildScriptGenerationService; -import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusRepository; -import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; -import de.tum.cit.aet.artemis.service.connectors.aeolus.ScriptAction; -import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; -import de.tum.cit.aet.artemis.service.connectors.aeolus.WindfileMetadata; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; class AeolusServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusTemplateResourceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusTemplateResourceTest.java index 9fff01b6889b..a9cfd4e7f93e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusTemplateResourceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusTemplateResourceTest.java @@ -17,8 +17,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.cit.aet.artemis.service.connectors.aeolus.ScriptAction; -import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.ScriptAction; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.Windfile; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.RequestUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusTest.java index e7b78de23c4f..a1421302a5a3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusTest.java @@ -8,13 +8,13 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusRepository; -import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusResult; -import de.tum.cit.aet.artemis.service.connectors.aeolus.DockerConfig; -import de.tum.cit.aet.artemis.service.connectors.aeolus.PlatformAction; -import de.tum.cit.aet.artemis.service.connectors.aeolus.ScriptAction; -import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; -import de.tum.cit.aet.artemis.service.connectors.aeolus.WindfileMetadata; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusRepository; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusResult; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.DockerConfig; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.PlatformAction; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.ScriptAction; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.Windfile; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.WindfileMetadata; class AeolusTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/ApollonConversionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/ApollonConversionServiceTest.java index 8ed588a56c27..b44432191703 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/ApollonConversionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/ApollonConversionServiceTest.java @@ -23,7 +23,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.connector.apollon.ApollonRequestMockProvider; -import de.tum.cit.aet.artemis.service.connectors.apollon.ApollonConversionService; +import de.tum.cit.aet.artemis.core.service.connectors.apollon.ApollonConversionService; class ApollonConversionServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/ApollonHealthIndicatorTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/ApollonHealthIndicatorTest.java index 39b9701fdcd3..990a57d8fa17 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/ApollonHealthIndicatorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/ApollonHealthIndicatorTest.java @@ -11,7 +11,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.connector.apollon.ApollonRequestMockProvider; -import de.tum.cit.aet.artemis.service.connectors.apollon.ApollonHealthIndicator; +import de.tum.cit.aet.artemis.core.service.connectors.apollon.ApollonHealthIndicator; class ApollonHealthIndicatorTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java index 2447c5f20d8b..769bad7b0303 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java @@ -52,6 +52,8 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProvider; import de.tum.cit.aet.artemis.core.security.lti.Lti13TokenRetriever; +import de.tum.cit.aet.artemis.core.service.connectors.lti.Lti13Service; +import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; @@ -63,8 +65,6 @@ import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; -import de.tum.cit.aet.artemis.service.connectors.lti.Lti13Service; -import de.tum.cit.aet.artemis.service.connectors.lti.LtiService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java index 1fde16ad1323..fcb3ed45331c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java @@ -21,11 +21,11 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; +import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiDynamicRegistrationService; import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.lti.dto.Lti13ClientRegistration; import de.tum.cit.aet.artemis.lti.dto.Lti13PlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; -import de.tum.cit.aet.artemis.service.connectors.lti.LtiDynamicRegistrationService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; class LtiDynamicRegistrationServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiNewResultServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiNewResultServiceTest.java index b286487dd2ad..8c755d570b2f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiNewResultServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiNewResultServiceTest.java @@ -12,10 +12,10 @@ import org.springframework.security.core.context.SecurityContextHolder; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.service.connectors.lti.Lti13Service; +import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiNewResultService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.service.connectors.lti.Lti13Service; -import de.tum.cit.aet.artemis.service.connectors.lti.LtiNewResultService; import de.tum.cit.aet.artemis.text.domain.TextExercise; class LtiNewResultServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiServiceTest.java index 51d9e34c4fe6..23503c7b0c64 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiServiceTest.java @@ -34,12 +34,12 @@ import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProvider; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.jwt.JWTCookieService; +import de.tum.cit.aet.artemis.core.service.connectors.ci.CIUserManagementService; +import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsUserManagementService; +import de.tum.cit.aet.artemis.core.service.user.UserCreationService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; -import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; -import de.tum.cit.aet.artemis.service.connectors.lti.LtiService; -import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; -import de.tum.cit.aet.artemis.service.user.UserCreationService; import de.tum.cit.aet.artemis.text.domain.TextExercise; class LtiServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java b/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java index 77114952ee52..8b4b987a44dd 100644 --- a/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java @@ -71,6 +71,7 @@ import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; import de.tum.cit.aet.artemis.atlas.repository.LearningPathRepository; @@ -79,6 +80,7 @@ import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; +import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.competency.PrerequisiteUtilService; import de.tum.cit.aet.artemis.core.config.Constants; @@ -90,6 +92,8 @@ import de.tum.cit.aet.artemis.core.repository.CustomAuditEventRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.export.CourseExamExportService; +import de.tum.cit.aet.artemis.core.service.export.DataExportUtil; import de.tum.cit.aet.artemis.exam.ExamFactory; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; @@ -139,10 +143,6 @@ import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.service.dto.UserPublicInfoDTO; -import de.tum.cit.aet.artemis.service.export.CourseExamExportService; -import de.tum.cit.aet.artemis.service.export.DataExportUtil; -import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; -import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.team.TeamUtilService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; diff --git a/src/test/java/de/tum/cit/aet/artemis/dataexport/DataExportResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/dataexport/DataExportResourceIntegrationTest.java index f9d90feb5fc5..4a865f4c539d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/dataexport/DataExportResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/dataexport/DataExportResourceIntegrationTest.java @@ -30,7 +30,7 @@ import de.tum.cit.aet.artemis.core.domain.DataExport; import de.tum.cit.aet.artemis.core.domain.DataExportState; import de.tum.cit.aet.artemis.core.repository.DataExportRepository; -import de.tum.cit.aet.artemis.service.export.DataExportService; +import de.tum.cit.aet.artemis.core.service.export.DataExportService; import de.tum.cit.aet.artemis.web.rest.dto.DataExportDTO; import de.tum.cit.aet.artemis.web.rest.dto.RequestDataExportDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/entitylistener/ResultListenerIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/entitylistener/ResultListenerIntegrationTest.java index 3df627a23979..25d51100739f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/entitylistener/ResultListenerIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/entitylistener/ResultListenerIntegrationTest.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.entitylistener; -import static de.tum.cit.aet.artemis.service.util.RoundingUtil.round; +import static de.tum.cit.aet.artemis.core.util.RoundingUtil.round; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -26,6 +26,7 @@ import de.tum.cit.aet.artemis.assessment.domain.TeamScore; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; +import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.SecurityUtils; @@ -37,7 +38,6 @@ import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.service.ResultService; -import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.team.TeamUtilService; import de.tum.cit.aet.artemis.text.domain.TextExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java index 0b03af43abbe..f558b41c6699 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java @@ -41,10 +41,12 @@ import org.springframework.util.MultiValueMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.user.PasswordService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; @@ -54,6 +56,8 @@ import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exam.service.ExamDateService; +import de.tum.cit.aet.artemis.exam.service.ExamService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; import de.tum.cit.aet.artemis.exercise.domain.Submission; @@ -73,12 +77,8 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizPoolRepository; +import de.tum.cit.aet.artemis.quiz.service.QuizPoolService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; -import de.tum.cit.aet.artemis.service.exam.ExamDateService; -import de.tum.cit.aet.artemis.service.exam.ExamService; -import de.tum.cit.aet.artemis.service.quiz.QuizPoolService; -import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; -import de.tum.cit.aet.artemis.service.user.PasswordService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserFactory; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java index c1b82c48b73e..1185ca7480a1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java @@ -42,6 +42,7 @@ import de.tum.cit.aet.artemis.assessment.repository.BonusRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.bonus.BonusFactory; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.DomainObject; @@ -53,6 +54,8 @@ import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exam.service.ExamService; +import de.tum.cit.aet.artemis.exam.service.StudentExamService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.domain.Submission; @@ -75,11 +78,8 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; +import de.tum.cit.aet.artemis.quiz.service.QuizSubmissionService; import de.tum.cit.aet.artemis.repository.ParticipationTestRepository; -import de.tum.cit.aet.artemis.service.exam.ExamService; -import de.tum.cit.aet.artemis.service.exam.StudentExamService; -import de.tum.cit.aet.artemis.service.quiz.QuizSubmissionService; -import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.team.TeamUtilService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.util.ExamPrepareExercisesTestUtil; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java index 15c2bb91ad41..d65a06b4d5dc 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java @@ -19,19 +19,19 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.ldap.LdapUserDto; +import de.tum.cit.aet.artemis.core.service.user.PasswordService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; +import de.tum.cit.aet.artemis.exam.service.ExamRegistrationService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; -import de.tum.cit.aet.artemis.service.exam.ExamRegistrationService; -import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; -import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; -import de.tum.cit.aet.artemis.service.user.PasswordService; import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamSessionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamSessionIntegrationTest.java index e39e5d9f9f64..309509526ddc 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamSessionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamSessionIntegrationTest.java @@ -13,7 +13,7 @@ import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamSessionRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.service.exam.ExamSessionService; +import de.tum.cit.aet.artemis.exam.service.ExamSessionService; import inet.ipaddr.IPAddressString; class ExamSessionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java index 365e895342a5..ebfdc3e771a8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java @@ -27,8 +27,10 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlRepositoryPermission; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; @@ -52,8 +54,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.repository.ParticipationTestRepository; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlRepositoryPermission; -import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamUtilService.java index fbc4e72e20f1..f6d9caba65d3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamUtilService.java @@ -64,7 +64,7 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizPool; -import de.tum.cit.aet.artemis.service.quiz.QuizPoolService; +import de.tum.cit.aet.artemis.quiz.service.QuizPoolService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ProgrammingExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ProgrammingExamIntegrationTest.java index ef2fe00c2edb..603fddf9ff29 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ProgrammingExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ProgrammingExamIntegrationTest.java @@ -28,6 +28,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.domain.Exam; @@ -43,7 +44,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.util.ExamPrepareExercisesTestUtil; class ProgrammingExamIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/QuizPoolIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/QuizPoolIntegrationTest.java index dafd46ccc2b5..6f3c6da3507d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/QuizPoolIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/QuizPoolIntegrationTest.java @@ -23,7 +23,7 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizPool; import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestion; -import de.tum.cit.aet.artemis.service.quiz.QuizPoolService; +import de.tum.cit.aet.artemis.quiz.service.QuizPoolService; class QuizPoolIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java index 46e021ae31fb..09bb14171b96 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java @@ -72,6 +72,7 @@ import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.util.RoundingUtil; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; @@ -80,6 +81,8 @@ import de.tum.cit.aet.artemis.exam.repository.ExamSessionRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exam.service.ExamQuizService; +import de.tum.cit.aet.artemis.exam.service.StudentExamService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.Submission; @@ -120,9 +123,6 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.exam.ExamQuizService; -import de.tum.cit.aet.artemis.service.exam.StudentExamService; -import de.tum.cit.aet.artemis.service.util.RoundingUtil; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.util.ExamPrepareExercisesTestUtil; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/TestExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/TestExamIntegrationTest.java index 8efb665f3f9f..71153f6dc025 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/TestExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/TestExamIntegrationTest.java @@ -14,17 +14,17 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.user.PasswordService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; -import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; -import de.tum.cit.aet.artemis.service.user.PasswordService; import de.tum.cit.aet.artemis.user.UserFactory; class TestExamIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonConversionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonConversionIntegrationTest.java index 48dd7cbc797f..2692fa48ef30 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonConversionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonConversionIntegrationTest.java @@ -20,8 +20,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.connector.apollon.ApollonRequestMockProvider; -import de.tum.cit.aet.artemis.service.connectors.apollon.ApollonConversionService; -import de.tum.cit.aet.artemis.service.connectors.apollon.dto.ApollonModelDTO; +import de.tum.cit.aet.artemis.core.service.connectors.apollon.ApollonConversionService; +import de.tum.cit.aet.artemis.core.service.connectors.apollon.dto.ApollonModelDTO; class ApollonConversionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java index 42f80ed0c3a6..b640a7e1272a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java @@ -59,6 +59,7 @@ import de.tum.cit.aet.artemis.modeling.repository.ModelClusterRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelElementRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; +import de.tum.cit.aet.artemis.modeling.service.compass.CompassService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.plagiarism.PlagiarismUtilService; @@ -67,7 +68,6 @@ import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingSubmissionElement; import de.tum.cit.aet.artemis.service.AssessmentService; import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.compass.CompassService; import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; import de.tum.cit.aet.artemis.web.rest.dto.ModelingAssessmentDTO; import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingComparisonTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingComparisonTest.java index b43efd48c300..b23e9402a965 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingComparisonTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingComparisonTest.java @@ -9,10 +9,10 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.course.CourseFactory; +import de.tum.cit.aet.artemis.exam.service.StudentExamService; import de.tum.cit.aet.artemis.modeling.domain.DiagramType; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; -import de.tum.cit.aet.artemis.service.exam.StudentExamService; class ModelingComparisonTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java index a5182c72b185..6a7a971f73f0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java @@ -46,6 +46,7 @@ import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; +import de.tum.cit.aet.artemis.modeling.service.compass.CompassService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; @@ -54,7 +55,6 @@ import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingSubmissionElement; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; -import de.tum.cit.aet.artemis.service.compass.CompassService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.util.TestResourceUtils; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/FeedbackSelectorTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/FeedbackSelectorTest.java index 746f679ed87e..d9c1320ad7d2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/FeedbackSelectorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/FeedbackSelectorTest.java @@ -9,7 +9,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.modeling.domain.ModelElement; -import de.tum.cit.aet.artemis.service.compass.controller.FeedbackSelector; +import de.tum.cit.aet.artemis.modeling.service.compass.controller.FeedbackSelector; class FeedbackSelectorTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/ModelClusterFactoryTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/ModelClusterFactoryTest.java index cdb82312d082..080df31329d8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/ModelClusterFactoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/ModelClusterFactoryTest.java @@ -12,8 +12,8 @@ import de.tum.cit.aet.artemis.modeling.domain.ModelElement; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.modeling.service.compass.controller.ModelClusterFactory; import de.tum.cit.aet.artemis.participation.ParticipationFactory; -import de.tum.cit.aet.artemis.service.compass.controller.ModelClusterFactory; class ModelClusterFactoryTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/UMLModelParserTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/UMLModelParserTest.java index 2162ef5c34ba..8b694ea41daa 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/UMLModelParserTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/controller/UMLModelParserTest.java @@ -1,19 +1,19 @@ package de.tum.cit.aet.artemis.exercise.modeling.compass.controller; import static com.google.gson.JsonParser.parseString; -import static de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_ACTION_NODE; -import static de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_FINAL_NODE; -import static de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_FORK_NODE; -import static de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_INITIAL_NODE; -import static de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_MERGE_NODE; -import static de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_OBJECT_NODE; -import static de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_AGGREGATION; -import static de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_BIDIRECTIONAL; -import static de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_COMPOSITION; -import static de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_DEPENDENCY; -import static de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_INHERITANCE; -import static de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_REALIZATION; -import static de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_UNIDIRECTIONAL; +import static de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_ACTION_NODE; +import static de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_FINAL_NODE; +import static de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_FORK_NODE; +import static de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_INITIAL_NODE; +import static de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_MERGE_NODE; +import static de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_OBJECT_NODE; +import static de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_AGGREGATION; +import static de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_BIDIRECTIONAL; +import static de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_COMPOSITION; +import static de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_DEPENDENCY; +import static de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_INHERITANCE; +import static de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_REALIZATION; +import static de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_UNIDIRECTIONAL; import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; @@ -24,18 +24,18 @@ import com.google.gson.JsonObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityNode; -import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLControlFlow; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClass; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClass.UMLClassType; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLMethod; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLPackage; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLActivity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLActivityNode; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLControlFlow; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLAttribute; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLClass; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLClass.UMLClassType; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLMethod; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLPackage; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLRelationship; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; import de.tum.cit.aet.artemis.util.TestResourceUtils; class UMLModelParserTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/AbstractUMLDiagramTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/AbstractUMLDiagramTest.java index 4fde4f85dfee..5569b6c2e102 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/AbstractUMLDiagramTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/AbstractUMLDiagramTest.java @@ -11,15 +11,15 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponent; -import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentInterface; -import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentRelationship; -import de.tum.cit.aet.artemis.service.plagiarism.ModelingPlagiarismDetectionService; -import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismService; -import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismWebsocketService; -import de.tum.cit.aet.artemis.service.plagiarism.cache.PlagiarismCacheService; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponent; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponentDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponentInterface; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponentRelationship; +import de.tum.cit.aet.artemis.plagiarism.service.ModelingPlagiarismDetectionService; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismService; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismWebsocketService; +import de.tum.cit.aet.artemis.plagiarism.service.cache.PlagiarismCacheService; public abstract class AbstractUMLDiagramTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/UMLDiagramTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/UMLDiagramTest.java index 51e4ea0d9703..2802615215c4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/UMLDiagramTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/UMLDiagramTest.java @@ -14,10 +14,10 @@ import org.mockito.MockitoAnnotations; import org.mockito.Spy; -import de.tum.cit.aet.artemis.service.compass.umlmodel.Similarity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.Similarity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLActivityDiagram; class UMLDiagramTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityDiagramTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityDiagramTest.java index e3b18b1f1855..9582128f7b62 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityDiagramTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityDiagramTest.java @@ -15,13 +15,13 @@ import org.mockito.MockitoAnnotations; import de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityNode; -import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLControlFlow; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLActivity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLActivityDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLActivityNode; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLControlFlow; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; class UMLActivityDiagramTest extends AbstractUMLDiagramTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityNodeTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityNodeTest.java index 8e993e638026..b40332b2099e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityNodeTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityNodeTest.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.activity; -import static de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_ACTION_NODE; -import static de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_FINAL_NODE; +import static de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_ACTION_NODE; +import static de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_FINAL_NODE; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -12,8 +12,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityNode; -import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLControlFlow; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLActivityNode; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLControlFlow; import me.xdrop.fuzzywuzzy.FuzzySearch; class UMLActivityNodeTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityTest.java index 5853843880cc..2b79d01053df 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityTest.java @@ -13,8 +13,8 @@ import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; -import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLControlFlow; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLActivity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLControlFlow; import me.xdrop.fuzzywuzzy.FuzzySearch; @ExtendWith(MockitoExtension.class) diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLControlFlowTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLControlFlowTest.java index 43ec9caea3ff..7bb6c7755095 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLControlFlowTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/activity/UMLControlFlowTest.java @@ -10,9 +10,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLActivityElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.activity.UMLControlFlow; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLActivityElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.activity.UMLControlFlow; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLRelationship; class UMLControlFlowTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/bpmn/BPMNDiagramTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/bpmn/BPMNDiagramTest.java index 55c6cb59b13d..e6d4940623de 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/bpmn/BPMNDiagramTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/bpmn/BPMNDiagramTest.java @@ -8,25 +8,25 @@ import org.junit.jupiter.api.Test; import de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNAnnotation; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNCallActivity; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNDataObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNDataStore; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNEndEvent; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNFlow; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNGateway; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNGroup; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNIntermediateEvent; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNPool; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNStartEvent; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNSubprocess; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNSwimlane; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNTask; -import de.tum.cit.aet.artemis.service.compass.umlmodel.bpmn.BPMNTransaction; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNAnnotation; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNCallActivity; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNDataObject; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNDataStore; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNEndEvent; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNFlow; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNGateway; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNGroup; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNIntermediateEvent; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNPool; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNStartEvent; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNSubprocess; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNSwimlane; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNTask; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.bpmn.BPMNTransaction; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; class BPMNDiagramTest extends AbstractUMLDiagramTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLAttributeTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLAttributeTest.java index 5413e74c525e..35bae0ea0485 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLAttributeTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLAttributeTest.java @@ -10,10 +10,10 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClass; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLMethod; -import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLAttribute; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLClass; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLMethod; +import de.tum.cit.aet.artemis.modeling.service.compass.utils.CompassConfiguration; import me.xdrop.fuzzywuzzy.FuzzySearch; class UMLAttributeTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassDiagramTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassDiagramTest.java index 2019db31562b..c1e39fa57dd3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassDiagramTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassDiagramTest.java @@ -13,13 +13,13 @@ import org.mockito.MockitoAnnotations; import de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClass; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClassDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLMethod; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLPackage; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLAttribute; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLClass; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLClassDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLMethod; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLPackage; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLRelationship; class UMLClassDiagramTest extends AbstractUMLDiagramTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassTest.java index bf21a10c41d6..102af805a7e7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassTest.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.classdiagram; -import static de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClass.UMLClassType.ABSTRACT_CLASS; -import static de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClass.UMLClassType.CLASS; +import static de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLClass.UMLClassType.ABSTRACT_CLASS; +import static de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLClass.UMLClassType.CLASS; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.CALLS_REAL_METHODS; import static org.mockito.Mockito.doReturn; @@ -19,13 +19,13 @@ import org.mockito.MockitoAnnotations; import org.mockito.Spy; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLElement; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClass; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLMethod; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLPackage; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship; -import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLElement; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLAttribute; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLClass; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLMethod; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLPackage; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLRelationship; +import de.tum.cit.aet.artemis.modeling.service.compass.utils.CompassConfiguration; import me.xdrop.fuzzywuzzy.FuzzySearch; class UMLClassTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLMethodTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLMethodTest.java index a25878979dd1..dbf3ec916b71 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLMethodTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLMethodTest.java @@ -12,10 +12,10 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLAttribute; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClass; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLMethod; -import de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLAttribute; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLClass; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLMethod; +import de.tum.cit.aet.artemis.modeling.service.compass.utils.CompassConfiguration; import me.xdrop.fuzzywuzzy.FuzzySearch; class UMLMethodTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLPackageTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLPackageTest.java index d046bc257e3d..49494b7ef94f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLPackageTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLPackageTest.java @@ -12,8 +12,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClass; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLPackage; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLClass; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLPackage; import me.xdrop.fuzzywuzzy.FuzzySearch; class UMLPackageTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLRelationshipTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLRelationshipTest.java index 0a971ba872f5..80652e2b433e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLRelationshipTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLRelationshipTest.java @@ -1,11 +1,11 @@ package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.classdiagram; -import static de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_BIDIRECTIONAL; -import static de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_UNIDIRECTIONAL; -import static de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration.RELATION_ELEMENT_WEIGHT; -import static de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration.RELATION_MULTIPLICITY_WEIGHT; -import static de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration.RELATION_ROLE_WEIGHT; -import static de.tum.cit.aet.artemis.service.compass.utils.CompassConfiguration.RELATION_TYPE_WEIGHT; +import static de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_BIDIRECTIONAL; +import static de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_UNIDIRECTIONAL; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.CompassConfiguration.RELATION_ELEMENT_WEIGHT; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.CompassConfiguration.RELATION_MULTIPLICITY_WEIGHT; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.CompassConfiguration.RELATION_ROLE_WEIGHT; +import static de.tum.cit.aet.artemis.modeling.service.compass.utils.CompassConfiguration.RELATION_TYPE_WEIGHT; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.offset; import static org.mockito.Mockito.doReturn; @@ -18,8 +18,8 @@ import org.mockito.MockitoAnnotations; import org.mockito.Spy; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLClass; -import de.tum.cit.aet.artemis.service.compass.umlmodel.classdiagram.UMLRelationship; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLClass; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.classdiagram.UMLRelationship; class UMLRelationshipTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/communication/UMLCommunicationDiagramTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/communication/UMLCommunicationDiagramTest.java index 6ab3dbbe1734..7313285ab401 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/communication/UMLCommunicationDiagramTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/communication/UMLCommunicationDiagramTest.java @@ -8,11 +8,11 @@ import org.junit.jupiter.api.Test; import de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.communication.UMLCommunicationDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.communication.UMLCommunicationLink; -import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.communication.UMLCommunicationDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.communication.UMLCommunicationLink; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.object.UMLObject; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; class UMLCommunicationDiagramTest extends AbstractUMLDiagramTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/component/UMLComponentDiagramTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/component/UMLComponentDiagramTest.java index 74ea9b7b15d4..0bfec3ed049f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/component/UMLComponentDiagramTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/component/UMLComponentDiagramTest.java @@ -1,9 +1,9 @@ package de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.component; import static com.google.gson.JsonParser.parseString; -import static de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentRelationship.UMLComponentRelationshipType.COMPONENT_DEPENDENCY; -import static de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentRelationship.UMLComponentRelationshipType.COMPONENT_INTERFACE_PROVIDED; -import static de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentRelationship.UMLComponentRelationshipType.COMPONENT_INTERFACE_REQUIRED; +import static de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponentRelationship.UMLComponentRelationshipType.COMPONENT_DEPENDENCY; +import static de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponentRelationship.UMLComponentRelationshipType.COMPONENT_INTERFACE_PROVIDED; +import static de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponentRelationship.UMLComponentRelationshipType.COMPONENT_INTERFACE_REQUIRED; import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; @@ -11,12 +11,12 @@ import org.junit.jupiter.api.Test; import de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponent; -import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentInterface; -import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponentRelationship; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponent; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponentDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponentInterface; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponentRelationship; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; class UMLComponentDiagramTest extends AbstractUMLDiagramTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/deployment/UMLDeploymentDiagramTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/deployment/UMLDeploymentDiagramTest.java index e0a2a785ee98..8975807fb094 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/deployment/UMLDeploymentDiagramTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/deployment/UMLDeploymentDiagramTest.java @@ -8,12 +8,12 @@ import org.junit.jupiter.api.Test; import de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.component.UMLComponent; -import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLArtifact; -import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLDeploymentDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.deployment.UMLNode; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.component.UMLComponent; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.deployment.UMLArtifact; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.deployment.UMLDeploymentDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.deployment.UMLNode; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; class UMLDeploymentDiagramTest extends AbstractUMLDiagramTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/flowchart/FlowchartTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/flowchart/FlowchartTest.java index 636a520055ab..d54b8a11ca4a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/flowchart/FlowchartTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/flowchart/FlowchartTest.java @@ -15,15 +15,15 @@ import org.junit.jupiter.api.Test; import de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.Flowchart; -import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartDecision; -import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartFlowline; -import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartFunctionCall; -import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartInputOutput; -import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartProcess; -import de.tum.cit.aet.artemis.service.compass.umlmodel.flowchart.FlowchartTerminal; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart.Flowchart; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart.FlowchartDecision; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart.FlowchartFlowline; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart.FlowchartFunctionCall; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart.FlowchartInputOutput; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart.FlowchartProcess; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.flowchart.FlowchartTerminal; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; class FlowchartTest extends AbstractUMLDiagramTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/object/UMLObjectDiagramTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/object/UMLObjectDiagramTest.java index 65172417294c..4535e0f36339 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/object/UMLObjectDiagramTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/object/UMLObjectDiagramTest.java @@ -8,11 +8,11 @@ import org.junit.jupiter.api.Test; import de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObject; -import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObjectDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.object.UMLObjectLink; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.object.UMLObject; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.object.UMLObjectDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.object.UMLObjectLink; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; class UMLObjectDiagramTest extends AbstractUMLDiagramTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/petrinet/PetriNetTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/petrinet/PetriNetTest.java index 8eda80db21cb..0acbfd84937d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/petrinet/PetriNetTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/petrinet/PetriNetTest.java @@ -15,12 +15,12 @@ import org.junit.jupiter.api.Test; import de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; -import de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet.PetriNet; -import de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet.PetriNetArc; -import de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet.PetriNetPlace; -import de.tum.cit.aet.artemis.service.compass.umlmodel.petrinet.PetriNetTransition; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.petrinet.PetriNet; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.petrinet.PetriNetArc; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.petrinet.PetriNetPlace; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.petrinet.PetriNetTransition; class PetriNetTest extends AbstractUMLDiagramTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/syntaxtree/SyntaxTreeTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/syntaxtree/SyntaxTreeTest.java index 3d29844f127e..04fb8c29b69c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/syntaxtree/SyntaxTreeTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/syntaxtree/SyntaxTreeTest.java @@ -9,12 +9,12 @@ import org.junit.jupiter.api.Test; import de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; -import de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree.SyntaxTree; -import de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeLink; -import de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeNonterminal; -import de.tum.cit.aet.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeTerminal; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.syntaxtree.SyntaxTree; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.syntaxtree.SyntaxTreeLink; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.syntaxtree.SyntaxTreeNonterminal; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.syntaxtree.SyntaxTreeTerminal; class SyntaxTreeTest extends AbstractUMLDiagramTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/usecase/UMLUseCaseDiagramTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/usecase/UMLUseCaseDiagramTest.java index 319bfd1808d6..84a601888b0b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/usecase/UMLUseCaseDiagramTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/compass/umlmodel/usecase/UMLUseCaseDiagramTest.java @@ -8,12 +8,12 @@ import org.junit.jupiter.api.Test; import de.tum.cit.aet.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest; -import de.tum.cit.aet.artemis.service.compass.umlmodel.UMLDiagram; -import de.tum.cit.aet.artemis.service.compass.umlmodel.parsers.UMLModelParser; -import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLActor; -import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLUseCase; -import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLUseCaseAssociation; -import de.tum.cit.aet.artemis.service.compass.umlmodel.usecase.UMLUseCaseDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.UMLDiagram; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.parsers.UMLModelParser; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.usecase.UMLActor; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.usecase.UMLUseCase; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.usecase.UMLUseCaseAssociation; +import de.tum.cit.aet.artemis.modeling.service.compass.umlmodel.usecase.UMLUseCaseDiagram; class UMLUseCaseDiagramTest extends AbstractUMLDiagramTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java index bfc3151c14f7..9f0267ab8fd5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java @@ -16,7 +16,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.service.programming.AuxiliaryRepositoryService; +import de.tum.cit.aet.artemis.programming.service.AuxiliaryRepositoryService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; class AuxiliaryRepositoryServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ContinuousIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ContinuousIntegrationTestService.java index 7cc04e6fa829..eca71a4475a4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ContinuousIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ContinuousIntegrationTestService.java @@ -18,11 +18,11 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.service.connectors.GitService; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.GitUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseFactory.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseFactory.java index 222daaf4e924..f5778d4fa929 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseFactory.java @@ -16,6 +16,11 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.CommitDTO; +import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestCaseDTO; +import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestCaseDetailMessageDTO; +import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestResultsDTO; +import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestSuiteDTO; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.ExerciseFactory; import de.tum.cit.aet.artemis.exercise.domain.DifficultyLevel; @@ -27,11 +32,6 @@ import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisCategory; import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; -import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.CommitDTO; -import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestCaseDTO; -import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestCaseDetailMessageDTO; -import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestResultsDTO; -import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestSuiteDTO; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; import de.tum.cit.aet.artemis.util.TestConstants; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java index 707e013dde94..dabeb701bb58 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java @@ -27,11 +27,11 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.util.GitUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitlabJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitlabJenkinsIntegrationTest.java index 50b5049f9cda..0ac16c56bd21 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitlabJenkinsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitlabJenkinsIntegrationTest.java @@ -43,7 +43,7 @@ import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.programming.domain.AeolusTarget; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; -import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeatureService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeatureService; import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider; import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider.InvalidExamExerciseDateConfiguration; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java index ad80ce8ce072..e2e8a60df620 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java @@ -38,6 +38,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.util.RoundingUtil; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; @@ -60,8 +61,7 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseGradingService; -import de.tum.cit.aet.artemis.service.util.RoundingUtil; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseGradingService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseGradingStatisticsDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java index b99eaa0ac9df..c33508108206 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java @@ -22,7 +22,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseService; class ProgrammingExerciseIntegrationJenkinsGitlabTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java index b5a5ca411640..07ba656bbf3c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java @@ -74,6 +74,10 @@ import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlRepositoryPermission; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; @@ -105,10 +109,6 @@ import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestRepository; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.UriService; -import de.tum.cit.aet.artemis.service.connectors.GitService; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlRepositoryPermission; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.GitUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java index 6026c9e52574..8592835f4fcf 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java @@ -35,6 +35,7 @@ import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.connector.AeolusRequestMockProvider; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.domain.AeolusTarget; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -42,7 +43,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.util.LocalRepository; import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseRepositoryServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseRepositoryServiceTest.java index 20e1ef5dbdde..a9110bcdac88 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseRepositoryServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseRepositoryServiceTest.java @@ -18,7 +18,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseRepositoryService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseRepositoryService; import de.tum.cit.aet.artemis.user.UserUtilService; class ProgrammingExerciseRepositoryServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultJenkinsIntegrationTest.java index 3bd975b8bad5..615e2a74a021 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultJenkinsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultJenkinsIntegrationTest.java @@ -21,9 +21,9 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.CommitDTO; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; -import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.CommitDTO; import de.tum.cit.aet.artemis.util.TestConstants; class ProgrammingExerciseResultJenkinsIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java index eeef82da2b1d..5ae84351fefc 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java @@ -40,6 +40,8 @@ import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.hestia.TestwiseCoverageTestUtil; import de.tum.cit.aet.artemis.participation.ParticipationFactory; @@ -58,13 +60,11 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseGradingService; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; -import de.tum.cit.aet.artemis.service.messaging.InstanceMessageSendService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseGradingService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.RequestUtilService; import de.tum.cit.aet.artemis.util.TestConstants; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java index cd447272f438..291164a34daa 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java @@ -33,6 +33,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageReceiveService; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.StudentExam; @@ -50,7 +51,6 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.service.messaging.InstanceMessageReceiveService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceIntegrationTest.java index 1d28abee891a..c2a287a67011 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceIntegrationTest.java @@ -27,8 +27,8 @@ import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPenaltyPolicy; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseImportBasicService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseImportBasicService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseService; import de.tum.cit.aet.artemis.util.ExerciseIntegrationTestService; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTemplateIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTemplateIntegrationTest.java index 651f2c572229..bb3a3dfd158f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTemplateIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTemplateIntegrationTest.java @@ -56,7 +56,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProjectType; -import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeatureService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeatureService; import de.tum.cit.aet.artemis.util.LocalRepository; @TestInstance(TestInstance.Lifecycle.PER_CLASS) diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java index f8b0fab31840..84747cdc22bd 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java @@ -32,8 +32,8 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseFeedbackCreationService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseTestCaseService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseFeedbackCreationService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseTestCaseService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseTestCaseDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java index e23c9e3dc3b1..d745cd42a279 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java @@ -5,9 +5,9 @@ import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.C; import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.JAVA; import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.SWIFT; -import static de.tum.cit.aet.artemis.service.export.ProgrammingExerciseExportService.BUILD_PLAN_FILE_NAME; -import static de.tum.cit.aet.artemis.service.export.ProgrammingExerciseExportService.EXPORTED_EXERCISE_DETAILS_FILE_PREFIX; -import static de.tum.cit.aet.artemis.service.export.ProgrammingExerciseExportService.EXPORTED_EXERCISE_PROBLEM_STATEMENT_FILE_PREFIX; +import static de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseExportService.BUILD_PLAN_FILE_NAME; +import static de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseExportService.EXPORTED_EXERCISE_DETAILS_FILE_PREFIX; +import static de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseExportService.EXPORTED_EXERCISE_PROBLEM_STATEMENT_FILE_PREFIX; import static de.tum.cit.aet.artemis.util.TestConstants.COMMIT_HASH_OBJECT_ID; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -80,6 +80,14 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.core.service.connectors.gitlab.GitLabException; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.build_plan.JenkinsBuildPlanUtils; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlRepositoryPermission; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.core.service.export.CourseExamExportService; +import de.tum.cit.aet.artemis.core.service.user.PasswordService; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exam.ExamFactory; import de.tum.cit.aet.artemis.exam.ExamUtilService; @@ -90,6 +98,7 @@ import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exam.service.ExamImportService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; @@ -126,23 +135,15 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.programming.service.AutomaticProgrammingExerciseCleanupService; +import de.tum.cit.aet.artemis.programming.service.JavaTemplateUpgradeService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeature; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationTestRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.UriService; -import de.tum.cit.aet.artemis.service.connectors.GitService; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.service.connectors.gitlab.GitLabException; -import de.tum.cit.aet.artemis.service.connectors.jenkins.build_plan.JenkinsBuildPlanUtils; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlRepositoryPermission; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; -import de.tum.cit.aet.artemis.service.export.CourseExamExportService; -import de.tum.cit.aet.artemis.service.programming.JavaTemplateUpgradeService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeature; -import de.tum.cit.aet.artemis.service.scheduled.AutomaticProgrammingExerciseCleanupService; -import de.tum.cit.aet.artemis.service.user.PasswordService; import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.ExamPrepareExercisesTestUtil; @@ -1176,7 +1177,7 @@ void testImportProgrammingExerciseNoneSubmissionPolicyChange() throws Exception /** * Method to test the correct import of a programming exercise into an exam during an exam import - * For more Information see {@link de.tum.cit.aet.artemis.service.exam.ExamImportService} + * For more Information see {@link ExamImportService} */ public void importProgrammingExerciseAsPartOfExamImport() throws Exception { // Setup existing exam and exercise diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java index 15c8210ec59b..4bd84e34343e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java @@ -33,6 +33,7 @@ import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; @@ -77,7 +78,6 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; import de.tum.cit.aet.artemis.util.TestConstants; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java index ac61b4e92bb4..6e732322f24d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java @@ -30,6 +30,10 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.CommitDTO; +import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestCaseDTO; +import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestCaseDetailMessageDTO; +import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestResultsDTO; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -40,10 +44,6 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.CommitDTO; -import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestCaseDTO; -import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestCaseDetailMessageDTO; -import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.TestResultsDTO; class ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java index 50ffd235ac51..2d2abec3499a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java @@ -57,6 +57,8 @@ import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlRepositoryPermission; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; @@ -82,10 +84,8 @@ import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseParticipationService; import de.tum.cit.aet.artemis.service.BuildLogEntryService; -import de.tum.cit.aet.artemis.service.connectors.GitService; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlRepositoryPermission; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseParticipationService; import de.tum.cit.aet.artemis.util.GitUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; import de.tum.cit.aet.artemis.util.TestConstants; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java index de6147304599..fc9cbe384d29 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java @@ -36,9 +36,9 @@ import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisCategory; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseFeedbackCreationService; import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseFeedbackCreationService; class StaticCodeAnalysisIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java index 5a02fc9601ad..6856fcbd3c18 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java @@ -21,6 +21,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.CommitDTO; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; @@ -32,8 +33,7 @@ import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPenaltyPolicy; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.service.connectors.ci.notification.dto.CommitDTO; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseGradingService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseGradingService; class SubmissionPolicyIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java index eb4d1eea557c..d0800bb5cbe9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java @@ -33,13 +33,13 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.programming.domain.File; import de.tum.cit.aet.artemis.programming.domain.FileType; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.service.connectors.GitService; import de.tum.cit.aet.artemis.util.GitUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; import de.tum.cit.aet.artemis.web.rest.dto.FileMove; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizComparisonTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizComparisonTest.java index aa8c6732ee13..2cc6c432b9ae 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizComparisonTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizComparisonTest.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.exercise.quiz; -import static de.tum.cit.aet.artemis.service.exam.StudentExamService.isContentEqualTo; +import static de.tum.cit.aet.artemis.exam.service.StudentExamService.isContentEqualTo; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import java.time.ZonedDateTime; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java index e4d424cca1bf..a17b477d3a73 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java @@ -80,8 +80,8 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; +import de.tum.cit.aet.artemis.quiz.service.QuizExerciseService; import de.tum.cit.aet.artemis.service.ExerciseService; -import de.tum.cit.aet.artemis.service.quiz.QuizExerciseService; import de.tum.cit.aet.artemis.util.ExerciseIntegrationTestService; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; import de.tum.cit.aet.artemis.web.rest.dto.QuizBatchJoinDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseUtilService.java index 08789c71e278..87d3f50134fa 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseUtilService.java @@ -50,8 +50,8 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizQuestionRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; +import de.tum.cit.aet.artemis.quiz.service.QuizScheduleService; import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.service.quiz.QuizScheduleService; import de.tum.cit.aet.artemis.user.UserUtilService; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java index 3d28071b4e5a..72e105e449ca 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java @@ -65,9 +65,9 @@ import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; -import de.tum.cit.aet.artemis.service.quiz.QuizBatchService; -import de.tum.cit.aet.artemis.service.quiz.QuizExerciseService; -import de.tum.cit.aet.artemis.service.quiz.QuizStatisticService; +import de.tum.cit.aet.artemis.quiz.service.QuizBatchService; +import de.tum.cit.aet.artemis.quiz.service.QuizExerciseService; +import de.tum.cit.aet.artemis.quiz.service.QuizStatisticService; import de.tum.cit.aet.artemis.web.rest.dto.QuizBatchJoinDTO; class QuizSubmissionIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextComparisonTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextComparisonTest.java index 0e49ddf9623b..26c909175646 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextComparisonTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/text/TextComparisonTest.java @@ -9,7 +9,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.course.CourseFactory; -import de.tum.cit.aet.artemis.service.exam.StudentExamService; +import de.tum.cit.aet.artemis.exam.service.StudentExamService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintServiceTest.java index decbb9662207..a47e9e432709 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintServiceTest.java @@ -30,7 +30,7 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.CodeHintRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; -import de.tum.cit.aet.artemis.service.hestia.CodeHintService; +import de.tum.cit.aet.artemis.programming.service.hestia.CodeHintService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java index a727992c1f93..26ce969c4f6b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java @@ -35,8 +35,8 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintActivationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintRepository; +import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; class ExerciseHintIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java index 8f902e6ddc19..2c39b7a2bffa 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java @@ -36,9 +36,9 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintActivationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.programming.service.hestia.ExerciseHintService; +import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.service.hestia.ExerciseHintService; -import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; import de.tum.cit.aet.artemis.user.UserUtilService; class ExerciseHintServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java index 511bbcbb3a33..8efecef86337 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java @@ -17,7 +17,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; -import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseGitDiffReportService; +import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseGitDiffReportService; import de.tum.cit.aet.artemis.util.HestiaUtilTestService; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java index d86f398094b2..a9659c0dda1c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java @@ -20,7 +20,7 @@ import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseGitDiffReportRepository; -import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseGitDiffReportService; +import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseGitDiffReportService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.HestiaUtilTestService; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskIntegrationTest.java index c32989e0fcd0..c4e4d5693020 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskIntegrationTest.java @@ -26,7 +26,7 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; -import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; +import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; class ProgrammingExerciseTaskIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskServiceTest.java index 629f3d366dd0..d41d9f291008 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ProgrammingExerciseTaskServiceTest.java @@ -25,7 +25,7 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CodeHintRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; -import de.tum.cit.aet.artemis.service.hestia.ProgrammingExerciseTaskService; +import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; import de.tum.cit.aet.artemis.user.UserUtilService; class ProgrammingExerciseTaskServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/StructuralTestCaseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/StructuralTestCaseServiceTest.java index 6e665c16b092..7ee786c73041 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/StructuralTestCaseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/StructuralTestCaseServiceTest.java @@ -21,8 +21,8 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTestCaseType; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.service.hestia.structural.StructuralSolutionEntryGenerationException; -import de.tum.cit.aet.artemis.service.hestia.structural.StructuralTestCaseService; +import de.tum.cit.aet.artemis.programming.service.hestia.structural.StructuralSolutionEntryGenerationException; +import de.tum.cit.aet.artemis.programming.service.hestia.structural.StructuralTestCaseService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.HestiaUtilTestService; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageReportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageReportServiceTest.java index 51cf81f98ece..ca8a60171f06 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageReportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageReportServiceTest.java @@ -26,7 +26,7 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageReportRepository; -import de.tum.cit.aet.artemis.service.hestia.TestwiseCoverageService; +import de.tum.cit.aet.artemis.programming.service.hestia.TestwiseCoverageService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.HestiaUtilTestService; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/AddUncoveredLinesAsPotentialCodeBlocksTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/AddUncoveredLinesAsPotentialCodeBlocksTest.java index 8cd33345a68a..0817bf437998 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/AddUncoveredLinesAsPotentialCodeBlocksTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/AddUncoveredLinesAsPotentialCodeBlocksTest.java @@ -8,9 +8,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; -import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.AddUncoveredLinesAsPotentialCodeBlocks; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource.AddUncoveredLinesAsPotentialCodeBlocks; class AddUncoveredLinesAsPotentialCodeBlocksTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java index fee54a37bc6a..ec83f2ffc3ea 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java @@ -32,7 +32,7 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageReportRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseGitDiffReportRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.TestwiseCoverageReportEntryRepository; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralTestCaseService; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralTestCaseService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.HestiaUtilTestService; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CombineChangeBlocksTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CombineChangeBlocksTest.java index 9e1cded9164b..2c9fd0950c31 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CombineChangeBlocksTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CombineChangeBlocksTest.java @@ -8,11 +8,11 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralSolutionEntryGenerationException; -import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; -import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile.ChangeBlock; -import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.CombineChangeBlocks; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralSolutionEntryGenerationException; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.GroupedFile.ChangeBlock; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource.CombineChangeBlocks; class CombineChangeBlocksTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CreateCommonChangeBlocksTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CreateCommonChangeBlocksTest.java index e5cde608488f..2465f8a19ad0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CreateCommonChangeBlocksTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CreateCommonChangeBlocksTest.java @@ -10,9 +10,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; -import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.CreateCommonChangeBlocks; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource.CreateCommonChangeBlocks; class CreateCommonChangeBlocksTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CreateSolutionEntriesTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CreateSolutionEntriesTest.java index ea9b528e1c96..615f37bf5489 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CreateSolutionEntriesTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/CreateSolutionEntriesTest.java @@ -10,9 +10,9 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; -import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.CreateSolutionEntries; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource.CreateSolutionEntries; class CreateSolutionEntriesTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/DropRemovedGitDiffEntriesTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/DropRemovedGitDiffEntriesTest.java index bdb462fbb709..42b40860c7c8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/DropRemovedGitDiffEntriesTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/DropRemovedGitDiffEntriesTest.java @@ -10,9 +10,9 @@ import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralSolutionEntryGenerationException; -import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.DropRemovedGitDiffEntries; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralSolutionEntryGenerationException; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource.DropRemovedGitDiffEntries; class DropRemovedGitDiffEntriesTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/ExtractChangedLinesTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/ExtractChangedLinesTest.java index 9c0ddf095a21..3c3a7bf79c38 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/ExtractChangedLinesTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/ExtractChangedLinesTest.java @@ -11,9 +11,9 @@ import org.junit.jupiter.api.Test; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; -import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.ExtractChangedLines; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource.ExtractChangedLines; class ExtractChangedLinesTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/ExtractCoveredLinesTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/ExtractCoveredLinesTest.java index 74acaeef87a6..b15f5a37cbff 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/ExtractCoveredLinesTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/ExtractCoveredLinesTest.java @@ -11,9 +11,9 @@ import org.junit.jupiter.api.Test; import de.tum.cit.aet.artemis.programming.domain.hestia.TestwiseCoverageReportEntry; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; -import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.ExtractCoveredLines; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource.ExtractCoveredLines; class ExtractCoveredLinesTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/FindCommonLinesTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/FindCommonLinesTest.java index f08dae47b84a..3b9d00026fdb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/FindCommonLinesTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/FindCommonLinesTest.java @@ -8,9 +8,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; -import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.FindCommonLines; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource.FindCommonLines; class FindCommonLinesTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/GroupGitDiffAndCoverageEntriesByFilePathAndTestCaseTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/GroupGitDiffAndCoverageEntriesByFilePathAndTestCaseTest.java index 1350a7899533..444f9ab74fe0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/GroupGitDiffAndCoverageEntriesByFilePathAndTestCaseTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/GroupGitDiffAndCoverageEntriesByFilePathAndTestCaseTest.java @@ -15,9 +15,9 @@ import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; import de.tum.cit.aet.artemis.programming.domain.hestia.TestwiseCoverageReportEntry; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; -import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.GroupGitDiffAndCoverageEntriesByFilePathAndTestCase; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource.GroupGitDiffAndCoverageEntriesByFilePathAndTestCase; class GroupGitDiffAndCoverageEntriesByFilePathAndTestCaseTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/InsertFileContentsTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/InsertFileContentsTest.java index 70f1f2561942..5061d14843bb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/InsertFileContentsTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/behavioral/InsertFileContentsTest.java @@ -10,10 +10,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralBlackboard; -import de.tum.cit.aet.artemis.service.hestia.behavioral.BehavioralSolutionEntryGenerationException; -import de.tum.cit.aet.artemis.service.hestia.behavioral.GroupedFile; -import de.tum.cit.aet.artemis.service.hestia.behavioral.knowledgesource.InsertFileContents; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralBlackboard; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralSolutionEntryGenerationException; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.GroupedFile; +import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.knowledgesource.InsertFileContents; class InsertFileContentsTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java index 924e3dab38ad..f91149d370be 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java @@ -24,9 +24,9 @@ import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettings; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; import de.tum.cit.aet.artemis.iris.repository.IrisTemplateRepository; +import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.service.iris.settings.IrisSettingsService; public abstract class AbstractIrisIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatMessageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatMessageIntegrationTest.java index 5112280d1efb..e27084665456 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatMessageIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatMessageIntegrationTest.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.iris; -import static de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageState.DONE; -import static de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageState.IN_PROGRESS; -import static de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageState.NOT_STARTED; +import static de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageState.DONE; +import static de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageState.IN_PROGRESS; +import static de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageState.NOT_STARTED; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatNoException; import static org.awaitility.Awaitility.await; @@ -31,25 +31,25 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageState; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessageContent; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessageSender; import de.tum.cit.aet.artemis.iris.domain.message.IrisTextMessageContent; import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; +import de.tum.cit.aet.artemis.iris.dto.IrisChatWebsocketDTO; import de.tum.cit.aet.artemis.iris.repository.IrisMessageRepository; import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; +import de.tum.cit.aet.artemis.iris.service.IrisMessageService; +import de.tum.cit.aet.artemis.iris.service.session.IrisExerciseChatSessionService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageState; -import de.tum.cit.aet.artemis.service.iris.IrisMessageService; -import de.tum.cit.aet.artemis.service.iris.dto.IrisChatWebsocketDTO; -import de.tum.cit.aet.artemis.service.iris.session.IrisExerciseChatSessionService; class IrisChatMessageIntegrationTest extends AbstractIrisIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatWebsocketTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatWebsocketTest.java index e16470281d17..f25d7ee43897 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatWebsocketTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatWebsocketTest.java @@ -15,12 +15,12 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.iris.domain.message.IrisTextMessageContent; +import de.tum.cit.aet.artemis.iris.dto.IrisChatWebsocketDTO; +import de.tum.cit.aet.artemis.iris.service.IrisRateLimitService; +import de.tum.cit.aet.artemis.iris.service.session.IrisExerciseChatSessionService; +import de.tum.cit.aet.artemis.iris.service.websocket.IrisChatWebsocketService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.service.iris.IrisRateLimitService; -import de.tum.cit.aet.artemis.service.iris.dto.IrisChatWebsocketDTO; -import de.tum.cit.aet.artemis.service.iris.session.IrisExerciseChatSessionService; -import de.tum.cit.aet.artemis.service.iris.websocket.IrisChatWebsocketService; @ActiveProfiles("iris") class IrisChatWebsocketTest extends AbstractIrisIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/IrisCompetencyGenerationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisCompetencyGenerationIntegrationTest.java index 8dbd349efc55..0456222fa6ff 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/IrisCompetencyGenerationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisCompetencyGenerationIntegrationTest.java @@ -16,12 +16,12 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; import de.tum.cit.aet.artemis.core.domain.Course; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionInputDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyRecommendationDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageState; -import de.tum.cit.aet.artemis.service.iris.IrisCompetencyGenerationService; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionInputDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency.PyrisCompetencyRecommendationDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageState; +import de.tum.cit.aet.artemis.iris.service.IrisCompetencyGenerationService; class IrisCompetencyGenerationIntegrationTest extends AbstractIrisIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/IrisSessionActivationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisSessionActivationIntegrationTest.java index 90a39a16e2a3..746a6fda6f15 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/IrisSessionActivationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisSessionActivationIntegrationTest.java @@ -13,9 +13,9 @@ import de.tum.cit.aet.artemis.iris.domain.message.IrisMessageSender; import de.tum.cit.aet.artemis.iris.domain.message.IrisTextMessageContent; import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; +import de.tum.cit.aet.artemis.iris.service.IrisMessageService; +import de.tum.cit.aet.artemis.iris.service.session.IrisExerciseChatSessionService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.service.iris.IrisMessageService; -import de.tum.cit.aet.artemis.service.iris.session.IrisExerciseChatSessionService; class IrisSessionActivationIntegrationTest extends AbstractIrisIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/PyrisConnectorServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/PyrisConnectorServiceTest.java index db942a208241..27aae3e10ce3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/PyrisConnectorServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/PyrisConnectorServiceTest.java @@ -11,10 +11,10 @@ import org.junit.jupiter.params.provider.MethodSource; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisConnectorException; -import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisConnectorService; -import de.tum.cit.aet.artemis.service.iris.exception.IrisForbiddenException; -import de.tum.cit.aet.artemis.service.iris.exception.IrisInternalPyrisErrorException; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisConnectorException; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisConnectorService; +import de.tum.cit.aet.artemis.iris.exception.IrisForbiddenException; +import de.tum.cit.aet.artemis.iris.exception.IrisInternalPyrisErrorException; class PyrisConnectorServiceTest extends AbstractIrisIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/PyrisLectureIngestionTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/PyrisLectureIngestionTest.java index dfe8938c21e2..1ea153ebc49d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/PyrisLectureIngestionTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/PyrisLectureIngestionTest.java @@ -16,6 +16,12 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisJobService; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisStatusUpdateService; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisWebhookService; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageState; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.iris.domain.settings.IrisCourseSettings; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; @@ -23,12 +29,6 @@ import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; -import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisJobService; -import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisStatusUpdateService; -import de.tum.cit.aet.artemis.service.connectors.pyris.PyrisWebhookService; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.cit.aet.artemis.service.connectors.pyris.dto.status.PyrisStageState; import de.tum.cit.aet.artemis.user.UserUtilService; class PyrisLectureIngestionTest extends AbstractIrisIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/settings/IrisSettingsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/settings/IrisSettingsIntegrationTest.java index e50e51ed4ef6..402f6501a3c0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/settings/IrisSettingsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/settings/IrisSettingsIntegrationTest.java @@ -20,10 +20,10 @@ import de.tum.cit.aet.artemis.iris.domain.settings.IrisHestiaSubSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisLectureIngestionSubSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSettings; +import de.tum.cit.aet.artemis.iris.dto.IrisCombinedSettingsDTO; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; import de.tum.cit.aet.artemis.iris.repository.IrisSubSettingsRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.service.iris.dto.IrisCombinedSettingsDTO; class IrisSettingsIntegrationTest extends AbstractIrisIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java index a8f3f98308db..8be818588794 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java @@ -16,6 +16,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusTemplateService; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; @@ -27,7 +28,6 @@ import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; -import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; import de.tum.cit.aet.artemis.user.UserUtilService; public class AbstractLocalCILocalVCIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentDockerServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentDockerServiceTest.java index b25833f362a0..5230d6834c10 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentDockerServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentDockerServiceTest.java @@ -30,12 +30,12 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; import de.tum.cit.aet.artemis.core.exception.LocalCIException; +import de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent.BuildAgentDockerService; +import de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent.BuildLogsMap; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildConfig; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; import de.tum.cit.aet.artemis.programming.domain.BuildJob; import de.tum.cit.aet.artemis.programming.domain.BuildStatus; -import de.tum.cit.aet.artemis.service.connectors.localci.buildagent.BuildAgentDockerService; -import de.tum.cit.aet.artemis.service.connectors.localci.buildagent.BuildLogsMap; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildConfig; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) class BuildAgentDockerServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentSshAuthenticationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentSshAuthenticationIntegrationTest.java index a5f3a2c4d1ae..86b77892b549 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentSshAuthenticationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentSshAuthenticationIntegrationTest.java @@ -14,9 +14,9 @@ import com.hazelcast.map.IMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.cit.aet.artemis.service.connectors.localci.buildagent.BuildAgentSshKeyService; -import de.tum.cit.aet.artemis.service.connectors.localci.buildagent.SharedQueueProcessingService; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent.BuildAgentSshKeyService; +import de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent.SharedQueueProcessingService; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildAgentInformation; class BuildAgentSshAuthenticationIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildResultTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildResultTest.java index e0d0b2c1f3d4..00a8e1132b4c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildResultTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildResultTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildResult; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildResult; class BuildResultTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java index 23405dbba75a..de6e9269a838 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java @@ -52,6 +52,8 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.exception.VersionControlException; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.ResultBuildJob; +import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCServletService; import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.programming.domain.BuildJob; @@ -62,8 +64,6 @@ import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.service.ParticipationVcsAccessTokenService; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.ResultBuildJob; -import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCServletService; import de.tum.cit.aet.artemis.util.LocalRepository; @TestInstance(TestInstance.Lifecycle.PER_CLASS) diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResourceIntegrationTest.java index bd1fbebf4c56..be472198c7ac 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResourceIntegrationTest.java @@ -24,17 +24,17 @@ import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.dto.SortingOrder; +import de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent.SharedQueueProcessingService; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildConfig; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.JobTimingInfo; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.RepositoryInfo; import de.tum.cit.aet.artemis.programming.domain.BuildJob; import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.BuildStatus; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.service.BuildLogEntryService; -import de.tum.cit.aet.artemis.service.connectors.localci.buildagent.SharedQueueProcessingService; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildAgentInformation; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildConfig; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.JobTimingInfo; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.RepositoryInfo; import de.tum.cit.aet.artemis.service.dto.BuildJobsStatisticsDTO; import de.tum.cit.aet.artemis.service.dto.FinishedBuildJobDTO; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResultServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResultServiceTest.java index b79ff4523bc8..653893ed2d05 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResultServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResultServiceTest.java @@ -9,8 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.core.exception.LocalCIException; +import de.tum.cit.aet.artemis.core.service.connectors.localci.LocalCIResultService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; -import de.tum.cit.aet.artemis.service.connectors.localci.LocalCIResultService; class LocalCIResultServiceTest extends AbstractLocalCILocalVCIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIServiceTest.java index 476a9dfd8a33..56e7e3bb5673 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIServiceTest.java @@ -25,6 +25,15 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.service.connectors.BuildScriptProviderService; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.core.service.connectors.aeolus.Windfile; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService.BuildStatus; +import de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent.SharedQueueProcessingService; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildConfig; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.JobTimingInfo; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.RepositoryInfo; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; @@ -33,15 +42,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; -import de.tum.cit.aet.artemis.service.connectors.BuildScriptProviderService; -import de.tum.cit.aet.artemis.service.connectors.aeolus.AeolusTemplateService; -import de.tum.cit.aet.artemis.service.connectors.aeolus.Windfile; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService.BuildStatus; -import de.tum.cit.aet.artemis.service.connectors.localci.buildagent.SharedQueueProcessingService; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildConfig; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.JobTimingInfo; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.RepositoryInfo; import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; class LocalCIServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCInfoContributorTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCInfoContributorTest.java index 1689331b3476..9938ed5664ca 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCInfoContributorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCInfoContributorTest.java @@ -9,7 +9,7 @@ import org.springframework.boot.test.mock.mockito.SpyBean; import org.springframework.test.context.ActiveProfiles; -import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCInfoContributor; +import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCInfoContributor; @ActiveProfiles({ "artemis", PROFILE_LOCALVC, PROFILE_BUILDAGENT }) class LocalVCInfoContributorTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCIntegrationTest.java index 29a134d25196..b2995b5c5ae2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCIntegrationTest.java @@ -29,9 +29,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; +import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCRepositoryUri; +import de.tum.cit.aet.artemis.core.service.ldap.LdapUserDto; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; -import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; import de.tum.cit.aet.artemis.util.LocalRepository; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIIntegrationTest.java index b5587a834fc7..a16209aa0ce6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIIntegrationTest.java @@ -2,9 +2,9 @@ import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_RESULTS_DIRECTORY; import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_WORKING_DIRECTORY; -import static de.tum.cit.aet.artemis.service.connectors.localci.LocalCITriggerService.PRIORITY_EXAM_CONDUCTION; -import static de.tum.cit.aet.artemis.service.connectors.localci.LocalCITriggerService.PRIORITY_NORMAL; -import static de.tum.cit.aet.artemis.service.connectors.localci.LocalCITriggerService.PRIORITY_OPTIONAL_EXERCISE; +import static de.tum.cit.aet.artemis.core.service.connectors.localci.LocalCITriggerService.PRIORITY_EXAM_CONDUCTION; +import static de.tum.cit.aet.artemis.core.service.connectors.localci.LocalCITriggerService.PRIORITY_NORMAL; +import static de.tum.cit.aet.artemis.core.service.connectors.localci.LocalCITriggerService.PRIORITY_OPTIONAL_EXERCISE; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; @@ -41,6 +41,7 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; +import de.tum.cit.aet.artemis.core.service.ldap.LdapUserDto; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; @@ -54,7 +55,6 @@ import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; -import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; import de.tum.cit.aet.artemis.util.LocalRepository; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java index dad85cf75204..9d086327dfb1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java @@ -12,11 +12,11 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.util.LocalRepository; class LocalVCLocalCIParticipationIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java index 17b256dead9f..22a41fab4386 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java @@ -56,6 +56,8 @@ import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.domain.ParticipationVCSAccessToken; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -66,8 +68,6 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.service.ParticipationVcsAccessTokenService; -import de.tum.cit.aet.artemis.service.connectors.GitService; -import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.util.LocalRepository; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCServiceTest.java index 60b53898b2ec..9f780f37593e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCServiceTest.java @@ -10,12 +10,12 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.service.connectors.ConnectorHealth; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.service.connectors.ConnectorHealth; class LocalVCServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/SharedQueueManagementServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/SharedQueueManagementServiceTest.java index 88f0387e6f3b..72f2e924f186 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/SharedQueueManagementServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/SharedQueueManagementServiceTest.java @@ -12,8 +12,8 @@ import com.hazelcast.map.IMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.core.service.connectors.localci.SharedQueueManagementService; import de.tum.cit.aet.artemis.programming.domain.BuildJob; -import de.tum.cit.aet.artemis.service.connectors.localci.SharedQueueManagementService; class SharedQueueManagementServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/TestBuildAgentConfiguration.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/TestBuildAgentConfiguration.java index 759ce305cba8..13f212884575 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/TestBuildAgentConfiguration.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/TestBuildAgentConfiguration.java @@ -36,8 +36,8 @@ import com.github.dockerjava.api.model.Container; import com.github.dockerjava.api.model.Image; +import de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent.BuildAgentDockerService; import de.tum.cit.aet.artemis.programming.icl.BuildAgentConfiguration; -import de.tum.cit.aet.artemis.service.connectors.localci.buildagent.BuildAgentDockerService; import de.tum.cit.aet.artemis.util.FixMissingServletPathProcessor; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java index f765406a0e86..bd717907311f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java @@ -28,13 +28,13 @@ import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.GroupChatRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.OneToOneChatRepository; +import de.tum.cit.aet.artemis.communication.service.conversation.ConversationService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.service.metis.conversation.ConversationService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java index f407f380f07c..9b1730e54f56 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java @@ -29,9 +29,9 @@ import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.post.ConversationUtilService; -import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupChannelManagementService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; +import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupChannelManagementService; import de.tum.cit.aet.artemis.tutorialgroups.TutorialGroupUtilService; import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/PostingServiceUnitTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/PostingServiceUnitTest.java index cfe61501b0e0..0641b4d5a209 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/PostingServiceUnitTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/PostingServiceUnitTest.java @@ -20,12 +20,12 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import de.tum.cit.aet.artemis.communication.service.ConversationMessagingService; +import de.tum.cit.aet.artemis.communication.service.PostingService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.metis.ConversationMessagingService; -import de.tum.cit.aet.artemis.service.metis.PostingService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; class PostingServiceUnitTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/similarity/TitleJaccardSimilarityCompareStrategyTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/similarity/TitleJaccardSimilarityCompareStrategyTest.java index 2447504c3eeb..0aa7bc523d61 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/similarity/TitleJaccardSimilarityCompareStrategyTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/similarity/TitleJaccardSimilarityCompareStrategyTest.java @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test; import de.tum.cit.aet.artemis.communication.domain.Post; -import de.tum.cit.aet.artemis.service.metis.similarity.TitleJaccardSimilarityCompareStrategy; +import de.tum.cit.aet.artemis.communication.service.similarity.TitleJaccardSimilarityCompareStrategy; class TitleJaccardSimilarityCompareStrategyTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/GroupNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/GroupNotificationServiceTest.java index 2db303e2b4cf..bf660a471c6e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/GroupNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/GroupNotificationServiceTest.java @@ -20,10 +20,10 @@ import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.ILLEGAL_SUBMISSION_TITLE; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.PROGRAMMING_TEST_CASES_CHANGED_TITLE; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.QUIZ_EXERCISE_STARTED_TITLE; -import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EDITOR_NOTIFICATION__PROGRAMMING_TEST_CASES_CHANGED; -import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_OPEN_FOR_PRACTICE; -import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_RELEASED; -import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__LECTURE_NOTIFICATION__ATTACHMENT_CHANGES; +import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.NOTIFICATION__EDITOR_NOTIFICATION__PROGRAMMING_TEST_CASES_CHANGED; +import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_OPEN_FOR_PRACTICE; +import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_RELEASED; +import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.NOTIFICATION__LECTURE_NOTIFICATION__ATTACHMENT_CHANGES; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; import static org.mockito.Mockito.any; @@ -51,6 +51,7 @@ import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.communication.repository.NotificationRepository; import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -68,7 +69,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizMode; -import de.tum.cit.aet.artemis.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationScheduleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationScheduleServiceTest.java index e618e0c0b2d4..96a84d64cb1f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationScheduleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationScheduleServiceTest.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.notification; -import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_RELEASED; -import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_SUBMISSION_ASSESSED; +import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_RELEASED; +import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_SUBMISSION_ASSESSED; import static java.time.ZonedDateTime.now; import static org.awaitility.Awaitility.await; import static org.mockito.Mockito.any; @@ -28,12 +28,12 @@ import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageReceiveService; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.service.messaging.InstanceMessageReceiveService; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsResourceIntegrationTest.java index efb12f069ee5..ad83b0464837 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsResourceIntegrationTest.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.notification; -import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.DEFAULT_NOTIFICATION_SETTINGS; +import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.DEFAULT_NOTIFICATION_SETTINGS; import static org.assertj.core.api.Assertions.assertThat; import java.util.List; diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsServiceTest.java index 5cfc31a07c5f..df938d4f0208 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/NotificationSettingsServiceTest.java @@ -6,12 +6,12 @@ import static de.tum.cit.aet.artemis.communication.domain.NotificationType.DATA_EXPORT_FAILED; import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXAM_ARCHIVE_STARTED; import static de.tum.cit.aet.artemis.communication.domain.NotificationType.EXERCISE_PRACTICE; -import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel.EMAIL; -import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel.PUSH; -import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.DEFAULT_NOTIFICATION_SETTINGS; -import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_OPEN_FOR_PRACTICE; -import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__INSTRUCTOR_NOTIFICATION__COURSE_AND_EXAM_ARCHIVING_STARTED; -import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__LECTURE_NOTIFICATION__ATTACHMENT_CHANGES; +import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsCommunicationChannel.EMAIL; +import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsCommunicationChannel.PUSH; +import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.DEFAULT_NOTIFICATION_SETTINGS; +import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_OPEN_FOR_PRACTICE; +import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.NOTIFICATION__INSTRUCTOR_NOTIFICATION__COURSE_AND_EXAM_ARCHIVING_STARTED; +import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.NOTIFICATION__LECTURE_NOTIFICATION__ATTACHMENT_CHANGES; import static org.assertj.core.api.Assertions.assertThat; import java.util.Arrays; @@ -30,10 +30,10 @@ import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsCommunicationChannel; +import de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsCommunicationChannel; -import de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService; import de.tum.cit.aet.artemis.user.UserUtilService; class NotificationSettingsServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/SingleUserNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/SingleUserNotificationServiceTest.java index bb5ece56f672..11a18d0bbbbd 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/SingleUserNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/SingleUserNotificationServiceTest.java @@ -29,14 +29,14 @@ import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_STUDENT_TITLE; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_REGISTRATION_TUTOR_TITLE; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_UNASSIGNED_TITLE; -import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION_USER_NOTIFICATION_DATA_EXPORT_CREATED; -import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION_USER_NOTIFICATION_DATA_EXPORT_FAILED; -import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_SUBMISSION_ASSESSED; -import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__FILE_SUBMISSION_SUCCESSFUL; -import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__NEW_REPLY_FOR_EXERCISE_POST; -import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__TUTORIAL_GROUP_NOTIFICATION__TUTORIAL_GROUP_REGISTRATION; -import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__TUTOR_NOTIFICATION__TUTORIAL_GROUP_ASSIGN_UNASSIGN; -import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__TUTOR_NOTIFICATION__TUTORIAL_GROUP_REGISTRATION; +import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.NOTIFICATION_USER_NOTIFICATION_DATA_EXPORT_CREATED; +import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.NOTIFICATION_USER_NOTIFICATION_DATA_EXPORT_FAILED; +import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__EXERCISE_SUBMISSION_ASSESSED; +import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__FILE_SUBMISSION_SUCCESSFUL; +import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.NOTIFICATION__EXERCISE_NOTIFICATION__NEW_REPLY_FOR_EXERCISE_POST; +import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.NOTIFICATION__TUTORIAL_GROUP_NOTIFICATION__TUTORIAL_GROUP_REGISTRATION; +import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.NOTIFICATION__TUTOR_NOTIFICATION__TUTORIAL_GROUP_ASSIGN_UNASSIGN; +import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.NOTIFICATION__TUTOR_NOTIFICATION__TUTORIAL_GROUP_REGISTRATION; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anySet; @@ -81,6 +81,7 @@ import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotification; import de.tum.cit.aet.artemis.communication.repository.NotificationRepository; import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.DataExport; import de.tum.cit.aet.artemis.core.domain.DomainObject; @@ -100,7 +101,6 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextSubmissionElement; -import de.tum.cit.aet.artemis.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java index 82fc3f90fb6c..5cedecc571ce 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java @@ -48,6 +48,8 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.feature.Feature; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggleService; import de.tum.cit.aet.artemis.exam.ExamFactory; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; @@ -84,12 +86,10 @@ import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSpot; import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedAnswer; import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedText; +import de.tum.cit.aet.artemis.quiz.service.QuizBatchService; +import de.tum.cit.aet.artemis.quiz.service.QuizScheduleService; import de.tum.cit.aet.artemis.service.GradingScaleService; import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.feature.Feature; -import de.tum.cit.aet.artemis.service.feature.FeatureToggleService; -import de.tum.cit.aet.artemis.service.quiz.QuizBatchService; -import de.tum.cit.aet.artemis.service.quiz.QuizScheduleService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java index 4974ab23514c..c802a789f7b0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java @@ -36,6 +36,8 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; @@ -65,8 +67,6 @@ import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.ParticipationVcsAccessTokenService; import de.tum.cit.aet.artemis.service.UriService; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java index 929b032baad6..bba2832d362d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java @@ -39,13 +39,13 @@ import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.plagiarism.service.ContinuousPlagiarismControlService; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismCaseService; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismDetectionService; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismPostService; +import de.tum.cit.aet.artemis.plagiarism.service.ProgrammingLanguageNotSupportedForPlagiarismDetectionException; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; -import de.tum.cit.aet.artemis.service.plagiarism.ContinuousPlagiarismControlService; -import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismCaseService; -import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionService; -import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismPostService; -import de.tum.cit.aet.artemis.service.plagiarism.ProgrammingLanguageNotSupportedForPlagiarismDetectionException; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionConfigHelperTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionConfigHelperTest.java index 602f2b7304b4..90de258e79ed 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionConfigHelperTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionConfigHelperTest.java @@ -12,7 +12,7 @@ import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismDetectionConfig; -import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionConfigHelper; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismDetectionConfigHelper; class PlagiarismDetectionConfigHelperTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionServiceTest.java index 98f0354f2da8..2c2f971a37a9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismDetectionServiceTest.java @@ -20,14 +20,14 @@ import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; +import de.tum.cit.aet.artemis.plagiarism.service.ModelingPlagiarismDetectionService; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismDetectionService; +import de.tum.cit.aet.artemis.plagiarism.service.ProgrammingLanguageNotSupportedForPlagiarismDetectionException; +import de.tum.cit.aet.artemis.plagiarism.service.ProgrammingPlagiarismDetectionService; +import de.tum.cit.aet.artemis.plagiarism.service.TextPlagiarismDetectionService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.service.plagiarism.ModelingPlagiarismDetectionService; -import de.tum.cit.aet.artemis.service.plagiarism.PlagiarismDetectionService; -import de.tum.cit.aet.artemis.service.plagiarism.ProgrammingLanguageNotSupportedForPlagiarismDetectionException; -import de.tum.cit.aet.artemis.service.plagiarism.ProgrammingPlagiarismDetectionService; -import de.tum.cit.aet.artemis.service.plagiarism.TextPlagiarismDetectionService; -import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeature; -import de.tum.cit.aet.artemis.service.programming.ProgrammingLanguageFeatureService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeature; +import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeatureService; import de.tum.cit.aet.artemis.text.domain.TextExercise; class PlagiarismDetectionServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismPostIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismPostIntegrationTest.java index 6a182e391fcc..47a0d899452b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismPostIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismPostIntegrationTest.java @@ -31,13 +31,13 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; +import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.post.ConversationUtilService; -import de.tum.cit.aet.artemis.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/repository/UserRepositoryTest.java b/src/test/java/de/tum/cit/aet/artemis/repository/UserRepositoryTest.java index 887a59bf3e14..3cd28165ba9b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repository/UserRepositoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/repository/UserRepositoryTest.java @@ -15,7 +15,7 @@ import de.tum.cit.aet.artemis.core.domain.Authority; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.service.user.PasswordService; +import de.tum.cit.aet.artemis.core.service.user.PasswordService; import de.tum.cit.aet.artemis.user.UserUtilService; class UserRepositoryTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/science/ScienceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/science/ScienceIntegrationTest.java index 7b4d7d72db28..d0457f37460d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/science/ScienceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/science/ScienceIntegrationTest.java @@ -14,8 +14,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.atlas.domain.science.ScienceEventType; import de.tum.cit.aet.artemis.atlas.repository.science.ScienceEventRepository; -import de.tum.cit.aet.artemis.service.feature.Feature; -import de.tum.cit.aet.artemis.service.feature.FeatureToggleService; +import de.tum.cit.aet.artemis.core.service.feature.Feature; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggleService; import de.tum.cit.aet.artemis.web.rest.dto.science.ScienceEventDTO; class ScienceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java b/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java index ef8d4047abb3..7eca212b575c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java @@ -45,11 +45,11 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import de.tum.cit.aet.artemis.core.exception.LtiEmailAlreadyInUseException; +import de.tum.cit.aet.artemis.core.service.connectors.lti.Lti13Service; import de.tum.cit.aet.artemis.core.web.filter.Lti13LaunchFilter; import de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; -import de.tum.cit.aet.artemis.service.connectors.lti.Lti13Service; import uk.ac.ox.ctl.lti13.lti.Claims; import uk.ac.ox.ctl.lti13.security.oauth2.client.lti.authentication.OidcAuthenticationToken; import uk.ac.ox.ctl.lti13.security.oauth2.client.lti.web.OAuth2LoginAuthenticationFilter; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java index c3b2a717707f..719a510f3742 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java @@ -25,6 +25,7 @@ import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.ldap.LdapUserDto; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; @@ -32,7 +33,6 @@ import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.service.dto.StudentDTO; -import de.tum.cit.aet.artemis.service.ldap.LdapUserDto; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/DataExportCreationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/DataExportCreationServiceTest.java index 8bfa4174b115..cf243856e7de 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/DataExportCreationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/DataExportCreationServiceTest.java @@ -55,6 +55,8 @@ import de.tum.cit.aet.artemis.core.domain.DataExportState; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.DataExportRepository; +import de.tum.cit.aet.artemis.core.service.connectors.apollon.ApollonConversionService; +import de.tum.cit.aet.artemis.core.service.export.DataExportCreationService; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; @@ -73,8 +75,6 @@ import de.tum.cit.aet.artemis.post.ConversationUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.science.ScienceUtilService; -import de.tum.cit.aet.artemis.service.connectors.apollon.ApollonConversionService; -import de.tum.cit.aet.artemis.service.export.DataExportCreationService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.TestResourceUtils; import de.tum.cit.aet.artemis.util.ZipFileTestUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/EmailSummaryServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/EmailSummaryServiceTest.java index ae08f3e32f5b..b991fd9d526e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/EmailSummaryServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/EmailSummaryServiceTest.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__WEEKLY_SUMMARY__BASIC_WEEKLY_SUMMARY; +import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.NOTIFICATION__WEEKLY_SUMMARY__BASIC_WEEKLY_SUMMARY; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doNothing; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/FeatureToggleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/FeatureToggleServiceTest.java index a950855c6bce..fa61f4845bf7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/FeatureToggleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/FeatureToggleServiceTest.java @@ -10,8 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.service.feature.Feature; -import de.tum.cit.aet.artemis.service.feature.FeatureToggleService; +import de.tum.cit.aet.artemis.core.service.feature.Feature; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggleService; class FeatureToggleServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java index ee20e1b44c7b..c2624728168a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java @@ -30,6 +30,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationGitlabCIGitlabSamlTest; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.exception.GitLabCIException; +import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.core.service.connectors.gitlabci.GitLabCIResultService; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; @@ -45,8 +47,6 @@ import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.service.connectors.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.service.connectors.gitlabci.GitLabCIResultService; import de.tum.cit.aet.artemis.user.UserUtilService; class GitlabCIServiceTest extends AbstractSpringIntegrationGitlabCIGitlabSamlTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsAuthorizationInterceptorTest.java b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsAuthorizationInterceptorTest.java index c2948607b857..7420e626d9e0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsAuthorizationInterceptorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsAuthorizationInterceptorTest.java @@ -31,7 +31,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsAuthorizationInterceptor; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsAuthorizationInterceptor; class JenkinsAuthorizationInterceptorTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsInternalUriServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsInternalUriServiceTest.java index fef15b888df7..b0212397c3d6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsInternalUriServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsInternalUriServiceTest.java @@ -18,8 +18,8 @@ import org.springframework.test.util.ReflectionTestUtils; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsInternalUrlService; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsInternalUrlService; class JenkinsInternalUriServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsJobPermissionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsJobPermissionServiceTest.java index 1bf7a5ed7a85..bd532bdcbac3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsJobPermissionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsJobPermissionServiceTest.java @@ -18,9 +18,9 @@ import org.w3c.dom.Document; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.cit.aet.artemis.service.connectors.jenkins.jobs.JenkinsJobPermission; -import de.tum.cit.aet.artemis.service.connectors.jenkins.jobs.JenkinsJobPermissionsService; -import de.tum.cit.aet.artemis.service.connectors.jenkins.jobs.JenkinsJobPermissionsUtils; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs.JenkinsJobPermission; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs.JenkinsJobPermissionsService; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs.JenkinsJobPermissionsUtils; class JenkinsJobPermissionServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsJobServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsJobServiceTest.java index 208766999bb3..8562ef6e5acf 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsJobServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsJobServiceTest.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsXmlFileUtils.getDocumentBuilderFactory; +import static de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsXmlFileUtils.getDocumentBuilderFactory; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIOException; import static org.mockito.Mockito.any; @@ -29,8 +29,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.core.exception.JenkinsException; -import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsXmlFileUtils; -import de.tum.cit.aet.artemis.service.connectors.jenkins.jobs.JenkinsJobService; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsXmlFileUtils; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs.JenkinsJobService; import de.tum.cit.aet.artemis.user.UserUtilService; class JenkinsJobServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsServiceTest.java index 352939016ad6..33e834469d00 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsServiceTest.java @@ -33,6 +33,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.core.exception.JenkinsException; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.build_plan.JenkinsBuildPlanUtils; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ContinuousIntegrationTestService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; @@ -44,8 +45,7 @@ import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.service.connectors.jenkins.build_plan.JenkinsBuildPlanUtils; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseImportService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseImportService; class JenkinsServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java index d5283b25cb0b..8b4026dfcac6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java @@ -25,6 +25,9 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; import de.tum.cit.aet.artemis.atlas.domain.competency.RelationType; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; +import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathNgxService; +import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathRecommendationService; +import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.competency.CompetencyProgressUtilService; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.competency.LearningPathUtilService; @@ -41,9 +44,6 @@ import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; -import de.tum.cit.aet.artemis.service.learningpath.LearningPathNgxService; -import de.tum.cit.aet.artemis.service.learningpath.LearningPathRecommendationService; -import de.tum.cit.aet.artemis.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.LearningPathResource; import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathHealthDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/RepositoryAccessServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/RepositoryAccessServiceTest.java index ad59e86852b3..70ce475b3b64 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/RepositoryAccessServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/RepositoryAccessServiceTest.java @@ -29,8 +29,8 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.service.programming.ProgrammingExerciseGradingService; -import de.tum.cit.aet.artemis.service.programming.RepositoryAccessService; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseGradingService; +import de.tum.cit.aet.artemis.programming.service.RepositoryAccessService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.TestConstants; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionServiceTest.java index bf20bff913e5..60973d0f3e98 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionServiceTest.java @@ -11,6 +11,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.core.repository.OrganizationRepository; +import de.tum.cit.aet.artemis.core.util.Tuple; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; @@ -25,7 +26,6 @@ import de.tum.cit.aet.artemis.organization.OrganizationUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintRepository; -import de.tum.cit.aet.artemis.service.util.Tuple; /** * Test for {@link TitleCacheEvictionService} that should evict entity titles from the title caches if the titles are diff --git a/src/test/java/de/tum/cit/aet/artemis/service/WeeklyEmailSummaryScheduleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/WeeklyEmailSummaryScheduleServiceTest.java index 95d5adad7c5a..3d1ae13cc76d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/WeeklyEmailSummaryScheduleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/WeeklyEmailSummaryScheduleServiceTest.java @@ -24,7 +24,7 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; -import de.tum.cit.aet.artemis.service.scheduled.WeeklyEmailSummaryScheduleService; +import de.tum.cit.aet.artemis.communication.service.WeeklyEmailSummaryScheduleService; /** * Tests if the WeeklyEmailSummaryScheduleService correctly calls the EmailSummaryService with the expected times and intervals diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java index 10b67720baa6..435b255ba4f9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java @@ -23,6 +23,9 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.repository.TextBlockRepository; +import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaDTOConverterService; +import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaFeedbackSendingService; +import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaModuleService; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java index 552b33340d96..4bf54d7ff094 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java @@ -14,14 +14,15 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractAthenaTest; +import de.tum.cit.aet.artemis.athena.dto.ProgrammingFeedbackDTO; +import de.tum.cit.aet.artemis.athena.dto.TextFeedbackDTO; import de.tum.cit.aet.artemis.core.exception.NetworkingException; +import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaFeedbackSuggestionsService; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.service.dto.athena.ProgrammingFeedbackDTO; -import de.tum.cit.aet.artemis.service.dto.athena.TextFeedbackDTO; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaHealthIndicatorTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaHealthIndicatorTest.java index fefbd5a73728..12dc1db90196 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaHealthIndicatorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaHealthIndicatorTest.java @@ -8,6 +8,7 @@ import org.springframework.boot.actuate.health.Status; import de.tum.cit.aet.artemis.AbstractAthenaTest; +import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaHealthIndicator; class AthenaHealthIndicatorTest extends AbstractAthenaTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java index e0b2e292fefa..733432d46eeb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java @@ -18,6 +18,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaRepositoryExportService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java index c22461a22150..e56752fb91fe 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java @@ -17,6 +17,7 @@ import de.tum.cit.aet.artemis.AbstractAthenaTest; import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; +import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java index 0f13367cb9ef..a102d958c0bb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java @@ -13,6 +13,9 @@ import de.tum.cit.aet.artemis.AbstractAthenaTest; import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaDTOConverterService; +import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaModuleService; +import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaSubmissionSendingService; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementServiceTest.java index 99f167d98254..e7b4de6db008 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementServiceTest.java @@ -32,7 +32,9 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.service.connectors.gitlab.dto.GitLabPersonalAccessTokenListResponseDTO; +import de.tum.cit.aet.artemis.core.service.connectors.gitlab.GitLabException; +import de.tum.cit.aet.artemis.core.service.connectors.gitlab.GitLabPersonalAccessTokenManagementService; +import de.tum.cit.aet.artemis.core.service.connectors.gitlab.dto.GitLabPersonalAccessTokenListResponseDTO; import de.tum.cit.aet.artemis.user.UserUtilService; class GitLabPersonalAccessTokenManagementServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreatorTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreatorTest.java index 062a9d8ad65a..86246f643786 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreatorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreatorTest.java @@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.build_plan.JenkinsPipelineScriptCreator; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.programming.domain.BuildPlan; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtilsTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtilsTest.java index 2b7d394a9fa8..5a82eb93c834 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtilsTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtilsTest.java @@ -13,7 +13,9 @@ import org.w3c.dom.Document; import org.w3c.dom.NodeList; -import de.tum.cit.aet.artemis.service.connectors.jenkins.JenkinsXmlFileUtils; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsXmlFileUtils; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs.JenkinsJobPermission; +import de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs.JenkinsJobPermissionsUtils; class JenkinsJobPermissionsUtilsTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/TestResultXmlParserTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/TestResultXmlParserTest.java index 6a4d22f405c7..397c5c890085 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/TestResultXmlParserTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/TestResultXmlParserTest.java @@ -8,7 +8,8 @@ import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.service.connectors.localci.dto.BuildResult; +import de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent.TestResultXmlParser; +import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildResult; class TestResultXmlParserTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java index 31992b50d4c0..f093346103f3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java @@ -34,6 +34,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.security.lti.Lti13TokenRetriever; +import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiDeepLinkingService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalServiceTest.java index 950a9026898b..355409a3c064 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalServiceTest.java @@ -24,6 +24,8 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsTokenManagementService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsTokenRenewalService; class VcsTokenRenewalServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java index fb91c4a07eec..111f45de77a4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java @@ -15,6 +15,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -28,7 +29,6 @@ import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamQuizServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamQuizServiceTest.java index ce54bbb0f4c8..6f9dbee655cf 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamQuizServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamQuizServiceTest.java @@ -24,6 +24,7 @@ import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExerciseGroupRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exam.service.StudentExamService; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; @@ -35,7 +36,7 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; -import de.tum.cit.aet.artemis.service.quiz.QuizExerciseService; +import de.tum.cit.aet.artemis.quiz.service.QuizExerciseService; import de.tum.cit.aet.artemis.user.UserUtilService; class ExamQuizServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java index 06d2517e35b3..372d223f31e9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java @@ -23,6 +23,7 @@ import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; +import de.tum.cit.aet.artemis.exam.service.ExamService; import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionServiceTest.java index 4bc420a2e56b..78ceb985b4d9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionServiceTest.java @@ -21,6 +21,7 @@ import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exam.service.ExamSubmissionService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessServiceTest.java index 5c3f361149db..969544b1dedc 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessServiceTest.java @@ -18,6 +18,7 @@ import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; +import de.tum.cit.aet.artemis.exam.service.StudentExamAccessService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/export/CourseExamExportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/export/CourseExamExportServiceTest.java index b7c2bba00c14..7b4f43fcf28e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/export/CourseExamExportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/export/CourseExamExportServiceTest.java @@ -17,6 +17,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.export.CourseExamExportService; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationServiceTest.java index af0e188a06ab..40e9000b2cf8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationServiceTest.java @@ -25,6 +25,7 @@ import de.tum.cit.aet.artemis.communication.repository.NotificationRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationNotificationRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; +import de.tum.cit.aet.artemis.communication.service.notifications.ConversationNotificationService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.domain.User; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationServiceTest.java index 421a431a8cd2..f5dc732d936e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/notifications/GeneralInstantNotificationServiceTest.java @@ -19,9 +19,13 @@ import de.tum.cit.aet.artemis.communication.domain.notification.GroupNotification; import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; +import de.tum.cit.aet.artemis.communication.service.notifications.GeneralInstantNotificationService; +import de.tum.cit.aet.artemis.communication.service.notifications.MailService; +import de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsCommunicationChannel; +import de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService; +import de.tum.cit.aet.artemis.communication.service.notifications.push_notifications.ApplePushNotificationService; +import de.tum.cit.aet.artemis.communication.service.notifications.push_notifications.FirebasePushNotificationService; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.service.notifications.push_notifications.ApplePushNotificationService; -import de.tum.cit.aet.artemis.service.notifications.push_notifications.FirebasePushNotificationService; class GeneralInstantNotificationServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/notifications/MailServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/notifications/MailServiceTest.java index b316c22d4414..4a1fd4cb1a82 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/notifications/MailServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/notifications/MailServiceTest.java @@ -29,6 +29,8 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.domain.notification.GroupNotification; import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; +import de.tum.cit.aet.artemis.communication.service.notifications.MailSendingService; +import de.tum.cit.aet.artemis.communication.service.notifications.MailService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.service.TimeService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationServiceTest.java index ad88aa6f57d5..fcdc341e42bf 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/notifications/TutorialGroupNotificationServiceTest.java @@ -2,7 +2,7 @@ import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_DELETED_TITLE; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.TUTORIAL_GROUP_UPDATED_TITLE; -import static de.tum.cit.aet.artemis.service.notifications.NotificationSettingsService.NOTIFICATION__TUTORIAL_GROUP_NOTIFICATION__TUTORIAL_GROUP_DELETE_UPDATE; +import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.NOTIFICATION__TUTORIAL_GROUP_NOTIFICATION__TUTORIAL_GROUP_DELETE_UPDATE; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doNothing; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/AppleFirebasePushNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/AppleFirebasePushNotificationServiceTest.java index 6f7e5d9a020f..97c9d66f522a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/AppleFirebasePushNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/notifications/push_notifications/AppleFirebasePushNotificationServiceTest.java @@ -31,6 +31,8 @@ import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfiguration; import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceType; import de.tum.cit.aet.artemis.communication.repository.PushNotificationDeviceConfigurationRepository; +import de.tum.cit.aet.artemis.communication.service.notifications.push_notifications.ApplePushNotificationService; +import de.tum.cit.aet.artemis.communication.service.notifications.push_notifications.FirebasePushNotificationService; import de.tum.cit.aet.artemis.core.domain.User; class AppleFirebasePushNotificationServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java index c33657498e62..e3437475d4be 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java @@ -30,6 +30,7 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseFeedbackCreationService; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleServiceTest.java index b36b2d14c5d7..d77a8e1785ee 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/scheduled/DataExportScheduleServiceTest.java @@ -31,6 +31,7 @@ import de.tum.cit.aet.artemis.core.domain.DataExportState; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.DataExportRepository; +import de.tum.cit.aet.artemis.core.service.DataExportScheduleService; import de.tum.cit.aet.artemis.user.UserUtilService; @ExtendWith(MockitoExtension.class) diff --git a/src/test/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupServiceTest.java index fa1e018846ef..43b14d922d4a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/scheduled/PushNotificationDeviceConfigurationCleanupServiceTest.java @@ -17,6 +17,7 @@ import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfiguration; import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceType; import de.tum.cit.aet.artemis.communication.repository.PushNotificationDeviceConfigurationRepository; +import de.tum.cit.aet.artemis.communication.service.PushNotificationDeviceConfigurationCleanupService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/util/HttpRequestUtilsTest.java b/src/test/java/de/tum/cit/aet/artemis/service/util/HttpRequestUtilsTest.java index 3816e6af0aa4..32e85699d42e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/util/HttpRequestUtilsTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/util/HttpRequestUtilsTest.java @@ -9,6 +9,8 @@ import org.junit.jupiter.api.Test; +import de.tum.cit.aet.artemis.core.util.HttpRequestUtils; + class HttpRequestUtilsTest { @Test diff --git a/src/test/java/de/tum/cit/aet/artemis/service/util/TimeUtilTest.java b/src/test/java/de/tum/cit/aet/artemis/service/util/TimeUtilTest.java index 285240cf1c46..fd7ff2fe7bdf 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/util/TimeUtilTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/util/TimeUtilTest.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service.util; -import static de.tum.cit.aet.artemis.service.util.TimeUtil.toRelativeTime; +import static de.tum.cit.aet.artemis.core.util.TimeUtil.toRelativeTime; import static org.assertj.core.api.Assertions.assertThat; import java.time.ZonedDateTime; diff --git a/src/test/java/de/tum/cit/aet/artemis/staticcodeanalysis/StaticCodeAnalysisParserUnitTest.java b/src/test/java/de/tum/cit/aet/artemis/staticcodeanalysis/StaticCodeAnalysisParserUnitTest.java index a30bbc1bbaae..6c645e0c4fe2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/staticcodeanalysis/StaticCodeAnalysisParserUnitTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/staticcodeanalysis/StaticCodeAnalysisParserUnitTest.java @@ -15,8 +15,8 @@ import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.service.connectors.localci.scaparser.ReportParser; -import de.tum.cit.aet.artemis.service.connectors.localci.scaparser.exception.ParserException; +import de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.ReportParser; +import de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.exception.ParserException; /** * Tests each parser with an example file diff --git a/src/test/java/de/tum/cit/aet/artemis/telemetry/TelemetryServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/telemetry/TelemetryServiceTest.java index c779e7e1acdb..f653d48702a1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/telemetry/TelemetryServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/telemetry/TelemetryServiceTest.java @@ -24,7 +24,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.service.telemetry.TelemetryService; +import de.tum.cit.aet.artemis.core.service.TelemetryService; @ExtendWith(MockitoExtension.class) class TelemetryServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/theia/TheiaInfoContributorTest.java b/src/test/java/de/tum/cit/aet/artemis/theia/TheiaInfoContributorTest.java index 2b97b257262b..4d3d55d99273 100644 --- a/src/test/java/de/tum/cit/aet/artemis/theia/TheiaInfoContributorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/theia/TheiaInfoContributorTest.java @@ -8,8 +8,8 @@ import org.springframework.boot.actuate.info.Info; import org.springframework.context.annotation.Profile; +import de.tum.cit.aet.artemis.core.component.TheiaInfoContributor; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.service.theia.TheiaInfoContributor; @Profile(PROFILE_THEIA) class TheiaInfoContributorTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/AbstractTutorialGroupIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/AbstractTutorialGroupIntegrationTest.java index 0c2487bbefb1..c6e912c73a4f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/AbstractTutorialGroupIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/AbstractTutorialGroupIntegrationTest.java @@ -32,8 +32,6 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseTestService; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupChannelManagementService; -import de.tum.cit.aet.artemis.service.tutorialgroups.TutorialGroupService; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSchedule; @@ -47,6 +45,8 @@ import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupScheduleRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupSessionRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupsConfigurationRepository; +import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupChannelManagementService; +import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupService; import de.tum.cit.aet.artemis.user.UserUtilService; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/uri/RepositoryUriTest.java b/src/test/java/de/tum/cit/aet/artemis/uri/RepositoryUriTest.java index ea6126d1f8f2..234374be8cb0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/uri/RepositoryUriTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/uri/RepositoryUriTest.java @@ -16,8 +16,8 @@ import org.junit.jupiter.api.Test; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; +import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.service.connectors.localvc.LocalVCRepositoryUri; class RepositoryUriTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java index 0063305284e6..0235ac23fcdb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java @@ -16,10 +16,10 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.user.PasswordService; import de.tum.cit.aet.artemis.service.AccountService; import de.tum.cit.aet.artemis.service.dto.PasswordChangeDTO; import de.tum.cit.aet.artemis.service.dto.UserDTO; -import de.tum.cit.aet.artemis.service.user.PasswordService; import de.tum.cit.aet.artemis.util.ConfigUtil; import de.tum.cit.aet.artemis.web.rest.AccountResource; import de.tum.cit.aet.artemis.web.rest.open.PublicAccountResource; diff --git a/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java b/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java index eb4011a37f00..5607aaf8fb48 100644 --- a/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java @@ -38,6 +38,10 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.service.connectors.ci.CIUserManagementService; +import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiService; +import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsUserManagementService; +import de.tum.cit.aet.artemis.core.service.user.PasswordService; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.programming.MockDelegate; @@ -46,12 +50,8 @@ import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ParticipationVCSAccessTokenRepository; -import de.tum.cit.aet.artemis.service.connectors.ci.CIUserManagementService; -import de.tum.cit.aet.artemis.service.connectors.lti.LtiService; -import de.tum.cit.aet.artemis.service.connectors.vcs.VcsUserManagementService; import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.service.dto.UserInitializationDTO; -import de.tum.cit.aet.artemis.service.user.PasswordService; import de.tum.cit.aet.artemis.util.RequestUtilService; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; diff --git a/src/test/java/de/tum/cit/aet/artemis/user/UserUtilService.java b/src/test/java/de/tum/cit/aet/artemis/user/UserUtilService.java index d9d112e1d6c5..aa71f04fa79c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/user/UserUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/UserUtilService.java @@ -25,8 +25,8 @@ import de.tum.cit.aet.artemis.core.repository.AuthorityRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.service.user.PasswordService; import de.tum.cit.aet.artemis.repository.UserTestRepository; -import de.tum.cit.aet.artemis.service.user.PasswordService; /** * Service responsible for initializing the database with specific testdata related to Users for use in integration tests. diff --git a/src/test/java/de/tum/cit/aet/artemis/util/ExamPrepareExercisesTestUtil.java b/src/test/java/de/tum/cit/aet/artemis/util/ExamPrepareExercisesTestUtil.java index cbca99d62cb3..9f262d88b9fd 100644 --- a/src/test/java/de/tum/cit/aet/artemis/util/ExamPrepareExercisesTestUtil.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/ExamPrepareExercisesTestUtil.java @@ -7,8 +7,8 @@ import org.springframework.http.HttpStatus; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.util.ExamExerciseStartPreparationStatus; import de.tum.cit.aet.artemis.exam.domain.Exam; -import de.tum.cit.aet.artemis.service.util.ExamExerciseStartPreparationStatus; public class ExamPrepareExercisesTestUtil { diff --git a/src/test/java/de/tum/cit/aet/artemis/util/GitUtilService.java b/src/test/java/de/tum/cit/aet/artemis/util/GitUtilService.java index 2052d2f4bee9..8a41e7adc3c3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/util/GitUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/GitUtilService.java @@ -24,6 +24,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; @@ -32,7 +33,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.service.connectors.GitService; @Service public class GitUtilService { diff --git a/src/test/java/de/tum/cit/aet/artemis/util/HestiaUtilTestService.java b/src/test/java/de/tum/cit/aet/artemis/util/HestiaUtilTestService.java index 532e6232a3c2..09462b381b29 100644 --- a/src/test/java/de/tum/cit/aet/artemis/util/HestiaUtilTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/HestiaUtilTestService.java @@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; @@ -31,7 +32,6 @@ import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.service.connectors.GitService; /** * Utility service specifically used for testing Hestia related functionality. diff --git a/src/test/java/de/tum/cit/aet/artemis/util/LocalRepository.java b/src/test/java/de/tum/cit/aet/artemis/util/LocalRepository.java index 604fff6658fa..1fe311d64e5c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/util/LocalRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/LocalRepository.java @@ -17,7 +17,7 @@ import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.transport.URIish; -import de.tum.cit.aet.artemis.service.connectors.GitService; +import de.tum.cit.aet.artemis.core.service.connectors.GitService; /** * This class describes a local repository cloned from an origin repository. From bffecad5451ac2b078d91aaece61bd583e757af8 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Wed, 11 Sep 2024 17:10:15 +0200 Subject: [PATCH 11/43] move services into modules (part 2) WORK IN PROGRESS --- .../aet/artemis/assessment/domain/Result.java | 2 +- .../service/AssessmentDashboardService.java | 2 +- .../service/AssessmentService.java | 4 +++- .../service/BonusService.java | 2 +- .../service/ComplaintResponseService.java | 3 ++- .../service/ComplaintService.java | 3 ++- .../CourseScoreCalculationService.java | 3 ++- .../service/ExampleSubmissionService.java | 4 +++- .../service/FeedbackService.java | 2 +- .../service/GradingScaleService.java | 3 ++- .../service/ParticipantScoreService.java | 2 +- .../PresentationPointsCalculationService.java | 2 +- .../service/RatingService.java | 2 +- .../service/ResultService.java | 5 ++++- .../service/TutorEffortService.java | 2 +- .../service/TutorLeaderboardService.java | 2 +- .../service/TutorParticipationService.java | 4 ++-- .../athena/service/AthenaScheduleService.java | 2 +- .../competency/CompetencyProgressService.java | 2 +- .../service/competency/CompetencyService.java | 6 ++--- .../competency/CourseCompetencyService.java | 6 ++--- .../competency/PrerequisiteService.java | 6 ++--- .../LearningPathRecommendationService.java | 2 +- .../service/AnswerMessageService.java | 2 +- .../service/ConversationMessagingService.java | 2 +- .../service/NotificationScheduleService.java | 2 +- .../communication/service/PostingService.java | 2 +- .../conversation/ConversationService.java | 2 +- .../auth/ChannelAuthorizationService.java | 2 +- .../ConversationAuthorizationService.java | 2 +- .../auth/GroupChatAuthorizationService.java | 2 +- .../OneToOneChatAuthorizationService.java | 2 +- .../GroupNotificationScheduleService.java | 2 +- .../SingleUserNotificationService.java | 4 ++-- .../websocket/WebsocketConfiguration.java | 2 +- .../EnforceRoleInResourceAspect.java | 2 +- .../EnforceRoleInCourseAspect.java | 2 +- .../EnforceRoleInExerciseAspect.java | 2 +- .../{ => core}/service/AccountService.java | 2 +- .../service/AuthorizationCheckService.java | 3 ++- .../artemis/core/service/ScheduleService.java | 2 +- .../aeolus/AeolusBuildPlanService.java | 2 +- .../jenkins/JenkinsInternalUrlService.java | 2 +- .../localci/LocalCITriggerService.java | 2 +- .../localvc/LocalVCServletService.java | 2 +- .../DataExportExerciseCreationService.java | 6 ++--- .../core/service/user/UserService.java | 2 +- .../admin/AdminLtiConfigurationResource.java | 2 +- .../admin/AdminModelingExerciseResource.java | 2 +- .../exam/service/ExamAccessService.java | 2 +- .../exam/service/ExamDeletionService.java | 2 +- .../exam/service/ExamImportService.java | 6 ++--- .../artemis/exam/service/ExamQuizService.java | 2 +- .../exam/service/ExamRegistrationService.java | 2 +- .../aet/artemis/exam/service/ExamService.java | 10 ++++----- .../exam/service/ExamSubmissionService.java | 2 +- .../service/StudentExamAccessService.java | 2 +- .../aet/artemis/exercise/domain/Exercise.java | 2 +- .../service/ExerciseDateService.java | 2 +- .../service/ExerciseDeletionService.java | 7 +++++- .../service/ExerciseImportService.java | 5 +++-- .../service/ExerciseLifecycleService.java | 2 +- .../service/ExerciseScoresChartService.java | 2 +- .../service/ExerciseService.java | 5 ++++- .../service/ExerciseSpecificationService.java | 3 ++- .../service/SubmissionExportService.java | 1 - .../FileUploadExerciseImportService.java | 4 +++- .../service/FileUploadExerciseService.java | 3 ++- .../service/FileUploadSubmissionService.java | 9 +++++++- .../session/IrisCourseChatSessionService.java | 2 +- .../IrisExerciseChatSessionService.java | 2 +- .../session/IrisHestiaSessionService.java | 2 +- .../service/settings/IrisSettingsService.java | 2 +- .../settings/IrisSubSettingsService.java | 2 +- .../service/LectureImportService.java | 5 ++++- .../{ => lecture}/service/LectureService.java | 3 ++- .../service/LectureUnitProcessingService.java | 6 ++++- .../service/LectureUnitService.java | 4 +++- .../ModelingExerciseImportService.java | 22 +++++-------------- .../service/ModelingExerciseService.java | 3 ++- .../service/ModelingSubmissionService.java | 8 ++++++- .../service/PlagiarismAnswerPostService.java | 2 +- .../service/PlagiarismPostService.java | 2 +- .../plagiarism/service/PlagiarismService.java | 4 ++-- .../domain/ProgrammingExercise.java | 2 +- .../domain/StaticCodeAnalysisCategory.java | 3 ++- .../LockRepositoryPolicy.java | 2 +- .../SubmissionPenaltyPolicy.java | 2 +- .../service/ConsistencyCheckService.java | 2 +- .../service/InternalUrlService.java | 2 +- .../ParticipationVcsAccessTokenService.java | 2 +- .../service/PlantUmlService.java | 3 ++- .../service/ProgrammingAssessmentService.java | 8 +++---- ...mingExerciseCodeReviewFeedbackService.java | 2 +- .../ProgrammingExerciseExportService.java | 2 +- .../ProgrammingExerciseGradingService.java | 7 +++--- ...ProgrammingExerciseImportBasicService.java | 1 - ...grammingExerciseImportFromFileService.java | 1 - ...ogrammingExerciseParticipationService.java | 2 +- .../ProgrammingExerciseScheduleService.java | 2 +- .../service/ProgrammingExerciseService.java | 5 ++--- .../service/ProgrammingSubmissionService.java | 6 ++--- .../service/RepositoryAccessService.java | 4 ++-- .../service/StaticCodeAnalysisService.java | 3 +-- .../service/SubmissionPolicyService.java | 3 +-- .../service/hestia/ExerciseHintService.java | 2 +- .../AbstractQuizSubmissionService.java | 3 ++- .../service/QuizExerciseImportService.java | 4 ++-- .../quiz/service/QuizExerciseService.java | 2 +- .../quiz/service/QuizResultService.java | 2 +- .../quiz/service/QuizSubmissionService.java | 1 - .../aet/artemis/service/CourseService.java | 7 ++++++ .../service/LearningObjectService.java | 1 + ...articipationAuthorizationCheckService.java | 1 + .../ParticipationLifecycleService.java | 1 + .../artemis/service/ParticipationService.java | 3 +++ .../artemis/service/SubmissionService.java | 3 +++ .../service/TextAssessmentService.java | 6 ++++- .../{ => text}/service/TextBlockService.java | 2 +- .../service/TextExerciseFeedbackService.java | 5 ++++- .../service/TextExerciseImportService.java | 8 ++++--- .../service/TextExerciseService.java | 3 ++- .../service/TextSubmissionService.java | 8 ++++++- .../service/TutorialGroupService.java | 2 +- .../web/rest/AbstractSubmissionResource.java | 2 +- .../aet/artemis/web/rest/AccountResource.java | 2 +- .../web/rest/ApollonDiagramResource.java | 2 +- .../artemis/web/rest/AssessmentResource.java | 4 ++-- .../aet/artemis/web/rest/AthenaResource.java | 2 +- .../artemis/web/rest/AttachmentResource.java | 2 +- .../aet/artemis/web/rest/BonusResource.java | 6 ++--- .../artemis/web/rest/ComplaintResource.java | 4 ++-- .../web/rest/ComplaintResponseResource.java | 2 +- .../web/rest/ConsistencyCheckResource.java | 4 ++-- .../aet/artemis/web/rest/CourseResource.java | 12 +++++----- .../aet/artemis/web/rest/ExamResource.java | 4 ++-- .../web/rest/ExampleSubmissionResource.java | 6 ++--- .../web/rest/ExerciseGroupResource.java | 2 +- .../artemis/web/rest/ExerciseResource.java | 8 +++---- .../web/rest/ExerciseScoresChartResource.java | 6 ++--- .../aet/artemis/web/rest/FileResource.java | 4 ++-- .../rest/FileUploadAssessmentResource.java | 4 ++-- .../web/rest/FileUploadExerciseResource.java | 10 ++++----- .../rest/FileUploadSubmissionResource.java | 8 +++---- .../artemis/web/rest/GradeStepResource.java | 2 +- .../web/rest/GradingScaleResource.java | 4 ++-- .../web/rest/LearningPathResource.java | 2 +- .../aet/artemis/web/rest/LectureResource.java | 8 +++---- .../cit/aet/artemis/web/rest/LtiResource.java | 2 +- .../web/rest/ModelingAssessmentResource.java | 4 ++-- .../web/rest/ModelingExerciseResource.java | 10 ++++----- .../web/rest/ModelingSubmissionResource.java | 6 ++--- .../web/rest/ParticipantScoreResource.java | 4 ++-- .../web/rest/ParticipationResource.java | 8 +++---- .../artemis/web/rest/PlantUmlResource.java | 2 +- .../web/rest/QuizExerciseResource.java | 6 ++--- .../artemis/web/rest/QuizPoolResource.java | 2 +- .../web/rest/QuizSubmissionResource.java | 2 +- .../aet/artemis/web/rest/RatingResource.java | 4 ++-- .../aet/artemis/web/rest/ResultResource.java | 4 ++-- .../web/rest/StaticCodeAnalysisResource.java | 4 ++-- .../artemis/web/rest/StatisticsResource.java | 2 +- .../artemis/web/rest/StudentExamResource.java | 2 +- .../web/rest/SubmissionPolicyResource.java | 4 ++-- .../artemis/web/rest/SubmissionResource.java | 4 ++-- .../aet/artemis/web/rest/TeamResource.java | 2 +- .../web/rest/TextAssessmentEventResource.java | 2 +- .../web/rest/TextAssessmentResource.java | 10 ++++----- .../web/rest/TextExerciseResource.java | 12 +++++----- .../web/rest/TextSubmissionResource.java | 8 +++---- .../artemis/web/rest/TutorEffortResource.java | 4 ++-- .../web/rest/TutorParticipationResource.java | 4 ++-- .../rest/competency/CompetencyResource.java | 4 ++-- .../competency/CourseCompetencyResource.java | 2 +- .../rest/competency/PrerequisiteResource.java | 4 ++-- ...grammingExerciseGitDiffReportResource.java | 2 +- ...grammingExerciseSolutionEntryResource.java | 2 +- .../ProgrammingExerciseTaskResource.java | 2 +- .../web/rest/iris/IrisSettingsResource.java | 2 +- .../rest/lecture/AttachmentUnitResource.java | 4 ++-- .../rest/lecture/ExerciseUnitResource.java | 2 +- .../web/rest/lecture/LectureUnitResource.java | 4 ++-- .../web/rest/lecture/OnlineUnitResource.java | 4 ++-- .../web/rest/lecture/TextUnitResource.java | 2 +- .../web/rest/lecture/VideoUnitResource.java | 4 ++-- .../rest/localci/BuildJobQueueResource.java | 2 +- .../web/rest/localci/BuildPlanResource.java | 2 +- .../metis/ConversationMessageResource.java | 2 +- .../metis/conversation/ChannelResource.java | 2 +- .../conversation/ConversationResource.java | 2 +- .../web/rest/open/PublicAccountResource.java | 2 +- .../web/rest/open/PublicResultResource.java | 2 +- .../plagiarism/PlagiarismCaseResource.java | 2 +- .../rest/plagiarism/PlagiarismResource.java | 2 +- .../ProgrammingAssessmentResource.java | 2 +- ...ogrammingExerciseExportImportResource.java | 6 ++--- .../ProgrammingExerciseGradingResource.java | 2 +- ...grammingExerciseParticipationResource.java | 4 ++-- ...ProgrammingExercisePlagiarismResource.java | 2 +- .../ProgrammingExerciseResource.java | 8 +++---- .../ProgrammingExerciseTestCaseResource.java | 2 +- .../ProgrammingSubmissionResource.java | 4 ++-- ...grammingExerciseParticipationResource.java | 2 +- .../rest/repository/RepositoryResource.java | 2 +- .../repository/TestRepositoryResource.java | 2 +- .../TutorialGroupFreePeriodResource.java | 2 +- .../tutorialgroups/TutorialGroupResource.java | 2 +- .../TutorialGroupSessionResource.java | 2 +- .../TutorialGroupsConfigurationResource.java | 2 +- .../web/websocket/ResultWebsocketService.java | 4 ++-- .../ParticipationTeamWebsocketService.java | 4 ++-- .../AbstractArtemisIntegrationTest.java | 6 ++--- .../FeedbackArchitectureTest.java | 2 +- .../RatingResourceIntegrationTest.java | 2 +- ...utorLeaderboardServiceIntegrationTest.java | 2 +- .../TutorParticipationIntegrationTest.java | 6 ++--- .../CourseCompetencyIntegrationTest.java | 2 +- .../LearningPathIntegrationTest.java | 2 +- .../aet/artemis/course/CourseUtilService.java | 2 +- .../cit/aet/artemis/domain/ExerciseTest.java | 2 +- .../ResultListenerIntegrationTest.java | 2 +- .../exercise/ExerciseIntegrationTest.java | 2 +- .../artemis/exercise/ExerciseUtilService.java | 2 +- .../ModelingAssessmentIntegrationTest.java | 2 +- .../modeling/ModelingExerciseUtilService.java | 4 ++-- .../ProgrammingExerciseResultTestService.java | 2 +- .../StaticCodeAnalysisIntegrationTest.java | 2 +- .../quiz/QuizExerciseIntegrationTest.java | 2 +- .../AttachmentUnitsIntegrationTest.java | 2 +- .../lecture/LectureUnitServiceTest.java | 2 +- ...AbstractLocalCILocalVCIntegrationTest.java | 2 +- .../localvcci/LocalCIIntegrationTest.java | 2 +- .../localvcci/LocalVCLocalCITestService.java | 2 +- .../artemis/metis/PostingServiceUnitTest.java | 2 +- .../ParticipationIntegrationTest.java | 2 +- .../ParticipationUtilService.java | 2 +- .../service/AssessmentServiceTest.java | 1 + .../AuthorizationCheckServiceTest.java | 1 + .../service/ComplaintResponseServiceTest.java | 1 + .../CourseScoreCalculationServiceTest.java | 1 + .../service/ExerciseDateServiceTest.java | 1 + .../service/ExerciseLifecycleServiceTest.java | 1 + .../artemis/service/FeedbackServiceTest.java | 1 + .../service/GradingScaleServiceTest.java | 1 + .../service/LectureImportServiceTest.java | 1 + .../artemis/service/LectureServiceTest.java | 1 + .../service/ParticipationServiceTest.java | 1 + ...sentationPointsCalculationServiceTest.java | 1 + .../artemis/service/ResultServiceTest.java | 1 + .../artemis/service/TextBlockServiceTest.java | 1 + .../text/TextAssessmentIntegrationTest.java | 2 +- .../user/AccountResourceIntegrationTest.java | 2 +- 252 files changed, 444 insertions(+), 364 deletions(-) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/service/AssessmentDashboardService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/service/AssessmentService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/service/BonusService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/service/ComplaintResponseService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/service/ComplaintService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/service/CourseScoreCalculationService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/service/ExampleSubmissionService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/service/FeedbackService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/service/GradingScaleService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/service/ParticipantScoreService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/service/PresentationPointsCalculationService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/service/RatingService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/service/ResultService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/service/TutorEffortService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/service/TutorLeaderboardService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => assessment}/service/TutorParticipationService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/AccountService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/AuthorizationCheckService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/service/ExerciseDateService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/service/ExerciseDeletionService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/service/ExerciseImportService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/service/ExerciseLifecycleService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/service/ExerciseScoresChartService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/service/ExerciseService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/service/ExerciseSpecificationService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => fileupload}/service/FileUploadExerciseImportService.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => fileupload}/service/FileUploadExerciseService.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => fileupload}/service/FileUploadSubmissionService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => lecture}/service/LectureImportService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => lecture}/service/LectureService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => lecture}/service/LectureUnitProcessingService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => lecture}/service/LectureUnitService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/ModelingExerciseImportService.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/ModelingExerciseService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => modeling}/service/ModelingSubmissionService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/ConsistencyCheckService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/InternalUrlService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/ParticipationVcsAccessTokenService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/PlantUmlService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/StaticCodeAnalysisService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/SubmissionPolicyService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => quiz}/service/AbstractQuizSubmissionService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => text}/service/TextAssessmentService.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => text}/service/TextBlockService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => text}/service/TextExerciseFeedbackService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => text}/service/TextExerciseImportService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => text}/service/TextExerciseService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => text}/service/TextSubmissionService.java (95%) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java index b4ace69e94b3..4cd6777b73e6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java @@ -51,12 +51,12 @@ import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageFileReport; import de.tum.cit.aet.artemis.quiz.config.QuizView; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; -import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AssessmentDashboardService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentDashboardService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/AssessmentDashboardService.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentDashboardService.java index ce301379025b..c89d4bfcf6c4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AssessmentDashboardService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentDashboardService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.assessment.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/AssessmentService.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentService.java index 96bfe95f2c8e..cd7286012469 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.assessment.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -28,8 +28,10 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.service.ProgrammingAssessmentService; +import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateBaseDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/BonusService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/BonusService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/BonusService.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/service/BonusService.java index b185d80fd0da..9d3265e1a9db 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/BonusService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/BonusService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.assessment.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ComplaintResponseService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintResponseService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/ComplaintResponseService.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintResponseService.java index a1272061b783..6bd66ee5ad20 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ComplaintResponseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintResponseService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.assessment.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -18,6 +18,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ComplaintService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/ComplaintService.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintService.java index b494d8924a81..b706f5a74d43 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ComplaintService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.assessment.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -34,6 +34,7 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.dto.ComplaintRequestDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/CourseScoreCalculationService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationService.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/service/CourseScoreCalculationService.java index 18c2aafa56ac..8ecbe91e04f7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/CourseScoreCalculationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.assessment.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; @@ -35,6 +35,7 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExampleSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ExampleSubmissionService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/ExampleSubmissionService.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/service/ExampleSubmissionService.java index 0427bf5354e3..2814c13a49c6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExampleSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ExampleSubmissionService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.assessment.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -21,9 +21,11 @@ import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.modeling.service.ModelingExerciseImportService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.text.service.TextExerciseImportService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/FeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/FeedbackService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/FeedbackService.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/service/FeedbackService.java index f2fbaebda8e9..74ace4fbd20c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/FeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/FeedbackService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.assessment.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/GradingScaleService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/GradingScaleService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/GradingScaleService.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/service/GradingScaleService.java index 92ffdf89b00b..7b590ab4710f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/GradingScaleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/GradingScaleService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.assessment.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -16,6 +16,7 @@ import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipantScoreService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/ParticipantScoreService.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreService.java index fb169ac714b4..c8a966a0a73f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipantScoreService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.assessment.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/PresentationPointsCalculationService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationService.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/service/PresentationPointsCalculationService.java index 7ee49da5d3ee..beb9ff42aae8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/PresentationPointsCalculationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.assessment.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/RatingService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/RatingService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/RatingService.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/service/RatingService.java index 3c4a980eff87..4365ebebe1bc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/RatingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/RatingService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.assessment.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/ResultService.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java index c5b7d57caf02..f759b9c37ecd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.assessment.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -39,6 +39,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.ResultBuildJob; import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiNewResultService; import de.tum.cit.aet.artemis.exam.domain.Exam; @@ -48,6 +49,7 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.programming.domain.BuildPlanType; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; @@ -58,6 +60,7 @@ import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; +import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.web.rest.dto.feedback.FeedbackDetailDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TutorEffortService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/TutorEffortService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/TutorEffortService.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/service/TutorEffortService.java index 8d9b6fc39310..7b89b6ed533a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TutorEffortService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/TutorEffortService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.assessment.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static java.lang.Math.toIntExact; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TutorLeaderboardService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/TutorLeaderboardService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/TutorLeaderboardService.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/service/TutorLeaderboardService.java index 08fdaaf8b97d..d16a62255a88 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TutorLeaderboardService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/TutorLeaderboardService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.assessment.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TutorParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/TutorParticipationService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/TutorParticipationService.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/service/TutorParticipationService.java index b97e23829272..795eedf2af99 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TutorParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/TutorParticipationService.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.assessment.service; import static de.tum.cit.aet.artemis.assessment.domain.FeedbackType.MANUAL_UNREFERENCED; +import static de.tum.cit.aet.artemis.assessment.service.TutorParticipationService.FeedbackCorrectionErrorType.UNNECESSARY_FEEDBACK; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.TutorParticipationService.FeedbackCorrectionErrorType.UNNECESSARY_FEEDBACK; import static de.tum.cit.aet.artemis.tutorialgroup.domain.TutorParticipationStatus.NOT_PARTICIPATED; import static de.tum.cit.aet.artemis.tutorialgroup.domain.TutorParticipationStatus.REVIEWED_INSTRUCTIONS; import static de.tum.cit.aet.artemis.tutorialgroup.domain.TutorParticipationStatus.TRAINED; diff --git a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaScheduleService.java index 8f66ef26f3e6..e9b3f7333cdb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaScheduleService.java @@ -25,7 +25,7 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseLifecycle; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.service.ExerciseLifecycleService; +import de.tum.cit.aet.artemis.exercise.service.ExerciseLifecycleService; import de.tum.cit.aet.artemis.service.ProfileService; @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyProgressService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyProgressService.java index bcdf467cd723..1fadb21f1d49 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyProgressService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyProgressService.java @@ -19,6 +19,7 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreService; import de.tum.cit.aet.artemis.atlas.domain.CompetencyProgressConfidenceReason; import de.tum.cit.aet.artemis.atlas.domain.LearningObject; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; @@ -37,7 +38,6 @@ import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; -import de.tum.cit.aet.artemis.service.ParticipantScoreService; import de.tum.cit.aet.artemis.web.rest.dto.CourseCompetencyProgressDTO; import de.tum.cit.aet.artemis.web.rest.dto.metrics.CompetencyExerciseMasteryCalculationDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java index 28447962aa87..f9ccdf48d864 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java @@ -20,10 +20,10 @@ import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.exercise.service.ExerciseService; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ExerciseService; -import de.tum.cit.aet.artemis.service.LectureUnitService; +import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java index d36be45e2f06..fefb619c6a6a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java @@ -31,11 +31,11 @@ import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.service.ExerciseService; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ExerciseService; -import de.tum.cit.aet.artemis.service.LectureUnitService; +import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyRelationDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java index 215a074a4dc8..a13c4742f266 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java @@ -20,10 +20,10 @@ import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.exercise.service.ExerciseService; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ExerciseService; -import de.tum.cit.aet.artemis.service.LectureUnitService; +import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathRecommendationService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathRecommendationService.java index c72414fc35ab..40c1fec1b84f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathRecommendationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathRecommendationService.java @@ -22,6 +22,7 @@ import com.google.common.util.concurrent.AtomicDouble; +import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreService; import de.tum.cit.aet.artemis.atlas.domain.LearningObject; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; @@ -38,7 +39,6 @@ import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.service.LearningObjectService; -import de.tum.cit.aet.artemis.service.ParticipantScoreService; /** * Service Implementation for the recommendation of competencies and learning objects in learning paths. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java index 32d941e58b25..8e99bf43ccb2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java @@ -28,9 +28,9 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java index 9dc83c2b91e7..224232058e34 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java @@ -53,9 +53,9 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/NotificationScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/NotificationScheduleService.java index bfcccdcc1dfa..b189e231e2be 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/NotificationScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/NotificationScheduleService.java @@ -23,7 +23,7 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseLifecycle; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.service.ExerciseDateService; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.ProfileService; @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/PostingService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/PostingService.java index 9c908e5c5dfd..979ddb31aadc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/PostingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/PostingService.java @@ -33,9 +33,9 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.dto.UserRoleDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationService.java index 2ee0f5fde9cd..b9157a3de978 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationService.java @@ -37,7 +37,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/ChannelAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/ChannelAuthorizationService.java index 3c73fd2273e1..c5fd0fa86f90 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/ChannelAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/ChannelAuthorizationService.java @@ -21,7 +21,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/ConversationAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/ConversationAuthorizationService.java index eb725cd9b380..e72aa2361c7b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/ConversationAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/ConversationAuthorizationService.java @@ -10,7 +10,7 @@ import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/GroupChatAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/GroupChatAuthorizationService.java index 4cdf724911b1..b538552582fb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/GroupChatAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/GroupChatAuthorizationService.java @@ -15,7 +15,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/OneToOneChatAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/OneToOneChatAuthorizationService.java index 49d2da19f5aa..844c1fa41ca4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/OneToOneChatAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/OneToOneChatAuthorizationService.java @@ -14,7 +14,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/GroupNotificationScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/GroupNotificationScheduleService.java index 3ac3ac002d77..153baf29df8c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/GroupNotificationScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/GroupNotificationScheduleService.java @@ -11,7 +11,7 @@ import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.service.ExerciseDateService; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/SingleUserNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/SingleUserNotificationService.java index 86c74fef604e..7925b0347fb5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/SingleUserNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/SingleUserNotificationService.java @@ -62,14 +62,14 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java index 1465bdc51a03..ce820ac1da45 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java @@ -60,13 +60,13 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.jwt.JWTFilter; import de.tum.cit.aet.artemis.core.security.jwt.TokenProvider; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.validation.InetSocketAddressValidator; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/core/security/annotations/EnforceRoleInResourceAspect.java b/src/main/java/de/tum/cit/aet/artemis/core/security/annotations/EnforceRoleInResourceAspect.java index 7fec2fd4d1ef..59814ef1f153 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/security/annotations/EnforceRoleInResourceAspect.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/security/annotations/EnforceRoleInResourceAspect.java @@ -12,7 +12,7 @@ import org.aspectj.lang.annotation.Pointcut; import de.tum.cit.aet.artemis.core.security.Role; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; public abstract class EnforceRoleInResourceAspect { diff --git a/src/main/java/de/tum/cit/aet/artemis/core/security/annotations/enforceRoleInCourse/EnforceRoleInCourseAspect.java b/src/main/java/de/tum/cit/aet/artemis/core/security/annotations/enforceRoleInCourse/EnforceRoleInCourseAspect.java index cb508676c245..9fedffec8904 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/security/annotations/enforceRoleInCourse/EnforceRoleInCourseAspect.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/security/annotations/enforceRoleInCourse/EnforceRoleInCourseAspect.java @@ -9,7 +9,7 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceRoleInResourceAspect; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; @Profile(PROFILE_CORE) @Component diff --git a/src/main/java/de/tum/cit/aet/artemis/core/security/annotations/enforceRoleInExercise/EnforceRoleInExerciseAspect.java b/src/main/java/de/tum/cit/aet/artemis/core/security/annotations/enforceRoleInExercise/EnforceRoleInExerciseAspect.java index fbe14be320cc..969d4e1c0ec4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/security/annotations/enforceRoleInExercise/EnforceRoleInExerciseAspect.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/security/annotations/enforceRoleInExercise/EnforceRoleInExerciseAspect.java @@ -9,7 +9,7 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceRoleInResourceAspect; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; @Profile(PROFILE_CORE) @Component diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AccountService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/AccountService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/AccountService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/AccountService.java index 97e5422596dd..dea1a737c3b2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AccountService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/AccountService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.core.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AuthorizationCheckService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/AuthorizationCheckService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/AuthorizationCheckService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/AuthorizationCheckService.java index 9152a7029f75..936966924aab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AuthorizationCheckService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/AuthorizationCheckService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.core.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -34,6 +34,7 @@ import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/ScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/ScheduleService.java index 08526db540f7..61a1e7117ec0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/ScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/ScheduleService.java @@ -20,10 +20,10 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseLifecycle; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.service.ExerciseLifecycleService; import de.tum.cit.aet.artemis.programming.domain.ParticipationLifecycle; import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; -import de.tum.cit.aet.artemis.service.ExerciseLifecycleService; import de.tum.cit.aet.artemis.service.ParticipationLifecycleService; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusBuildPlanService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusBuildPlanService.java index 1ccf4ae08b41..936d9b1f3c97 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusBuildPlanService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusBuildPlanService.java @@ -35,7 +35,7 @@ import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.service.InternalUrlService; +import de.tum.cit.aet.artemis.programming.service.InternalUrlService; /** * Service for publishing custom build plans using Aeolus diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsInternalUrlService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsInternalUrlService.java index 46c237897405..e9642b16f808 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsInternalUrlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsInternalUrlService.java @@ -7,7 +7,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.service.InternalUrlService; +import de.tum.cit.aet.artemis.programming.service.InternalUrlService; @Profile("jenkins") @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCITriggerService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCITriggerService.java index 278301c5a6ac..c68991f5d829 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCITriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCITriggerService.java @@ -37,6 +37,7 @@ import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; @@ -48,7 +49,6 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeature; -import de.tum.cit.aet.artemis.service.ExerciseDateService; /** * Service for triggering builds on the local CI system. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCServletService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCServletService.java index 80f6242b2a37..be87b3298060 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCServletService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCServletService.java @@ -45,6 +45,7 @@ import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationTriggerService; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.programming.domain.Commit; @@ -62,7 +63,6 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingSubmissionService; import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; import de.tum.cit.aet.artemis.programming.service.RepositoryAccessService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; import de.tum.cit.aet.artemis.web.rest.repository.RepositoryActionType; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExerciseCreationService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExerciseCreationService.java index e97f16931f58..dfd77f2ab8c2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExerciseCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExerciseCreationService.java @@ -30,12 +30,15 @@ import de.tum.cit.aet.artemis.assessment.domain.Complaint; import de.tum.cit.aet.artemis.assessment.domain.ComplaintType; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.communication.domain.AnswerPost; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.apollon.ApollonConversionService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; @@ -46,10 +49,7 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseExportService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryExportOptionsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java index c3f9c9ab1db2..9bf0dab3c998 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java @@ -56,9 +56,9 @@ import de.tum.cit.aet.artemis.core.service.ldap.LdapUserService; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.programming.domain.ParticipationVCSAccessToken; +import de.tum.cit.aet.artemis.programming.service.ParticipationVcsAccessTokenService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.ParticipationVcsAccessTokenService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java index 0a9f012c7b48..088b18c2c93c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java @@ -20,10 +20,10 @@ import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiDynamicRegistrationService; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminModelingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminModelingExerciseResource.java index 31c8003a3346..fd251aa85c44 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminModelingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminModelingExerciseResource.java @@ -18,7 +18,7 @@ import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.modeling.repository.ModelClusterRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; -import de.tum.cit.aet.artemis.service.ModelingExerciseService; +import de.tum.cit.aet.artemis.modeling.service.ModelingExerciseService; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamAccessService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamAccessService.java index 9cbb9f7ee150..9b9a7367d1fb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamAccessService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamAccessService.java @@ -13,13 +13,13 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDeletionService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDeletionService.java index 19328d79ee15..e0c094a24d40 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDeletionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDeletionService.java @@ -34,9 +34,9 @@ import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDeletionService; import de.tum.cit.aet.artemis.quiz.domain.QuizPool; import de.tum.cit.aet.artemis.quiz.repository.QuizPoolRepository; -import de.tum.cit.aet.artemis.service.ExerciseDeletionService; import de.tum.cit.aet.artemis.service.ParticipationService; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamImportService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamImportService.java index 97bbe50d5927..a361bd1a268d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamImportService.java @@ -26,8 +26,10 @@ import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; +import de.tum.cit.aet.artemis.fileupload.service.FileUploadExerciseImportService; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.modeling.service.ModelingExerciseImportService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; @@ -36,11 +38,9 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.service.QuizExerciseImportService; -import de.tum.cit.aet.artemis.service.FileUploadExerciseImportService; -import de.tum.cit.aet.artemis.service.ModelingExerciseImportService; -import de.tum.cit.aet.artemis.service.TextExerciseImportService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.text.service.TextExerciseImportService; import de.tum.cit.aet.artemis.web.rest.errors.ExamConfigurationException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamQuizService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamQuizService.java index 7fe387fb6bc4..0576db3f4b80 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamQuizService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamQuizService.java @@ -13,6 +13,7 @@ import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; @@ -22,7 +23,6 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.quiz.service.QuizStatisticService; -import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamRegistrationService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamRegistrationService.java index 7ee77ff89790..e73b9a658ae6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamRegistrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamRegistrationService.java @@ -23,6 +23,7 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.user.UserService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExamUser; @@ -32,7 +33,6 @@ import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.web.rest.dto.ExamUserDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamService.java index f57c170efa80..4c6119b833ea 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamService.java @@ -49,6 +49,9 @@ import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.BonusService; +import de.tum.cit.aet.artemis.assessment.service.CourseScoreCalculationService; +import de.tum.cit.aet.artemis.assessment.service.TutorLeaderboardService; import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.core.config.Constants; @@ -57,6 +60,7 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.core.service.export.CourseExamExportService; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; @@ -73,6 +77,7 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDeletionService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; @@ -93,11 +98,6 @@ import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.quiz.service.QuizPoolService; import de.tum.cit.aet.artemis.quiz.service.QuizResultService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.BonusService; -import de.tum.cit.aet.artemis.service.CourseScoreCalculationService; -import de.tum.cit.aet.artemis.service.ExerciseDeletionService; -import de.tum.cit.aet.artemis.service.TutorLeaderboardService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSubmissionService.java index 9c99a94cf87f..bb6fd8392253 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSubmissionService.java @@ -12,6 +12,7 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; @@ -21,7 +22,6 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamAccessService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamAccessService.java index 33a5e670b3c5..74d63aec26e2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamAccessService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamAccessService.java @@ -11,11 +11,11 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java index 91f7d80d280b..8cbb7cf9dad7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java @@ -63,6 +63,7 @@ import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; @@ -71,7 +72,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.quiz.config.QuizView; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; -import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDateService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseDateService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/ExerciseDateService.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseDateService.java index 2dfd214616d5..71803529055c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseDateService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.exercise.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDeletionService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseDeletionService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/ExerciseDeletionService.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseDeletionService.java index b1665e3efe71..5bc8312e9b9d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseDeletionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseDeletionService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.exercise.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; +import de.tum.cit.aet.artemis.assessment.service.ExampleSubmissionService; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; @@ -26,14 +27,18 @@ import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; import de.tum.cit.aet.artemis.lecture.repository.ExerciseUnitRepository; +import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.service.ModelingExerciseService; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.service.QuizExerciseService; +import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.service.TextExerciseService; /** * Service Implementation for managing Exercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseImportService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/ExerciseImportService.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseImportService.java index 7d01c8d5b2ed..21d0d05a9a8b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseImportService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.exercise.service; import java.util.ArrayList; import java.util.List; @@ -12,6 +12,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.FeedbackService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; import de.tum.cit.aet.artemis.exercise.domain.Submission; @@ -89,7 +90,7 @@ protected void copyExerciseBasis(final Exercise newExercise, final Exercise impo * @param gradingInstructionCopyTracker The mapping from original GradingInstruction Ids to new GradingInstruction instances. * @return The cloned result */ - Result copyExampleResult(Result originalResult, Submission newSubmission, Map gradingInstructionCopyTracker) { + protected Result copyExampleResult(Result originalResult, Submission newSubmission, Map gradingInstructionCopyTracker) { Result newResult = new Result(); newResult.setAssessmentType(originalResult.getAssessmentType()); newResult.setAssessor(originalResult.getAssessor()); diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseLifecycleService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleService.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseLifecycleService.java index e017774f8838..48387319740a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseLifecycleService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.exercise.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseScoresChartService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseScoresChartService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/ExerciseScoresChartService.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseScoresChartService.java index 66e215b7d6cd..144d386145ee 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseScoresChartService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseScoresChartService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.exercise.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/ExerciseService.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseService.java index 81febb9f773e..e90b13472db7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.exercise.service; import static de.tum.cit.aet.artemis.core.config.Constants.EXAM_START_WAIT_TIME_MINUTES; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -41,12 +41,15 @@ import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.RatingService; +import de.tum.cit.aet.artemis.assessment.service.TutorLeaderboardService; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.service.ExamLiveEventsService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseSpecificationService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseSpecificationService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/ExerciseSpecificationService.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseSpecificationService.java index b985a8816a61..fd3872042db4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ExerciseSpecificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseSpecificationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.exercise.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -14,6 +14,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.Course_; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.Exam_; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionExportService.java index 6184b02d5e87..b9a2d59f414f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionExportService.java @@ -31,7 +31,6 @@ import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ZipFileService; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseImportService.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseImportService.java rename to src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseImportService.java index 0d28f09792c2..a6e1a51ad71e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseImportService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.fileupload.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -14,9 +14,11 @@ import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.FeedbackService; import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseImportService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseService.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseService.java rename to src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseService.java index a1e01bd27756..fc26e4c10dc5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.fileupload.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -10,6 +10,7 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.exercise.service.ExerciseSpecificationService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/FileUploadSubmissionService.java rename to src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionService.java index 59115a1abb1a..8def5e2e0fa3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/FileUploadSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.fileupload.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -22,10 +22,12 @@ import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.FeedbackService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.EmptyFileException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; @@ -35,9 +37,14 @@ import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadSubmissionRepository; +import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisCourseChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisCourseChatSessionService.java index 0d5bf3de1201..e02fefe5c846 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisCourseChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisCourseChatSessionService.java @@ -15,6 +15,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisPipelineService; import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.CourseChatJob; @@ -29,7 +30,6 @@ import de.tum.cit.aet.artemis.iris.service.IrisRateLimitService; import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; import de.tum.cit.aet.artemis.iris.service.websocket.IrisChatWebsocketService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisExerciseChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisExerciseChatSessionService.java index 27121ae92395..6fff9a345700 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisExerciseChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisExerciseChatSessionService.java @@ -10,6 +10,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisPipelineService; import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.ExerciseChatJob; @@ -29,7 +30,6 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisHestiaSessionService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisHestiaSessionService.java index deee3f3d4af9..b255f5876e50 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisHestiaSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisHestiaSessionService.java @@ -11,6 +11,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisConnectorService; import de.tum.cit.aet.artemis.iris.domain.session.IrisHestiaSession; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; @@ -19,7 +20,6 @@ import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; /** * Service to handle the Hestia integration of Iris. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSettingsService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSettingsService.java index 064a3bdfd2dd..b03825b4a7b7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSettingsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSettingsService.java @@ -18,6 +18,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; import de.tum.cit.aet.artemis.iris.domain.settings.IrisChatSubSettings; @@ -33,7 +34,6 @@ import de.tum.cit.aet.artemis.iris.dto.IrisCombinedSettingsDTO; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; import de.tum.cit.aet.artemis.iris.service.IrisDefaultTemplateService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenAlertException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSubSettingsService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSubSettingsService.java index 12c6e4ed5fec..445bf5e60fe4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSubSettingsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSubSettingsService.java @@ -12,6 +12,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; import de.tum.cit.aet.artemis.iris.domain.settings.IrisChatSubSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisCompetencyGenerationSubSettings; @@ -25,7 +26,6 @@ import de.tum.cit.aet.artemis.iris.dto.IrisCombinedCompetencyGenerationSubSettingsDTO; import de.tum.cit.aet.artemis.iris.dto.IrisCombinedHestiaSubSettingsDTO; import de.tum.cit.aet.artemis.iris.dto.IrisCombinedLectureIngestionSubSettingsDTO; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; /** * Service for handling {@link IrisSubSettings} objects. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LectureImportService.java b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureImportService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/LectureImportService.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureImportService.java index c7759cc37e55..2306788bbaa3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LectureImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureImportService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.lecture.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -30,6 +30,9 @@ import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; +import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.SlideSplitterService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LectureService.java b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/LectureService.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureService.java index a2121367f871..d38deb7e7e22 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LectureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.lecture.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -19,6 +19,7 @@ import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisWebhookService; import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitProcessingService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/LectureUnitProcessingService.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitProcessingService.java index d98e907f5a3b..426d6ba2bfab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitProcessingService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.lecture.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -33,6 +33,10 @@ import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.service.AttachmentUnitService; +import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.service.FileService; +import de.tum.cit.aet.artemis.service.SlideSplitterService; import de.tum.cit.aet.artemis.web.rest.dto.LectureUnitInformationDTO; import de.tum.cit.aet.artemis.web.rest.dto.LectureUnitSplitDTO; import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitService.java b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/LectureUnitService.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitService.java index c924f0315e2f..577a0bfdca80 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LectureUnitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.lecture.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -38,6 +38,8 @@ import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.SlideRepository; +import de.tum.cit.aet.artemis.service.FilePathService; +import de.tum.cit.aet.artemis.service.FileService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseImportService.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseImportService.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseImportService.java index f0f982c95d07..4c9a8b01bf09 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseImportService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.modeling.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -20,11 +20,13 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.FeedbackService; import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseImportService; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; @@ -54,7 +56,7 @@ public ModelingExerciseImportService(ModelingExerciseRepository modelingExercise * Imports a modeling exercise creating a new entity, copying all basic values and saving it in the database. * All basic include everything except Student-, Tutor participations, and student questions.
* This method calls {@link #copyModelingExerciseBasis(Exercise, Map)} to set up the basis of the exercise - * {@link #copyExampleSubmission(Exercise, Exercise)} for a hard copy of the example submissions. + * {@link #copyExampleSubmission(Exercise, Exercise, Map)} for a hard copy of the example submissions. * * @param templateExercise The template exercise which should get imported * @param importedExercise The new exercise already containing values which should not get copied, i.e. overwritten @@ -97,18 +99,6 @@ private ModelingExercise copyModelingExerciseBasis(Exercise importedExercise, Ma return newExercise; } - /** - * This functions does a hard copy of the example submissions contained in {@code templateExercise}. - * To copy the corresponding Submission entity this function calls {@link #copySubmission(Submission, Map)} - * - * @param templateExercise {TextExercise} The original exercise from which to fetch the example submissions - * @param newExercise The new exercise in which we will insert the example submissions - * @return The cloned set of example submissions - */ - Set copyExampleSubmission(Exercise templateExercise, Exercise newExercise) { - return copyExampleSubmission(templateExercise, newExercise, new HashMap<>()); - } - /** * This functions does a hard copy of the example submissions contained in {@code templateExercise}. * To copy the corresponding Submission entity this function calls {@link #copySubmission(Submission, Map)} @@ -118,7 +108,7 @@ Set copyExampleSubmission(Exercise templateExercise, Exercise * @param gradingInstructionCopyTracker The mapping from original GradingInstruction Ids to new GradingInstruction instances. * @return The cloned set of example submissions */ - Set copyExampleSubmission(Exercise templateExercise, Exercise newExercise, Map gradingInstructionCopyTracker) { + private Set copyExampleSubmission(Exercise templateExercise, Exercise newExercise, Map gradingInstructionCopyTracker) { log.debug("Copying the ExampleSubmissions to new Exercise: {}", newExercise); Set newExampleSubmissions = new HashSet<>(); for (ExampleSubmission originalExampleSubmission : templateExercise.getExampleSubmissions()) { @@ -144,7 +134,7 @@ Set copyExampleSubmission(Exercise templateExercise, Exercise * @param gradingInstructionCopyTracker The mapping from original GradingInstruction Ids to new GradingInstruction instances. * @return The cloned submission */ - Submission copySubmission(Submission originalSubmission, Map gradingInstructionCopyTracker) { + public Submission copySubmission(Submission originalSubmission, Map gradingInstructionCopyTracker) { ModelingSubmission newSubmission = new ModelingSubmission(); if (originalSubmission != null) { log.debug("Copying the Submission to new ExampleSubmission: {}", newSubmission); diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseService.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseService.java index e6ced8ccaf98..1841b6dcdd79 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ModelingExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.modeling.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -12,6 +12,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.exercise.service.ExerciseSpecificationService; import de.tum.cit.aet.artemis.modeling.domain.ModelCluster; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.repository.ModelClusterRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ModelingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/ModelingSubmissionService.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java index f856118aa90d..b319296fd4b6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ModelingSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.modeling.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -22,9 +22,11 @@ import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.FeedbackService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; @@ -33,12 +35,16 @@ import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.domain.SimilarElementCount; import de.tum.cit.aet.artemis.modeling.repository.ModelElementRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; import de.tum.cit.aet.artemis.modeling.service.compass.CompassService; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.service.SubmissionService; +import de.tum.cit.aet.artemis.service.SubmissionVersionService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismAnswerPostService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismAnswerPostService.java index aa1efa7fde6e..662145ecafb8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismAnswerPostService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismAnswerPostService.java @@ -19,9 +19,9 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismPostService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismPostService.java index 952da8956a4c..e840e1b62cbb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismPostService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismPostService.java @@ -19,11 +19,11 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismService.java index 1de15a374696..7ea600536fae 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismService.java @@ -16,17 +16,17 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmission; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java index 23448ac5b594..ee8e621d869d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java @@ -46,11 +46,11 @@ import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeature; -import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/StaticCodeAnalysisCategory.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/StaticCodeAnalysisCategory.java index f4912e89b375..fef1328cd8c6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/StaticCodeAnalysisCategory.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/StaticCodeAnalysisCategory.java @@ -16,6 +16,7 @@ import de.tum.cit.aet.artemis.assessment.domain.CategoryState; import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.programming.service.StaticCodeAnalysisService; /** * Entity for storing static code analysis categories and their settings. @@ -88,7 +89,7 @@ public void setProgrammingExercise(ProgrammingExercise exercise) { * As an exception, the {exercise} attribute will not be set and be null. * * @return New SCA category object with the same values - * @see de.tum.cit.aet.artemis.service.StaticCodeAnalysisService#importCategoriesFromExercise(ProgrammingExercise, ProgrammingExercise) + * @see StaticCodeAnalysisService#importCategoriesFromExercise(ProgrammingExercise, ProgrammingExercise) */ public StaticCodeAnalysisCategory copy() { StaticCodeAnalysisCategory category = new StaticCodeAnalysisCategory(); diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/submissionpolicy/LockRepositoryPolicy.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/submissionpolicy/LockRepositoryPolicy.java index a4f40a321c24..53f840c2940a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/submissionpolicy/LockRepositoryPolicy.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/submissionpolicy/LockRepositoryPolicy.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; -import de.tum.cit.aet.artemis.service.SubmissionPolicyService; +import de.tum.cit.aet.artemis.programming.service.SubmissionPolicyService; /** * Configures a Lock Repository Policy.
diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/submissionpolicy/SubmissionPenaltyPolicy.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/submissionpolicy/SubmissionPenaltyPolicy.java index bcde1fd30ad0..918526016e7c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/submissionpolicy/SubmissionPenaltyPolicy.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/submissionpolicy/SubmissionPenaltyPolicy.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; -import de.tum.cit.aet.artemis.service.SubmissionPolicyService; +import de.tum.cit.aet.artemis.programming.service.SubmissionPolicyService; /** * Configures a Submission Penalty Policy.
diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ConsistencyCheckService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ConsistencyCheckService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/ConsistencyCheckService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ConsistencyCheckService.java index b6f3c38355af..d7bf2cfbc85f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ConsistencyCheckService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ConsistencyCheckService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/InternalUrlService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/InternalUrlService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/InternalUrlService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/InternalUrlService.java index 962155e0f4c6..7df53789c6af 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/InternalUrlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/InternalUrlService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationVcsAccessTokenService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ParticipationVcsAccessTokenService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/ParticipationVcsAccessTokenService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ParticipationVcsAccessTokenService.java index 50dfc327bd9b..9a8428adab24 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationVcsAccessTokenService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ParticipationVcsAccessTokenService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/PlantUmlService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/PlantUmlService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/PlantUmlService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/PlantUmlService.java index 7f15c348aef5..ef73ac5408ec 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/PlantUmlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/PlantUmlService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -20,6 +20,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; +import de.tum.cit.aet.artemis.service.ResourceLoaderService; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.FileFormatOption; import net.sourceforge.plantuml.SourceStringReader; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingAssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingAssessmentService.java index d2c328957389..0adc0ccdba01 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingAssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingAssessmentService.java @@ -17,6 +17,9 @@ import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.AssessmentService; +import de.tum.cit.aet.artemis.assessment.service.ComplaintResponseService; +import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -26,13 +29,10 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.service.AssessmentService; -import de.tum.cit.aet.artemis.service.ComplaintResponseService; -import de.tum.cit.aet.artemis.service.ExerciseDateService; -import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java index 68d1a59af78b..31117b9a1591 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java @@ -19,13 +19,13 @@ import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaFeedbackSuggestionsService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseExportService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseExportService.java index 1a9ac21bc68c..9b27ec90fcec 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseExportService.java @@ -60,6 +60,7 @@ import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.exercise.service.ExerciseWithSubmissionsExportService; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -72,7 +73,6 @@ import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; -import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ZipFileService; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryExportOptionsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java index a2f8a3ba6ac6..73652b2cf0a3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java @@ -35,6 +35,8 @@ import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.FeedbackService; +import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; @@ -48,6 +50,7 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; @@ -66,10 +69,6 @@ import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.service.BuildLogEntryService; -import de.tum.cit.aet.artemis.service.ExerciseDateService; -import de.tum.cit.aet.artemis.service.FeedbackService; -import de.tum.cit.aet.artemis.service.ResultService; -import de.tum.cit.aet.artemis.service.SubmissionPolicyService; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseGradingStatisticsDTO; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportBasicService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportBasicService.java index 4d8438aff9fe..add9651addc2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportBasicService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportBasicService.java @@ -40,7 +40,6 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.programming.service.hestia.ExerciseHintService; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; -import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportFromFileService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportFromFileService.java index 1b74ff8261ac..35e190b98083 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportFromFileService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportFromFileService.java @@ -37,7 +37,6 @@ import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; import de.tum.cit.aet.artemis.service.ZipFileService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseParticipationService.java index 544da138ae04..6176430ebf65 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseParticipationService.java @@ -22,6 +22,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlRepositoryPermission; import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; @@ -44,7 +45,6 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.dto.CommitInfoDTO; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseScheduleService.java index 3ed69627c737..b18798285f2e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseScheduleService.java @@ -52,6 +52,7 @@ import de.tum.cit.aet.artemis.exercise.domain.ExerciseLifecycle; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.exercise.service.IExerciseScheduleService; import de.tum.cit.aet.artemis.programming.domain.ParticipationLifecycle; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -59,7 +60,6 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; import tech.jhipster.config.JHipsterConstants; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java index c8830c026466..f3656f680551 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java @@ -60,6 +60,8 @@ import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseService; +import de.tum.cit.aet.artemis.exercise.service.ExerciseSpecificationService; import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -85,11 +87,8 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; import de.tum.cit.aet.artemis.programming.service.structureoraclegenerator.OracleGenerator; -import de.tum.cit.aet.artemis.service.ExerciseService; -import de.tum.cit.aet.artemis.service.ExerciseSpecificationService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.service.SubmissionPolicyService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingSubmissionService.java index 64dddf1903e1..2996eca34574 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingSubmissionService.java @@ -27,12 +27,14 @@ import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.FeedbackService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationTriggerService; @@ -47,6 +49,7 @@ import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.programming.domain.AbstractBaseProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.Commit; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -62,9 +65,6 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.repository.SubmissionPolicyRepository; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseGitDiffReportService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ExerciseDateService; -import de.tum.cit.aet.artemis.service.FeedbackService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.SubmissionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryAccessService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryAccessService.java index 9aa86ce51997..fd32f17a67bb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryAccessService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryAccessService.java @@ -6,13 +6,13 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.repository.RepositoryActionType; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/StaticCodeAnalysisService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/StaticCodeAnalysisService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/StaticCodeAnalysisService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/StaticCodeAnalysisService.java index 5d424c4bbb5a..18b87aa30f4b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/StaticCodeAnalysisService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/StaticCodeAnalysisService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -19,7 +19,6 @@ import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisCategory; import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisDefaultCategory; import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; -import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionPolicyService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/SubmissionPolicyService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/SubmissionPolicyService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/SubmissionPolicyService.java index fc7626ae379a..53cdd9aeca73 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionPolicyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/SubmissionPolicyService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -22,7 +22,6 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.repository.SubmissionPolicyRepository; -import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseParticipationService; import de.tum.cit.aet.artemis.web.rest.SubmissionPolicyResource; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ExerciseHintService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ExerciseHintService.java index 6cde0f4035a2..2d56a911885e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ExerciseHintService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ExerciseHintService.java @@ -21,6 +21,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -30,7 +31,6 @@ import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintActivationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AbstractQuizSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/AbstractQuizSubmissionService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/AbstractQuizSubmissionService.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/service/AbstractQuizSubmissionService.java index 3fec3e51f903..fd8d60c18f9c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AbstractQuizSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/AbstractQuizSubmissionService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.quiz.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -14,6 +14,7 @@ import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.quiz.domain.AbstractQuizSubmission; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; +import de.tum.cit.aet.artemis.service.SubmissionVersionService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseImportService.java index 8880a8806636..234a951bba25 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseImportService.java @@ -22,9 +22,11 @@ import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.FeedbackService; import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseImportService; import de.tum.cit.aet.artemis.quiz.domain.AnswerOption; import de.tum.cit.aet.artemis.quiz.domain.DragAndDropMapping; import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; @@ -38,8 +40,6 @@ import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestion; import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSolution; import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSpot; -import de.tum.cit.aet.artemis.service.ExerciseImportService; -import de.tum.cit.aet.artemis.service.FeedbackService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseService.java index 174d25d1c0c4..f7fe59bbee33 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseService.java @@ -38,6 +38,7 @@ import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.service.ExerciseSpecificationService; import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; import de.tum.cit.aet.artemis.quiz.domain.DragItem; import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; @@ -51,7 +52,6 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.quiz.repository.ShortAnswerMappingRepository; -import de.tum.cit.aet.artemis.service.ExerciseSpecificationService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizResultService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizResultService.java index a927bb8cad88..b540fdc5f9bd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizResultService.java @@ -18,6 +18,7 @@ import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.Submission; @@ -28,7 +29,6 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; -import de.tum.cit.aet.artemis.service.ResultService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizSubmissionService.java index c4e0ded3d387..75b0cbaaecc4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizSubmissionService.java @@ -30,7 +30,6 @@ import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; -import de.tum.cit.aet.artemis.service.AbstractQuizSubmissionService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.SubmissionVersionService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java b/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java index 8028c7857008..6be57f0b6dc7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java @@ -50,6 +50,9 @@ import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.RatingRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.ComplaintService; +import de.tum.cit.aet.artemis.assessment.service.PresentationPointsCalculationService; +import de.tum.cit.aet.artemis.assessment.service.TutorLeaderboardService; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; @@ -69,6 +72,7 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.export.CourseExamExportService; import de.tum.cit.aet.artemis.core.service.user.UserService; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; @@ -82,9 +86,12 @@ import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDeletionService; +import de.tum.cit.aet.artemis.exercise.service.ExerciseService; import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.service.LectureService; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java b/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java index 4e9602ce99b4..a8415c0d1faa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java @@ -12,6 +12,7 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreService; import de.tum.cit.aet.artemis.atlas.domain.LearningObject; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.Exercise; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java index c2d72c330e42..fbb5ac8e7103 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java @@ -12,6 +12,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.ParticipationInterface; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleService.java index 6f805b52a0cf..d4c7b8c81f05 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleService.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.programming.domain.ParticipationLifecycle; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java index 2bf704c2bb0f..8ea1a0556f77 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java @@ -23,6 +23,7 @@ import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.TeamScoreRepository; +import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; @@ -43,6 +44,7 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.programming.domain.BuildPlanType; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; @@ -52,6 +54,7 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageReportRepository; +import de.tum.cit.aet.artemis.programming.service.ParticipationVcsAccessTokenService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java index 348048e4c4b3..6605024a1c44 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java @@ -30,9 +30,11 @@ import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.FeedbackService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; @@ -44,6 +46,7 @@ import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.text.domain.TextSubmission; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextAssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextAssessmentService.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/service/TextAssessmentService.java rename to src/main/java/de/tum/cit/aet/artemis/text/service/TextAssessmentService.java index 871dd95939fa..9af2cb7ce199 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextAssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextAssessmentService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.text.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.hibernate.Hibernate.isInitialized; @@ -17,6 +17,9 @@ import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.AssessmentService; +import de.tum.cit.aet.artemis.assessment.service.ComplaintResponseService; +import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiNewResultService; @@ -24,6 +27,7 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextBlockService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextBlockService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/TextBlockService.java rename to src/main/java/de/tum/cit/aet/artemis/text/service/TextBlockService.java index 6f98fc5e5f5f..6b16554f4e7b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextBlockService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextBlockService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.text.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static java.lang.Integer.compare; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseFeedbackService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/TextExerciseFeedbackService.java rename to src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseFeedbackService.java index b685e42d98ff..8e43f033fff3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseFeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseFeedbackService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.text.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -17,9 +17,12 @@ import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaFeedbackSuggestionsService; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseImportService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/TextExerciseImportService.java rename to src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseImportService.java index 29c9415ef006..249d395c295b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseImportService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.text.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -26,11 +26,13 @@ import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.repository.TextBlockRepository; +import de.tum.cit.aet.artemis.assessment.service.FeedbackService; import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseImportService; import de.tum.cit.aet.artemis.text.domain.TextBlock; import de.tum.cit.aet.artemis.text.domain.TextBlockType; import de.tum.cit.aet.artemis.text.domain.TextExercise; @@ -157,7 +159,7 @@ private Set copyTextBlocks(Set originalTextBlocks, TextSub * @param gradingInstructionCopyTracker The mapping from original GradingInstruction Ids to new GradingInstruction instances. * @return The cloned set of example submissions */ - Set copyExampleSubmission(Exercise templateExercise, Exercise newExercise, Map gradingInstructionCopyTracker) { + private Set copyExampleSubmission(Exercise templateExercise, Exercise newExercise, Map gradingInstructionCopyTracker) { log.debug("Copying the ExampleSubmissions to new Exercise: {}", newExercise); Set newExampleSubmissions = new HashSet<>(); for (ExampleSubmission originalExampleSubmission : templateExercise.getExampleSubmissions()) { @@ -184,7 +186,7 @@ Set copyExampleSubmission(Exercise templateExercise, Exercise * @param originalSubmission The original submission to be copied. * @return The cloned submission */ - TextSubmission copySubmission(final Submission originalSubmission, Map gradingInstructionCopyTracker) { + public TextSubmission copySubmission(final Submission originalSubmission, Map gradingInstructionCopyTracker) { TextSubmission newSubmission = new TextSubmission(); if (originalSubmission != null) { log.debug("Copying the Submission to new ExampleSubmission: {}", newSubmission); diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/TextExerciseService.java rename to src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseService.java index 1ffb266e7314..2ededa0f67e4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.text.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -11,6 +11,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.exercise.service.ExerciseSpecificationService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TextSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionService.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/TextSubmissionService.java rename to src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionService.java index a069d50746d7..7f555160fd71 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TextSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.text.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -16,9 +16,11 @@ import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.FeedbackService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; @@ -27,6 +29,10 @@ import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; +import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.service.SubmissionService; +import de.tum.cit.aet.artemis.service.SubmissionVersionService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupService.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupService.java index 8fe575d3cada..3770037f7a0b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupService.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupService.java @@ -39,7 +39,7 @@ import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AbstractSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AbstractSubmissionResource.java index f561c22bee25..14387b58b64a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AbstractSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AbstractSubmissionResource.java @@ -7,12 +7,12 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.SubmissionService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AccountResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AccountResource.java index cc127fe2e259..9d838d5c5374 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AccountResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AccountResource.java @@ -34,11 +34,11 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.service.AccountService; import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCPersonalAccessTokenManagementService; import de.tum.cit.aet.artemis.core.service.user.UserCreationService; import de.tum.cit.aet.artemis.core.service.user.UserService; import de.tum.cit.aet.artemis.programming.icl.ssh.HashUtils; -import de.tum.cit.aet.artemis.service.AccountService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.dto.PasswordChangeDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonDiagramResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonDiagramResource.java index 9bbd02b5414d..fd61612fba43 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonDiagramResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonDiagramResource.java @@ -26,9 +26,9 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.modeling.domain.ApollonDiagram; import de.tum.cit.aet.artemis.modeling.repository.ApollonDiagramRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AssessmentResource.java index afc9fc1146e4..bb38f12089a8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AssessmentResource.java @@ -12,18 +12,18 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.AssessmentService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.service.AssessmentService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AthenaResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AthenaResource.java index 72a345ef0ebf..beeb319351af 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AthenaResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AthenaResource.java @@ -28,6 +28,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.core.security.annotations.ManualConfig; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaFeedbackSuggestionsService; import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaModuleService; import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaRepositoryExportService; @@ -39,7 +40,6 @@ import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AttachmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/AttachmentResource.java index a5a6acfe8701..db3865a82119 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AttachmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/AttachmentResource.java @@ -34,10 +34,10 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.lecture.domain.AttachmentType; import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/BonusResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/BonusResource.java index c0e9e9706b55..bd851c04e82e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/BonusResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/BonusResource.java @@ -26,6 +26,8 @@ import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.repository.BonusRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.assessment.service.BonusService; +import de.tum.cit.aet.artemis.assessment.service.CourseScoreCalculationService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -33,10 +35,8 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.ManualConfig; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.service.ExamAccessService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.BonusService; -import de.tum.cit.aet.artemis.service.CourseScoreCalculationService; import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResource.java index a3569dd305cc..7f8d0aa13f3d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResource.java @@ -26,6 +26,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.ComplaintService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -34,6 +35,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.Team; @@ -45,8 +47,6 @@ import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ComplaintService; import de.tum.cit.aet.artemis.service.dto.ComplaintRequestDTO; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResponseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResponseResource.java index f073ff5d835b..7fe81edb8ad7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResponseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResponseResource.java @@ -20,10 +20,10 @@ import de.tum.cit.aet.artemis.assessment.domain.Complaint; import de.tum.cit.aet.artemis.assessment.domain.ComplaintResponse; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; +import de.tum.cit.aet.artemis.assessment.service.ComplaintResponseService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.service.ComplaintResponseService; import de.tum.cit.aet.artemis.service.dto.ComplaintAction; import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ConsistencyCheckResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ConsistencyCheckResource.java index abd55f810841..23d3880b7e6b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ConsistencyCheckResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ConsistencyCheckResource.java @@ -15,10 +15,10 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ConsistencyCheckService; +import de.tum.cit.aet.artemis.programming.service.ConsistencyCheckService; import de.tum.cit.aet.artemis.service.dto.ConsistencyErrorDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java index 5fc6c51edac0..de18e79887e7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java @@ -60,6 +60,10 @@ import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; +import de.tum.cit.aet.artemis.assessment.service.AssessmentDashboardService; +import de.tum.cit.aet.artemis.assessment.service.ComplaintService; +import de.tum.cit.aet.artemis.assessment.service.CourseScoreCalculationService; +import de.tum.cit.aet.artemis.assessment.service.GradingScaleService; import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; @@ -71,6 +75,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaModuleService; import de.tum.cit.aet.artemis.core.service.connectors.ci.CIUserManagementService; import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsUserManagementService; @@ -85,17 +90,12 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseService; import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; -import de.tum.cit.aet.artemis.service.AssessmentDashboardService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ComplaintService; import de.tum.cit.aet.artemis.service.ConductAgreementService; -import de.tum.cit.aet.artemis.service.CourseScoreCalculationService; import de.tum.cit.aet.artemis.service.CourseService; -import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.GradingScaleService; import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java index 4bc8992c72de..462ee5c97336 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java @@ -52,6 +52,7 @@ import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; +import de.tum.cit.aet.artemis.assessment.service.AssessmentDashboardService; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; @@ -66,6 +67,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; @@ -89,8 +91,6 @@ import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.service.AssessmentDashboardService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.web.rest.dto.CourseWithIdDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java index 15b22ae99a13..21bb02efbf95 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java @@ -23,19 +23,19 @@ import de.tum.cit.aet.artemis.assessment.domain.ExampleSubmission; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.assessment.service.ExampleSubmissionService; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ExampleSubmissionService; -import de.tum.cit.aet.artemis.service.TextBlockService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.text.service.TextBlockService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java index 70651846f040..a5881b428d9a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java @@ -37,7 +37,7 @@ import de.tum.cit.aet.artemis.exam.service.ExamAccessService; import de.tum.cit.aet.artemis.exam.service.ExamImportService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.service.ExerciseDeletionService; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDeletionService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java index aa9cce780835..451dc61c1e0a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java @@ -28,12 +28,14 @@ import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.assessment.service.TutorParticipationService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.service.ExamAccessService; import de.tum.cit.aet.artemis.exam.service.ExamDateService; @@ -41,6 +43,8 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDeletionService; +import de.tum.cit.aet.artemis.exercise.service.ExerciseService; import de.tum.cit.aet.artemis.iris.dto.IrisCombinedSettingsDTO; import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismCaseService; @@ -50,11 +54,7 @@ import de.tum.cit.aet.artemis.programming.service.hestia.ExerciseHintService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.service.QuizBatchService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ExerciseDeletionService; -import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.TutorParticipationService; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorParticipationStatus; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseDetailsDTO; import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseScoresChartResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseScoresChartResource.java index 621babdeaaad..84889a183a01 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseScoresChartResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseScoresChartResource.java @@ -21,10 +21,10 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ExerciseDateService; -import de.tum.cit.aet.artemis.service.ExerciseScoresChartService; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; +import de.tum.cit.aet.artemis.exercise.service.ExerciseScoresChartService; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseScoresDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java index bc8b4f98155c..b27a53c79947 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java @@ -49,6 +49,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -64,16 +65,15 @@ import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.SlideRepository; +import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; import de.tum.cit.aet.artemis.quiz.domain.DragItem; import de.tum.cit.aet.artemis.quiz.repository.DragItemRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizQuestionRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.LectureUnitService; import de.tum.cit.aet.artemis.service.ResourceLoaderService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java index e170ebcc3d7f..f793de44406a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java @@ -20,11 +20,13 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.AssessmentService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; @@ -33,8 +35,6 @@ import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadSubmissionRepository; -import de.tum.cit.aet.artemis.service.AssessmentService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; import de.tum.cit.aet.artemis.web.rest.dto.FileUploadAssessmentDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java index d0bfe6a30588..f0d353424009 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java @@ -41,19 +41,19 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDeletionService; +import de.tum.cit.aet.artemis.exercise.service.ExerciseService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; +import de.tum.cit.aet.artemis.fileupload.service.FileUploadExerciseImportService; +import de.tum.cit.aet.artemis.fileupload.service.FileUploadExerciseService; import de.tum.cit.aet.artemis.fileupload.service.FileUploadSubmissionExportService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; -import de.tum.cit.aet.artemis.service.ExerciseDeletionService; -import de.tum.cit.aet.artemis.service.ExerciseService; -import de.tum.cit.aet.artemis.service.FileUploadExerciseImportService; -import de.tum.cit.aet.artemis.service.FileUploadExerciseService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java index 3623d0fd2590..e0f0e65ec4dc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java @@ -29,6 +29,7 @@ import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.User; @@ -37,6 +38,7 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.service.ExamSubmissionService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; @@ -44,14 +46,12 @@ import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadSubmissionRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ExerciseDateService; -import de.tum.cit.aet.artemis.service.FileUploadSubmissionService; -import de.tum.cit.aet.artemis.service.ResultService; +import de.tum.cit.aet.artemis.fileupload.service.FileUploadSubmissionService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/GradeStepResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/GradeStepResource.java index 4a26f197d27d..2727efffd77e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/GradeStepResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/GradeStepResource.java @@ -26,12 +26,12 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.dto.GradeDTO; import de.tum.cit.aet.artemis.web.rest.dto.GradeStepsDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/GradingScaleResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/GradingScaleResource.java index 769a844f9001..a4ce9d838821 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/GradingScaleResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/GradingScaleResource.java @@ -25,15 +25,15 @@ import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.assessment.service.GradingScaleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.GradingScaleService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java index eb1a29f83db0..88283e17229e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java @@ -37,9 +37,9 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.LearningObjectService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java index de0d9e85e440..b53989af2b00 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java @@ -37,16 +37,16 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.service.ExerciseService; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ExerciseService; -import de.tum.cit.aet.artemis.service.LectureImportService; -import de.tum.cit.aet.artemis.service.LectureService; +import de.tum.cit.aet.artemis.lecture.service.LectureImportService; +import de.tum.cit.aet.artemis.lecture.service.LectureService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java index 6b2da625b209..1f0a74d102f0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java @@ -29,10 +29,10 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiDeepLinkingService; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.PaginationUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java index 42e51f512069..ade01423bbd5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java @@ -24,11 +24,13 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.AssessmentService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; @@ -37,8 +39,6 @@ import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; -import de.tum.cit.aet.artemis.service.AssessmentService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; import de.tum.cit.aet.artemis.web.rest.dto.ModelingAssessmentDTO; import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java index 8fb144e27271..750bcaf25df3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java @@ -42,24 +42,24 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDeletionService; +import de.tum.cit.aet.artemis.exercise.service.ExerciseService; import de.tum.cit.aet.artemis.exercise.service.SubmissionExportService; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; +import de.tum.cit.aet.artemis.modeling.service.ModelingExerciseImportService; +import de.tum.cit.aet.artemis.modeling.service.ModelingExerciseService; import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismDetectionConfigHelper; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismDetectionService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; -import de.tum.cit.aet.artemis.service.ExerciseDeletionService; -import de.tum.cit.aet.artemis.service.ExerciseService; -import de.tum.cit.aet.artemis.service.ModelingExerciseImportService; -import de.tum.cit.aet.artemis.service.ModelingExerciseService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java index 7bd414b1fd50..758f1e80c27c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java @@ -29,11 +29,13 @@ import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.service.ExamSubmissionService; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -44,10 +46,8 @@ import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; +import de.tum.cit.aet.artemis.modeling.service.ModelingSubmissionService; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ModelingSubmissionService; -import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java index 5bb0c8d041a2..00cfeca2806d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java @@ -14,14 +14,14 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.assessment.listener.ResultListener; +import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ParticipantScoreService; import de.tum.cit.aet.artemis.web.rest.dto.score.ScoreDTO; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java index 54bf3245571f..bc2fb5743fad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java @@ -45,6 +45,7 @@ import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.GradingScaleService; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.config.GuidedTourConfiguration; import de.tum.cit.aet.artemis.core.domain.Course; @@ -56,6 +57,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; @@ -73,6 +75,7 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; @@ -88,13 +91,10 @@ import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.quiz.service.QuizBatchService; import de.tum.cit.aet.artemis.quiz.service.QuizSubmissionService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ExerciseDateService; -import de.tum.cit.aet.artemis.service.GradingScaleService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.TextExerciseFeedbackService; import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.service.TextExerciseFeedbackService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/PlantUmlResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/PlantUmlResource.java index dc45d82563fc..e4def890e420 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/PlantUmlResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/PlantUmlResource.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.service.PlantUmlService; +import de.tum.cit.aet.artemis.programming.service.PlantUmlService; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java index 57e90c5c469e..4f3e3cfc0ee5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java @@ -58,9 +58,12 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastInstructorInExercise; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDeletionService; +import de.tum.cit.aet.artemis.exercise.service.ExerciseService; import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; import de.tum.cit.aet.artemis.quiz.domain.DragItem; import de.tum.cit.aet.artemis.quiz.domain.QuizAction; @@ -76,10 +79,7 @@ import de.tum.cit.aet.artemis.quiz.service.QuizResultService; import de.tum.cit.aet.artemis.quiz.service.QuizStatisticService; import de.tum.cit.aet.artemis.quiz.service.QuizSubmissionService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; -import de.tum.cit.aet.artemis.service.ExerciseDeletionService; -import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.web.rest.dto.QuizBatchJoinDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java index 0ee8017e1c10..2d6cf2bef2d3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java @@ -18,10 +18,10 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.service.ExamAccessService; import de.tum.cit.aet.artemis.quiz.domain.QuizPool; import de.tum.cit.aet.artemis.quiz.service.QuizPoolService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java index bee0972ef279..8880b6191588 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java @@ -28,6 +28,7 @@ import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.service.ExamSubmissionService; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; @@ -38,7 +39,6 @@ import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.service.QuizSubmissionService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java index ddcea3d96f60..178999b64efb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java @@ -22,6 +22,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Rating; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.RatingService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -29,9 +30,8 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.RatingService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java index 60ffea494bd9..2807ae95a30c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java @@ -28,6 +28,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -36,6 +37,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; @@ -47,10 +49,8 @@ import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.web.rest.dto.ResultWithPointsPerGradingCriterionDTO; import de.tum.cit.aet.artemis.web.rest.dto.feedback.FeedbackDetailDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java index e5c9722021c1..f649c330c400 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java @@ -20,12 +20,12 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisCategory; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; +import de.tum.cit.aet.artemis.programming.service.StaticCodeAnalysisService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/StatisticsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/StatisticsResource.java index 2333e790294d..54ecf8f08ac8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/StatisticsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/StatisticsResource.java @@ -18,9 +18,9 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.StatisticsService; import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementStatisticsDTO; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseManagementStatisticsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java index 69f37a8613b0..078edd8b9d7a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java @@ -41,6 +41,7 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.core.util.ExamExerciseStartPreparationStatus; import de.tum.cit.aet.artemis.core.util.HttpRequestUtils; @@ -65,7 +66,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.SubmissionPolicyRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.web.rest.dto.StudentExamWithGradeDTO; import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamAttendanceCheckEventDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java index a6f0d8f1c255..482f21e81068 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java @@ -25,13 +25,13 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.programming.service.SubmissionPolicyService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; -import de.tum.cit.aet.artemis.service.SubmissionPolicyService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java index c9047adadb93..c7274647a5d7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java @@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -25,6 +26,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.SubmissionVersion; @@ -35,9 +37,7 @@ import de.tum.cit.aet.artemis.exercise.repository.SubmissionVersionRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.BuildLogEntryService; -import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionVersionDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java index 33a6ccbddec0..293f66fe23d0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java @@ -45,6 +45,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -54,7 +55,6 @@ import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.service.team.TeamService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.service.dto.TeamSearchUserDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentEventResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentEventResource.java index bb5d2e98362b..660ccc31bd1f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentEventResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentEventResource.java @@ -26,8 +26,8 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.text.domain.TextAssessmentEvent; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java index fde8dfb1f683..6fa12f903e1e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java @@ -38,11 +38,13 @@ import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaFeedbackSendingService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; @@ -50,16 +52,14 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ResultService; -import de.tum.cit.aet.artemis.service.TextAssessmentService; -import de.tum.cit.aet.artemis.service.TextBlockService; -import de.tum.cit.aet.artemis.service.TextSubmissionService; import de.tum.cit.aet.artemis.text.domain.TextBlock; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.text.service.TextAssessmentService; +import de.tum.cit.aet.artemis.text.service.TextBlockService; +import de.tum.cit.aet.artemis.text.service.TextSubmissionService; import de.tum.cit.aet.artemis.web.rest.dto.TextAssessmentDTO; import de.tum.cit.aet.artemis.web.rest.dto.TextAssessmentUpdateDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java index a60ac7eebac4..1426a884010a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java @@ -53,6 +53,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaModuleService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; @@ -63,20 +64,19 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDeletionService; +import de.tum.cit.aet.artemis.exercise.service.ExerciseService; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismDetectionConfigHelper; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismDetectionService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; -import de.tum.cit.aet.artemis.service.ExerciseDateService; -import de.tum.cit.aet.artemis.service.ExerciseDeletionService; -import de.tum.cit.aet.artemis.service.ExerciseService; -import de.tum.cit.aet.artemis.service.TextExerciseImportService; -import de.tum.cit.aet.artemis.service.TextExerciseService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.text.service.TextExerciseImportService; +import de.tum.cit.aet.artemis.text.service.TextExerciseService; import de.tum.cit.aet.artemis.text.service.TextSubmissionExportService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java index 2da6d369201d..f89497a81c37 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java @@ -24,10 +24,12 @@ import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.service.ExamSubmissionService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; @@ -36,14 +38,12 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ResultService; -import de.tum.cit.aet.artemis.service.TextAssessmentService; -import de.tum.cit.aet.artemis.service.TextSubmissionService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.text.service.TextAssessmentService; +import de.tum.cit.aet.artemis.text.service.TextSubmissionService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorEffortResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorEffortResource.java index 65df7908ee83..03d61414b82c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorEffortResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorEffortResource.java @@ -14,16 +14,16 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.assessment.dto.TutorEffort; +import de.tum.cit.aet.artemis.assessment.service.TutorEffortService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.TutorEffortService; /** * REST controller for managing TutorEffortResource. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java index fbe719c7c649..14506fdfe0cb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java @@ -20,15 +20,15 @@ import de.tum.cit.aet.artemis.assessment.domain.ExampleSubmission; import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; +import de.tum.cit.aet.artemis.assessment.service.TutorParticipationService; import de.tum.cit.aet.artemis.core.config.GuidedTourConfiguration; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.TutorParticipationService; import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java index 42e80bdc2137..2d30a2112c5d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java @@ -39,8 +39,8 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.LectureUnitService; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java index 8d1d05c8eff0..a3ac91df3697 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java @@ -45,11 +45,11 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionInputDTO; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.iris.service.IrisCompetencyGenerationService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.dto.CourseCompetencyProgressDTO; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolPairDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java index 90d25770ee78..4a46f618d401 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java @@ -39,8 +39,8 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.LectureUnitService; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java index 233dc14cc7e7..2bd5d5df8ab3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java @@ -19,6 +19,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -30,7 +31,6 @@ import de.tum.cit.aet.artemis.programming.service.CommitHistoryService; import de.tum.cit.aet.artemis.programming.service.RepositoryService; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseGitDiffReportService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseGitDiffReportDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java index 3519635a7a4e..8fc3258e0910 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java @@ -25,6 +25,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; @@ -37,7 +38,6 @@ import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralTestCaseService; import de.tum.cit.aet.artemis.programming.service.hestia.structural.StructuralSolutionEntryGenerationException; import de.tum.cit.aet.artemis.programming.service.hestia.structural.StructuralTestCaseService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; import tech.jhipster.web.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java index b9f671697ea2..f068bf580cfb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java @@ -15,11 +15,11 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; /** * REST controller for managing {@link ProgrammingExerciseTask}. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisSettingsResource.java index 2316efab7623..d914307f16de 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisSettingsResource.java @@ -15,13 +15,13 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.iris.domain.settings.IrisCourseSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisExerciseSettings; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSettings; import de.tum.cit.aet.artemis.iris.dto.IrisCombinedSettingsDTO; import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; /** * REST controller for managing {@link IrisSettings}. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java index c80d55a495aa..681995691b04 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java @@ -33,15 +33,15 @@ import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.service.LectureUnitProcessingService; import de.tum.cit.aet.artemis.service.AttachmentUnitService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.LectureUnitProcessingService; import de.tum.cit.aet.artemis.service.SlideSplitterService; import de.tum.cit.aet.artemis.web.rest.dto.LectureUnitInformationDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/ExerciseUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/ExerciseUnitResource.java index 24e878de0203..5a38853b0094 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/ExerciseUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/ExerciseUnitResource.java @@ -21,11 +21,11 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.repository.ExerciseUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java index 33320c876e4b..85d60b0c198a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java @@ -29,13 +29,13 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.user.UserService; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.LectureUnitService; +import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; import de.tum.cit.aet.artemis.web.rest.dto.lectureunit.LectureUnitForLearningPathNodeDetailsDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java index 94fefc5415b6..04a8ded7a92b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java @@ -31,12 +31,12 @@ import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.OnlineUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.OnlineUnitRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.LectureUnitService; +import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; import de.tum.cit.aet.artemis.web.rest.dto.OnlineResourceDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java index 0ed1ce470a08..48025c16c433 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java @@ -21,11 +21,11 @@ import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.TextUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java index 7072ecbc7c7d..1b1b99d90ac8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java @@ -23,12 +23,12 @@ import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.VideoUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.VideoUnitRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.LectureUnitService; +import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildJobQueueResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildJobQueueResource.java index ae0d041f9c33..7bcb4a75befc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildJobQueueResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildJobQueueResource.java @@ -24,11 +24,11 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.localci.SharedQueueManagementService; import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; import de.tum.cit.aet.artemis.programming.domain.BuildJob; import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.dto.BuildJobResultCountDTO; import de.tum.cit.aet.artemis.service.dto.BuildJobsStatisticsDTO; import de.tum.cit.aet.artemis.service.dto.FinishedBuildJobDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildPlanResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildPlanResource.java index 5d8bd8b41704..7be9c4b5dc84 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildPlanResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildPlanResource.java @@ -13,12 +13,12 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.programming.domain.BuildPlan; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; @Profile("gitlabci | jenkins") diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java index cda2b04f9c50..26c85b963c9a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java @@ -36,8 +36,8 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import io.swagger.annotations.ApiParam; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java index d5a51af01d80..e9f7c267f73e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java @@ -45,7 +45,7 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupChannelManagementService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenAlertException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java index e7f153db103c..73a53fd16a91 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java @@ -35,7 +35,7 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ConductAgreementService; import de.tum.cit.aet.artemis.service.dto.ResponsibleUserDTO; import de.tum.cit.aet.artemis.service.dto.UserPublicInfoDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicAccountResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicAccountResource.java index b9d961173837..e5b0eb8f5edd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicAccountResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicAccountResource.java @@ -30,8 +30,8 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.core.service.AccountService; import de.tum.cit.aet.artemis.core.service.user.UserService; -import de.tum.cit.aet.artemis.service.AccountService; import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicResultResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicResultResource.java index 1f5503e6cc8a..91098c3f2ecf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicResultResource.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; @@ -27,7 +28,6 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingMessagingService; import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; import de.tum.cit.aet.artemis.programming.service.hestia.TestwiseCoverageService; -import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java index 4c41d6411de6..aa75dcc7e9be 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java @@ -27,11 +27,11 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismDetectionConfig; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismCaseService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismVerdictDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java index b57b09459db5..84a6691f501e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java @@ -25,6 +25,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; @@ -32,7 +33,6 @@ import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismComparisonStatusDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java index a5329595ad2d..df692add0515 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java @@ -27,6 +27,7 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.service.ExamService; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; @@ -36,7 +37,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingAssessmentService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.AssessmentResource; import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java index 2af618e108c3..dc49d7bda772 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java @@ -51,6 +51,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaModuleService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; @@ -63,15 +64,14 @@ import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.programming.service.ConsistencyCheckService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseExportService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseImportFromFileService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseImportService; import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeature; import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeatureService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ConsistencyCheckService; +import de.tum.cit.aet.artemis.programming.service.SubmissionPolicyService; import de.tum.cit.aet.artemis.service.CourseService; -import de.tum.cit.aet.artemis.service.SubmissionPolicyService; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryExportOptionsDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java index c29a4140d546..0024f4af3c59 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java @@ -22,10 +22,10 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseGradingService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseGradingStatisticsDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java index 0b4e1e05eaba..19525972717a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java @@ -22,11 +22,13 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exam.service.ExamService; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; @@ -42,9 +44,7 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseParticipationService; import de.tum.cit.aet.artemis.programming.service.ProgrammingSubmissionService; import de.tum.cit.aet.artemis.programming.service.RepositoryService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.web.rest.dto.CommitInfoDTO; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java index 7e59c44ffc21..c7f4e1a2a3df 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java @@ -22,6 +22,7 @@ import de.jplag.exceptions.ExitException; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; @@ -32,7 +33,6 @@ import de.tum.cit.aet.artemis.plagiarism.service.ProgrammingLanguageNotSupportedForPlagiarismDetectionException; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java index 9d561f24288f..276fd236e0ea 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java @@ -53,6 +53,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaModuleService; import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; @@ -61,6 +62,8 @@ import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDeletionService; +import de.tum.cit.aet.artemis.exercise.service.ExerciseService; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismDetectionConfigHelper; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -75,12 +78,9 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseRepositoryService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseTestCaseService; +import de.tum.cit.aet.artemis.programming.service.StaticCodeAnalysisService; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.CourseService; -import de.tum.cit.aet.artemis.service.ExerciseDeletionService; -import de.tum.cit.aet.artemis.service.ExerciseService; -import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; import de.tum.cit.aet.artemis.web.rest.dto.BuildLogStatisticsDTO; import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseResetOptionsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java index c8ea95ee623c..62b0c91ebbce 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java @@ -21,13 +21,13 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseTestCaseService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseTestCaseDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java index e3559bbdae03..ca79d58ef55e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java @@ -30,6 +30,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; @@ -40,6 +41,7 @@ import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; @@ -50,8 +52,6 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingMessagingService; import de.tum.cit.aet.artemis.programming.service.ProgrammingSubmissionService; import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java index c51fe0db94c5..3f6d5727bdb1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java @@ -33,6 +33,7 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCServletService; import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; @@ -56,7 +57,6 @@ import de.tum.cit.aet.artemis.programming.service.RepositoryAccessService; import de.tum.cit.aet.artemis.programming.service.RepositoryParticipationService; import de.tum.cit.aet.artemis.programming.service.RepositoryService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.service.ProfileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryResource.java index 3979838a6e70..6b30ba2af6ab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryResource.java @@ -30,6 +30,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCServletService; import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; @@ -40,7 +41,6 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.RepositoryAccessService; import de.tum.cit.aet.artemis.programming.service.RepositoryService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.web.rest.dto.FileMove; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/TestRepositoryResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/TestRepositoryResource.java index 342d7dcffda1..13205ddb9dc9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/TestRepositoryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/TestRepositoryResource.java @@ -30,6 +30,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCServletService; import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; @@ -42,7 +43,6 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.RepositoryAccessService; import de.tum.cit.aet.artemis.programming.service.RepositoryService; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.web.rest.dto.FileMove; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java index 92f7aae45bc9..7f5971dd2bd8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java @@ -25,9 +25,9 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupFreePeriod; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupFreePeriodRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java index 85d1c3fcd0e0..3e063a46bcac 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java @@ -53,9 +53,9 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistrationType; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java index e8929ecedf0d..58116bc075f1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java @@ -39,9 +39,9 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupFreePeriod; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSessionStatus; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java index f5f125a7e52d..84376773a597 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java @@ -27,9 +27,9 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupsConfigurationRepository; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupChannelManagementService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java index d31304f774cf..df787f28cab5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java @@ -15,14 +15,14 @@ import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ExerciseDateService; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/ParticipationTeamWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/ParticipationTeamWebsocketService.java index 1731bf0c285d..84f7030db173 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/ParticipationTeamWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/ParticipationTeamWebsocketService.java @@ -42,11 +42,11 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; -import de.tum.cit.aet.artemis.service.ModelingSubmissionService; -import de.tum.cit.aet.artemis.service.TextSubmissionService; +import de.tum.cit.aet.artemis.modeling.service.ModelingSubmissionService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; +import de.tum.cit.aet.artemis.text.service.TextSubmissionService; import de.tum.cit.aet.artemis.web.websocket.dto.OnlineTeamStudentDTO; import de.tum.cit.aet.artemis.web.websocket.dto.SubmissionPatch; import de.tum.cit.aet.artemis.web.websocket.dto.SubmissionPatchPayload; diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractArtemisIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractArtemisIntegrationTest.java index 90ba08d101b2..0576660cb16d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractArtemisIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractArtemisIntegrationTest.java @@ -46,18 +46,18 @@ import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.MockDelegate; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.modeling.service.ModelingSubmissionService; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseGradingService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseParticipationService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseScheduleService; import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.ModelingSubmissionService; -import de.tum.cit.aet.artemis.service.TextBlockService; -import de.tum.cit.aet.artemis.service.TextSubmissionService; import de.tum.cit.aet.artemis.service.UriService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.ZipFileService; +import de.tum.cit.aet.artemis.text.service.TextBlockService; +import de.tum.cit.aet.artemis.text.service.TextSubmissionService; import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.HibernateQueryInterceptor; diff --git a/src/test/java/de/tum/cit/aet/artemis/architecture/FeedbackArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/architecture/FeedbackArchitectureTest.java index 446ee130bb44..9bd71d8ca7e8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/architecture/FeedbackArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/architecture/FeedbackArchitectureTest.java @@ -11,7 +11,7 @@ import com.tngtech.archunit.lang.ArchRule; import de.tum.cit.aet.artemis.assessment.domain.Feedback; -import de.tum.cit.aet.artemis.service.FeedbackService; +import de.tum.cit.aet.artemis.assessment.service.FeedbackService; class FeedbackArchitectureTest extends AbstractArchitectureTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/RatingResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/RatingResourceIntegrationTest.java index b8df7878304c..92d04ae92bdc 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/RatingResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/RatingResourceIntegrationTest.java @@ -15,13 +15,13 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.domain.Rating; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.service.RatingService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.service.RatingService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java index 35df3be13b26..7e7ff8e31735 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java @@ -14,12 +14,12 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.assessment.service.TutorLeaderboardService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.service.TutorLeaderboardService; import de.tum.cit.aet.artemis.web.rest.dto.TutorLeaderboardDTO; class TutorLeaderboardServiceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationIntegrationTest.java index e9e0b0d5c0a1..21a768b86d8b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationIntegrationTest.java @@ -22,6 +22,9 @@ import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingInstructionRepository; +import de.tum.cit.aet.artemis.assessment.service.ExampleSubmissionService; +import de.tum.cit.aet.artemis.assessment.service.ResultService; +import de.tum.cit.aet.artemis.assessment.service.TutorParticipationService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.ExerciseFactory; import de.tum.cit.aet.artemis.exercise.domain.Exercise; @@ -30,10 +33,7 @@ import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.service.ExampleSubmissionService; -import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.service.SubmissionService; -import de.tum.cit.aet.artemis.service.TutorParticipationService; import de.tum.cit.aet.artemis.text.domain.TextBlock; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/CourseCompetencyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/CourseCompetencyIntegrationTest.java index 62bdaa19da5d..c48387dfc89e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/CourseCompetencyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/CourseCompetencyIntegrationTest.java @@ -57,11 +57,11 @@ import de.tum.cit.aet.artemis.lecture.repository.ExerciseUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; +import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.service.LectureUnitService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.team.TeamUtilService; import de.tum.cit.aet.artemis.text.domain.TextExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java index 0c15f5a148e3..e3e4901a2c0d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java @@ -46,7 +46,7 @@ import de.tum.cit.aet.artemis.lecture.domain.TextUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; -import de.tum.cit.aet.artemis.service.LectureUnitService; +import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; import de.tum.cit.aet.artemis.web.rest.LearningPathResource; diff --git a/src/test/java/de/tum/cit/aet/artemis/course/CourseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/course/CourseUtilService.java index b4d80cd0ad86..c81e535dea2c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/course/CourseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/course/CourseUtilService.java @@ -70,6 +70,7 @@ import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; +import de.tum.cit.aet.artemis.modeling.service.ModelingSubmissionService; import de.tum.cit.aet.artemis.organization.OrganizationUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; @@ -81,7 +82,6 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.service.ModelingSubmissionService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/ExerciseTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/ExerciseTest.java index 9eee7f7abcb8..1656002f1a3d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/ExerciseTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/ExerciseTest.java @@ -24,13 +24,13 @@ import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; +import de.tum.cit.aet.artemis.exercise.service.ExerciseService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.modeling.domain.DiagramType; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.text.domain.TextExercise; class ExerciseTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/entitylistener/ResultListenerIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/entitylistener/ResultListenerIntegrationTest.java index 25d51100739f..8c1ec1ba3289 100644 --- a/src/test/java/de/tum/cit/aet/artemis/entitylistener/ResultListenerIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/entitylistener/ResultListenerIntegrationTest.java @@ -27,6 +27,7 @@ import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; +import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.SecurityUtils; @@ -37,7 +38,6 @@ import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.service.ResultService; import de.tum.cit.aet.artemis.team.TeamUtilService; import de.tum.cit.aet.artemis.text.domain.TextExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java index d31fff922d0f..39f4530109fe 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java @@ -39,6 +39,7 @@ import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.modeling.domain.DiagramType; @@ -49,7 +50,6 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizPointStatistic; import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; -import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorParticipationStatus; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseUtilService.java index ca0e179798e7..a7a2869dc2b5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseUtilService.java @@ -44,6 +44,7 @@ import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.modeling.service.ModelingSubmissionService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; @@ -53,7 +54,6 @@ import de.tum.cit.aet.artemis.post.ConversationUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.service.ModelingSubmissionService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java index b640a7e1272a..1c63da6ce0a4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java @@ -38,6 +38,7 @@ import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; +import de.tum.cit.aet.artemis.assessment.service.AssessmentService; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; @@ -66,7 +67,6 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus; import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingSubmissionElement; -import de.tum.cit.aet.artemis.service.AssessmentService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; import de.tum.cit.aet.artemis.web.rest.dto.ModelingAssessmentDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseUtilService.java index 1e62901b1e3c..59ff3b9ac1e9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseUtilService.java @@ -22,6 +22,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.AssessmentService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.course.CourseFactory; @@ -38,12 +39,11 @@ import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; +import de.tum.cit.aet.artemis.modeling.service.ModelingSubmissionService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; -import de.tum.cit.aet.artemis.service.AssessmentService; -import de.tum.cit.aet.artemis.service.ModelingSubmissionService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.TestResourceUtils; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java index 5ae84351fefc..1a194c0f6ef1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java @@ -61,8 +61,8 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseGradingService; +import de.tum.cit.aet.artemis.programming.service.StaticCodeAnalysisService; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java index fc9cbe384d29..cf73077fb49c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java @@ -37,7 +37,7 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseFeedbackCreationService; -import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; +import de.tum.cit.aet.artemis.programming.service.StaticCodeAnalysisService; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; class StaticCodeAnalysisIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java index a17b477d3a73..f10797958d65 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java @@ -57,6 +57,7 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.quiz.domain.AnswerOption; import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; @@ -81,7 +82,6 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.quiz.service.QuizExerciseService; -import de.tum.cit.aet.artemis.service.ExerciseService; import de.tum.cit.aet.artemis.util.ExerciseIntegrationTestService; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; import de.tum.cit.aet.artemis.web.rest.dto.QuizBatchJoinDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java index 3a26d081889f..39bc7d3ec678 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java @@ -33,7 +33,7 @@ import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.SlideRepository; -import de.tum.cit.aet.artemis.service.LectureUnitProcessingService; +import de.tum.cit.aet.artemis.lecture.service.LectureUnitProcessingService; import de.tum.cit.aet.artemis.web.rest.dto.LectureUnitInformationDTO; import de.tum.cit.aet.artemis.web.rest.dto.LectureUnitSplitDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitServiceTest.java index 837289fd4154..99b6eec6a2b3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitServiceTest.java @@ -15,7 +15,7 @@ import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.domain.LectureUnitCompletion; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; -import de.tum.cit.aet.artemis.service.LectureUnitService; +import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; import de.tum.cit.aet.artemis.user.UserUtilService; class LectureUnitServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java index 8be818588794..9b58e14aa2bc 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java @@ -27,7 +27,7 @@ import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; -import de.tum.cit.aet.artemis.service.StaticCodeAnalysisService; +import de.tum.cit.aet.artemis.programming.service.StaticCodeAnalysisService; import de.tum.cit.aet.artemis.user.UserUtilService; public class AbstractLocalCILocalVCIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java index de6e9269a838..3a61ae6bb7a2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java @@ -61,9 +61,9 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +import de.tum.cit.aet.artemis.programming.service.ParticipationVcsAccessTokenService; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.service.BuildLogEntryService; -import de.tum.cit.aet.artemis.service.ParticipationVcsAccessTokenService; import de.tum.cit.aet.artemis.util.LocalRepository; @TestInstance(TestInstance.Lifecycle.PER_CLASS) diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java index 22a41fab4386..61d891d244cd 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java @@ -66,8 +66,8 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.service.ParticipationVcsAccessTokenService; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.service.ParticipationVcsAccessTokenService; import de.tum.cit.aet.artemis.util.LocalRepository; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/PostingServiceUnitTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/PostingServiceUnitTest.java index 0641b4d5a209..70f5ac32bad3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/PostingServiceUnitTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/PostingServiceUnitTest.java @@ -25,7 +25,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; class PostingServiceUnitTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java index 5cedecc571ce..f8b1b9e0f7ea 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java @@ -45,6 +45,7 @@ import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.service.GradingScaleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.domain.User; @@ -88,7 +89,6 @@ import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedText; import de.tum.cit.aet.artemis.quiz.service.QuizBatchService; import de.tum.cit.aet.artemis.quiz.service.QuizScheduleService; -import de.tum.cit.aet.artemis.service.GradingScaleService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java index c802a789f7b0..b7eff3b4d72a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java @@ -61,11 +61,11 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.service.ParticipationVcsAccessTokenService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.ParticipationVcsAccessTokenService; import de.tum.cit.aet.artemis.service.UriService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/AssessmentServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/AssessmentServiceTest.java index d050eaa7c1cc..6381739b4e96 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/AssessmentServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/AssessmentServiceTest.java @@ -19,6 +19,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.AssessmentService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.exam.ExamUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/AuthorizationCheckServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/AuthorizationCheckServiceTest.java index 32ce1fbfcbba..14b0ec3159db 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/AuthorizationCheckServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/AuthorizationCheckServiceTest.java @@ -19,6 +19,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ComplaintResponseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ComplaintResponseServiceTest.java index a33443c09946..4fbcd4f99873 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ComplaintResponseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ComplaintResponseServiceTest.java @@ -17,6 +17,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.ComplaintResponseService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationServiceTest.java index 515fcfaa1e47..a2f6f79eed4c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationServiceTest.java @@ -23,6 +23,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.CourseScoreCalculationService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.course.CourseUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ExerciseDateServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ExerciseDateServiceTest.java index c6131a4d2fde..fcf85b4f4925 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ExerciseDateServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ExerciseDateServiceTest.java @@ -25,6 +25,7 @@ import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseFactory; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.modeling.domain.DiagramType; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleServiceTest.java index 07b854153d7c..7f53c0962bab 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ExerciseLifecycleServiceTest.java @@ -15,6 +15,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseLifecycle; +import de.tum.cit.aet.artemis.exercise.service.ExerciseLifecycleService; import de.tum.cit.aet.artemis.text.domain.TextExercise; class ExerciseLifecycleServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/FeedbackServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/FeedbackServiceTest.java index c26d982176b4..b02eef5a5283 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/FeedbackServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/FeedbackServiceTest.java @@ -12,6 +12,7 @@ import de.tum.cit.aet.artemis.assessment.domain.LongFeedbackText; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.LongFeedbackTextRepository; +import de.tum.cit.aet.artemis.assessment.service.FeedbackService; import de.tum.cit.aet.artemis.core.config.Constants; class FeedbackServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java index 6b69ebbac7cd..8b09de0e9282 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java @@ -21,6 +21,7 @@ import de.tum.cit.aet.artemis.assessment.domain.GradeType; import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.assessment.service.GradingScaleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.course.CourseUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/LectureImportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/LectureImportServiceTest.java index b18f54c8c031..0c7d316651ba 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/LectureImportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/LectureImportServiceTest.java @@ -19,6 +19,7 @@ import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.service.LectureImportService; import de.tum.cit.aet.artemis.user.UserUtilService; class LectureImportServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/LectureServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/LectureServiceTest.java index e0328b080314..ee979e294a19 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/LectureServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/LectureServiceTest.java @@ -22,6 +22,7 @@ import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.service.LectureService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java index 5d7641f9ff56..3734453894c0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java @@ -20,6 +20,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationServiceTest.java index e589ea978e60..a710b4ba5cf9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/PresentationPointsCalculationServiceTest.java @@ -10,6 +10,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.GradingScaleFactory; import de.tum.cit.aet.artemis.assessment.domain.GradingScale; +import de.tum.cit.aet.artemis.assessment.service.PresentationPointsCalculationService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.course.CourseUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ResultServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ResultServiceTest.java index 4c385dc38710..0098b991c37d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ResultServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ResultServiceTest.java @@ -17,6 +17,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/TextBlockServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/TextBlockServiceTest.java index 09382d75be21..02e1ebb866f6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/TextBlockServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/TextBlockServiceTest.java @@ -11,6 +11,7 @@ import de.tum.cit.aet.artemis.text.domain.TextBlock; import de.tum.cit.aet.artemis.text.domain.TextSubmission; +import de.tum.cit.aet.artemis.text.service.TextBlockService; class TextBlockServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java index f1254ad14d37..a43b96b21d09 100644 --- a/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java @@ -70,12 +70,12 @@ import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.service.TextAssessmentService; import de.tum.cit.aet.artemis.text.domain.TextBlock; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; +import de.tum.cit.aet.artemis.text.service.TextAssessmentService; import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; import de.tum.cit.aet.artemis.web.rest.dto.TextAssessmentDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java index 0235ac23fcdb..d7eb2747a451 100644 --- a/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java @@ -16,8 +16,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.AccountService; import de.tum.cit.aet.artemis.core.service.user.PasswordService; -import de.tum.cit.aet.artemis.service.AccountService; import de.tum.cit.aet.artemis.service.dto.PasswordChangeDTO; import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.util.ConfigUtil; From 615666fec7c2d52c49dfbcfe2859848dda80fb82 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Wed, 11 Sep 2024 17:16:02 +0200 Subject: [PATCH 12/43] fix test compile issues due to package private --- .../service/notifications/MailSendingService.java | 6 +++--- .../push_notifications/ApplePushNotificationService.java | 4 ++-- .../push_notifications/FirebasePushNotificationService.java | 2 +- .../connectors/localci/buildagent/TestResultXmlParser.java | 4 ++-- .../tum/cit/aet/artemis/text/service/TextBlockService.java | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MailSendingService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MailSendingService.java index 7a923380a802..173aa77d7b3d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MailSendingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MailSendingService.java @@ -24,7 +24,7 @@ */ @Service @Profile(PROFILE_CORE) -class MailSendingService { +public class MailSendingService { private static final Logger log = LoggerFactory.getLogger(MailSendingService.class); @@ -32,7 +32,7 @@ class MailSendingService { private final JavaMailSender javaMailSender; - MailSendingService(JHipsterProperties jHipsterProperties, JavaMailSender javaMailSender) { + public MailSendingService(JHipsterProperties jHipsterProperties, JavaMailSender javaMailSender) { this.jHipsterProperties = jHipsterProperties; this.javaMailSender = javaMailSender; } @@ -47,7 +47,7 @@ class MailSendingService { * @param isHtml Whether the mail should support HTML tags */ @Async - void sendEmail(User recipient, String subject, String content, boolean isMultipart, boolean isHtml) { + public void sendEmail(User recipient, String subject, String content, boolean isMultipart, boolean isHtml) { log.debug("Send email[multipart '{}' and html '{}'] to '{}' with subject '{}'", isMultipart, isHtml, recipient, subject); // Prepare message using a Spring helper diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/push_notifications/ApplePushNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/push_notifications/ApplePushNotificationService.java index f166257f3cc4..ecd0a14f7490 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/push_notifications/ApplePushNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/push_notifications/ApplePushNotificationService.java @@ -37,12 +37,12 @@ public ApplePushNotificationService(PushNotificationDeviceConfigurationRepositor } @Override - protected PushNotificationDeviceConfigurationRepository getRepository() { + public PushNotificationDeviceConfigurationRepository getRepository() { return repository; } @Override - PushNotificationDeviceType getDeviceType() { + public PushNotificationDeviceType getDeviceType() { return PushNotificationDeviceType.APNS; } diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/push_notifications/FirebasePushNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/push_notifications/FirebasePushNotificationService.java index edf777e45149..364b89dea225 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/push_notifications/FirebasePushNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/push_notifications/FirebasePushNotificationService.java @@ -56,7 +56,7 @@ protected PushNotificationDeviceConfigurationRepository getRepository() { } @Override - PushNotificationDeviceType getDeviceType() { + public PushNotificationDeviceType getDeviceType() { return PushNotificationDeviceType.FIREBASE; } diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/TestResultXmlParser.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/TestResultXmlParser.java index 69da3be14937..8557405ec318 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/TestResultXmlParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/TestResultXmlParser.java @@ -13,7 +13,7 @@ import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildResult; -class TestResultXmlParser { +public class TestResultXmlParser { private static final XmlMapper mapper = new XmlMapper(); @@ -28,7 +28,7 @@ class TestResultXmlParser { * @param successfulTests A list of successful tests. This list will be populated by the method. * @throws IOException If an I/O error occurs while reading the test result file. */ - static void processTestResultFile(String testResultFileString, List failedTests, List successfulTests) + public static void processTestResultFile(String testResultFileString, List failedTests, List successfulTests) throws IOException { testResultFileString = testResultFileString.replaceAll(INVALID_XML_CHARS, ""); TestSuite testSuite = mapper.readValue(testResultFileString, TestSuite.class); diff --git a/src/main/java/de/tum/cit/aet/artemis/text/service/TextBlockService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextBlockService.java index 6b16554f4e7b..bb69d33cd8ee 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/service/TextBlockService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextBlockService.java @@ -31,7 +31,7 @@ public class TextBlockService { private final TextBlockRepository textBlockRepository; - TextBlockService(TextBlockRepository textBlockRepository) { + public TextBlockService(TextBlockRepository textBlockRepository) { this.textBlockRepository = textBlockRepository; } From 043991e7c1a1b37aae7adde9af3b6902408501a5 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Wed, 11 Sep 2024 17:18:39 +0200 Subject: [PATCH 13/43] fix issue with dto in query server currently starts --- .../artemis/programming/repository/BuildJobRepository.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java index e822f5a0fd97..1360e774b4b0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java @@ -58,7 +58,7 @@ Page findIdsByFilterCriteria(@Param("buildStatus") BuildStatus buildStatus @Param("durationLower") Duration durationLower, @Param("durationUpper") Duration durationUpper, Pageable pageable); @Query(""" - SELECT new de.tum.cit.aet.artemis.service.connectors.localci.dto.DockerImageBuild( + SELECT new de.tum.cit.aet.artemis.core.service.connectors.localci.dto.DockerImageBuild( b.dockerImage, MAX(b.buildStartDate) ) @@ -93,7 +93,7 @@ default Page findAllWithDataByCourseId(long courseId, Pageable pageabl } @Query(""" - SELECT new de.tum.cit.aet.artemis.service.connectors.localci.dto.ResultBuildJob( + SELECT new de.tum.cit.aet.artemis.core.service.connectors.localci.dto.ResultBuildJob( b.result.id, b.buildJobId ) From 2c3aef98a793e1a3f8bdbbe5e7d9bb5e6b9c2f28 Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Wed, 11 Sep 2024 17:27:06 +0200 Subject: [PATCH 14/43] Move web layer (part 1, WIP) --- .../assessment/domain/BonusStrategy.java | 2 +- .../repository/GradingScaleRepository.java | 4 +- .../assessment/service/AssessmentService.java | 4 +- .../assessment/service/BonusService.java | 2 +- .../service/ComplaintResponseService.java | 6 +- .../assessment/service/ComplaintService.java | 2 +- .../service/ExampleSubmissionService.java | 2 +- .../service/GradingScaleService.java | 4 +- .../service/ParticipantScoreService.java | 2 +- .../assessment/service/ResultService.java | 2 +- .../service/TutorParticipationService.java | 4 +- .../web}/BonusResource.java | 12 +- .../web}/ComplaintResource.java | 8 +- .../web}/ComplaintResponseResource.java | 6 +- .../web}/GradeStepResource.java | 4 +- .../web}/GradingScaleResource.java | 6 +- .../web}/ResultResource.java | 6 +- .../web}/open/PublicResultResource.java | 8 +- .../rest => athena/web}/AthenaResource.java | 8 +- .../competency/KnowledgeAreaRepository.java | 2 +- .../competency/CompetencyJolService.java | 2 +- .../competency/CourseCompetencyService.java | 6 +- .../competency/KnowledgeAreaService.java | 2 +- .../StandardizedCompetencyService.java | 4 +- .../learningpath/LearningPathService.java | 4 +- .../web}/CompetencyResource.java | 6 +- .../web}/CourseCompetencyResource.java | 4 +- .../web}/PrerequisiteResource.java | 6 +- .../web}/StandardizedCompetencyResource.java | 2 +- .../web}/science/ScienceResource.java | 2 +- .../web}/science/ScienceSettingsResource.java | 6 +- .../ConversationMessageRepository.java | 2 +- .../repository/PostRepository.java | 2 +- .../conversation/OneToOneChatRepository.java | 2 +- .../service/AnswerMessageService.java | 4 +- .../service/ConversationMessagingService.java | 4 +- .../communication/service/PostingService.java | 2 +- .../service/ReactionService.java | 4 +- .../service/conversation/ChannelService.java | 4 +- .../conversation/ConversationDTOService.java | 10 +- .../conversation/ConversationService.java | 6 +- .../conversation/GroupChatService.java | 4 +- .../auth/ChannelAuthorizationService.java | 2 +- .../auth/GroupChatAuthorizationService.java | 2 +- .../OneToOneChatAuthorizationService.java | 2 +- .../errors/ChannelNameDuplicateException.java | 4 +- .../FirebasePushNotificationService.java | 2 +- .../web}/AnswerMessageResource.java | 2 +- .../web}/ConversationMessageResource.java | 4 +- .../web}/LinkPreviewResource.java | 2 +- .../web}/ReactionResource.java | 2 +- .../web}/conversation/ChannelResource.java | 12 +- .../ConversationManagementResource.java | 2 +- .../conversation/ConversationResource.java | 10 +- .../web}/conversation/GroupChatResource.java | 6 +- .../conversation/OneToOneChatResource.java | 6 +- .../web}/conversation/dtos/ChannelDTO.java | 2 +- .../dtos/ChannelIdAndNameDTO.java | 2 +- .../conversation/dtos/ConversationDTO.java | 2 +- .../dtos/ConversationUserDTO.java | 2 +- .../web}/conversation/dtos/GroupChatDTO.java | 2 +- .../conversation/dtos/OneToOneChatDTO.java | 2 +- .../PushNotificationRegisterBody.java | 2 +- .../PushNotificationRegisterDTO.java | 2 +- .../PushNotificationResource.java | 2 +- .../PushNotificationUnregisterRequest.java | 2 +- .../core/config/GuidedTourConfiguration.java | 2 +- .../websocket/WebsocketConfiguration.java | 2 +- .../cit/aet/artemis/core/domain/Course.java | 2 +- .../tum/cit/aet/artemis/core/domain/User.java | 2 +- .../dto}/vm/KeyAndPasswordVM.java | 2 +- .../{web/rest => core/dto}/vm/LoggerVM.java | 2 +- .../{web/rest => core/dto}/vm/LoginVM.java | 2 +- .../rest => core/dto}/vm/ManagedUserVM.java | 2 +- .../rest => core/dto}/vm/package-info.java | 2 +- .../AccessForbiddenAlertException.java | 2 +- .../exception}/AccessForbiddenException.java | 2 +- .../AccountRegistrationBlockedException.java | 3 - .../exception}/BadRequestAlertException.java | 2 +- .../exception}/CaptchaRequiredException.java | 2 +- .../ComplaintResponseLockedException.java | 4 +- .../exception}/ConflictException.java | 2 +- .../exception}/EmailAlreadyUsedException.java | 2 +- .../exception}/EntityNotFoundException.java | 2 +- .../exception}/ErrorConstants.java | 2 +- .../ExamConfigurationException.java | 2 +- .../exception}/ExceptionTranslator.java | 3 +- .../exception}/FieldErrorVM.java | 2 +- .../exception}/HttpStatusException.java | 2 +- .../InternalServerErrorAlertException.java | 2 +- .../InternalServerErrorException.java | 2 +- .../exception}/LoginAlreadyUsedException.java | 2 +- ...PasswordViolatesRequirementsException.java | 2 +- .../ServiceUnavailableException.java | 2 +- .../StudentsAlreadyAssignedException.java | 2 +- .../StudentsAppearMultipleTimesException.java | 2 +- .../exception}/StudentsNotFoundException.java | 2 +- .../exception}/package-info.java | 2 +- .../core/repository/CourseRepository.java | 2 +- .../repository/OrganizationRepository.java | 2 +- .../core/repository/UserRepository.java | 2 +- .../base/DynamicSpecificationRepository.java | 2 +- .../core/repository/base/RepositoryImpl.java | 2 +- .../artemis/core/security/SecurityUtils.java | 2 +- .../artemis/core/service/AccountService.java | 4 +- .../service/AuthorizationCheckService.java | 2 +- .../connectors/AbstractGitService.java | 2 +- .../core/service/connectors/GitService.java | 2 +- .../core/service/connectors/SAML2Service.java | 2 +- .../aeolus/AeolusTemplateService.java | 3 +- .../AthenaFeedbackSuggestionsService.java | 2 +- .../athena/AthenaModuleService.java | 2 +- .../athena/AthenaRepositoryExportService.java | 4 +- .../LocalCIResultProcessingService.java | 2 +- .../buildagent/BuildJobExecutionService.java | 2 +- .../localvc/LocalVCFetchFilter.java | 2 +- .../connectors/localvc/LocalVCPushFilter.java | 2 +- .../localvc/LocalVCServletService.java | 6 +- .../service/connectors/lti/Lti13Service.java | 2 +- .../connectors/lti/LtiDeepLinkingService.java | 2 +- .../lti/LtiDynamicRegistrationService.java | 2 +- .../pyris/PyrisConnectorService.java | 2 +- .../connectors/pyris/PyrisJobService.java | 4 +- .../service/export/DataExportService.java | 9 +- .../service/feature/FeatureToggleAspect.java | 2 +- .../service/user/UserCreationService.java | 2 +- .../core/service/user/UserService.java | 8 +- .../{web/rest => core}/util/DateUtil.java | 2 +- .../{web/rest => core}/util/HeaderUtil.java | 2 +- .../{web/rest => core}/util/PageUtil.java | 2 +- .../{web/rest => core}/util/ResponseUtil.java | 4 +- .../{web/rest => core}/util/StringUtil.java | 2 +- .../rest => core/web}/AccountResource.java | 10 +- .../AndroidAppSiteAssociationResource.java | 4 +- .../web}/AppleAppSiteAssociationResource.java | 8 +- .../rest => core/web}/AttachmentResource.java | 4 +- .../core/web/admin/AdminCourseResource.java | 4 +- .../admin/AdminLtiConfigurationResource.java | 2 +- .../admin/AdminModelingExerciseResource.java | 2 +- .../web/admin/AdminOrganizationResource.java | 4 +- .../AdminSystemNotificationResource.java | 4 +- .../core/web/admin/AdminUserResource.java | 10 +- .../artemis/core/web/admin/LogResource.java | 2 +- .../web}/open/PublicAccountResource.java | 20 +-- .../web}/open/PublicImprintResource.java | 2 +- .../open/PublicPrivacyStatementResource.java | 2 +- .../PublicSystemNotificationResource.java | 2 +- .../web}/open/PublicTimeResource.java | 2 +- .../web}/open/PublicUserJwtResource.java | 6 +- .../tum/cit/aet/artemis/exam/domain/Exam.java | 2 +- .../exam/repository/ExamRepository.java | 2 +- .../repository/StudentExamRepository.java | 2 +- .../exam/service/ExamAccessService.java | 8 +- .../artemis/exam/service/ExamDateService.java | 2 +- .../exam/service/ExamImportService.java | 2 +- .../artemis/exam/service/ExamQuizService.java | 2 +- .../exam/service/ExamRegistrationService.java | 6 +- .../aet/artemis/exam/service/ExamService.java | 8 +- .../exam/service/ExamSubmissionService.java | 4 +- .../artemis/exam/service/ExamUserService.java | 2 +- .../artemis/exam/service/ImageExtractor.java | 2 +- .../service/StudentExamAccessService.java | 4 +- .../exam/service/StudentExamService.java | 4 +- .../artemis/exercise/domain/BaseExercise.java | 2 +- .../aet/artemis/exercise/domain/Exercise.java | 2 +- .../repository/ExerciseRepository.java | 2 +- .../repository/SubmissionRepository.java | 2 +- .../exercise/repository/TeamRepository.java | 4 +- .../exercise/service/ExerciseService.java | 4 +- .../service/SubmissionExportService.java | 2 +- .../exercise/service/team/TeamService.java | 6 +- .../web}/AbstractSubmissionResource.java | 2 +- .../web}/AssessmentResource.java | 12 +- .../service/FileUploadExerciseService.java | 2 +- .../service/FileUploadSubmissionService.java | 4 +- .../artemis/iris/exception/IrisException.java | 4 +- .../IrisCourseChatSessionRepository.java | 2 +- .../IrisExerciseChatSessionRepository.java | 2 +- .../repository/IrisSessionRepository.java | 2 +- .../iris/service/IrisSessionService.java | 2 +- .../session/IrisCourseChatSessionService.java | 2 +- .../IrisExerciseChatSessionService.java | 4 +- .../service/settings/IrisSettingsService.java | 6 +- .../web}/IrisCourseChatSessionResource.java | 2 +- .../web}/IrisExerciseChatSessionResource.java | 4 +- .../web}/IrisMessageResource.java | 4 +- .../iris => iris/web}/IrisModelsResource.java | 4 +- .../rest/iris => iris/web}/IrisResource.java | 2 +- .../web}/IrisSettingsResource.java | 2 +- .../rest/iris => iris/web}/IrisStatusDTO.java | 2 +- .../repository/AttachmentUnitRepository.java | 2 +- .../lecture/service/LectureService.java | 2 +- .../service/LectureUnitProcessingService.java | 2 +- .../web}/AttachmentUnitResource.java | 8 +- .../web}/ExerciseUnitResource.java | 4 +- .../web}/LectureUnitResource.java | 8 +- .../web}/OnlineUnitResource.java | 6 +- .../web}/TextUnitResource.java | 6 +- .../web}/VideoUnitResource.java | 4 +- .../LtiPlatformConfigurationRepository.java | 2 +- .../web}/open/PublicLtiResource.java | 2 +- .../web}/open/PublicOAuth2JWKSResource.java | 2 +- .../open/PublicPyrisStatusUpdateResource.java | 6 +- .../ModelingExerciseScheduleService.java | 2 +- .../service/ModelingExerciseService.java | 2 +- .../service/ModelingSubmissionService.java | 2 +- .../ModelingPlagiarismDetectionService.java | 2 +- .../service/PlagiarismAnswerPostService.java | 4 +- .../service/PlagiarismPostService.java | 4 +- .../plagiarism/service/PlagiarismService.java | 2 +- ...ProgrammingPlagiarismDetectionService.java | 2 +- .../TextPlagiarismDetectionService.java | 2 +- .../web}/PlagiarismAnswerPostResource.java | 2 +- .../web}/PlagiarismCaseResource.java | 6 +- .../web}/PlagiarismPostResource.java | 6 +- .../web}/PlagiarismResource.java | 6 +- .../web}/PlagiarismResultResponseBuilder.java | 2 +- .../web}/PlagiarismResultStats.java | 2 +- .../domain/ProgrammingExercise.java | 2 +- .../ProgrammingExerciseRepository.java | 4 +- ...ammingExerciseParticipationRepository.java | 2 +- ...ammingExerciseParticipationRepository.java | 2 +- .../repository/hestia/CodeHintRepository.java | 2 +- .../hestia/ExerciseHintRepository.java | 2 +- ...ammingExerciseSolutionEntryRepository.java | 2 +- .../ProgrammingExerciseTaskRepository.java | 2 +- .../service/AuxiliaryRepositoryService.java | 4 +- ...mingExerciseCodeReviewFeedbackService.java | 2 +- .../ProgrammingExerciseGradingService.java | 2 +- ...grammingExerciseImportFromFileService.java | 2 +- ...ogrammingExerciseParticipationService.java | 2 +- .../ProgrammingExerciseScheduleService.java | 2 +- .../service/ProgrammingExerciseService.java | 6 +- .../ProgrammingExerciseTestCaseService.java | 6 +- .../service/ProgrammingSubmissionService.java | 2 +- .../service/ProgrammingTriggerService.java | 2 +- .../service/RepositoryAccessService.java | 4 +- .../RepositoryParticipationService.java | 4 +- .../service/RepositoryService.java | 2 +- .../service/SubmissionPolicyService.java | 4 +- .../service/hestia/CodeHintService.java | 2 +- .../service/hestia/ExerciseHintService.java | 4 +- ...ogrammingExerciseGitDiffReportService.java | 2 +- .../hestia/TestwiseCoverageService.java | 2 +- .../OracleGenerator.java | 2 +- .../web}/IdeSettingsResource.java | 2 +- .../web}/ProgrammingAssessmentResource.java | 10 +- ...ogrammingExerciseExportImportResource.java | 18 +-- .../ProgrammingExerciseGradingResource.java | 2 +- .../web}/ProgrammingExerciseLockResource.java | 2 +- ...grammingExerciseParticipationResource.java | 8 +- ...ProgrammingExercisePlagiarismResource.java | 6 +- .../web}/ProgrammingExerciseResource.java | 10 +- .../ProgrammingExerciseResourceErrorKeys.java | 2 +- .../ProgrammingExerciseTestCaseResource.java | 2 +- .../web}/ProgrammingSubmissionResource.java | 8 +- .../web}/hestia/CodeHintResource.java | 6 +- .../web}/hestia/CoverageReportResource.java | 4 +- .../web}/hestia/ExerciseHintResource.java | 6 +- ...grammingExerciseGitDiffReportResource.java | 4 +- ...grammingExerciseSolutionEntryResource.java | 6 +- .../ProgrammingExerciseTaskResource.java | 2 +- .../web/localci}/AeolusTemplateResource.java | 2 +- .../web}/localci/BuildJobQueueResource.java | 4 +- .../web}/localci/BuildLogResource.java | 2 +- .../web}/localci/BuildPlanResource.java | 4 +- .../web}/open/PublicBuildPlanResource.java | 6 +- .../PublicProgrammingSubmissionResource.java | 6 +- .../web}/repository/FileSubmission.java | 2 +- .../web}/repository/FileSubmissionError.java | 2 +- .../web}/repository/RepositoryActionType.java | 2 +- ...grammingExerciseParticipationResource.java | 6 +- .../web}/repository/RepositoryResource.java | 10 +- .../repository/TestRepositoryResource.java | 4 +- .../repository/util/RepositoryExecutor.java | 2 +- .../theia/TheiaConfigurationResource.java | 2 +- .../aet/artemis/quiz/domain/QuizExercise.java | 2 +- .../quiz/service/QuizExerciseService.java | 4 +- .../artemis/quiz/service/QuizPoolService.java | 4 +- .../quiz/service/QuizSubmissionService.java | 2 +- .../service/AttachmentUnitService.java | 2 +- .../aet/artemis/service/CourseService.java | 2 +- .../cit/aet/artemis/service/FileService.java | 4 +- .../artemis/service/LegalDocumentService.java | 4 +- .../OnlineCourseConfigurationService.java | 2 +- ...articipationAuthorizationCheckService.java | 2 +- .../artemis/service/ParticipationService.java | 2 +- .../artemis/service/SlideSplitterService.java | 2 +- .../artemis/service/StatisticsService.java | 2 +- .../artemis/service/SubmissionService.java | 6 +- .../service/SystemNotificationService.java | 2 +- .../icl/SshGitLocationResolverService.java | 4 +- .../service/TextExerciseFeedbackService.java | 4 +- .../text/service/TextExerciseService.java | 2 +- .../text/service/TextSubmissionService.java | 2 +- .../web}/ApollonConversionResource.java | 2 +- .../web}/ApollonDiagramResource.java | 6 +- .../web}/TextAssessmentEventResource.java | 2 +- .../web}/TextAssessmentResource.java | 9 +- .../web}/TextExerciseResource.java | 16 +- .../web}/TextSubmissionResource.java | 7 +- .../tutorialgroup/domain/TutorialGroup.java | 2 +- .../ScheduleOverlapsWithSessionException.java | 8 +- .../SessionOverlapsWithSessionException.java | 8 +- .../service/TutorialGroupScheduleService.java | 6 +- .../service/TutorialGroupService.java | 10 +- .../web}/TutorialGroupFreePeriodResource.java | 6 +- .../web}/TutorialGroupResource.java | 10 +- .../web}/TutorialGroupSessionResource.java | 8 +- .../TutorialGroupsConfigurationResource.java | 6 +- .../aet/artemis/web/rest/CourseResource.java | 10 +- .../artemis/web/rest/DataExportResource.java | 4 +- .../aet/artemis/web/rest/ExamResource.java | 12 +- .../artemis/web/rest/ExamUserResource.java | 2 +- .../web/rest/ExampleSubmissionResource.java | 6 +- .../web/rest/ExerciseGroupResource.java | 6 +- .../artemis/web/rest/ExerciseResource.java | 4 +- .../aet/artemis/web/rest/FileResource.java | 4 +- .../rest/FileUploadAssessmentResource.java | 1 + .../web/rest/FileUploadExerciseResource.java | 8 +- .../rest/FileUploadSubmissionResource.java | 7 +- .../web/rest/LearningPathResource.java | 2 +- .../aet/artemis/web/rest/LectureResource.java | 4 +- .../web/rest/LongFeedbackTextResource.java | 2 +- .../cit/aet/artemis/web/rest/LtiResource.java | 2 +- .../web/rest/ModelingAssessmentResource.java | 3 +- .../web/rest/ModelingExerciseResource.java | 10 +- .../web/rest/ModelingSubmissionResource.java | 9 +- .../rest/NotificationSettingsResource.java | 4 +- .../web/rest/ParticipationResource.java | 8 +- .../web/rest/QuizExerciseResource.java | 6 +- .../web/rest/QuizParticipationResource.java | 2 +- .../artemis/web/rest/QuizPoolResource.java | 2 +- .../web/rest/QuizSubmissionResource.java | 2 +- .../aet/artemis/web/rest/RatingResource.java | 4 +- .../web/rest/StaticCodeAnalysisResource.java | 4 +- .../artemis/web/rest/StudentExamResource.java | 10 +- .../web/rest/SubmissionPolicyResource.java | 4 +- .../artemis/web/rest/SubmissionResource.java | 4 +- .../aet/artemis/web/rest/TeamResource.java | 8 +- .../web/rest/TutorParticipationResource.java | 2 +- .../web/rest/dto/StudentExamWithGradeDTO.java | 3 +- .../dto/plagiarism/PlagiarismResultDTO.java | 2 +- .../dto/metis/ConversationWebsocketDTO.java | 2 +- .../webapp/app/course/manage/faq.component.ts | 145 ++++++++++++++++++ .../artemis/LogResourceIntegrationTest.java | 2 +- .../cit/aet/artemis/LtiIntegrationTest.java | 2 +- .../tum/cit/aet/artemis/StringUtilTest.java | 4 +- .../architecture/ArchitectureTest.java | 2 +- .../ResourceArchitectureTest.java | 2 +- .../ResultServiceIntegrationTest.java | 2 +- ...InternalAuthenticationIntegrationTest.java | 4 +- .../LdapAuthenticationIntegrationTest.java | 2 +- .../UserJenkinsGitlabIntegrationTest.java | 2 +- .../UserSaml2IntegrationTest.java | 4 +- .../artemis/connectors/Lti13ServiceTest.java | 4 +- .../LtiDynamicRegistrationServiceTest.java | 2 +- .../aet/artemis/course/CourseTestService.java | 4 +- .../cit/aet/artemis/domain/CourseTest.java | 2 +- .../aet/artemis/exam/ExamIntegrationTest.java | 2 +- .../exam/ExamRegistrationIntegrationTest.java | 2 +- .../exam/StudentExamIntegrationTest.java | 2 +- .../exercise/ExerciseIntegrationTest.java | 2 +- .../FileUploadSubmissionIntegrationTest.java | 2 +- .../ModelingSubmissionIntegrationTest.java | 2 +- .../AuxiliaryRepositoryServiceTest.java | 2 +- ...ProgrammingExerciseGitIntegrationTest.java | 2 +- ...rammingExerciseIntegrationTestService.java | 8 +- .../ProgrammingSubmissionIntegrationTest.java | 2 +- .../RepositoryIntegrationTest.java | 2 +- ...TestRepositoryResourceIntegrationTest.java | 2 +- .../artemis/hestia/CodeHintServiceTest.java | 2 +- ...risExerciseChatSessionIntegrationTest.java | 2 +- .../metis/AbstractConversationTest.java | 4 +- .../artemis/metis/ChannelIntegrationTest.java | 4 +- .../metis/ConversationIntegrationTest.java | 10 +- .../metis/GroupChatIntegrationTest.java | 2 +- .../metis/OneToOneChatIntegrationTest.java | 2 +- .../artemis/metis/PostingServiceUnitTest.java | 2 +- .../PushNotificationResourceTest.java | 6 +- .../OrganizationIntegrationTest.java | 2 +- .../AuthorizationCheckServiceTest.java | 2 +- .../service/GradingScaleServiceTest.java | 4 +- .../OnlineCourseConfigurationServiceTest.java | 4 +- ...cipationAuthorizationCheckServiceTest.java | 2 +- .../service/ParticipationServiceTest.java | 3 +- .../service/RepositoryAccessServiceTest.java | 4 +- .../service/SubmissionServiceTest.java | 2 +- .../AthenaFeedbackSuggestionsServiceTest.java | 2 +- .../AthenaRepositoryExportServiceTest.java | 2 +- .../lti/LtiDeepLinkingServiceTest.java | 2 +- .../service/exam/ExamAccessServiceTest.java | 8 +- .../artemis/service/exam/ExamServiceTest.java | 4 +- .../exam/ExamSubmissionServiceTest.java | 4 +- .../exam/StudentExamAccessServiceTest.java | 6 +- .../text/TextSubmissionIntegrationTest.java | 2 +- .../TutorialGroupIntegrationTest.java | 4 +- .../TutorialGroupScheduleIntegrationTest.java | 2 +- .../TutorialGroupSessionIntegrationTest.java | 2 +- .../TutorialGroupUtilService.java | 2 +- .../user/AccountResourceIntegrationTest.java | 8 +- ...ountResourceWithGitLabIntegrationTest.java | 2 +- .../cit/aet/artemis/user/UserTestService.java | 4 +- .../util/ExerciseIntegrationTestService.java | 2 +- ...AndroidAppSiteAssociationResourceTest.java | 1 + .../AppleAppSiteAssociationResourceTest.java | 1 + .../PlagiarismResultResponseBuilderTest.java | 1 + .../artemis/config/application-buildagent.yml | 0 .../www1/artemis/config/application-dev.yml | 0 409 files changed, 890 insertions(+), 736 deletions(-) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => assessment/web}/BonusResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => assessment/web}/ComplaintResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => assessment/web}/ComplaintResponseResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => assessment/web}/GradeStepResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => assessment/web}/GradingScaleResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => assessment/web}/ResultResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => assessment/web}/open/PublicResultResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => athena/web}/AthenaResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/competency => atlas/web}/CompetencyResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/competency => atlas/web}/CourseCompetencyResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/competency => atlas/web}/PrerequisiteResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/competency => atlas/web}/StandardizedCompetencyResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => atlas/web}/science/ScienceResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => atlas/web}/science/ScienceSettingsResource.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/metis => communication/web}/AnswerMessageResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/metis => communication/web}/ConversationMessageResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/ogparser => communication/web}/LinkPreviewResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/metis => communication/web}/ReactionResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/metis => communication/web}/conversation/ChannelResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/metis => communication/web}/conversation/ConversationManagementResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/metis => communication/web}/conversation/ConversationResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/metis => communication/web}/conversation/GroupChatResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/metis => communication/web}/conversation/OneToOneChatResource.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/metis => communication/web}/conversation/dtos/ChannelDTO.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/metis => communication/web}/conversation/dtos/ChannelIdAndNameDTO.java (81%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/metis => communication/web}/conversation/dtos/ConversationDTO.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/metis => communication/web}/conversation/dtos/ConversationUserDTO.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/metis => communication/web}/conversation/dtos/GroupChatDTO.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/metis => communication/web}/conversation/dtos/OneToOneChatDTO.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => communication/web}/push_notification/PushNotificationRegisterBody.java (74%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => communication/web}/push_notification/PushNotificationRegisterDTO.java (72%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => communication/web}/push_notification/PushNotificationResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => communication/web}/push_notification/PushNotificationUnregisterRequest.java (75%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/dto}/vm/KeyAndPasswordVM.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/dto}/vm/LoggerVM.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/dto}/vm/LoginVM.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/dto}/vm/ManagedUserVM.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/dto}/vm/package-info.java (57%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/errors => core/exception}/AccessForbiddenAlertException.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/errors => core/exception}/AccessForbiddenException.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/errors => core/exception}/BadRequestAlertException.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/errors => core/exception}/CaptchaRequiredException.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/errors => core/exception}/ComplaintResponseLockedException.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/errors => core/exception}/ConflictException.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/errors => core/exception}/EmailAlreadyUsedException.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/errors => core/exception}/EntityNotFoundException.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/errors => core/exception}/ErrorConstants.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/errors => core/exception}/ExamConfigurationException.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/errors => core/exception}/ExceptionTranslator.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/errors => core/exception}/FieldErrorVM.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/errors => core/exception}/HttpStatusException.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/errors => core/exception}/InternalServerErrorAlertException.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/errors => core/exception}/InternalServerErrorException.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/errors => core/exception}/LoginAlreadyUsedException.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/errors => core/exception}/PasswordViolatesRequirementsException.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/errors => core/exception}/ServiceUnavailableException.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/errors => core/exception}/StudentsAlreadyAssignedException.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/errors => core/exception}/StudentsAppearMultipleTimesException.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/errors => core/exception}/StudentsNotFoundException.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/errors => core/exception}/package-info.java (74%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/util/DateUtil.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/util/HeaderUtil.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/util/PageUtil.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/util/ResponseUtil.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/util/StringUtil.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/AccountResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/AndroidAppSiteAssociationResource.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/AppleAppSiteAssociationResource.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/AttachmentResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/open/PublicAccountResource.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/open/PublicImprintResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/open/PublicPrivacyStatementResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/open/PublicSystemNotificationResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/open/PublicTimeResource.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/open/PublicUserJwtResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exercise/web}/AbstractSubmissionResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exercise/web}/AssessmentResource.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/iris => iris/web}/IrisCourseChatSessionResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/iris => iris/web}/IrisExerciseChatSessionResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/iris => iris/web}/IrisMessageResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/iris => iris/web}/IrisModelsResource.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/iris => iris/web}/IrisResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/iris => iris/web}/IrisSettingsResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/iris => iris/web}/IrisStatusDTO.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/lecture => lecture/web}/AttachmentUnitResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/lecture => lecture/web}/ExerciseUnitResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/lecture => lecture/web}/LectureUnitResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/lecture => lecture/web}/OnlineUnitResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/lecture => lecture/web}/TextUnitResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/lecture => lecture/web}/VideoUnitResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => lti/web}/open/PublicLtiResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => lti/web}/open/PublicOAuth2JWKSResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => lti/web}/open/PublicPyrisStatusUpdateResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/plagiarism => plagiarism/web}/PlagiarismAnswerPostResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/plagiarism => plagiarism/web}/PlagiarismCaseResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/plagiarism => plagiarism/web}/PlagiarismPostResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/plagiarism => plagiarism/web}/PlagiarismResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/plagiarism => plagiarism/web}/PlagiarismResultResponseBuilder.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/plagiarism => plagiarism/web}/PlagiarismResultStats.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/settings/ide => programming/web}/IdeSettingsResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/programming => programming/web}/ProgrammingAssessmentResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/programming => programming/web}/ProgrammingExerciseExportImportResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/programming => programming/web}/ProgrammingExerciseGradingResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/programming => programming/web}/ProgrammingExerciseLockResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/programming => programming/web}/ProgrammingExerciseParticipationResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/programming => programming/web}/ProgrammingExercisePlagiarismResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/programming => programming/web}/ProgrammingExerciseResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/programming => programming/web}/ProgrammingExerciseResourceErrorKeys.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/programming => programming/web}/ProgrammingExerciseTestCaseResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/programming => programming/web}/ProgrammingSubmissionResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming/web}/hestia/CodeHintResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming/web}/hestia/CoverageReportResource.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming/web}/hestia/ExerciseHintResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming/web}/hestia/ProgrammingExerciseGitDiffReportResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming/web}/hestia/ProgrammingExerciseSolutionEntryResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming/web}/hestia/ProgrammingExerciseTaskResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming/web/localci}/AeolusTemplateResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming/web}/localci/BuildJobQueueResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming/web}/localci/BuildLogResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming/web}/localci/BuildPlanResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming/web}/open/PublicBuildPlanResource.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming/web}/open/PublicProgrammingSubmissionResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming/web}/repository/FileSubmission.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming/web}/repository/FileSubmissionError.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming/web}/repository/RepositoryActionType.java (77%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming/web}/repository/RepositoryProgrammingExerciseParticipationResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming/web}/repository/RepositoryResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming/web}/repository/TestRepositoryResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming/web}/repository/util/RepositoryExecutor.java (80%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming/web}/theia/TheiaConfigurationResource.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => text/web}/ApollonConversionResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => text/web}/ApollonDiagramResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => text/web}/TextAssessmentEventResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => text/web}/TextAssessmentResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => text/web}/TextExerciseResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => text/web}/TextSubmissionResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/tutorialgroups/errors => tutorialgroup/exception}/ScheduleOverlapsWithSessionException.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/tutorialgroups/errors => tutorialgroup/exception}/SessionOverlapsWithSessionException.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/tutorialgroups => tutorialgroup/web}/TutorialGroupFreePeriodResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/tutorialgroups => tutorialgroup/web}/TutorialGroupResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/tutorialgroups => tutorialgroup/web}/TutorialGroupSessionResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/tutorialgroups => tutorialgroup/web}/TutorialGroupsConfigurationResource.java (98%) create mode 100644 src/main/webapp/app/course/manage/faq.component.ts create mode 100644 src/test/resources/de/tum/in/www1/artemis/config/application-buildagent.yml create mode 100644 src/test/resources/de/tum/in/www1/artemis/config/application-dev.yml diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/BonusStrategy.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/BonusStrategy.java index cf48d2bc8681..b1131ddb802e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/BonusStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/BonusStrategy.java @@ -7,7 +7,7 @@ import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; public enum BonusStrategy implements IBonusStrategy { diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingScaleRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingScaleRepository.java index 35958b839799..db99353a1ba1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingScaleRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingScaleRepository.java @@ -22,8 +22,8 @@ import de.tum.cit.aet.artemis.assessment.domain.GradeStep; import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data JPA for the GradingScale entity diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentService.java index cd7286012469..96ec5d002772 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentService.java @@ -33,8 +33,8 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingAssessmentService; import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateBaseDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/BonusService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/BonusService.java index 9d3265e1a9db..bec1624947b1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/BonusService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/BonusService.java @@ -13,7 +13,7 @@ import de.tum.cit.aet.artemis.assessment.repository.BonusRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintResponseService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintResponseService.java index 6bd66ee5ad20..0f04518e8bf3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintResponseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintResponseService.java @@ -22,9 +22,9 @@ import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.ComplaintResponseLockedException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ComplaintResponseLockedException; /** * Service for managing complaint responses. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintService.java index b706f5a74d43..e2563a2fa5d7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintService.java @@ -36,7 +36,7 @@ import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.dto.ComplaintRequestDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * Service for managing complaints. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ExampleSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ExampleSubmissionService.java index 2814c13a49c6..c4693be803b8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ExampleSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ExampleSubmissionService.java @@ -26,7 +26,7 @@ import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.text.service.TextExerciseImportService; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/GradingScaleService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/GradingScaleService.java index 7b590ab4710f..bc71b944164e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/GradingScaleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/GradingScaleService.java @@ -8,6 +8,7 @@ import java.util.Set; import java.util.stream.IntStream; +import de.tum.cit.aet.artemis.core.util.PageUtil; import org.springframework.context.annotation.Profile; import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; @@ -19,8 +20,7 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.util.PageUtil; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreService.java index c8a966a0a73f..c2552c24f22b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreService.java @@ -36,7 +36,7 @@ import de.tum.cit.aet.artemis.web.rest.dto.score.ScoreDTO; import de.tum.cit.aet.artemis.web.rest.dto.score.StudentScoreSum; import de.tum.cit.aet.artemis.web.rest.dto.score.TeamScoreSum; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java index f759b9c37ecd..dc5048227108 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java @@ -62,7 +62,7 @@ import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.web.rest.dto.feedback.FeedbackDetailDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/TutorParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/TutorParticipationService.java index 795eedf2af99..3973d27f0965 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/TutorParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/TutorParticipationService.java @@ -31,8 +31,8 @@ import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Service Implementation for managing TutorParticipation. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/BonusResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/BonusResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/BonusResource.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/web/BonusResource.java index bd851c04e82e..f6dd14b08819 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/BonusResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/BonusResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.assessment.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -38,10 +38,10 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.service.ExamAccessService; import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing bonus @@ -49,7 +49,7 @@ @Profile(PROFILE_CORE) @RestController @RequestMapping("api/") -public class BonusResource { +public class dBonusResource { private static final Logger log = LoggerFactory.getLogger(BonusResource.class); diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ComplaintResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResource.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/web/ComplaintResource.java index 7f8d0aa13f3d..44688a1d248a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ComplaintResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.assessment.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -50,9 +50,9 @@ import de.tum.cit.aet.artemis.service.dto.ComplaintRequestDTO; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing complaints. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResponseResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ComplaintResponseResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResponseResource.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/web/ComplaintResponseResource.java index 7fe81edb8ad7..c90de6ceb034 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ComplaintResponseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ComplaintResponseResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.assessment.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -26,8 +26,8 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.dto.ComplaintAction; import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * REST controller for managing complaints. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/GradeStepResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradeStepResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/GradeStepResource.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/web/GradeStepResource.java index 2727efffd77e..4852916c33e1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/GradeStepResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradeStepResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.assessment.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -34,7 +34,7 @@ import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.web.rest.dto.GradeDTO; import de.tum.cit.aet.artemis.web.rest.dto.GradeStepsDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; /** * REST controller for managing grade steps of a grading scale diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/GradingScaleResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradingScaleResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/GradingScaleResource.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/web/GradingScaleResource.java index a4ce9d838821..b5873244d9c5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/GradingScaleResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradingScaleResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.assessment.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -36,8 +36,8 @@ import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing grading scale diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java index 2807ae95a30c..1219a56ebea9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.assessment.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -53,8 +53,8 @@ import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.web.rest.dto.ResultWithPointsPerGradingCriterionDTO; import de.tum.cit.aet.artemis.web.rest.dto.feedback.FeedbackDetailDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing Result. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicResultResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/open/PublicResultResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicResultResource.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/web/open/PublicResultResource.java index 91098c3f2ecf..65363e5ea358 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/open/PublicResultResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.open; +package de.tum.cit.aet.artemis.assessment.web.open; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -28,9 +28,9 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingMessagingService; import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; import de.tum.cit.aet.artemis.programming.service.hestia.TestwiseCoverageService; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * REST controller for receiving build results. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AthenaResource.java b/src/main/java/de/tum/cit/aet/artemis/athena/web/AthenaResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/AthenaResource.java rename to src/main/java/de/tum/cit/aet/artemis/athena/web/AthenaResource.java index beeb319351af..6a8864a79c9f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AthenaResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/web/AthenaResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.athena.web; import java.io.IOException; import java.util.List; @@ -42,9 +42,9 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; -import de.tum.cit.aet.artemis.web.rest.util.ResponseUtil; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; +import de.tum.cit.aet.artemis.core.util.ResponseUtil; /** * REST controller for Athena feedback suggestions. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/KnowledgeAreaRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/KnowledgeAreaRepository.java index 384516c67562..1eea8725ba49 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/KnowledgeAreaRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/KnowledgeAreaRepository.java @@ -16,7 +16,7 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.KnowledgeArea; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data JPA repository for the {@link KnowledgeArea} entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyJolService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyJolService.java index 41de1362b552..b3deba89ebd3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyJolService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyJolService.java @@ -23,7 +23,7 @@ import de.tum.cit.aet.artemis.iris.service.session.IrisCourseChatSessionService; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolPairDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * Service Implementation for managing CompetencyJol. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java index fefb619c6a6a..0e7c33bb07fe 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java @@ -40,9 +40,9 @@ import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyRelationDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.CompetencyPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.cit.aet.artemis.web.rest.util.PageUtil; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.util.PageUtil; /** * Service for managing competencies. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/KnowledgeAreaService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/KnowledgeAreaService.java index c6593b4e443d..13568741ac97 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/KnowledgeAreaService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/KnowledgeAreaService.java @@ -10,7 +10,7 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.KnowledgeArea; import de.tum.cit.aet.artemis.atlas.repository.competency.KnowledgeAreaRepository; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaRequestDTO; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Service for managing {@link KnowledgeArea} entities. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/StandardizedCompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/StandardizedCompetencyService.java index d421219573f8..59c8c1f2f9bd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/StandardizedCompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/StandardizedCompetencyService.java @@ -31,8 +31,8 @@ import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO.KnowledgeAreaForCatalogDTO; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO.StandardizedCompetencyForCatalogDTO; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyRequestDTO; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; /** * Service for managing {@link StandardizedCompetency} entities. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathService.java index 86ad4d09b8be..39d45b86cbe6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathService.java @@ -47,8 +47,8 @@ import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationOverviewDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.NgxLearningPathDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.util.PageUtil; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.util.PageUtil; /** * Service Implementation for managing Learning Paths. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/CompetencyResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/web/CompetencyResource.java index 2d30a2112c5d..bb4e5909a5dc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/CompetencyResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.competency; +package de.tum.cit.aet.artemis.atlas.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -43,8 +43,8 @@ import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/CourseCompetencyResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/web/CourseCompetencyResource.java index a3ac91df3697..ab5d507d3782 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/CourseCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/CourseCompetencyResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.competency; +package de.tum.cit.aet.artemis.atlas.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -56,7 +56,7 @@ import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyRelationDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.CompetencyPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/PrerequisiteResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/web/PrerequisiteResource.java index 4a46f618d401..14b6638651bc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/PrerequisiteResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/PrerequisiteResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.competency; +package de.tum.cit.aet.artemis.atlas.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -43,8 +43,8 @@ import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing {@link Prerequisite Prerequisite} entities. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/StandardizedCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/StandardizedCompetencyResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/competency/StandardizedCompetencyResource.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/web/StandardizedCompetencyResource.java index 102e52e590d7..a60bc11b4f86 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/competency/StandardizedCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/StandardizedCompetencyResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.competency; +package de.tum.cit.aet.artemis.atlas.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/science/ScienceResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceResource.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/web/science/ScienceResource.java index 6bdd0ef8a394..3f19b8e85f69 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/science/ScienceResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.science; +package de.tum.cit.aet.artemis.atlas.web.science; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/science/ScienceSettingsResource.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceSettingsResource.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/web/science/ScienceSettingsResource.java index ed0b92f0c465..f0f6149bfdb3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/science/ScienceSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/science/ScienceSettingsResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.science; +package de.tum.cit.aet.artemis.atlas.web.science; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -25,8 +25,8 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing ScienceSettings. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java index 9a6c4a704879..55253321ed40 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java @@ -31,7 +31,7 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data repository for the Message (Post) entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/PostRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/PostRepository.java index a7249138e2cf..a7b9236def03 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/PostRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/PostRepository.java @@ -14,7 +14,7 @@ import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data repository for the Post entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/OneToOneChatRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/OneToOneChatRepository.java index 38b7e944c1ec..46e9648ec222 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/OneToOneChatRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/OneToOneChatRepository.java @@ -12,7 +12,7 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.OneToOneChat; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java index 8e99bf43ccb2..ff6927d16ecc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java @@ -32,8 +32,8 @@ import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java index 224232058e34..5e969c51caf1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java @@ -58,8 +58,8 @@ import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/PostingService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/PostingService.java index 979ddb31aadc..083fbc9b0759 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/PostingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/PostingService.java @@ -38,7 +38,7 @@ import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.dto.UserRoleDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/ReactionService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/ReactionService.java index 4e447c71c838..b1b671278266 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/ReactionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/ReactionService.java @@ -21,8 +21,8 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismAnswerPostService; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismPostService; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java index 588bf2150940..1d7010dbac39 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java @@ -27,8 +27,8 @@ import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.lecture.domain.Lecture; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationDTOService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationDTOService.java index 6c57f0e6dcf2..6e4ce6857ee5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationDTOService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationDTOService.java @@ -27,11 +27,11 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.service.dto.UserPublicInfoDTO; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ConversationDTO; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ConversationUserDTO; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.GroupChatDTO; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.OneToOneChatDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationUserDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.GroupChatDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.OneToOneChatDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationService.java index b9157a3de978..1c9dec7aef1e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationService.java @@ -39,9 +39,9 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ConversationDTO; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationDTO; import de.tum.cit.aet.artemis.web.websocket.dto.metis.ConversationWebsocketDTO; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/GroupChatService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/GroupChatService.java index fb15a3a2bd04..61de1b1410fb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/GroupChatService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/GroupChatService.java @@ -16,8 +16,8 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.GroupChatDTO; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.GroupChatDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/ChannelAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/ChannelAuthorizationService.java index c5fd0fa86f90..9e3049a53ed6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/ChannelAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/ChannelAuthorizationService.java @@ -22,7 +22,7 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/GroupChatAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/GroupChatAuthorizationService.java index b538552582fb..323668f523c7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/GroupChatAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/GroupChatAuthorizationService.java @@ -16,7 +16,7 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/OneToOneChatAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/OneToOneChatAuthorizationService.java index 844c1fa41ca4..e902174e8704 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/OneToOneChatAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/OneToOneChatAuthorizationService.java @@ -15,7 +15,7 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/errors/ChannelNameDuplicateException.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/errors/ChannelNameDuplicateException.java index 9927dc37b315..a85b86ffb32b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/errors/ChannelNameDuplicateException.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/errors/ChannelNameDuplicateException.java @@ -6,8 +6,8 @@ import java.util.HashMap; import java.util.Map; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ErrorConstants; public class ChannelNameDuplicateException extends BadRequestAlertException { diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/push_notifications/FirebasePushNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/push_notifications/FirebasePushNotificationService.java index 364b89dea225..1d6c843b41a8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/push_notifications/FirebasePushNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/push_notifications/FirebasePushNotificationService.java @@ -51,7 +51,7 @@ void sendNotificationRequestsToEndpoint(List requests, } @Override - protected PushNotificationDeviceConfigurationRepository getRepository() { + public PushNotificationDeviceConfigurationRepository getRepository() { return repository; } diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/AnswerMessageResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/AnswerMessageResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/metis/AnswerMessageResource.java rename to src/main/java/de/tum/cit/aet/artemis/communication/web/AnswerMessageResource.java index 94ccd6ab2610..50f7d2e6f3b8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/AnswerMessageResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/AnswerMessageResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.metis; +package de.tum.cit.aet.artemis.communication.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/ConversationMessageResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java rename to src/main/java/de/tum/cit/aet/artemis/communication/web/ConversationMessageResource.java index 26c85b963c9a..9654ed2ed22e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ConversationMessageResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/ConversationMessageResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.metis; +package de.tum.cit.aet.artemis.communication.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -39,7 +39,7 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.PaginationUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ogparser/LinkPreviewResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/LinkPreviewResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/ogparser/LinkPreviewResource.java rename to src/main/java/de/tum/cit/aet/artemis/communication/web/LinkPreviewResource.java index 7560cc73781d..0d70fff501f6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ogparser/LinkPreviewResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/LinkPreviewResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.ogparser; +package de.tum.cit.aet.artemis.communication.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ReactionResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/ReactionResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ReactionResource.java rename to src/main/java/de/tum/cit/aet/artemis/communication/web/ReactionResource.java index 55345388f256..f4e6bb1aac1e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/ReactionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/ReactionResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.metis; +package de.tum.cit.aet.artemis.communication.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java rename to src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java index e9f7c267f73e..88e61a456dc1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ChannelResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.metis.conversation; +package de.tum.cit.aet.artemis.communication.web.conversation; import static de.tum.cit.aet.artemis.communication.service.conversation.ChannelService.CHANNEL_ENTITY_NAME; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -47,11 +47,11 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupChannelManagementService; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelIdAndNameDTO; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ErrorConstants; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelIdAndNameDTO; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationManagementResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ConversationManagementResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationManagementResource.java rename to src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ConversationManagementResource.java index 2ac98a8ef331..728350ca570c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationManagementResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ConversationManagementResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.metis.conversation; +package de.tum.cit.aet.artemis.communication.web.conversation; import org.springframework.http.HttpStatus; import org.springframework.web.server.ResponseStatusException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ConversationResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java rename to src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ConversationResource.java index 73a53fd16a91..721d03aba1fc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/ConversationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ConversationResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.metis.conversation; +package de.tum.cit.aet.artemis.communication.web.conversation; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -39,10 +39,10 @@ import de.tum.cit.aet.artemis.service.ConductAgreementService; import de.tum.cit.aet.artemis.service.dto.ResponsibleUserDTO; import de.tum.cit.aet.artemis.service.dto.UserPublicInfoDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ConversationDTO; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ConversationUserDTO; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationUserDTO; import tech.jhipster.web.util.PaginationUtil; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/GroupChatResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/GroupChatResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/GroupChatResource.java rename to src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/GroupChatResource.java index 39b365db9547..9ba29531d42d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/GroupChatResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/GroupChatResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.metis.conversation; +package de.tum.cit.aet.artemis.communication.web.conversation; import static de.tum.cit.aet.artemis.communication.ConversationSettings.MAX_GROUP_CHAT_PARTICIPANTS; import static de.tum.cit.aet.artemis.communication.service.conversation.GroupChatService.GROUP_CHAT_ENTITY_NAME; @@ -32,8 +32,8 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.GroupChatDTO; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.GroupChatDTO; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/OneToOneChatResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/OneToOneChatResource.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/OneToOneChatResource.java rename to src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/OneToOneChatResource.java index 6d1225dad5e3..e752a1d25038 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/OneToOneChatResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/OneToOneChatResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.metis.conversation; +package de.tum.cit.aet.artemis.communication.web.conversation; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -27,8 +27,8 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.OneToOneChatDTO; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.OneToOneChatDTO; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ChannelDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/ChannelDTO.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ChannelDTO.java rename to src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/ChannelDTO.java index 2f360a626d00..fbc679cfcfee 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ChannelDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/ChannelDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos; +package de.tum.cit.aet.artemis.communication.web.conversation.dtos; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ChannelIdAndNameDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/ChannelIdAndNameDTO.java similarity index 81% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ChannelIdAndNameDTO.java rename to src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/ChannelIdAndNameDTO.java index 037441c008cd..9676f806b705 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ChannelIdAndNameDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/ChannelIdAndNameDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos; +package de.tum.cit.aet.artemis.communication.web.conversation.dtos; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ConversationDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/ConversationDTO.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ConversationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/ConversationDTO.java index 4bf055a3c0f9..529a24ed65fb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ConversationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/ConversationDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos; +package de.tum.cit.aet.artemis.communication.web.conversation.dtos; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ConversationUserDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/ConversationUserDTO.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ConversationUserDTO.java rename to src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/ConversationUserDTO.java index f6c72f8d54a2..bbd8ca1337b6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/ConversationUserDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/ConversationUserDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos; +package de.tum.cit.aet.artemis.communication.web.conversation.dtos; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/GroupChatDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/GroupChatDTO.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/GroupChatDTO.java rename to src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/GroupChatDTO.java index 98e3f46514ca..ffffddb30ce6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/GroupChatDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/GroupChatDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos; +package de.tum.cit.aet.artemis.communication.web.conversation.dtos; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/OneToOneChatDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/OneToOneChatDTO.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/OneToOneChatDTO.java rename to src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/OneToOneChatDTO.java index caf9c589f603..cb0b9dc0c1dd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/metis/conversation/dtos/OneToOneChatDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/OneToOneChatDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos; +package de.tum.cit.aet.artemis.communication.web.conversation.dtos; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationRegisterBody.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/push_notification/PushNotificationRegisterBody.java similarity index 74% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationRegisterBody.java rename to src/main/java/de/tum/cit/aet/artemis/communication/web/push_notification/PushNotificationRegisterBody.java index b44d90d74cf6..d8d4637b921c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationRegisterBody.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/push_notification/PushNotificationRegisterBody.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.push_notification; +package de.tum.cit.aet.artemis.communication.web.push_notification; import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceType; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationRegisterDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/push_notification/PushNotificationRegisterDTO.java similarity index 72% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationRegisterDTO.java rename to src/main/java/de/tum/cit/aet/artemis/communication/web/push_notification/PushNotificationRegisterDTO.java index 18fc1c4924bb..661dff1ed66b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationRegisterDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/push_notification/PushNotificationRegisterDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.push_notification; +package de.tum.cit.aet.artemis.communication.web.push_notification; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/push_notification/PushNotificationResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationResource.java rename to src/main/java/de/tum/cit/aet/artemis/communication/web/push_notification/PushNotificationResource.java index 7d88e6f38b39..048cedd0154f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/push_notification/PushNotificationResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.push_notification; +package de.tum.cit.aet.artemis.communication.web.push_notification; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationUnregisterRequest.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/push_notification/PushNotificationUnregisterRequest.java similarity index 75% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationUnregisterRequest.java rename to src/main/java/de/tum/cit/aet/artemis/communication/web/push_notification/PushNotificationUnregisterRequest.java index d61c35fac182..ac753d8ffc0a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/push_notification/PushNotificationUnregisterRequest.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/push_notification/PushNotificationUnregisterRequest.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.push_notification; +package de.tum.cit.aet.artemis.communication.web.push_notification; import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceType; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/GuidedTourConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/GuidedTourConfiguration.java index 60404b891555..a4c4303124ce 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/GuidedTourConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/GuidedTourConfiguration.java @@ -13,7 +13,7 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; @Profile(PROFILE_CORE) @Component diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java index ce820ac1da45..96e7745e980b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java @@ -67,7 +67,7 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @Configuration diff --git a/src/main/java/de/tum/cit/aet/artemis/core/domain/Course.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/Course.java index 5fc14688da64..0b70bdb68f38 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/domain/Course.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/Course.java @@ -46,7 +46,7 @@ import de.tum.cit.aet.artemis.quiz.config.QuizView; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * A Course. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/domain/User.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/User.java index 919dcc6c22bc..e214b06237ca 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/domain/User.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/User.java @@ -48,7 +48,7 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; import de.tum.cit.aet.artemis.lecture.domain.LectureUnitCompletion; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; /** * A user. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/KeyAndPasswordVM.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/vm/KeyAndPasswordVM.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/vm/KeyAndPasswordVM.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/vm/KeyAndPasswordVM.java index 301bcffff223..55600ccbbbf9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/KeyAndPasswordVM.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/vm/KeyAndPasswordVM.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.vm; +package de.tum.cit.aet.artemis.core.dto.vm; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/LoggerVM.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/vm/LoggerVM.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/vm/LoggerVM.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/vm/LoggerVM.java index f0978f62d559..8c046535fbdb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/LoggerVM.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/vm/LoggerVM.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.vm; +package de.tum.cit.aet.artemis.core.dto.vm; import java.util.Objects; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/LoginVM.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/vm/LoginVM.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/vm/LoginVM.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/vm/LoginVM.java index d63c92c89e5f..65cb1c4a5973 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/LoginVM.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/vm/LoginVM.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.vm; +package de.tum.cit.aet.artemis.core.dto.vm; import static de.tum.cit.aet.artemis.core.config.Constants.PASSWORD_MAX_LENGTH; import static de.tum.cit.aet.artemis.core.config.Constants.PASSWORD_MIN_LENGTH; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/ManagedUserVM.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/vm/ManagedUserVM.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/vm/ManagedUserVM.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/vm/ManagedUserVM.java index 31561d04e548..6d7bd4f4ede2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/ManagedUserVM.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/vm/ManagedUserVM.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.vm; +package de.tum.cit.aet.artemis.core.dto.vm; import jakarta.validation.constraints.Size; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/package-info.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/vm/package-info.java similarity index 57% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/vm/package-info.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/vm/package-info.java index 4442f7f26ef8..20aee97be2c5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/vm/package-info.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/vm/package-info.java @@ -1,4 +1,4 @@ /** * View Models used by Spring MVC REST controllers. */ -package de.tum.cit.aet.artemis.web.rest.vm; +package de.tum.cit.aet.artemis.core.dto.vm; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/AccessForbiddenAlertException.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/AccessForbiddenAlertException.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/errors/AccessForbiddenAlertException.java rename to src/main/java/de/tum/cit/aet/artemis/core/exception/AccessForbiddenAlertException.java index d73185b34aa8..ce89cd4b1a8d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/AccessForbiddenAlertException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/AccessForbiddenAlertException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.core.exception; import java.net.URI; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/AccessForbiddenException.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/AccessForbiddenException.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/errors/AccessForbiddenException.java rename to src/main/java/de/tum/cit/aet/artemis/core/exception/AccessForbiddenException.java index 31714d31a1e8..aa8c7ccf8b42 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/AccessForbiddenException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/AccessForbiddenException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.core.exception; import java.io.Serial; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/exception/AccountRegistrationBlockedException.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/AccountRegistrationBlockedException.java index 1f3ac1c7c8fc..9859783be150 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/exception/AccountRegistrationBlockedException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/AccountRegistrationBlockedException.java @@ -2,9 +2,6 @@ import java.io.Serial; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; - public class AccountRegistrationBlockedException extends BadRequestAlertException { @Serial diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/BadRequestAlertException.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/BadRequestAlertException.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/errors/BadRequestAlertException.java rename to src/main/java/de/tum/cit/aet/artemis/core/exception/BadRequestAlertException.java index d75acee1e1c8..50d8316f0c3d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/BadRequestAlertException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/BadRequestAlertException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.core.exception; import java.net.URI; import java.util.Map; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/CaptchaRequiredException.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/CaptchaRequiredException.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/errors/CaptchaRequiredException.java rename to src/main/java/de/tum/cit/aet/artemis/core/exception/CaptchaRequiredException.java index 33e342894260..ef06daf6a455 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/CaptchaRequiredException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/CaptchaRequiredException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.core.exception; import java.io.Serial; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ComplaintResponseLockedException.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/ComplaintResponseLockedException.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ComplaintResponseLockedException.java rename to src/main/java/de/tum/cit/aet/artemis/core/exception/ComplaintResponseLockedException.java index 2083cfa3d759..3039f61722d4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ComplaintResponseLockedException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/ComplaintResponseLockedException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.core.exception; import java.io.Serial; import java.time.format.DateTimeFormatter; @@ -6,7 +6,7 @@ import java.util.Map; import de.tum.cit.aet.artemis.assessment.domain.ComplaintResponse; -import de.tum.cit.aet.artemis.web.rest.ComplaintResponseResource; +import de.tum.cit.aet.artemis.assessment.web.ComplaintResponseResource; public class ComplaintResponseLockedException extends BadRequestAlertException { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ConflictException.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/ConflictException.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ConflictException.java rename to src/main/java/de/tum/cit/aet/artemis/core/exception/ConflictException.java index 58c8fca26fae..0427f020b555 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ConflictException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/ConflictException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.core.exception; import java.net.URI; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/EmailAlreadyUsedException.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/EmailAlreadyUsedException.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/errors/EmailAlreadyUsedException.java rename to src/main/java/de/tum/cit/aet/artemis/core/exception/EmailAlreadyUsedException.java index 4b1bae770635..610df0b279b2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/EmailAlreadyUsedException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/EmailAlreadyUsedException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.core.exception; import java.io.Serial; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/EntityNotFoundException.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/EntityNotFoundException.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/errors/EntityNotFoundException.java rename to src/main/java/de/tum/cit/aet/artemis/core/exception/EntityNotFoundException.java index 5313bd5158c8..3cba00489aa9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/EntityNotFoundException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/EntityNotFoundException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.core.exception; import java.io.Serial; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ErrorConstants.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/ErrorConstants.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ErrorConstants.java rename to src/main/java/de/tum/cit/aet/artemis/core/exception/ErrorConstants.java index 1ddaf6f6523b..383c5264dda6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ErrorConstants.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/ErrorConstants.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.core.exception; import java.net.URI; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ExamConfigurationException.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/ExamConfigurationException.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ExamConfigurationException.java rename to src/main/java/de/tum/cit/aet/artemis/core/exception/ExamConfigurationException.java index e9056774966f..6e66fc27e3b6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ExamConfigurationException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/ExamConfigurationException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.core.exception; import java.io.Serial; import java.util.HashMap; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ExceptionTranslator.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/ExceptionTranslator.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ExceptionTranslator.java rename to src/main/java/de/tum/cit/aet/artemis/core/exception/ExceptionTranslator.java index 0d18d1ecfe3f..1fb3d1db9171 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ExceptionTranslator.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/ExceptionTranslator.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.core.exception; import java.io.IOException; import java.util.List; @@ -33,7 +33,6 @@ import org.zalando.problem.spring.web.advice.security.SecurityAdviceTrait; import org.zalando.problem.violations.ConstraintViolationProblem; -import de.tum.cit.aet.artemis.core.exception.UsernameAlreadyUsedException; import de.tum.cit.aet.artemis.core.service.connectors.gitlab.GitLabException; import tech.jhipster.web.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/FieldErrorVM.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/FieldErrorVM.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/errors/FieldErrorVM.java rename to src/main/java/de/tum/cit/aet/artemis/core/exception/FieldErrorVM.java index 0f022e16d13d..6d2e5558b74c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/FieldErrorVM.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/FieldErrorVM.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.core.exception; import java.io.Serial; import java.io.Serializable; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/HttpStatusException.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/HttpStatusException.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/errors/HttpStatusException.java rename to src/main/java/de/tum/cit/aet/artemis/core/exception/HttpStatusException.java index 4990b16f1c16..565348bed847 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/HttpStatusException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/HttpStatusException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.core.exception; import java.io.Serial; import java.net.URI; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/InternalServerErrorAlertException.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/InternalServerErrorAlertException.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/errors/InternalServerErrorAlertException.java rename to src/main/java/de/tum/cit/aet/artemis/core/exception/InternalServerErrorAlertException.java index 91074f3a6c97..3edf16f89ac4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/InternalServerErrorAlertException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/InternalServerErrorAlertException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.core.exception; import java.net.URI; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/InternalServerErrorException.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/InternalServerErrorException.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/errors/InternalServerErrorException.java rename to src/main/java/de/tum/cit/aet/artemis/core/exception/InternalServerErrorException.java index 4a74f7a24182..a5c4df8093a4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/InternalServerErrorException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/InternalServerErrorException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.core.exception; import java.io.Serial; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/LoginAlreadyUsedException.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/LoginAlreadyUsedException.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/errors/LoginAlreadyUsedException.java rename to src/main/java/de/tum/cit/aet/artemis/core/exception/LoginAlreadyUsedException.java index bb2731554020..3d5db9d59e66 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/LoginAlreadyUsedException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/LoginAlreadyUsedException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.core.exception; import java.io.Serial; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/PasswordViolatesRequirementsException.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/PasswordViolatesRequirementsException.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/errors/PasswordViolatesRequirementsException.java rename to src/main/java/de/tum/cit/aet/artemis/core/exception/PasswordViolatesRequirementsException.java index 76e3f4a9d1a0..0128ad79fadd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/PasswordViolatesRequirementsException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/PasswordViolatesRequirementsException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.core.exception; import java.io.Serial; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ServiceUnavailableException.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/ServiceUnavailableException.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ServiceUnavailableException.java rename to src/main/java/de/tum/cit/aet/artemis/core/exception/ServiceUnavailableException.java index 54c34b84eada..74de2bdfcdcd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/ServiceUnavailableException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/ServiceUnavailableException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.core.exception; import java.io.Serial; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/StudentsAlreadyAssignedException.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/StudentsAlreadyAssignedException.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/errors/StudentsAlreadyAssignedException.java rename to src/main/java/de/tum/cit/aet/artemis/core/exception/StudentsAlreadyAssignedException.java index c086542618ea..e5acc1262463 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/StudentsAlreadyAssignedException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/StudentsAlreadyAssignedException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.core.exception; import java.io.Serial; import java.util.HashMap; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/StudentsAppearMultipleTimesException.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/StudentsAppearMultipleTimesException.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/errors/StudentsAppearMultipleTimesException.java rename to src/main/java/de/tum/cit/aet/artemis/core/exception/StudentsAppearMultipleTimesException.java index b25841ce3d99..6750c6e6badb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/StudentsAppearMultipleTimesException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/StudentsAppearMultipleTimesException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.core.exception; import java.io.Serial; import java.util.HashMap; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/StudentsNotFoundException.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/StudentsNotFoundException.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/errors/StudentsNotFoundException.java rename to src/main/java/de/tum/cit/aet/artemis/core/exception/StudentsNotFoundException.java index fcb5758635ec..9c7524d89fea 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/StudentsNotFoundException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/StudentsNotFoundException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.core.exception; import java.io.Serial; import java.util.HashMap; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/package-info.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/package-info.java similarity index 74% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/errors/package-info.java rename to src/main/java/de/tum/cit/aet/artemis/core/exception/package-info.java index f0f87034cf81..d4609c3bc522 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/errors/package-info.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/package-info.java @@ -1,4 +1,4 @@ /** * Specific errors used with Zalando's "problem-spring-web" library. More information on https://github.com/zalando/problem-spring-web */ -package de.tum.cit.aet.artemis.web.rest.errors; +package de.tum.cit.aet.artemis.core.exception; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/CourseRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/CourseRepository.java index 8781e09de89a..3672f195e42c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/CourseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/CourseRepository.java @@ -32,7 +32,7 @@ import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.text.domain.TextExercise; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data JPA repository for the Course entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/OrganizationRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/OrganizationRepository.java index da1a37730f85..e6a68e72d1ac 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/OrganizationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/OrganizationRepository.java @@ -18,7 +18,7 @@ import de.tum.cit.aet.artemis.core.domain.Organization; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring JPA repository for Organization entities diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java index b37113931ca0..5932319c0252 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java @@ -50,7 +50,7 @@ import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.service.dto.UserRoleDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.UserPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data JPA repository for the User entity.
diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/base/DynamicSpecificationRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/base/DynamicSpecificationRepository.java index 483b2a13e1ef..b10fa30617e5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/base/DynamicSpecificationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/base/DynamicSpecificationRepository.java @@ -10,7 +10,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.repository.NoRepositoryBean; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * A repository that provides methods for fetching entities dynamically using {@link FetchOptions}. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/base/RepositoryImpl.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/base/RepositoryImpl.java index af41b6e3c0d8..5e4d33392c1c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/base/RepositoryImpl.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/base/RepositoryImpl.java @@ -13,7 +13,7 @@ import org.springframework.data.jpa.repository.support.SimpleJpaRepository; import de.tum.cit.aet.artemis.core.domain.DomainObject_; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; public class RepositoryImpl extends SimpleJpaRepository { diff --git a/src/main/java/de/tum/cit/aet/artemis/core/security/SecurityUtils.java b/src/main/java/de/tum/cit/aet/artemis/core/security/SecurityUtils.java index c70f33d322e9..84dae572072b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/security/SecurityUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/security/SecurityUtils.java @@ -23,7 +23,7 @@ import org.springframework.security.core.userdetails.UserDetails; import org.springframework.util.StringUtils; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; /** * Utility class for Spring Security. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/AccountService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/AccountService.java index dea1a737c3b2..569154b797cd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/AccountService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/AccountService.java @@ -4,14 +4,14 @@ import java.util.Optional; +import de.tum.cit.aet.artemis.core.web.AccountResource; +import de.tum.cit.aet.artemis.core.web.open.PublicAccountResource; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.web.rest.AccountResource; -import de.tum.cit.aet.artemis.web.rest.open.PublicAccountResource; /** * Service class for {@link AccountResource} and {@link PublicAccountResource}. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/AuthorizationCheckService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/AuthorizationCheckService.java index 936966924aab..b4603c9dcfba 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/AuthorizationCheckService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/AuthorizationCheckService.java @@ -37,7 +37,7 @@ import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; /** * Service used to check whether user is authorized to perform actions on the entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/AbstractGitService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/AbstractGitService.java index 9bad67b8c215..00fe4ad5ce72 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/AbstractGitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/AbstractGitService.java @@ -49,7 +49,7 @@ import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; public abstract class AbstractGitService { diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/GitService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/GitService.java index fbdf11e917b4..26317267afba 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/GitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/GitService.java @@ -88,7 +88,7 @@ import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.ZipFileService; import de.tum.cit.aet.artemis.web.rest.dto.CommitInfoDTO; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/SAML2Service.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/SAML2Service.java index dca5cdae6fcd..68c610c315d1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/SAML2Service.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/SAML2Service.java @@ -30,7 +30,7 @@ import de.tum.cit.aet.artemis.core.security.UserNotActivatedException; import de.tum.cit.aet.artemis.core.service.user.UserCreationService; import de.tum.cit.aet.artemis.core.service.user.UserService; -import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; +import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; /** * This class describes a service for SAML2 authentication. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusTemplateService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusTemplateService.java index 3401c65462a8..96a25d0fa9ed 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusTemplateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusTemplateService.java @@ -7,6 +7,7 @@ import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; +import de.tum.cit.aet.artemis.programming.web.localci.AeolusTemplateResource; import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,7 +29,7 @@ import de.tum.cit.aet.artemis.service.ResourceLoaderService; /** - * Handles the request to {@link de.tum.cit.aet.artemis.web.rest.AeolusTemplateResource} and Artemis internal + * Handles the request to {@link AeolusTemplateResource} and Artemis internal * requests to fetch aeolus templates for programming exercises. */ @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaFeedbackSuggestionsService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaFeedbackSuggestionsService.java index 86817faf0da1..ec6cd3dcffc3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaFeedbackSuggestionsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaFeedbackSuggestionsService.java @@ -24,7 +24,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; /** * Service for receiving feedback suggestions from the Athena service. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaModuleService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaModuleService.java index 83582c126f34..8fa7d42f87b1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaModuleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaModuleService.java @@ -25,7 +25,7 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * Service to get the URL for an Athena module, depending on the type of exercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaRepositoryExportService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaRepositoryExportService.java index 1c7af447a2af..0a258cf8e8e5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaRepositoryExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaRepositoryExportService.java @@ -21,8 +21,8 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseExportService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryExportOptionsDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.ServiceUnavailableException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.ServiceUnavailableException; /** * Service for exporting programming exercise repositories for Athena. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIResultProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIResultProcessingService.java index 223badb8a5f6..67d5df9c31f0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIResultProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIResultProcessingService.java @@ -43,7 +43,7 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.web.websocket.programmingSubmission.BuildTriggerWebsocketError; @Profile(PROFILE_LOCALCI) diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobExecutionService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobExecutionService.java index 3df43fa0277f..99abc18cae97 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobExecutionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobExecutionService.java @@ -46,7 +46,7 @@ import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * This service contains the logic to execute a build job for a programming exercise participation in the local CI system. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCFetchFilter.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCFetchFilter.java index 13aa2fd715e8..f8ab737a9d8e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCFetchFilter.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCFetchFilter.java @@ -15,7 +15,7 @@ import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCAuthException; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCForbiddenException; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; -import de.tum.cit.aet.artemis.web.rest.repository.RepositoryActionType; +import de.tum.cit.aet.artemis.programming.web.repository.RepositoryActionType; /** * Filters incoming fetch requests reaching the local git server implementation. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPushFilter.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPushFilter.java index 8eca72e33cf7..0f07f7e7c7ac 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPushFilter.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPushFilter.java @@ -15,7 +15,7 @@ import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCAuthException; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCForbiddenException; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; -import de.tum.cit.aet.artemis.web.rest.repository.RepositoryActionType; +import de.tum.cit.aet.artemis.programming.web.repository.RepositoryActionType; /** * Filters incoming push requests reaching the local Version Control implementation. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCServletService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCServletService.java index be87b3298060..b6d399c231c2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCServletService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCServletService.java @@ -63,9 +63,9 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingSubmissionService; import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; import de.tum.cit.aet.artemis.programming.service.RepositoryAccessService; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.cit.aet.artemis.web.rest.repository.RepositoryActionType; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.programming.web.repository.RepositoryActionType; /** * This service is responsible for authenticating and authorizing git requests as well as for retrieving the requested Git repositories from disk. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/Lti13Service.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/Lti13Service.java index 082040f39140..afebd79d5c46 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/Lti13Service.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/Lti13Service.java @@ -53,7 +53,7 @@ import de.tum.cit.aet.artemis.lti.repository.Lti13ResourceLaunchRepository; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Service @Profile("lti") diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiDeepLinkingService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiDeepLinkingService.java index 044ebcc9eda6..791a00bbc083 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiDeepLinkingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiDeepLinkingService.java @@ -18,7 +18,7 @@ import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lti.dto.Lti13DeepLinkingResponse; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * Service for handling LTI deep linking functionality. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiDynamicRegistrationService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiDynamicRegistrationService.java index 3bfc3dbdee42..51463f70ff14 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiDynamicRegistrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiDynamicRegistrationService.java @@ -20,7 +20,7 @@ import de.tum.cit.aet.artemis.lti.dto.Lti13ClientRegistration; import de.tum.cit.aet.artemis.lti.dto.Lti13PlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Service @Profile("lti") diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisConnectorService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisConnectorService.java index 08de05aabe3f..8d97d36e07da 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisConnectorService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisConnectorService.java @@ -22,7 +22,7 @@ import de.tum.cit.aet.artemis.iris.exception.IrisException; import de.tum.cit.aet.artemis.iris.exception.IrisForbiddenException; import de.tum.cit.aet.artemis.iris.exception.IrisInternalPyrisErrorException; -import de.tum.cit.aet.artemis.web.rest.open.PublicPyrisStatusUpdateResource; +import de.tum.cit.aet.artemis.lti.web.open.PublicPyrisStatusUpdateResource; /** * This service connects to the Python implementation of Iris (called Pyris). diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisJobService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisJobService.java index 352d51b98d0b..f89a492a93fc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisJobService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisJobService.java @@ -19,8 +19,8 @@ import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.ExerciseChatJob; import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.IngestionWebhookJob; import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.PyrisJob; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; /** * The PyrisJobService class is responsible for managing Pyris jobs in the Artemis system. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportService.java index 6cdc5d644c6c..50904474d32e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportService.java @@ -8,6 +8,7 @@ import java.time.ZoneId; import java.time.ZonedDateTime; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import jakarta.validation.constraints.NotNull; import org.slf4j.Logger; @@ -26,8 +27,8 @@ import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.web.rest.dto.DataExportDTO; import de.tum.cit.aet.artemis.web.rest.dto.RequestDataExportDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; /** * Service Implementation for managing the data export in accordance with Art. 15 GDPR. @@ -91,8 +92,8 @@ public RequestDataExportDTO requestDataExportForUserAsAdmin(String login) { * * @param dataExport the data export to download * @return the file path where the data export is stored - * @throws de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException if the data export or the user could not be found - * @throws de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException if the user is not allowed to download the data export + * @throws EntityNotFoundException if the data export or the user could not be found + * @throws AccessForbiddenException if the user is not allowed to download the data export */ public Resource downloadDataExport(DataExport dataExport) { dataExport.setDownloadDate(ZonedDateTime.now()); diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/feature/FeatureToggleAspect.java b/src/main/java/de/tum/cit/aet/artemis/core/service/feature/FeatureToggleAspect.java index c228bbd11093..87785e123cec 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/feature/FeatureToggleAspect.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/feature/FeatureToggleAspect.java @@ -11,7 +11,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; @Profile(PROFILE_CORE) @Component diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserCreationService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserCreationService.java index 4e94063cd94e..1ac2fd2d323d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserCreationService.java @@ -34,7 +34,7 @@ import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.service.connectors.ci.CIUserManagementService; import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsUserManagementService; -import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; +import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; import tech.jhipster.security.RandomUtil; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java index 9bf0dab3c998..73561b92f52d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java @@ -61,10 +61,10 @@ import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.dto.UserDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.EmailAlreadyUsedException; -import de.tum.cit.aet.artemis.web.rest.errors.PasswordViolatesRequirementsException; -import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.EmailAlreadyUsedException; +import de.tum.cit.aet.artemis.core.exception.PasswordViolatesRequirementsException; +import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; import tech.jhipster.security.RandomUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/util/DateUtil.java b/src/main/java/de/tum/cit/aet/artemis/core/util/DateUtil.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/util/DateUtil.java rename to src/main/java/de/tum/cit/aet/artemis/core/util/DateUtil.java index dccb5056090e..55a44a583791 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/util/DateUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/util/DateUtil.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.util; +package de.tum.cit.aet.artemis.core.util; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/util/HeaderUtil.java b/src/main/java/de/tum/cit/aet/artemis/core/util/HeaderUtil.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/util/HeaderUtil.java rename to src/main/java/de/tum/cit/aet/artemis/core/util/HeaderUtil.java index dcbe8336ff25..c66ab3cc4fcb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/util/HeaderUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/util/HeaderUtil.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.util; +package de.tum.cit.aet.artemis.core.util; import org.springframework.http.HttpHeaders; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/util/PageUtil.java b/src/main/java/de/tum/cit/aet/artemis/core/util/PageUtil.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/util/PageUtil.java rename to src/main/java/de/tum/cit/aet/artemis/core/util/PageUtil.java index 8a39bdcc1ec7..b6867d9f0b16 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/util/PageUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/util/PageUtil.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.util; +package de.tum.cit.aet.artemis.core.util; import java.util.Map; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/util/ResponseUtil.java b/src/main/java/de/tum/cit/aet/artemis/core/util/ResponseUtil.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/util/ResponseUtil.java rename to src/main/java/de/tum/cit/aet/artemis/core/util/ResponseUtil.java index c91bed729f89..8be235aae419 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/util/ResponseUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/util/ResponseUtil.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.util; +package de.tum.cit.aet.artemis.core.util; import java.io.File; import java.io.FileInputStream; @@ -9,7 +9,7 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Deprecation: please throw exceptions instead of using the below methods, diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/util/StringUtil.java b/src/main/java/de/tum/cit/aet/artemis/core/util/StringUtil.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/util/StringUtil.java rename to src/main/java/de/tum/cit/aet/artemis/core/util/StringUtil.java index 2898f45737b2..26067d378036 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/util/StringUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/util/StringUtil.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.util; +package de.tum.cit.aet.artemis.core.util; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AccountResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/AccountResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/AccountResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/AccountResource.java index 9d838d5c5374..0a204800448b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AccountResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/AccountResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.core.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -43,10 +43,10 @@ import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.dto.PasswordChangeDTO; import de.tum.cit.aet.artemis.service.dto.UserDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EmailAlreadyUsedException; -import de.tum.cit.aet.artemis.web.rest.errors.PasswordViolatesRequirementsException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EmailAlreadyUsedException; +import de.tum.cit.aet.artemis.core.exception.PasswordViolatesRequirementsException; /** * REST controller for managing the current user's account. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AndroidAppSiteAssociationResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/AndroidAppSiteAssociationResource.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/AndroidAppSiteAssociationResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/AndroidAppSiteAssociationResource.java index 6f2a9a598ef9..0f25af42296d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AndroidAppSiteAssociationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/AndroidAppSiteAssociationResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.core.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -56,7 +56,7 @@ public ResponseEntity> getAndroidAssetLinks() { public record AndroidAssetLinksEntry(List relation, AndroidTarget target) { - record AndroidTarget(String namespace, String package_name, List sha256_cert_fingerprints) { + public record AndroidTarget(String namespace, String package_name, List sha256_cert_fingerprints) { } } } diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AppleAppSiteAssociationResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/AppleAppSiteAssociationResource.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/AppleAppSiteAssociationResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/AppleAppSiteAssociationResource.java index 666f8875dfac..9d45bb57bf59 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AppleAppSiteAssociationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/AppleAppSiteAssociationResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.core.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -56,12 +56,12 @@ public ResponseEntity getAppleAppSiteAssociation() { public record AppleAppSiteAssociation(Applinks applinks, Webcredentials webcredentials) { - record Webcredentials(String[] apps) { + public record Webcredentials(String[] apps) { } - record Applinks(String[] apps, Detail[] details) { + public record Applinks(String[] apps, Detail[] details) { - record Detail(String appID, String[] paths) { + public record Detail(String appID, String[] paths) { } } } diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AttachmentResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/AttachmentResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/AttachmentResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/AttachmentResource.java index db3865a82119..8792e34fbd47 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AttachmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/AttachmentResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.core.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.service.FilePathService.actualPathForPublicPath; @@ -40,7 +40,7 @@ import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import tech.jhipster.web.util.ResponseUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java index 130f3cd46df6..c3e4df5aa30d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java @@ -41,8 +41,8 @@ import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing Course. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java index 088b18c2c93c..8509cc3e2cc0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java @@ -24,7 +24,7 @@ import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiDynamicRegistrationService; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing LTI platform configurations. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminModelingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminModelingExerciseResource.java index fd251aa85c44..babecc9b0572 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminModelingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminModelingExerciseResource.java @@ -19,7 +19,7 @@ import de.tum.cit.aet.artemis.modeling.repository.ModelClusterRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.modeling.service.ModelingExerciseService; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for administrating ModelingExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminOrganizationResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminOrganizationResource.java index 59ab5b03c5e2..e952ee1f62d3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminOrganizationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminOrganizationResource.java @@ -29,8 +29,8 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.service.OrganizationService; import de.tum.cit.aet.artemis.web.rest.dto.OrganizationCountDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for administrating the Organization entities diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminSystemNotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminSystemNotificationResource.java index 9d3708ea8180..4c67f174df2f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminSystemNotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminSystemNotificationResource.java @@ -23,8 +23,8 @@ import de.tum.cit.aet.artemis.communication.repository.SystemNotificationRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.service.SystemNotificationService; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for administrating system notifications. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java index bf40834fb398..e1638e04231b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java @@ -40,11 +40,11 @@ import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.UserPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EmailAlreadyUsedException; -import de.tum.cit.aet.artemis.web.rest.errors.LoginAlreadyUsedException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; -import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EmailAlreadyUsedException; +import de.tum.cit.aet.artemis.core.exception.LoginAlreadyUsedException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.PaginationUtil; import tech.jhipster.web.util.ResponseUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/LogResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/LogResource.java index f9dbb07458da..4d25cac75287 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/LogResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/LogResource.java @@ -17,7 +17,7 @@ import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.web.rest.vm.LoggerVM; +import de.tum.cit.aet.artemis.core.dto.vm.LoggerVM; /** * Controller for view and managing Log Level at runtime. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicAccountResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicAccountResource.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicAccountResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicAccountResource.java index e5b0eb8f5edd..5949ed3533ed 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicAccountResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicAccountResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.open; +package de.tum.cit.aet.artemis.core.web.open; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -33,15 +33,15 @@ import de.tum.cit.aet.artemis.core.service.AccountService; import de.tum.cit.aet.artemis.core.service.user.UserService; import de.tum.cit.aet.artemis.service.dto.UserDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EmailAlreadyUsedException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; -import de.tum.cit.aet.artemis.web.rest.errors.LoginAlreadyUsedException; -import de.tum.cit.aet.artemis.web.rest.errors.PasswordViolatesRequirementsException; -import de.tum.cit.aet.artemis.web.rest.vm.KeyAndPasswordVM; -import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EmailAlreadyUsedException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; +import de.tum.cit.aet.artemis.core.exception.LoginAlreadyUsedException; +import de.tum.cit.aet.artemis.core.exception.PasswordViolatesRequirementsException; +import de.tum.cit.aet.artemis.core.dto.vm.KeyAndPasswordVM; +import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; /** * REST controller for public endpoints regarding the current user's account. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicImprintResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicImprintResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicImprintResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicImprintResource.java index 3e6a284508e0..5368cd6f51bc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicImprintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicImprintResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.open; +package de.tum.cit.aet.artemis.core.web.open; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPrivacyStatementResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicPrivacyStatementResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPrivacyStatementResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicPrivacyStatementResource.java index 0743f983d077..eb053f213fa2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPrivacyStatementResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicPrivacyStatementResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.open; +package de.tum.cit.aet.artemis.core.web.open; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicSystemNotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicSystemNotificationResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicSystemNotificationResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicSystemNotificationResource.java index b2be95c07582..8547320e0c14 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicSystemNotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicSystemNotificationResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.open; +package de.tum.cit.aet.artemis.core.web.open; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicTimeResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicTimeResource.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicTimeResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicTimeResource.java index ed7f8cc5937b..c293837fb069 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicTimeResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicTimeResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.open; +package de.tum.cit.aet.artemis.core.web.open; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicUserJwtResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicUserJwtResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicUserJwtResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicUserJwtResource.java index 2f0355f261ed..8f9f97c1e318 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicUserJwtResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicUserJwtResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.open; +package de.tum.cit.aet.artemis.core.web.open; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -34,8 +34,8 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.core.security.jwt.JWTCookieService; import de.tum.cit.aet.artemis.core.service.connectors.SAML2Service; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.vm.LoginVM; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.dto.vm.LoginVM; /** * REST controller to authenticate users. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/domain/Exam.java b/src/main/java/de/tum/cit/aet/artemis/exam/domain/Exam.java index ab893c874d88..2f9fb58e62b9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/domain/Exam.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/domain/Exam.java @@ -32,7 +32,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.web.rest.util.StringUtil; +import de.tum.cit.aet.artemis.core.util.StringUtil; @Entity @Table(name = "exam") diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamRepository.java b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamRepository.java index a86c05a2ded3..0300b9281f07 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamRepository.java @@ -28,7 +28,7 @@ import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.web.rest.dto.CourseContentCount; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data JPA repository for the ExamRepository entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/repository/StudentExamRepository.java b/src/main/java/de/tum/cit/aet/artemis/exam/repository/StudentExamRepository.java index 296088a80384..6dfaf26b7837 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/repository/StudentExamRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/repository/StudentExamRepository.java @@ -30,7 +30,7 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data JPA repository for the StudentExam entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamAccessService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamAccessService.java index 9b9a7367d1fb..659ae9af8f56 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamAccessService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamAccessService.java @@ -20,10 +20,10 @@ import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Service implementation to check exam access. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDateService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDateService.java index e5e082f26524..673d70b00ab5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDateService.java @@ -20,7 +20,7 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamImportService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamImportService.java index a361bd1a268d..b7f431710386 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamImportService.java @@ -41,7 +41,7 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.text.service.TextExerciseImportService; -import de.tum.cit.aet.artemis.web.rest.errors.ExamConfigurationException; +import de.tum.cit.aet.artemis.core.exception.ExamConfigurationException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamQuizService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamQuizService.java index 0576db3f4b80..aa099a89ce15 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamQuizService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamQuizService.java @@ -23,7 +23,7 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.quiz.service.QuizStatisticService; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamRegistrationService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamRegistrationService.java index e73b9a658ae6..44e763ea05fd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamRegistrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamRegistrationService.java @@ -35,9 +35,9 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.web.rest.dto.ExamUserDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Service Implementation for registering students in the exam. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamService.java index 4c6119b833ea..a97a2f5f6b41 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamService.java @@ -111,10 +111,10 @@ import de.tum.cit.aet.artemis.web.rest.dto.StudentExamWithGradeDTO; import de.tum.cit.aet.artemis.web.rest.dto.TutorLeaderboardDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.cit.aet.artemis.web.rest.util.PageUtil; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.util.PageUtil; /** * Service Implementation for managing exams. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSubmissionService.java index bb6fd8392253..09cd68dcdd00 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSubmissionService.java @@ -23,8 +23,8 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamUserService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamUserService.java index f9c989f19af1..6aa18e744474 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamUserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamUserService.java @@ -32,7 +32,7 @@ import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.web.rest.dto.ExamUsersNotFoundDTO; import de.tum.cit.aet.artemis.web.rest.dto.ImageDTO; -import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; /** * Service Implementation for managing Exam Users. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ImageExtractor.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ImageExtractor.java index eef235ba0cc9..14c38f26ed7f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ImageExtractor.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ImageExtractor.java @@ -26,7 +26,7 @@ import org.apache.pdfbox.util.Matrix; import de.tum.cit.aet.artemis.web.rest.dto.ImageDTO; -import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; /** * Processor to extract images from a PDF and get information. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamAccessService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamAccessService.java index 74d63aec26e2..ea620cc7edcc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamAccessService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamAccessService.java @@ -16,8 +16,8 @@ import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; /** * Service implementation to check student exam access. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamService.java index ac2b0772ca39..b96c6ca93a04 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamService.java @@ -74,8 +74,8 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Service Implementation for managing StudentExam. diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/BaseExercise.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/BaseExercise.java index 76e4fbb0b3a6..ac3c91248235 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/BaseExercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/BaseExercise.java @@ -14,7 +14,7 @@ import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.quiz.config.QuizView; -import de.tum.cit.aet.artemis.web.rest.util.StringUtil; +import de.tum.cit.aet.artemis.core.util.StringUtil; @MappedSuperclass public abstract class BaseExercise extends DomainObject { diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java index 8cbb7cf9dad7..279d3d05efd7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java @@ -74,7 +74,7 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * An Exercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java index f3b002e2ef80..69eb2a60f559 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java @@ -24,7 +24,7 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.dto.ExerciseTypeMetricsEntry; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data JPA repository for the Exercise entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java index c34441ef5abc..0551856fcaf5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java @@ -33,7 +33,7 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data repository for the Submission entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/TeamRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/TeamRepository.java index 63cd4eacf987..eb31f770f361 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/TeamRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/TeamRepository.java @@ -20,8 +20,8 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Team; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.cit.aet.artemis.web.rest.errors.StudentsAlreadyAssignedException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.StudentsAlreadyAssignedException; /** * Spring Data repository for the Team entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseService.java index e90b13472db7..428835058ccb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseService.java @@ -70,8 +70,8 @@ import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; import de.tum.cit.aet.artemis.web.rest.dto.TutorLeaderboardDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Service Implementation for managing Exercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionExportService.java index b9a2d59f414f..d0b40b7056d3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionExportService.java @@ -34,7 +34,7 @@ import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ZipFileService; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamService.java index d4055f5e863a..c97f95468f1f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamService.java @@ -29,9 +29,9 @@ import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.dto.TeamSearchUserDTO; import de.tum.cit.aet.artemis.web.rest.TeamResource; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.StudentsAppearMultipleTimesException; -import de.tum.cit.aet.artemis.web.rest.errors.StudentsNotFoundException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.StudentsAppearMultipleTimesException; +import de.tum.cit.aet.artemis.core.exception.StudentsNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AbstractSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/AbstractSubmissionResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/AbstractSubmissionResource.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/web/AbstractSubmissionResource.java index 14387b58b64a..2d4a62214d66 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AbstractSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/AbstractSubmissionResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.exercise.web; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/AssessmentResource.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/AssessmentResource.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/web/AssessmentResource.java index bb38f12089a8..1a7d4db7ba78 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/AssessmentResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.exercise.web; import java.util.List; @@ -24,9 +24,9 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; public abstract class AssessmentResource { @@ -67,7 +67,7 @@ public AssessmentResource(AuthorizationCheckService authCheckService, UserReposi * @param submissionId the id of the submission that should be sent to the client * @return the assessment of the given id */ - ResponseEntity getAssessmentBySubmissionId(Long submissionId) { + public ResponseEntity getAssessmentBySubmissionId(Long submissionId) { log.debug("REST request to get assessment for submission with id {}", submissionId); Submission submission = submissionRepository.findOneWithEagerResultAndFeedbackAndAssessmentNoteAndTeamStudents(submissionId); StudentParticipation participation = (StudentParticipation) submission.getParticipation(); @@ -101,7 +101,7 @@ ResponseEntity getAssessmentBySubmissionId(Long submissionId) { * @param assessmentNote the assessment note of the result * @return result after saving/submitting modeling assessment */ - ResponseEntity saveAssessment(Submission submission, boolean submit, List feedbackList, Long resultId, String assessmentNote) { + public ResponseEntity saveAssessment(Submission submission, boolean submit, List feedbackList, Long resultId, String assessmentNote) { User user = userRepository.getUserWithGroupsAndAuthorities(); StudentParticipation studentParticipation = (StudentParticipation) submission.getParticipation(); long exerciseId = studentParticipation.getExercise().getId(); diff --git a/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseService.java index fc26e4c10dc5..0754303bc324 100644 --- a/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseService.java @@ -4,6 +4,7 @@ import java.util.Collections; +import de.tum.cit.aet.artemis.core.util.PageUtil; import org.springframework.context.annotation.Profile; import org.springframework.data.domain.Page; import org.springframework.data.jpa.domain.Specification; @@ -15,7 +16,6 @@ import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.util.PageUtil; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionService.java index 8def5e2e0fa3..bb39985b653c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionService.java @@ -45,8 +45,8 @@ import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.SubmissionService; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/exception/IrisException.java b/src/main/java/de/tum/cit/aet/artemis/iris/exception/IrisException.java index 71c05f954df6..764f51ca82e2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/exception/IrisException.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/exception/IrisException.java @@ -5,8 +5,8 @@ import org.zalando.problem.Status; -import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; -import de.tum.cit.aet.artemis.web.rest.errors.HttpStatusException; +import de.tum.cit.aet.artemis.core.exception.ErrorConstants; +import de.tum.cit.aet.artemis.core.exception.HttpStatusException; public class IrisException extends HttpStatusException { diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisCourseChatSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisCourseChatSessionRepository.java index 10d9d87904c1..ab865ca09897 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisCourseChatSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisCourseChatSessionRepository.java @@ -15,7 +15,7 @@ import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.iris.domain.session.IrisCourseChatSession; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Repository interface for managing {@link IrisCourseChatSession} entities. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisExerciseChatSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisExerciseChatSessionRepository.java index baca220bf8bf..ee267b0b7378 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisExerciseChatSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisExerciseChatSessionRepository.java @@ -15,7 +15,7 @@ import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.iris.domain.session.IrisExerciseChatSession; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Repository interface for managing {@link IrisExerciseChatSession} entities. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSessionRepository.java index fe08b870b6ad..2d17b71efbf4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSessionRepository.java @@ -9,7 +9,7 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data repository for the IrisSession entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisSessionService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisSessionService.java index bb39e66c7755..631e734413c2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisSessionService.java @@ -19,7 +19,7 @@ import de.tum.cit.aet.artemis.iris.service.session.IrisHestiaSessionService; import de.tum.cit.aet.artemis.iris.service.session.IrisRateLimitedFeatureInterface; import de.tum.cit.aet.artemis.iris.service.session.IrisSubFeatureInterface; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; /** * Service for managing Iris sessions. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisCourseChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisCourseChatSessionService.java index e02fefe5c846..b9e9d740486f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisCourseChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisCourseChatSessionService.java @@ -30,7 +30,7 @@ import de.tum.cit.aet.artemis.iris.service.IrisRateLimitService; import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; import de.tum.cit.aet.artemis.iris.service.websocket.IrisChatWebsocketService; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; /** * Service to handle the course chat subsystem of Iris. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisExerciseChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisExerciseChatSessionService.java index 6fff9a345700..36d01d8ebe63 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisExerciseChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisExerciseChatSessionService.java @@ -30,8 +30,8 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; /** * Service to handle the chat subsystem of Iris. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSettingsService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSettingsService.java index b03825b4a7b7..1418e07ecc73 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSettingsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSettingsService.java @@ -34,9 +34,9 @@ import de.tum.cit.aet.artemis.iris.dto.IrisCombinedSettingsDTO; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; import de.tum.cit.aet.artemis.iris.service.IrisDefaultTemplateService; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; /** * Service for managing {@link IrisSettings}. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisCourseChatSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisCourseChatSessionResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisCourseChatSessionResource.java rename to src/main/java/de/tum/cit/aet/artemis/iris/web/IrisCourseChatSessionResource.java index f4bddf6a1e2b..bcdb2d61eb58 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisCourseChatSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisCourseChatSessionResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.iris; +package de.tum.cit.aet.artemis.iris.web; import java.net.URI; import java.net.URISyntaxException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisExerciseChatSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisExerciseChatSessionResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisExerciseChatSessionResource.java rename to src/main/java/de/tum/cit/aet/artemis/iris/web/IrisExerciseChatSessionResource.java index fb4c6afce51f..f2e58739afe1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisExerciseChatSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisExerciseChatSessionResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.iris; +package de.tum.cit.aet.artemis.iris.web; import java.net.URI; import java.net.URISyntaxException; @@ -25,7 +25,7 @@ import de.tum.cit.aet.artemis.iris.service.IrisSessionService; import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; /** * REST controller for managing {@link IrisExerciseChatSession}. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisMessageResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisMessageResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisMessageResource.java rename to src/main/java/de/tum/cit/aet/artemis/iris/web/IrisMessageResource.java index bfc47a0d0b94..8d96b1e46467 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisMessageResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisMessageResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.iris; +package de.tum.cit.aet.artemis.iris.web; import java.net.URI; import java.net.URISyntaxException; @@ -26,7 +26,7 @@ import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; import de.tum.cit.aet.artemis.iris.service.IrisMessageService; import de.tum.cit.aet.artemis.iris.service.IrisSessionService; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; /** * REST controller for managing {@link IrisMessage}. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisModelsResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisModelsResource.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisModelsResource.java rename to src/main/java/de/tum/cit/aet/artemis/iris/web/IrisModelsResource.java index 72b9927563b0..f076cb191fde 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisModelsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisModelsResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.iris; +package de.tum.cit.aet.artemis.iris.web; import java.util.List; @@ -12,7 +12,7 @@ import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisConnectorException; import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisConnectorService; import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.PyrisModelDTO; -import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; /** * REST controller for managing the models Pyris provides. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisResource.java rename to src/main/java/de/tum/cit/aet/artemis/iris/web/IrisResource.java index 22d3ab615050..e41ee5150f22 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.iris; +package de.tum.cit.aet.artemis.iris.web; import org.springframework.boot.actuate.health.Status; import org.springframework.context.annotation.Profile; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisSettingsResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisSettingsResource.java rename to src/main/java/de/tum/cit/aet/artemis/iris/web/IrisSettingsResource.java index d914307f16de..1a5e4f0ebe94 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisSettingsResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.iris; +package de.tum.cit.aet.artemis.iris.web; import org.springframework.context.annotation.Profile; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisStatusDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisStatusDTO.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisStatusDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/web/IrisStatusDTO.java index db97200bddd9..459536fb1b12 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/iris/IrisStatusDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisStatusDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.iris; +package de.tum.cit.aet.artemis.iris.web; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentUnitRepository.java index 2f34236d5966..81f19e4659d4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentUnitRepository.java @@ -14,7 +14,7 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.lecture.domain.AttachmentType; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data JPA repository for the Attachment Unit entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureService.java b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureService.java index d38deb7e7e22..430089d40fbb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureService.java @@ -9,6 +9,7 @@ import java.util.Optional; import java.util.Set; +import de.tum.cit.aet.artemis.core.util.PageUtil; import org.springframework.context.annotation.Profile; import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; @@ -29,7 +30,6 @@ import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.util.PageUtil; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitProcessingService.java index 426d6ba2bfab..6aadb7d7845c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitProcessingService.java @@ -39,7 +39,7 @@ import de.tum.cit.aet.artemis.service.SlideSplitterService; import de.tum.cit.aet.artemis.web.rest.dto.LectureUnitInformationDTO; import de.tum.cit.aet.artemis.web.rest.dto.LectureUnitSplitDTO; -import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/lecture/web/AttachmentUnitResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/web/AttachmentUnitResource.java index 681995691b04..5263a5a98ef0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/AttachmentUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/web/AttachmentUnitResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.lecture; +package de.tum.cit.aet.artemis.lecture.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -44,9 +44,9 @@ import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.SlideSplitterService; import de.tum.cit.aet.artemis.web.rest.dto.LectureUnitInformationDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/ExerciseUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/lecture/web/ExerciseUnitResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/ExerciseUnitResource.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/web/ExerciseUnitResource.java index 5a38853b0094..a2f511f2363f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/ExerciseUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/web/ExerciseUnitResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.lecture; +package de.tum.cit.aet.artemis.lecture.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -26,7 +26,7 @@ import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.repository.ExerciseUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/lecture/web/LectureUnitResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/web/LectureUnitResource.java index 85d60b0c198a..f1150ae21f42 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/LectureUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/web/LectureUnitResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.lecture; +package de.tum.cit.aet.artemis.lecture.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -37,9 +37,9 @@ import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; import de.tum.cit.aet.artemis.web.rest.dto.lectureunit.LectureUnitForLearningPathNodeDetailsDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/lecture/web/OnlineUnitResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/web/OnlineUnitResource.java index 04a8ded7a92b..f6750a5eee9b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/OnlineUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/web/OnlineUnitResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.lecture; +package de.tum.cit.aet.artemis.lecture.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -38,8 +38,8 @@ import de.tum.cit.aet.artemis.lecture.repository.OnlineUnitRepository; import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; import de.tum.cit.aet.artemis.web.rest.dto.OnlineResourceDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/lecture/web/TextUnitResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/web/TextUnitResource.java index 48025c16c433..56d44475dc71 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/TextUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/web/TextUnitResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.lecture; +package de.tum.cit.aet.artemis.lecture.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -26,8 +26,8 @@ import de.tum.cit.aet.artemis.lecture.domain.TextUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/lecture/web/VideoUnitResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/web/VideoUnitResource.java index 1b1b99d90ac8..b57876936bc7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/lecture/VideoUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/web/VideoUnitResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.lecture; +package de.tum.cit.aet.artemis.lecture.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -29,7 +29,7 @@ import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.VideoUnitRepository; import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/repository/LtiPlatformConfigurationRepository.java b/src/main/java/de/tum/cit/aet/artemis/lti/repository/LtiPlatformConfigurationRepository.java index e516f92f278b..d79b14ff39c9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/repository/LtiPlatformConfigurationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/repository/LtiPlatformConfigurationRepository.java @@ -13,7 +13,7 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Repository for managing LtiPlatformConfiguration entities. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicLtiResource.java b/src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicLtiResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicLtiResource.java rename to src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicLtiResource.java index f6cbbd658aae..b349d4307fd3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicLtiResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicLtiResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.open; +package de.tum.cit.aet.artemis.lti.web.open; import static de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer.LTI13_DEEPLINK_REDIRECT_PATH; import static de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer.LTI13_LOGIN_REDIRECT_PROXY_PATH; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicOAuth2JWKSResource.java b/src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicOAuth2JWKSResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicOAuth2JWKSResource.java rename to src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicOAuth2JWKSResource.java index 024540c8c5ce..c5787b684c43 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicOAuth2JWKSResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicOAuth2JWKSResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.open; +package de.tum.cit.aet.artemis.lti.web.open; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPyrisStatusUpdateResource.java b/src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicPyrisStatusUpdateResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPyrisStatusUpdateResource.java rename to src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicPyrisStatusUpdateResource.java index ba934c8d0217..ab0b98f8f4e3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicPyrisStatusUpdateResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicPyrisStatusUpdateResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.open; +package de.tum.cit.aet.artemis.lti.web.open; import java.util.Objects; @@ -23,8 +23,8 @@ import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.ExerciseChatJob; import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.IngestionWebhookJob; import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.PyrisJob; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; /** * REST controller for providing Pyris access to Artemis internal data and status updates. diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseScheduleService.java index 268d7d07477d..a90639efc073 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseScheduleService.java @@ -33,7 +33,7 @@ import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.modeling.service.compass.CompassService; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import tech.jhipster.config.JHipsterConstants; @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseService.java index 1841b6dcdd79..76de18036228 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseService.java @@ -5,6 +5,7 @@ import java.util.Collections; import java.util.List; +import de.tum.cit.aet.artemis.core.util.PageUtil; import org.springframework.context.annotation.Profile; import org.springframework.data.domain.Page; import org.springframework.data.jpa.domain.Specification; @@ -20,7 +21,6 @@ import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.util.PageUtil; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java index b319296fd4b6..f987a5565ff0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java @@ -45,7 +45,7 @@ import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.service.SubmissionVersionService; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ModelingPlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ModelingPlagiarismDetectionService.java index f028d12e7ca3..5580bfe74950 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ModelingPlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ModelingPlagiarismDetectionService.java @@ -30,7 +30,7 @@ import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingSubmissionElement; import de.tum.cit.aet.artemis.plagiarism.service.cache.PlagiarismCacheService; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismAnswerPostService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismAnswerPostService.java index 662145ecafb8..de98517ac8db 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismAnswerPostService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismAnswerPostService.java @@ -23,8 +23,8 @@ import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismPostService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismPostService.java index e840e1b62cbb..e299693bcdb1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismPostService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismPostService.java @@ -26,8 +26,8 @@ import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismService.java index 7ea600536fae..3014184a4e95 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismService.java @@ -27,7 +27,7 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmission; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ProgrammingPlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ProgrammingPlagiarismDetectionService.java index 13e99c23fc06..97afa474d503 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ProgrammingPlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ProgrammingPlagiarismDetectionService.java @@ -53,7 +53,7 @@ import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseGitDiffReportService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.UriService; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/TextPlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/TextPlagiarismDetectionService.java index c6061b09608a..8548312556f5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/TextPlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/TextPlagiarismDetectionService.java @@ -33,7 +33,7 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.service.TextSubmissionExportService; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismAnswerPostResource.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismAnswerPostResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismAnswerPostResource.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismAnswerPostResource.java index c13201e61609..68dd14b3cfa4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismAnswerPostResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismAnswerPostResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismCaseResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismCaseResource.java index aa75dcc7e9be..623e89c5666e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismCaseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismCaseResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -34,8 +34,8 @@ import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismCaseService; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismVerdictDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; /** * REST controller for managing Plagiarism Cases. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismPostResource.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismPostResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismPostResource.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismPostResource.java index ff41b742588e..4141402372e5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismPostResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismPostResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -33,8 +33,8 @@ import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismPostService; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import tech.jhipster.web.util.PaginationUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismResource.java index 84a6691f501e..d93458351a6c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -34,8 +34,8 @@ import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismService; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismComparisonStatusDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * REST controller for managing Plagiarism Cases. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilder.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismResultResponseBuilder.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilder.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismResultResponseBuilder.java index 2813927205be..2e16d50932e5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilder.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismResultResponseBuilder.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.web; import static de.tum.cit.aet.artemis.core.config.Constants.SYSTEM_ACCOUNT; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultStats.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismResultStats.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultStats.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismResultStats.java index 1fdbe7db7451..e592bc074882 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultStats.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismResultStats.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.plagiarism; +package de.tum.cit.aet.artemis.plagiarism.web; /** * Stores statistics about particular plagiarism checks result. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java index ee8e621d869d..98a0738a5b85 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java @@ -51,7 +51,7 @@ import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeature; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * A ProgrammingExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java index b440faeb72d3..59177c13bdf6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java @@ -34,8 +34,8 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise_; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data JPA repository for the ProgrammingExercise entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/SolutionProgrammingExerciseParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/SolutionProgrammingExerciseParticipationRepository.java index 59e88f508b8e..4ace16e9be96 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/SolutionProgrammingExerciseParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/SolutionProgrammingExerciseParticipationRepository.java @@ -23,7 +23,7 @@ import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation_; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation_; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data JPA repository for the Participation entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/TemplateProgrammingExerciseParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/TemplateProgrammingExerciseParticipationRepository.java index 4d02cf5d3359..1a711803dc52 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/TemplateProgrammingExerciseParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/TemplateProgrammingExerciseParticipationRepository.java @@ -22,7 +22,7 @@ import de.tum.cit.aet.artemis.exercise.domain.Submission_; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation_; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data JPA repository for the Participation entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CodeHintRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CodeHintRepository.java index 23fbba6db515..98fb27b672d3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CodeHintRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CodeHintRepository.java @@ -10,7 +10,7 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data repository for the CodeHint entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ExerciseHintRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ExerciseHintRepository.java index 884ea95babab..2cb4d79f71c0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ExerciseHintRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ExerciseHintRepository.java @@ -14,7 +14,7 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data repository for the ExerciseHint entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseSolutionEntryRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseSolutionEntryRepository.java index 354a6242a32a..f9bf30a51bc8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseSolutionEntryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseSolutionEntryRepository.java @@ -10,7 +10,7 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data repository for the ProgrammingExerciseSolutionEntry entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseTaskRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseTaskRepository.java index bf8ec01b63d5..b766a9e6560f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseTaskRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseTaskRepository.java @@ -10,7 +10,7 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data repository for the ProgrammingExerciseTask entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/AuxiliaryRepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/AuxiliaryRepositoryService.java index 86bd37b4b77e..b9b4259fccc8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/AuxiliaryRepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/AuxiliaryRepositoryService.java @@ -18,8 +18,8 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.programming.ProgrammingExerciseResourceErrorKeys; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.programming.web.ProgrammingExerciseResourceErrorKeys; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java index 31117b9a1591..793feadb36a0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java @@ -27,7 +27,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.service.SubmissionService; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * Service class for managing code review feedback on programming exercises. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java index 73652b2cf0a3..0fb9576e7311 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java @@ -71,7 +71,7 @@ import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseGradingStatisticsDTO; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportFromFileService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportFromFileService.java index 35e190b98083..cf35694ec06a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportFromFileService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportFromFileService.java @@ -38,7 +38,7 @@ import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.ZipFileService; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseParticipationService.java index 6176430ebf65..a9fc3c71bf77 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseParticipationService.java @@ -46,7 +46,7 @@ import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.web.rest.dto.CommitInfoDTO; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseScheduleService.java index b18798285f2e..bcfd873e8b5a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseScheduleService.java @@ -60,7 +60,7 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import tech.jhipster.config.JHipsterConstants; @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java index f3656f680551..2f9a5e9e1761 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java @@ -91,9 +91,9 @@ import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.cit.aet.artemis.web.rest.util.PageUtil; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.util.PageUtil; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseTestCaseService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseTestCaseService.java index 08bde48ed041..9ecd91a03cf0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseTestCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseTestCaseService.java @@ -25,9 +25,9 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseTestCaseDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.ErrorConstants; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingSubmissionService.java index 2996eca34574..104a6a31699f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingSubmissionService.java @@ -68,7 +68,7 @@ import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.SubmissionService; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; // TODO: this class has too many dependencies to other services. We should reduce this @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingTriggerService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingTriggerService.java index 9f5b8e30f102..1dabf291ca32 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingTriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingTriggerService.java @@ -40,7 +40,7 @@ import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.web.websocket.programmingSubmission.BuildTriggerWebsocketError; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryAccessService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryAccessService.java index fd32f17a67bb..d001e33df105 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryAccessService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryAccessService.java @@ -13,8 +13,8 @@ import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.repository.RepositoryActionType; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.programming.web.repository.RepositoryActionType; /** * Service for checking if a user has access to a repository. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryParticipationService.java index 422268ec7d8f..da20429ae49c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryParticipationService.java @@ -15,8 +15,8 @@ import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.Repository; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.repository.RepositoryActionType; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.programming.web.repository.RepositoryActionType; /** * Service for managing programming exercise repositories and participations diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryService.java index 08c19fd93a13..d9a6cbfe65a3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryService.java @@ -47,7 +47,7 @@ import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.web.rest.dto.FileMove; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; /** * Service that provides utilities for managing files in a git repository. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/SubmissionPolicyService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/SubmissionPolicyService.java index 53cdd9aeca73..9f60233fbeb3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/SubmissionPolicyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/SubmissionPolicyService.java @@ -23,8 +23,8 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.repository.SubmissionPolicyRepository; import de.tum.cit.aet.artemis.web.rest.SubmissionPolicyResource; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/CodeHintService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/CodeHintService.java index eaa7d872e92d..a4c2d67b7245 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/CodeHintService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/CodeHintService.java @@ -21,7 +21,7 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.CodeHintRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ExerciseHintService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ExerciseHintService.java index 2d56a911885e..a6d50cf1bdcc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ExerciseHintService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ExerciseHintService.java @@ -31,8 +31,8 @@ import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintActivationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintRepository; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseGitDiffReportService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseGitDiffReportService.java index 7e2a85f71dd0..72ae44f2b068 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseGitDiffReportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseGitDiffReportService.java @@ -38,7 +38,7 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseGitDiffReportRepository; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.web.rest.GitDiffReportParserService; -import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; /** * The service handling ProgrammingExerciseGitDiffReport and their ProgrammingExerciseGitDiffEntries. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/TestwiseCoverageService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/TestwiseCoverageService.java index db06c48deac9..c501e65a1273 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/TestwiseCoverageService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/TestwiseCoverageService.java @@ -33,7 +33,7 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageReportRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.TestwiseCoverageReportEntryRepository; import de.tum.cit.aet.artemis.programming.service.RepositoryService; -import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; /** * Service for managing testwise coverage data and interacts with both CoverageReport, CoverageFileReport diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/structureoraclegenerator/OracleGenerator.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/structureoraclegenerator/OracleGenerator.java index dae3b1848340..454fa5d11e93 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/structureoraclegenerator/OracleGenerator.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/structureoraclegenerator/OracleGenerator.java @@ -23,7 +23,7 @@ import com.thoughtworks.qdox.model.JavaClass; import com.thoughtworks.qdox.model.JavaType; -import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; /** * This generator is used to parse the structure of a programming exercise to be then assessed from Artemis. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/settings/ide/IdeSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/IdeSettingsResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/settings/ide/IdeSettingsResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/IdeSettingsResource.java index a40d9d54e0ba..3a52e454e6ba 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/settings/ide/IdeSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/IdeSettingsResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.settings.ide; +package de.tum.cit.aet.artemis.programming.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingAssessmentResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingAssessmentResource.java index df692add0515..ea22cebd7438 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingAssessmentResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.programming; +package de.tum.cit.aet.artemis.programming.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -37,11 +37,11 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingAssessmentService; -import de.tum.cit.aet.artemis.web.rest.AssessmentResource; +import de.tum.cit.aet.artemis.exercise.web.AssessmentResource; import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * REST controller for managing ProgrammingAssessment. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseExportImportResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseExportImportResource.java index dc49d7bda772..d4507230c541 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseExportImportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseExportImportResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.programming; +package de.tum.cit.aet.artemis.programming.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.util.TimeLogUtil.formatDurationFrom; @@ -73,14 +73,14 @@ import de.tum.cit.aet.artemis.programming.service.SubmissionPolicyService; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryExportOptionsDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.cit.aet.artemis.web.rest.errors.HttpStatusException; -import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.HttpStatusException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorAlertException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing ProgrammingExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseGradingResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseGradingResource.java index 0024f4af3c59..5b284126b2e9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseGradingResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseGradingResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.programming; +package de.tum.cit.aet.artemis.programming.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseLockResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseLockResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseLockResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseLockResource.java index fed6e90c2cb8..145b34bdabba 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseLockResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseLockResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.programming; +package de.tum.cit.aet.artemis.programming.web; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseParticipationResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseParticipationResource.java index 19525972717a..41b0a86f5bb6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseParticipationResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.programming; +package de.tum.cit.aet.artemis.programming.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -46,9 +46,9 @@ import de.tum.cit.aet.artemis.programming.service.RepositoryService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.dto.CommitInfoDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExercisePlagiarismResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExercisePlagiarismResource.java index c7f4e1a2a3df..eb8b4bea595c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExercisePlagiarismResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExercisePlagiarismResource.java @@ -1,7 +1,7 @@ -package de.tum.cit.aet.artemis.web.rest.programming; +package de.tum.cit.aet.artemis.programming.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.web.rest.plagiarism.PlagiarismResultResponseBuilder.buildPlagiarismResultResponse; +import static de.tum.cit.aet.artemis.plagiarism.web.PlagiarismResultResponseBuilder.buildPlagiarismResultResponse; import java.io.FileInputStream; import java.io.IOException; @@ -34,7 +34,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * REST controller for managing ProgrammingExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResource.java index 276fd236e0ea..5e54e9a0c99c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.programming; +package de.tum.cit.aet.artemis.programming.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_THEIA; @@ -86,10 +86,10 @@ import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseResetOptionsDTO; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.web.websocket.dto.ProgrammingExerciseTestCaseStateDTO; import io.jsonwebtoken.lang.Arrays; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResourceErrorKeys.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResourceErrorKeys.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResourceErrorKeys.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResourceErrorKeys.java index e3c8523d900f..e584f174a46d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseResourceErrorKeys.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResourceErrorKeys.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.programming; +package de.tum.cit.aet.artemis.programming.web; public final class ProgrammingExerciseResourceErrorKeys { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseTestCaseResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseTestCaseResource.java index 62b0c91ebbce..76c3b22c3151 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingExerciseTestCaseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseTestCaseResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.programming; +package de.tum.cit.aet.artemis.programming.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingSubmissionResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingSubmissionResource.java index ca79d58ef55e..570d9d83f405 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/programming/ProgrammingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingSubmissionResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.programming; +package de.tum.cit.aet.artemis.programming.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -53,9 +53,9 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingSubmissionService; import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * REST controller for managing ProgrammingSubmission. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CodeHintResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/CodeHintResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CodeHintResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/CodeHintResource.java index 1c872d2cdbb4..a0db6bdf6643 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CodeHintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/CodeHintResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.hestia; +package de.tum.cit.aet.artemis.programming.web.hestia; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -28,8 +28,8 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.CodeHintRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; import de.tum.cit.aet.artemis.programming.service.hestia.CodeHintService; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; /** * REST controller for managing {@link CodeHint}. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CoverageReportResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/CoverageReportResource.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CoverageReportResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/CoverageReportResource.java index 00cf8f313898..b4cb6af4da79 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/CoverageReportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/CoverageReportResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.hestia; +package de.tum.cit.aet.artemis.programming.web.hestia; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -14,7 +14,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageReport; import de.tum.cit.aet.artemis.programming.service.hestia.TestwiseCoverageService; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * REST controller for managing ProgrammingExerciseTestwiseCoverageReports and its entries. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ExerciseHintResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ExerciseHintResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ExerciseHintResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ExerciseHintResource.java index aaf6e55e77b5..3dc059dd3182 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ExerciseHintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ExerciseHintResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.hestia; +package de.tum.cit.aet.artemis.programming.web.hestia; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -34,8 +34,8 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintRepository; import de.tum.cit.aet.artemis.programming.service.hestia.CodeHintService; import de.tum.cit.aet.artemis.programming.service.hestia.ExerciseHintService; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; import tech.jhipster.web.util.HeaderUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ProgrammingExerciseGitDiffReportResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ProgrammingExerciseGitDiffReportResource.java index 2bd5d5df8ab3..9609e6d64d21 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseGitDiffReportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ProgrammingExerciseGitDiffReportResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.hestia; +package de.tum.cit.aet.artemis.programming.web.hestia; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -33,7 +33,7 @@ import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseGitDiffReportService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseGitDiffReportDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * REST controller for managing ProgrammingExerciseGitDiffReports and its entries. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ProgrammingExerciseSolutionEntryResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ProgrammingExerciseSolutionEntryResource.java index 8fc3258e0910..af6240b5375a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseSolutionEntryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ProgrammingExerciseSolutionEntryResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.hestia; +package de.tum.cit.aet.artemis.programming.web.hestia; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -38,8 +38,8 @@ import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralTestCaseService; import de.tum.cit.aet.artemis.programming.service.hestia.structural.StructuralSolutionEntryGenerationException; import de.tum.cit.aet.artemis.programming.service.hestia.structural.StructuralTestCaseService; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; -import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import tech.jhipster.web.util.HeaderUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ProgrammingExerciseTaskResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ProgrammingExerciseTaskResource.java index f068bf580cfb..8618c9be7c1c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/hestia/ProgrammingExerciseTaskResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ProgrammingExerciseTaskResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.hestia; +package de.tum.cit.aet.artemis.programming.web.hestia; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/AeolusTemplateResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/AeolusTemplateResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/AeolusTemplateResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/localci/AeolusTemplateResource.java index 81b9d980c71d..88de52e05ead 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/AeolusTemplateResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/AeolusTemplateResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.programming.web.localci; import java.io.IOException; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildJobQueueResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildJobQueueResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildJobQueueResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildJobQueueResource.java index 7bcb4a75befc..8731bda3732d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildJobQueueResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildJobQueueResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.localci; +package de.tum.cit.aet.artemis.programming.web.localci; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; @@ -33,7 +33,7 @@ import de.tum.cit.aet.artemis.service.dto.BuildJobsStatisticsDTO; import de.tum.cit.aet.artemis.service.dto.FinishedBuildJobDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.FinishedBuildJobPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import tech.jhipster.web.util.PaginationUtil; @Profile(PROFILE_LOCALCI) diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildLogResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildLogResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildLogResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildLogResource.java index b1adabafbff5..14043dd2c075 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildLogResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildLogResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.localci; +package de.tum.cit.aet.artemis.programming.web.localci; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildPlanResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildPlanResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildPlanResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildPlanResource.java index 7be9c4b5dc84..c9a6182c60f5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/localci/BuildPlanResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildPlanResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.localci; +package de.tum.cit.aet.artemis.programming.web.localci; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,7 +19,7 @@ import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile("gitlabci | jenkins") @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicBuildPlanResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/open/PublicBuildPlanResource.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicBuildPlanResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/open/PublicBuildPlanResource.java index b39e8522938a..6d4129eb8821 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicBuildPlanResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/open/PublicBuildPlanResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.open; +package de.tum.cit.aet.artemis.programming.web.open; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -14,8 +14,8 @@ import de.tum.cit.aet.artemis.programming.domain.BuildPlan; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile("gitlabci | jenkins") @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicProgrammingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/open/PublicProgrammingSubmissionResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicProgrammingSubmissionResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/open/PublicProgrammingSubmissionResource.java index d17fd0f82fe0..a07d91e6ad01 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/open/PublicProgrammingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/open/PublicProgrammingSubmissionResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.open; +package de.tum.cit.aet.artemis.programming.web.open; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -30,8 +30,8 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingMessagingService; import de.tum.cit.aet.artemis.programming.service.ProgrammingSubmissionService; import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * REST controller for receiving updates for a ProgrammingSubmission. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/FileSubmission.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/FileSubmission.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/repository/FileSubmission.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/repository/FileSubmission.java index 138ed3ec18e4..166f56e532e4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/FileSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/FileSubmission.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.repository; +package de.tum.cit.aet.artemis.programming.web.repository; import java.io.Serializable; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/FileSubmissionError.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/FileSubmissionError.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/repository/FileSubmissionError.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/repository/FileSubmissionError.java index a8116d32bf5e..df39830627d9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/FileSubmissionError.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/FileSubmissionError.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.repository; +package de.tum.cit.aet.artemis.programming.web.repository; import java.io.Serializable; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryActionType.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryActionType.java similarity index 77% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryActionType.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryActionType.java index 83e6f8b6df22..f7f62ebb4989 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryActionType.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryActionType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.repository; +package de.tum.cit.aet.artemis.programming.web.repository; /** * Determines if a repository action only reads (e.g. get a file from the repo) or updates (e.g. create a new file in the repo). diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryProgrammingExerciseParticipationResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryProgrammingExerciseParticipationResource.java index 3f6d5727bdb1..dff6b92d5dc8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryProgrammingExerciseParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryProgrammingExerciseParticipationResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.repository; +package de.tum.cit.aet.artemis.programming.web.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -62,8 +62,8 @@ import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.web.rest.dto.FileMove; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Executes repository actions on repositories related to the participation id transmitted. Available to the owner of the participation, TAs/Instructors of the exercise and Admins. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryResource.java index 6b30ba2af6ab..0c5a3cb498b8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/RepositoryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.repository; +package de.tum.cit.aet.artemis.programming.web.repository; import static de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTOType.CLEAN; import static de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTOType.CONFLICT; @@ -45,10 +45,10 @@ import de.tum.cit.aet.artemis.web.rest.dto.FileMove; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTO; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTOType; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.cit.aet.artemis.web.rest.repository.util.RepositoryExecutor; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.programming.web.repository.util.RepositoryExecutor; /** * Abstract class that can be extended to make repository endpoints available that retrieve the repository based on the implemented method getRepository. This way the retrieval of diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/TestRepositoryResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/TestRepositoryResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/repository/TestRepositoryResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/repository/TestRepositoryResource.java index 13205ddb9dc9..a206bc8e32ff 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/TestRepositoryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/TestRepositoryResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.repository; +package de.tum.cit.aet.artemis.programming.web.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -46,7 +46,7 @@ import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.web.rest.dto.FileMove; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; /** * Executes requested actions on the test repository of a programming exercise. Only available to TAs, Instructors and Admins. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/util/RepositoryExecutor.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/util/RepositoryExecutor.java similarity index 80% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/repository/util/RepositoryExecutor.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/repository/util/RepositoryExecutor.java index c9b188c773ae..cda87103a88a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/repository/util/RepositoryExecutor.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/util/RepositoryExecutor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.repository.util; +package de.tum.cit.aet.artemis.programming.web.repository.util; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/theia/TheiaConfigurationResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/theia/TheiaConfigurationResource.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/theia/TheiaConfigurationResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/theia/TheiaConfigurationResource.java index 5349041d97c1..3ff891ee2d5d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/theia/TheiaConfigurationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/theia/TheiaConfigurationResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.theia; +package de.tum.cit.aet.artemis.programming.web.theia; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_THEIA; diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizExercise.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizExercise.java index d476a26cbcde..e6a8cf8009b9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizExercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizExercise.java @@ -41,7 +41,7 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.quiz.config.QuizView; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * A QuizExercise contains multiple quiz quizQuestions, which can be either multiple choice, drag and drop or short answer. Artemis supports live quizzes with a start and end time diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseService.java index f7fe59bbee33..4e4bc1a7769f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseService.java @@ -56,8 +56,8 @@ import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.util.PageUtil; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.util.PageUtil; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizPoolService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizPoolService.java index bf95c530e330..069a039759db 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizPoolService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizPoolService.java @@ -28,8 +28,8 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizGroupRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizPoolRepository; import de.tum.cit.aet.artemis.quiz.repository.ShortAnswerMappingRepository; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * This service contains the functions to manage QuizPool entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizSubmissionService.java index 75b0cbaaecc4..b9ad36b51143 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizSubmissionService.java @@ -33,7 +33,7 @@ import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.SubmissionVersionService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java b/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java index 6b50575b2263..d39210d5d124 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java @@ -26,7 +26,7 @@ import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.SlideRepository; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java b/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java index 6be57f0b6dc7..689ac382fe03 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java @@ -107,7 +107,7 @@ import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; import de.tum.cit.aet.artemis.web.rest.dto.TutorLeaderboardDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.util.PageUtil; +import de.tum.cit.aet.artemis.core.util.PageUtil; /** * Service Implementation for managing Course. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/FileService.java b/src/main/java/de/tum/cit/aet/artemis/service/FileService.java index cf29fe55abfd..687a78f212a3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/FileService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/FileService.java @@ -65,8 +65,8 @@ import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; import de.tum.cit.aet.artemis.core.util.CommonsMultipartFile; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LegalDocumentService.java b/src/main/java/de/tum/cit/aet/artemis/service/LegalDocumentService.java index ea7ad5628c0a..e3f4e51856ab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LegalDocumentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LegalDocumentService.java @@ -20,8 +20,8 @@ import de.tum.cit.aet.artemis.web.rest.dto.ImprintDTO; import de.tum.cit.aet.artemis.web.rest.dto.LegalDocument; import de.tum.cit.aet.artemis.web.rest.dto.PrivacyStatementDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; /** * Service class responsible for providing and managing legal documents (privacy statment, imprint). diff --git a/src/main/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationService.java b/src/main/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationService.java index a25d4dadde1b..d90fa409a9f0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationService.java @@ -22,7 +22,7 @@ import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * Service Implementation for OnlineCourseConfiguration. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java index fbb5ac8e7103..4108f72ce0bd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java @@ -21,7 +21,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java index 8ea1a0556f77..387246252eca 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java @@ -56,7 +56,7 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageReportRepository; import de.tum.cit.aet.artemis.programming.service.ParticipationVcsAccessTokenService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Service Implementation for managing Participation. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SlideSplitterService.java b/src/main/java/de/tum/cit/aet/artemis/service/SlideSplitterService.java index fdee4133fba4..eeea44b757ba 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SlideSplitterService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SlideSplitterService.java @@ -26,7 +26,7 @@ import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.Slide; import de.tum.cit.aet.artemis.lecture.repository.SlideRepository; -import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; /** * Service Implementation for managing the split of AttachmentUnit into single slides and save them as PNG. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java b/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java index b2d44147c3b4..1c288dbfadd4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java @@ -43,7 +43,7 @@ import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementStatisticsDTO; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseManagementStatisticsDTO; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java index 6605024a1c44..aa7fd4b0bda3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java @@ -53,9 +53,9 @@ import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionWithComplaintDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.util.PageUtil; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.util.PageUtil; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SystemNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/SystemNotificationService.java index 48cf471c55fc..79b895419a07 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SystemNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SystemNotificationService.java @@ -11,7 +11,7 @@ import de.tum.cit.aet.artemis.communication.domain.notification.SystemNotification; import de.tum.cit.aet.artemis.communication.repository.SystemNotificationRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitLocationResolverService.java b/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitLocationResolverService.java index 6ac7100effe5..d2dbefa3b6b1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitLocationResolverService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitLocationResolverService.java @@ -25,8 +25,8 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.icl.ssh.SshConstants; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.cit.aet.artemis.web.rest.repository.RepositoryActionType; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.programming.web.repository.RepositoryActionType; @Profile(PROFILE_LOCALVC) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseFeedbackService.java index 8e43f033fff3..1199d46dfaf7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseFeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseFeedbackService.java @@ -25,8 +25,8 @@ import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.InternalServerErrorException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseService.java index 2ededa0f67e4..6146ee7dce67 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseService.java @@ -4,6 +4,7 @@ import java.util.Collections; +import de.tum.cit.aet.artemis.core.util.PageUtil; import org.springframework.context.annotation.Profile; import org.springframework.data.domain.Page; import org.springframework.data.jpa.domain.Specification; @@ -16,7 +17,6 @@ import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.util.PageUtil; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionService.java index 7f555160fd71..7665583d9fba 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionService.java @@ -36,7 +36,7 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonConversionResource.java b/src/main/java/de/tum/cit/aet/artemis/text/web/ApollonConversionResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonConversionResource.java rename to src/main/java/de/tum/cit/aet/artemis/text/web/ApollonConversionResource.java index 5853c710a2e0..8dfa95bdc119 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonConversionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/web/ApollonConversionResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.text.web; import java.io.InputStream; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonDiagramResource.java b/src/main/java/de/tum/cit/aet/artemis/text/web/ApollonDiagramResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonDiagramResource.java rename to src/main/java/de/tum/cit/aet/artemis/text/web/ApollonDiagramResource.java index fd61612fba43..8372b0958ae9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ApollonDiagramResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/web/ApollonDiagramResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.text.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -29,8 +29,8 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.modeling.domain.ApollonDiagram; import de.tum.cit.aet.artemis.modeling.repository.ApollonDiagramRepository; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; /** * REST controller for managing ApollonDiagram. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentEventResource.java b/src/main/java/de/tum/cit/aet/artemis/text/web/TextAssessmentEventResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentEventResource.java rename to src/main/java/de/tum/cit/aet/artemis/text/web/TextAssessmentEventResource.java index 660ccc31bd1f..5a2db513dde7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentEventResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/web/TextAssessmentEventResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.text.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/text/web/TextAssessmentResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java rename to src/main/java/de/tum/cit/aet/artemis/text/web/TextAssessmentResource.java index 6fa12f903e1e..c98fc1dd22f3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/web/TextAssessmentResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.text.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static java.util.stream.Collectors.toSet; @@ -11,6 +11,7 @@ import java.util.function.Function; import java.util.stream.Collectors; +import de.tum.cit.aet.artemis.exercise.web.AssessmentResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -62,9 +63,9 @@ import de.tum.cit.aet.artemis.text.service.TextSubmissionService; import de.tum.cit.aet.artemis.web.rest.dto.TextAssessmentDTO; import de.tum.cit.aet.artemis.web.rest.dto.TextAssessmentUpdateDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ErrorConstants; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/text/web/TextExerciseResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java rename to src/main/java/de/tum/cit/aet/artemis/text/web/TextExerciseResource.java index 1426a884010a..ca48f01dc26c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/web/TextExerciseResource.java @@ -1,7 +1,7 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.text.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.web.rest.plagiarism.PlagiarismResultResponseBuilder.buildPlagiarismResultResponse; +import static de.tum.cit.aet.artemis.plagiarism.web.PlagiarismResultResponseBuilder.buildPlagiarismResultResponse; import java.io.File; import java.net.URI; @@ -82,12 +82,12 @@ import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; -import de.tum.cit.aet.artemis.web.rest.util.ResponseUtil; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.util.ResponseUtil; /** * REST controller for managing TextExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/text/web/TextSubmissionResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java rename to src/main/java/de/tum/cit/aet/artemis/text/web/TextSubmissionResource.java index f89497a81c37..8819a9d46cae 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TextSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/web/TextSubmissionResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.text.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -6,6 +6,7 @@ import java.util.Optional; import java.util.Set; +import de.tum.cit.aet.artemis.exercise.web.AbstractSubmissionResource; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; @@ -44,8 +45,8 @@ import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.text.service.TextAssessmentService; import de.tum.cit.aet.artemis.text.service.TextSubmissionService; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * REST controller for managing TextSubmission. diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroup.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroup.java index ce7ce59f01bf..e73979c3eeeb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroup.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroup.java @@ -31,7 +31,7 @@ import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupService; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; @Entity @Table(name = "tutorial_group") diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/errors/ScheduleOverlapsWithSessionException.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/exception/ScheduleOverlapsWithSessionException.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/errors/ScheduleOverlapsWithSessionException.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/exception/ScheduleOverlapsWithSessionException.java index 6f2d69dfa82b..e88807a1f2ab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/errors/ScheduleOverlapsWithSessionException.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/exception/ScheduleOverlapsWithSessionException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.tutorialgroups.errors; +package de.tum.cit.aet.artemis.tutorialgroup.exception; import java.io.Serial; import java.time.ZoneId; @@ -9,9 +9,9 @@ import java.util.Set; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; -import de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupResource; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ErrorConstants; +import de.tum.cit.aet.artemis.tutorialgroup.web.TutorialGroupResource; /** * Exception that will be thrown if the user tries to create a tutorial group with a schedule that overlaps with a session of the same tutorial group. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/errors/SessionOverlapsWithSessionException.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/exception/SessionOverlapsWithSessionException.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/errors/SessionOverlapsWithSessionException.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/exception/SessionOverlapsWithSessionException.java index 1620de3e0551..78d1c0f63534 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/errors/SessionOverlapsWithSessionException.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/exception/SessionOverlapsWithSessionException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.tutorialgroups.errors; +package de.tum.cit.aet.artemis.tutorialgroup.exception; import java.io.Serial; import java.time.ZoneId; @@ -9,9 +9,9 @@ import java.util.Set; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; -import de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupResource; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ErrorConstants; +import de.tum.cit.aet.artemis.tutorialgroup.web.TutorialGroupResource; /** * Exception that will be thrown if the user tries to create a session that overlaps with a session of the same tutorial group. diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupScheduleService.java index 2d0b30a59d8f..b8c9f720250b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupScheduleService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.tutorialgroup.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.web.rest.util.DateUtil.getFirstDateOfWeekDay; +import static de.tum.cit.aet.artemis.core.util.DateUtil.getFirstDateOfWeekDay; import java.time.LocalDate; import java.time.LocalTime; @@ -27,8 +27,8 @@ import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupScheduleRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupSessionRepository; -import de.tum.cit.aet.artemis.web.rest.tutorialgroups.errors.ScheduleOverlapsWithSessionException; -import de.tum.cit.aet.artemis.web.rest.util.DateUtil; +import de.tum.cit.aet.artemis.tutorialgroup.exception.ScheduleOverlapsWithSessionException; +import de.tum.cit.aet.artemis.core.util.DateUtil; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupService.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupService.java index 3770037f7a0b..4a31fcabdc4d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupService.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.tutorialgroup.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupResource.TutorialGroupImportErrors.MULTIPLE_REGISTRATIONS; +import static de.tum.cit.aet.artemis.tutorialgroup.web.TutorialGroupResource.TutorialGroupImportErrors.MULTIPLE_REGISTRATIONS; import static jakarta.persistence.Persistence.getPersistenceUtil; import java.io.IOException; @@ -49,10 +49,10 @@ import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRegistrationRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupSessionRepository; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupResource.TutorialGroupImportErrors; -import de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupResource.TutorialGroupRegistrationImportDTO; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.tutorialgroup.web.TutorialGroupResource.TutorialGroupImportErrors; +import de.tum.cit.aet.artemis.tutorialgroup.web.TutorialGroupResource.TutorialGroupRegistrationImportDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupFreePeriodResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupFreePeriodResource.java index 7f5971dd2bd8..5eab789a4191 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupFreePeriodResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupFreePeriodResource.java @@ -1,7 +1,7 @@ -package de.tum.cit.aet.artemis.web.rest.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.web.rest.util.DateUtil.interpretInTimeZone; +import static de.tum.cit.aet.artemis.core.util.DateUtil.interpretInTimeZone; import java.net.URI; import java.net.URISyntaxException; @@ -34,7 +34,7 @@ import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupsConfigurationRepository; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupFreePeriodService; import de.tum.cit.aet.artemis.web.rest.dto.TutorialGroupFreePeriodDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupResource.java index 3e063a46bcac..896f96dae847 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupResource.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.web.rest.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.web.rest.util.DateUtil.isIso8601DateString; -import static de.tum.cit.aet.artemis.web.rest.util.DateUtil.isIso8601TimeString; +import static de.tum.cit.aet.artemis.core.util.DateUtil.isIso8601DateString; +import static de.tum.cit.aet.artemis.core.util.DateUtil.isIso8601TimeString; import java.io.IOException; import java.net.URI; @@ -67,8 +67,8 @@ import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupChannelManagementService; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupScheduleService; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupService; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupSessionResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupSessionResource.java index 58116bc075f1..c0d2988ba335 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupSessionResource.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.web.rest.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupScheduleService.updateTutorialGroupSession; -import static de.tum.cit.aet.artemis.web.rest.util.DateUtil.interpretInTimeZone; +import static de.tum.cit.aet.artemis.core.util.DateUtil.interpretInTimeZone; import java.net.URI; import java.net.URISyntaxException; @@ -52,8 +52,8 @@ import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupSessionRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupsConfigurationRepository; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupService; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.tutorialgroups.errors.SessionOverlapsWithSessionException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.tutorialgroup.exception.SessionOverlapsWithSessionException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupsConfigurationResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupsConfigurationResource.java index 84376773a597..583266931f28 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/tutorialgroups/TutorialGroupsConfigurationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupsConfigurationResource.java @@ -1,7 +1,7 @@ -package de.tum.cit.aet.artemis.web.rest.tutorialgroups; +package de.tum.cit.aet.artemis.tutorialgroup.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.web.rest.util.DateUtil.isIso8601DateString; +import static de.tum.cit.aet.artemis.core.util.DateUtil.isIso8601DateString; import java.net.URI; import java.net.URISyntaxException; @@ -33,7 +33,7 @@ import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupsConfigurationRepository; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupChannelManagementService; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java index de18e79887e7..462261c7a4ef 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java @@ -112,11 +112,11 @@ import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.web.rest.dto.user.UserNameAndLoginDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenAlertException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.ErrorConstants; import tech.jhipster.web.util.PaginationUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java index 132b3d0c984a..b01f320e04a6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java @@ -31,8 +31,8 @@ import de.tum.cit.aet.artemis.core.service.export.DataExportService; import de.tum.cit.aet.artemis.web.rest.dto.DataExportDTO; import de.tum.cit.aet.artemis.web.rest.dto.RequestDataExportDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * REST controller for data exports. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java index 462ee5c97336..70918bf9f8bd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java @@ -106,12 +106,12 @@ import de.tum.cit.aet.artemis.web.rest.dto.SuspiciousExamSessionsDTO; import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamWideAnnouncementEventDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenAlertException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.PaginationUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java index 5e7def08f226..045d8e144f63 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java @@ -32,7 +32,7 @@ import de.tum.cit.aet.artemis.web.rest.dto.ExamUserAttendanceCheckDTO; import de.tum.cit.aet.artemis.web.rest.dto.ExamUserDTO; import de.tum.cit.aet.artemis.web.rest.dto.ExamUsersNotFoundDTO; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * REST controller for managing ExamUser. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java index 21bb02efbf95..866b6004dda9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java @@ -36,9 +36,9 @@ import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.text.service.TextBlockService; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing ExampleSubmission. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java index a5881b428d9a..e27542b0ea3d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java @@ -38,9 +38,9 @@ import de.tum.cit.aet.artemis.exam.service.ExamImportService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.service.ExerciseDeletionService; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing ExerciseGroup. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java index 451dc61c1e0a..98fe2055cd1d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java @@ -59,8 +59,8 @@ import de.tum.cit.aet.artemis.web.rest.dto.ExerciseDetailsDTO; import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * REST controller for managing Exercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java index b27a53c79947..5992f698795a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java @@ -75,8 +75,8 @@ import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ResourceLoaderService; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * REST controller for managing Files. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java index f793de44406a..a55ef202ae85 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java @@ -2,6 +2,7 @@ import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import de.tum.cit.aet.artemis.exercise.web.AssessmentResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Profile; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java index f0d353424009..56b6ffdfcb45 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java @@ -57,10 +57,10 @@ import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; -import de.tum.cit.aet.artemis.web.rest.util.ResponseUtil; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.util.ResponseUtil; /** * REST controller for managing FileUploadExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java index e0f0e65ec4dc..189ef513ab9d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java @@ -8,6 +8,7 @@ import java.util.Optional; import java.util.Set; +import de.tum.cit.aet.artemis.exercise.web.AbstractSubmissionResource; import jakarta.validation.constraints.NotNull; import org.slf4j.Logger; @@ -52,9 +53,9 @@ import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadSubmissionRepository; import de.tum.cit.aet.artemis.fileupload.service.FileUploadSubmissionService; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing FileUploadSubmission. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java index 88283e17229e..c61d98fb5fa8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java @@ -54,7 +54,7 @@ import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationOverviewDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.NgxLearningPathDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java index b53989af2b00..9d707e01d899 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java @@ -49,8 +49,8 @@ import de.tum.cit.aet.artemis.lecture.service.LectureService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing Lecture. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java index f0e9254ab21f..84289ae92c46 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java @@ -18,7 +18,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java index 1f0a74d102f0..75224c024263 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java @@ -33,7 +33,7 @@ import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiDeepLinkingService; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.PaginationUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java index ade01423bbd5..6ef9fac28f00 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java @@ -4,6 +4,7 @@ import java.util.List; +import de.tum.cit.aet.artemis.exercise.web.AssessmentResource; import org.hibernate.Hibernate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,7 +42,7 @@ import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; import de.tum.cit.aet.artemis.web.rest.dto.ModelingAssessmentDTO; -import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; +import de.tum.cit.aet.artemis.core.exception.ErrorConstants; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java index 750bcaf25df3..6de06c43c4ef 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.web.rest; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.web.rest.plagiarism.PlagiarismResultResponseBuilder.buildPlagiarismResultResponse; +import static de.tum.cit.aet.artemis.plagiarism.web.PlagiarismResultResponseBuilder.buildPlagiarismResultResponse; import java.io.File; import java.net.URI; @@ -64,10 +64,10 @@ import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; -import de.tum.cit.aet.artemis.web.rest.util.ResponseUtil; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.util.ResponseUtil; /** * REST controller for managing ModelingExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java index 758f1e80c27c..2384bf1febd6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java @@ -7,6 +7,7 @@ import java.util.Optional; import java.util.Set; +import de.tum.cit.aet.artemis.exercise.web.AbstractSubmissionResource; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; @@ -48,10 +49,10 @@ import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; import de.tum.cit.aet.artemis.modeling.service.ModelingSubmissionService; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismService; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.ErrorConstants; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ErrorConstants; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java index 44bba926ef05..f1e2255e7881 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java @@ -27,8 +27,8 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing NotificationSettings (NotificationSettings). diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java index bc2fb5743fad..39048538db2a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java @@ -95,10 +95,10 @@ import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.service.TextExerciseFeedbackService; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing Participation. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java index 4f3e3cfc0ee5..e71967fcd35d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java @@ -85,9 +85,9 @@ import de.tum.cit.aet.artemis.web.rest.dto.QuizBatchJoinDTO; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing QuizExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java index c4632002eacf..4d9f1819305d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java @@ -31,7 +31,7 @@ import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.quiz.service.QuizBatchService; import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; /** * REST controller for managing quiz participations. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java index 2d6cf2bef2d3..5a36fc9fb9c7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java @@ -22,7 +22,7 @@ import de.tum.cit.aet.artemis.exam.service.ExamAccessService; import de.tum.cit.aet.artemis.quiz.domain.QuizPool; import de.tum.cit.aet.artemis.quiz.service.QuizPoolService; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing QuizPool. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java index 8880b6191588..dc67c0a39bcc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java @@ -40,7 +40,7 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.service.QuizSubmissionService; import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java index 178999b64efb..f7d895a2d7ab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java @@ -32,8 +32,8 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * REST controller for managing Rating. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java index f649c330c400..b8447a87a45b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java @@ -26,8 +26,8 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; import de.tum.cit.aet.artemis.programming.service.StaticCodeAnalysisService; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; /** * REST controller for managing static code analysis. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java index 078edd8b9d7a..aef26a9ab905 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java @@ -70,11 +70,11 @@ import de.tum.cit.aet.artemis.web.rest.dto.StudentExamWithGradeDTO; import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamAttendanceCheckEventDTO; import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamLiveEventBaseDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing ExerciseGroup. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java index 482f21e81068..7afe38ae4161 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java @@ -32,8 +32,8 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.service.SubmissionPolicyService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java index c7274647a5d7..2d6f30207d0a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java @@ -43,8 +43,8 @@ import de.tum.cit.aet.artemis.web.rest.dto.SubmissionVersionDTO; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionWithComplaintDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing Submission. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java index 293f66fe23d0..346691a1b9ca 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java @@ -2,7 +2,7 @@ import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.config.Constants.SHORT_NAME_PATTERN; -import static de.tum.cit.aet.artemis.web.rest.util.StringUtil.stripIllegalCharacters; +import static de.tum.cit.aet.artemis.core.util.StringUtil.stripIllegalCharacters; import java.net.URI; import java.net.URISyntaxException; @@ -58,9 +58,9 @@ import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.service.dto.TeamSearchUserDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.web.websocket.team.TeamWebsocketService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java index 14506fdfe0cb..1b375185a91a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java @@ -29,7 +29,7 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.web.rest.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing TutorParticipation. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StudentExamWithGradeDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StudentExamWithGradeDTO.java index 43dd656d72f9..b956a791a56e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StudentExamWithGradeDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StudentExamWithGradeDTO.java @@ -6,6 +6,7 @@ import de.tum.cit.aet.artemis.assessment.domain.GradeType; import de.tum.cit.aet.artemis.assessment.domain.GradingScale; +import de.tum.cit.aet.artemis.assessment.web.GradeStepResource; import de.tum.cit.aet.artemis.exam.domain.StudentExam; /** @@ -15,7 +16,7 @@ * It is possible to calculate data included in this DTO by using the {@link StudentExam}, {@link ExamScoresDTO.StudentResult} * and {@link GradingScale} for the exam. The calculations are done in the server and returned with this DTO so that the client * does not need to repeat the same filtering and calculation logic. Also this removes the need for client to send an extra request to - * {@link de.tum.cit.aet.artemis.web.rest.GradeStepResource#getGradeStepByPercentageForExam(Long, Long, Double)} + * {@link GradeStepResource#getGradeStepByPercentageForExam(Long, Long, Double)} * by including the grade in {@link ExamScoresDTO.StudentResult#overallGrade()}. */ @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismResultDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismResultDTO.java index 3413f3571342..12e3e4ee939c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismResultDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/plagiarism/PlagiarismResultDTO.java @@ -4,7 +4,7 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmissionElement; -import de.tum.cit.aet.artemis.web.rest.plagiarism.PlagiarismResultStats; +import de.tum.cit.aet.artemis.plagiarism.web.PlagiarismResultStats; /** * Transfers information about plagiarism checks result and its statistics diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/metis/ConversationWebsocketDTO.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/metis/ConversationWebsocketDTO.java index ecafba5378ca..5bf11d77b108 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/metis/ConversationWebsocketDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/metis/ConversationWebsocketDTO.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ConversationDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationDTO; /** * DTO that is included as payload for conversation related websocket messages diff --git a/src/main/webapp/app/course/manage/faq.component.ts b/src/main/webapp/app/course/manage/faq.component.ts new file mode 100644 index 000000000000..d9eaa4ce81b8 --- /dev/null +++ b/src/main/webapp/app/course/manage/faq.component.ts @@ -0,0 +1,145 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Faq } from 'app/entities/faq.model'; +import { + faEdit, + faFile, + faFileExport, + faFileImport, + faFilter, + faPencilAlt, + faPlus, + faPuzzlePiece, + faSort, + faTrash +} from '@fortawesome/free-solid-svg-icons'; +import { Subject } from 'rxjs'; +import { map } from 'rxjs/operators'; +import { AlertService } from 'app/core/util/alert.service'; +import { ActivatedRoute } from '@angular/router'; +import { FaqService } from 'app/faq/faq.service'; +import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; +import { onError } from 'app/shared/util/global.utils'; +import { FaqCategory } from 'app/entities/faq-category.model'; +import { loadCourseFaqCategories } from 'app/faq/faq.utils'; +import { SortService } from 'app/shared/service/sort.service'; + +@Component({ + selector: 'jhi-faq', + templateUrl: './faq.component.html' + +}) + +export class FAQComponent implements OnInit, OnDestroy { + faqs: Faq[]; + filteredFaq: Faq[]; + existingCategories: FaqCategory[] + courseId: number; + + private dialogErrorSource = new Subject(); + dialogError$ = this.dialogErrorSource.asObservable(); + + activeFilters = new Set(); + predicate: string; + ascending: boolean; + + irisEnabled = false; + + // Icons + faEdit = faEdit; + faPlus = faPlus; + faFileImport = faFileImport; + faFileExport = faFileExport; + faTrash = faTrash; + faPencilAlt = faPencilAlt; + faFile = faFile; + faPuzzlePiece = faPuzzlePiece; + faFilter = faFilter; + faSort = faSort; + + constructor( + protected faqService: FaqService, + private route: ActivatedRoute, + private alertService: AlertService, + private sortService: SortService, + ) { + this.predicate = 'id'; + this.ascending = true; + } + + ngOnInit() { + this.courseId = Number(this.route.snapshot.paramMap.get('courseId')); + this.loadAll() + this.loadCourseExerciseCategories(this.courseId) + } + + ngOnDestroy(): void { + this.dialogErrorSource.unsubscribe(); + } + + trackId(index: number, item: Faq) { + return item.id; + } + + deleteFaq(faqId: number) { + this.faqService.delete(faqId).subscribe({ + next: () => { + this.handleDeleteSuccess(faqId); + }, + error: (error: HttpErrorResponse) => this.dialogErrorSource.next(error.message), + }); + } + + private handleDeleteSuccess(faqId: number) { + this.faqs = this.faqs.filter(faq => faq.id !== faqId); + this.dialogErrorSource.next(''); + this.applyFilters(); + } + + toggleFilters(category: String) { + this.activeFilters.has(category) ? this.activeFilters.delete(category) : this.activeFilters.add(category) + this.applyFilters(); + } + + sortRows() { + this.sortService.sortByProperty(this.filteredFaq, this.predicate, this.ascending); + } + + private loadAll() { + this.faqService.findAllByCourseId(this.courseId) + .pipe( + map((res: HttpResponse) => res.body), + ) + .subscribe({ + next: (res: Faq[]) => { + this.faqs = res; + this.applyFilters() + }, + error: (res: HttpErrorResponse) => onError(this.alertService, res), + }); + } + + private loadCourseExerciseCategories(courseId: number) { + loadCourseFaqCategories(courseId, this.alertService, this.faqService).subscribe((existingCategories) => { + this.existingCategories = existingCategories; + }); + } + + + private applyFilters(): void { + if (this.activeFilters.size === 0) { + // If no filters selected, show all faqs + this.filteredFaq = this.faqs; + } else { + this.filteredFaq = this.faqs.filter((faq) => this.hasFilteredCategory(faq, this.activeFilters)); + } + + } + + public hasFilteredCategory(faq: Faq, filteredCategory: Set){ + let categories = faq.categories?.map((category) => category.category) + if(categories){ + return categories.some(category => filteredCategory.has(category!)); + } + + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/LogResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/LogResourceIntegrationTest.java index ec390884b99c..9fd6141665d1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/LogResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/LogResourceIntegrationTest.java @@ -8,7 +8,7 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.web.rest.vm.LoggerVM; +import de.tum.cit.aet.artemis.core.dto.vm.LoggerVM; class LogResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/LtiIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/LtiIntegrationTest.java index f1ba6132123c..a0f4b7954922 100644 --- a/src/test/java/de/tum/cit/aet/artemis/LtiIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/LtiIntegrationTest.java @@ -31,7 +31,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class LtiIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/StringUtilTest.java b/src/test/java/de/tum/cit/aet/artemis/StringUtilTest.java index f0406b79c29c..484e194d0f6f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/StringUtilTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/StringUtilTest.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis; -import static de.tum.cit.aet.artemis.web.rest.util.StringUtil.ILLEGAL_CHARACTERS; -import static de.tum.cit.aet.artemis.web.rest.util.StringUtil.stripIllegalCharacters; +import static de.tum.cit.aet.artemis.core.util.StringUtil.ILLEGAL_CHARACTERS; +import static de.tum.cit.aet.artemis.core.util.StringUtil.stripIllegalCharacters; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; diff --git a/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java index e0a6faf86bef..05b76561d90b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java @@ -77,7 +77,7 @@ import de.tum.cit.aet.artemis.core.config.ConditionalMetricsExclusionConfiguration; import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.web.rest.repository.RepositoryResource; +import de.tum.cit.aet.artemis.programming.web.repository.RepositoryResource; /** * This class contains architecture tests that apply for the whole project. diff --git a/src/test/java/de/tum/cit/aet/artemis/architecture/ResourceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/architecture/ResourceArchitectureTest.java index a679466b8cd9..44d348678d91 100644 --- a/src/test/java/de/tum/cit/aet/artemis/architecture/ResourceArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/architecture/ResourceArchitectureTest.java @@ -30,7 +30,7 @@ import com.tngtech.archunit.lang.ArchRule; import com.tngtech.archunit.lang.ConditionEvents; -import de.tum.cit.aet.artemis.web.rest.ogparser.LinkPreviewResource; +import de.tum.cit.aet.artemis.communication.web.LinkPreviewResource; class ResourceArchitectureTest extends AbstractArchitectureTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java index 75c0784fde93..02ca3b6b5d79 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java @@ -74,7 +74,7 @@ import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.web.rest.dto.ResultWithPointsPerGradingCriterionDTO; import de.tum.cit.aet.artemis.web.rest.dto.feedback.FeedbackDetailDTO; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class ResultServiceIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/authentication/InternalAuthenticationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/InternalAuthenticationIntegrationTest.java index 464744ce5ad7..c6ad4d46a3d7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authentication/InternalAuthenticationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/InternalAuthenticationIntegrationTest.java @@ -40,8 +40,8 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.tutorialgroups.TutorialGroupUtilService; -import de.tum.cit.aet.artemis.web.rest.vm.LoginVM; -import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; +import de.tum.cit.aet.artemis.core.dto.vm.LoginVM; +import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; class InternalAuthenticationIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java index 08d93e2c2ab2..91176cc3f785 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java @@ -33,7 +33,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.dto.StudentDTO; -import de.tum.cit.aet.artemis.web.rest.vm.LoginVM; +import de.tum.cit.aet.artemis.core.dto.vm.LoginVM; class LdapAuthenticationIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/authentication/UserJenkinsGitlabIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/UserJenkinsGitlabIntegrationTest.java index a74888acb0d8..3d47901529d5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authentication/UserJenkinsGitlabIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/UserJenkinsGitlabIntegrationTest.java @@ -29,7 +29,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.user.UserTestService; -import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; +import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; class UserJenkinsGitlabIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/authentication/UserSaml2IntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/UserSaml2IntegrationTest.java index ee9aff5d4e3d..9a17b5d245c9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authentication/UserSaml2IntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/UserSaml2IntegrationTest.java @@ -23,8 +23,8 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.service.connectors.SAML2Service; import de.tum.cit.aet.artemis.core.service.user.PasswordService; -import de.tum.cit.aet.artemis.web.rest.open.PublicUserJwtResource; -import de.tum.cit.aet.artemis.web.rest.vm.LoginVM; +import de.tum.cit.aet.artemis.core.web.open.PublicUserJwtResource; +import de.tum.cit.aet.artemis.core.dto.vm.LoginVM; /** * Tests for {@link PublicUserJwtResource} and {@link SAML2Service}. diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java index 769bad7b0303..58451c02a207 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java @@ -66,8 +66,8 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; import de.tum.cit.aet.artemis.text.domain.TextExercise; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import uk.ac.ox.ctl.lti13.lti.Claims; class Lti13ServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java index fcb3ed45331c..b743f0b7c099 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java @@ -26,7 +26,7 @@ import de.tum.cit.aet.artemis.lti.dto.Lti13ClientRegistration; import de.tum.cit.aet.artemis.lti.dto.Lti13PlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; class LtiDynamicRegistrationServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java b/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java index 8b4b987a44dd..8547e0cad240 100644 --- a/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java @@ -165,8 +165,8 @@ import de.tum.cit.aet.artemis.web.rest.dto.TextAssessmentUpdateDTO; import de.tum.cit.aet.artemis.web.rest.dto.TutorLeaderboardDTO; import de.tum.cit.aet.artemis.web.rest.dto.user.UserNameAndLoginDTO; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; @Service public class CourseTestService { diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/CourseTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/CourseTest.java index 68519362a6de..4676f537a475 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/CourseTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/CourseTest.java @@ -11,7 +11,7 @@ import org.junit.jupiter.params.provider.MethodSource; import de.tum.cit.aet.artemis.core.domain.Course; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; class CourseTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java index f558b41c6699..2f26668ec653 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java @@ -94,7 +94,7 @@ import de.tum.cit.aet.artemis.web.rest.dto.ExerciseGroupWithIdAndExamDTO; import de.tum.cit.aet.artemis.web.rest.dto.SuspiciousExamSessionsDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @TestInstance(TestInstance.Lifecycle.PER_CLASS) class ExamIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java index d65a06b4d5dc..420433b989c7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java @@ -33,7 +33,7 @@ import de.tum.cit.aet.artemis.exam.service.ExamRegistrationService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.user.UserFactory; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; class ExamRegistrationIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java index 09bb14171b96..b2f06a7f3e66 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java @@ -132,7 +132,7 @@ import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamLiveEventBaseDTO; import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamWideAnnouncementEventDTO; import de.tum.cit.aet.artemis.web.rest.dto.examevent.WorkingTimeUpdateEventDTO; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class StudentExamIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java index 39f4530109fe..8e714fae1a86 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java @@ -56,7 +56,7 @@ import de.tum.cit.aet.artemis.util.TestResourceUtils; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseDetailsDTO; import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class ExerciseIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java index 7c455d7c665c..44287c60b459 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java @@ -46,7 +46,7 @@ import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class FileUploadSubmissionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java index 6a7a971f73f0..897e70bc9caf 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java @@ -57,7 +57,7 @@ import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.util.TestResourceUtils; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class ModelingSubmissionIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java index 9f0267ab8fd5..e4edb3f50744 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java @@ -17,7 +17,7 @@ import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.AuxiliaryRepositoryService; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; class AuxiliaryRepositoryServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java index dabeb701bb58..7c85a232e61f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java @@ -34,7 +34,7 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.util.GitUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class ProgrammingExerciseGitIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java index 07ba656bbf3c..967873f1ec66 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java @@ -3,10 +3,10 @@ import static de.tum.cit.aet.artemis.programming.domain.BuildPlanType.SOLUTION; import static de.tum.cit.aet.artemis.programming.domain.BuildPlanType.TEMPLATE; import static de.tum.cit.aet.artemis.util.TestResourceUtils.HalfSecond; -import static de.tum.cit.aet.artemis.web.rest.programming.ProgrammingExerciseResourceErrorKeys.INVALID_SOLUTION_BUILD_PLAN_ID; -import static de.tum.cit.aet.artemis.web.rest.programming.ProgrammingExerciseResourceErrorKeys.INVALID_SOLUTION_REPOSITORY_URL; -import static de.tum.cit.aet.artemis.web.rest.programming.ProgrammingExerciseResourceErrorKeys.INVALID_TEMPLATE_BUILD_PLAN_ID; -import static de.tum.cit.aet.artemis.web.rest.programming.ProgrammingExerciseResourceErrorKeys.INVALID_TEMPLATE_REPOSITORY_URL; +import static de.tum.cit.aet.artemis.programming.web.ProgrammingExerciseResourceErrorKeys.INVALID_SOLUTION_BUILD_PLAN_ID; +import static de.tum.cit.aet.artemis.programming.web.ProgrammingExerciseResourceErrorKeys.INVALID_SOLUTION_REPOSITORY_URL; +import static de.tum.cit.aet.artemis.programming.web.ProgrammingExerciseResourceErrorKeys.INVALID_TEMPLATE_BUILD_PLAN_ID; +import static de.tum.cit.aet.artemis.programming.web.ProgrammingExerciseResourceErrorKeys.INVALID_TEMPLATE_REPOSITORY_URL; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; import static org.mockito.Mockito.any; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java index dfefe813c613..dca8d0fcf9bc 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java @@ -63,7 +63,7 @@ import de.tum.cit.aet.artemis.util.TestConstants; import de.tum.cit.aet.artemis.util.TestResourceUtils; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionDTO; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class ProgrammingSubmissionIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java index 2d2abec3499a..df10178fced7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java @@ -91,7 +91,7 @@ import de.tum.cit.aet.artemis.util.TestConstants; import de.tum.cit.aet.artemis.web.rest.dto.FileMove; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTO; -import de.tum.cit.aet.artemis.web.rest.repository.FileSubmission; +import de.tum.cit.aet.artemis.programming.web.repository.FileSubmission; class RepositoryIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java index d0800bb5cbe9..4ac910e2a68e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java @@ -44,7 +44,7 @@ import de.tum.cit.aet.artemis.util.LocalRepository; import de.tum.cit.aet.artemis.web.rest.dto.FileMove; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTO; -import de.tum.cit.aet.artemis.web.rest.repository.FileSubmission; +import de.tum.cit.aet.artemis.programming.web.repository.FileSubmission; class TestRepositoryResourceIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintServiceTest.java index a47e9e432709..21d43cf31e6e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintServiceTest.java @@ -32,7 +32,7 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.programming.service.hestia.CodeHintService; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @SuppressWarnings("ArraysAsListWithZeroOrOneArgument") class CodeHintServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/IrisExerciseChatSessionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisExerciseChatSessionIntegrationTest.java index 03a3fc04688d..5475f3e4518b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/IrisExerciseChatSessionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisExerciseChatSessionIntegrationTest.java @@ -15,7 +15,7 @@ import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; import de.tum.cit.aet.artemis.iris.repository.IrisExerciseChatSessionRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.web.rest.iris.IrisStatusDTO; +import de.tum.cit.aet.artemis.iris.web.IrisStatusDTO; class IrisExerciseChatSessionIntegrationTest extends AbstractIrisIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java index bd717907311f..8f78886c211a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java @@ -37,8 +37,8 @@ import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.GroupChatDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.GroupChatDTO; import de.tum.cit.aet.artemis.web.websocket.dto.metis.ConversationWebsocketDTO; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java index 9b1730e54f56..d4ad0b0b47ac 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java @@ -34,8 +34,8 @@ import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupChannelManagementService; import de.tum.cit.aet.artemis.tutorialgroups.TutorialGroupUtilService; import de.tum.cit.aet.artemis.user.UserFactory; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelIdAndNameDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelIdAndNameDTO; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; class ChannelIntegrationTest extends AbstractConversationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/ConversationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/ConversationIntegrationTest.java index 42be4ab51108..157318280e97 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/ConversationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/ConversationIntegrationTest.java @@ -32,11 +32,11 @@ import de.tum.cit.aet.artemis.service.dto.ResponsibleUserDTO; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.user.UserFactory; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ChannelDTO; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ConversationDTO; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.ConversationUserDTO; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.GroupChatDTO; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.OneToOneChatDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationUserDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.GroupChatDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.OneToOneChatDTO; class ConversationIntegrationTest extends AbstractConversationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/GroupChatIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/GroupChatIntegrationTest.java index 6120f85ecc08..d75be1b30647 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/GroupChatIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/GroupChatIntegrationTest.java @@ -18,7 +18,7 @@ import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.user.UserFactory; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.GroupChatDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.GroupChatDTO; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/OneToOneChatIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/OneToOneChatIntegrationTest.java index b251eb425cee..c991a940d298 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/OneToOneChatIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/OneToOneChatIntegrationTest.java @@ -18,7 +18,7 @@ import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.user.UserFactory; -import de.tum.cit.aet.artemis.web.rest.metis.conversation.dtos.OneToOneChatDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.OneToOneChatDTO; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/PostingServiceUnitTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/PostingServiceUnitTest.java index 70f5ac32bad3..54d9c3db1b06 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/PostingServiceUnitTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/PostingServiceUnitTest.java @@ -26,7 +26,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; class PostingServiceUnitTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/PushNotificationResourceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/PushNotificationResourceTest.java index ba59f5f7b1c7..6a44a2196a45 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/PushNotificationResourceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/PushNotificationResourceTest.java @@ -20,9 +20,9 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.web.rest.push_notification.PushNotificationRegisterBody; -import de.tum.cit.aet.artemis.web.rest.push_notification.PushNotificationRegisterDTO; -import de.tum.cit.aet.artemis.web.rest.push_notification.PushNotificationUnregisterRequest; +import de.tum.cit.aet.artemis.communication.web.push_notification.PushNotificationRegisterBody; +import de.tum.cit.aet.artemis.communication.web.push_notification.PushNotificationRegisterDTO; +import de.tum.cit.aet.artemis.communication.web.push_notification.PushNotificationUnregisterRequest; @TestInstance(TestInstance.Lifecycle.PER_CLASS) class PushNotificationResourceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationIntegrationTest.java index c3f6c85678c1..06c371ee923d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationIntegrationTest.java @@ -20,7 +20,7 @@ import de.tum.cit.aet.artemis.core.repository.OrganizationRepository; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.web.rest.dto.OrganizationCountDTO; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class OrganizationIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/AuthorizationCheckServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/AuthorizationCheckServiceTest.java index 14b0ec3159db..28683737b429 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/AuthorizationCheckServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/AuthorizationCheckServiceTest.java @@ -25,7 +25,7 @@ import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; class AuthorizationCheckServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java index 8b09de0e9282..04221b10fe4a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java @@ -28,8 +28,8 @@ import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class GradingScaleServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationServiceTest.java index e5a8835bf117..1407111a6725 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationServiceTest.java @@ -21,8 +21,8 @@ import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class OnlineCourseConfigurationServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckServiceTest.java index d05c1ad9f0d9..dad44ef404c3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckServiceTest.java @@ -22,7 +22,7 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; class ParticipationAuthorizationCheckServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java index 3734453894c0..a441f786ca7c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java @@ -8,6 +8,7 @@ import java.util.Map; import java.util.Optional; +import de.tum.cit.aet.artemis.assessment.web.ResultResource; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -110,7 +111,7 @@ void tearDown() throws Exception { } /** - * Test for methods of {@link ParticipationService} used by {@link de.tum.cit.aet.artemis.web.rest.ResultResource#createResultForExternalSubmission(Long, String, Result)}. + * Test for methods of {@link ParticipationService} used by {@link ResultResource#createResultForExternalSubmission(Long, String, Result)}. */ @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") diff --git a/src/test/java/de/tum/cit/aet/artemis/service/RepositoryAccessServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/RepositoryAccessServiceTest.java index 70ce475b3b64..d824405410da 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/RepositoryAccessServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/RepositoryAccessServiceTest.java @@ -33,8 +33,8 @@ import de.tum.cit.aet.artemis.programming.service.RepositoryAccessService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.TestConstants; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.repository.RepositoryActionType; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.programming.web.repository.RepositoryActionType; class RepositoryAccessServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java index 839015b77af7..e38ad1cdf47b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java @@ -46,7 +46,7 @@ import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionWithComplaintDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; class SubmissionServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java index 4bf54d7ff094..a0d5ec3621ec 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java @@ -25,7 +25,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; class AthenaFeedbackSuggestionsServiceTest extends AbstractAthenaTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java index 733432d46eeb..2708f1e258c9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java @@ -27,7 +27,7 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; -import de.tum.cit.aet.artemis.web.rest.errors.ServiceUnavailableException; +import de.tum.cit.aet.artemis.core.exception.ServiceUnavailableException; class AthenaRepositoryExportServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java index f093346103f3..e8e8c6f692aa 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java @@ -39,7 +39,7 @@ import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.text.domain.TextExercise; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import uk.ac.ox.ctl.lti13.lti.Claims; class LtiDeepLinkingServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java index 111f45de77a4..ca5ddb3070f9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java @@ -30,10 +30,10 @@ import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class ExamAccessServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java index 372d223f31e9..96d4ae9c52ee 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java @@ -32,8 +32,8 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.dto.ExamChecklistDTO; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; class ExamServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionServiceTest.java index 78ceb985b4d9..dc78c77a8b68 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionServiceTest.java @@ -30,8 +30,8 @@ import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class ExamSubmissionServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessServiceTest.java index 969544b1dedc..20aa389de269 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessServiceTest.java @@ -20,9 +20,9 @@ import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exam.service.StudentExamAccessService; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.web.rest.errors.AccessForbiddenException; -import de.tum.cit.aet.artemis.web.rest.errors.ConflictException; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class StudentExamAccessServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java index 80a00be5f9b9..3135ae1a969d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java @@ -49,7 +49,7 @@ import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseDetailsDTO; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class TextSubmissionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java index 16d598136631..c62d16d6220f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java @@ -42,8 +42,8 @@ import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistrationType; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; import de.tum.cit.aet.artemis.user.UserFactory; -import de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupResource; -import de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupResource.TutorialGroupRegistrationImportDTO; +import de.tum.cit.aet.artemis.tutorialgroup.web.TutorialGroupResource; +import de.tum.cit.aet.artemis.tutorialgroup.web.TutorialGroupResource.TutorialGroupRegistrationImportDTO; class TutorialGroupIntegrationTest extends AbstractTutorialGroupIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupScheduleIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupScheduleIntegrationTest.java index cf4b3a388833..c3fc245f6ec2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupScheduleIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupScheduleIntegrationTest.java @@ -12,7 +12,7 @@ import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; -import de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupResource; +import de.tum.cit.aet.artemis.tutorialgroup.web.TutorialGroupResource; class TutorialGroupScheduleIntegrationTest extends AbstractTutorialGroupIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupSessionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupSessionIntegrationTest.java index cc2fcaea9374..44ba7403d1c5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupSessionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupSessionIntegrationTest.java @@ -18,7 +18,7 @@ import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSessionStatus; -import de.tum.cit.aet.artemis.web.rest.tutorialgroups.TutorialGroupSessionResource; +import de.tum.cit.aet.artemis.tutorialgroup.web.TutorialGroupSessionResource; class TutorialGroupSessionIntegrationTest extends AbstractTutorialGroupIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupUtilService.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupUtilService.java index 9a232d9d4c72..9663dd183fc3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupUtilService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.tutorialgroups; -import static de.tum.cit.aet.artemis.web.rest.util.DateUtil.interpretInTimeZone; +import static de.tum.cit.aet.artemis.core.util.DateUtil.interpretInTimeZone; import static org.assertj.core.api.Assertions.assertThat; import java.time.LocalDate; diff --git a/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java index d7eb2747a451..c20677403fe2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java @@ -21,10 +21,10 @@ import de.tum.cit.aet.artemis.service.dto.PasswordChangeDTO; import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.util.ConfigUtil; -import de.tum.cit.aet.artemis.web.rest.AccountResource; -import de.tum.cit.aet.artemis.web.rest.open.PublicAccountResource; -import de.tum.cit.aet.artemis.web.rest.vm.KeyAndPasswordVM; -import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; +import de.tum.cit.aet.artemis.core.web.AccountResource; +import de.tum.cit.aet.artemis.core.web.open.PublicAccountResource; +import de.tum.cit.aet.artemis.core.dto.vm.KeyAndPasswordVM; +import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; /** * Tests {@link AccountResource}. Several Tests rely on overwriting AccountResource.registrationEnabled and other attributes with reflections. Any changes to the internal diff --git a/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceWithGitLabIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceWithGitLabIntegrationTest.java index ca965fc79113..92bd3fd41630 100644 --- a/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceWithGitLabIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceWithGitLabIntegrationTest.java @@ -21,7 +21,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.connector.GitlabRequestMockProvider; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; +import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; class AccountResourceWithGitLabIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java b/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java index 5607aaf8fb48..1d62d8c20df4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java @@ -53,8 +53,8 @@ import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.service.dto.UserInitializationDTO; import de.tum.cit.aet.artemis.util.RequestUtilService; -import de.tum.cit.aet.artemis.web.rest.errors.EntityNotFoundException; -import de.tum.cit.aet.artemis.web.rest.vm.ManagedUserVM; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; /** * Note: this class should be independent of the actual VCS and CIS and contains common test logic for scenarios: diff --git a/src/test/java/de/tum/cit/aet/artemis/util/ExerciseIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/util/ExerciseIntegrationTestService.java index e928a6c1abff..a822c033173a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/util/ExerciseIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/ExerciseIntegrationTestService.java @@ -13,7 +13,7 @@ import de.tum.cit.aet.artemis.core.dto.SortingOrder; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.web.rest.util.PageUtil; +import de.tum.cit.aet.artemis.core.util.PageUtil; /** * Service responsible for util methods / shared code that is helpful or common for testing all exercise types diff --git a/src/test/java/de/tum/cit/aet/artemis/web/rest/AndroidAppSiteAssociationResourceTest.java b/src/test/java/de/tum/cit/aet/artemis/web/rest/AndroidAppSiteAssociationResourceTest.java index ca5fe6b157aa..fb28372f40ca 100644 --- a/src/test/java/de/tum/cit/aet/artemis/web/rest/AndroidAppSiteAssociationResourceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/web/rest/AndroidAppSiteAssociationResourceTest.java @@ -4,6 +4,7 @@ import java.util.List; +import de.tum.cit.aet.artemis.core.web.AndroidAppSiteAssociationResource; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/de/tum/cit/aet/artemis/web/rest/AppleAppSiteAssociationResourceTest.java b/src/test/java/de/tum/cit/aet/artemis/web/rest/AppleAppSiteAssociationResourceTest.java index e01d303eb434..fd599498026d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/web/rest/AppleAppSiteAssociationResourceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/web/rest/AppleAppSiteAssociationResourceTest.java @@ -2,6 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; +import de.tum.cit.aet.artemis.core.web.AppleAppSiteAssociationResource; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilderTest.java b/src/test/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilderTest.java index dd5f9dbbc30e..12171faf0f87 100644 --- a/src/test/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilderTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilderTest.java @@ -4,6 +4,7 @@ import java.util.Set; +import de.tum.cit.aet.artemis.plagiarism.web.PlagiarismResultResponseBuilder; import org.junit.jupiter.api.Test; import org.springframework.http.HttpStatus; diff --git a/src/test/resources/de/tum/in/www1/artemis/config/application-buildagent.yml b/src/test/resources/de/tum/in/www1/artemis/config/application-buildagent.yml new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/src/test/resources/de/tum/in/www1/artemis/config/application-dev.yml b/src/test/resources/de/tum/in/www1/artemis/config/application-dev.yml new file mode 100644 index 000000000000..e69de29bb2d1 From 957f39e4e0aa2c88980dbc90635520d8a93bbba4 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Wed, 11 Sep 2024 17:27:50 +0200 Subject: [PATCH 15/43] move services into modules (part 2) WORK IN PROGRESS --- .../assessment/service/AssessmentService.java | 2 +- .../assessment/service/ResultService.java | 4 ++-- .../artemis/assessment/web/BonusResource.java | 2 +- .../web/open/PublicResultResource.java | 2 +- .../service}/AthenaConnector.java | 2 +- .../service}/AthenaDTOConverterService.java | 2 +- .../AthenaFeedbackSendingService.java | 2 +- .../AthenaFeedbackSuggestionsService.java | 2 +- .../service}/AthenaHealthIndicator.java | 2 +- .../service}/AthenaModuleService.java | 2 +- .../AthenaRepositoryExportService.java | 2 +- .../athena/service/AthenaScheduleService.java | 1 - .../AthenaSubmissionSelectionService.java | 2 +- .../AthenaSubmissionSendingService.java | 2 +- .../artemis/athena/web/AthenaResource.java | 6 ++--- .../atlas/web/CourseCompetencyResource.java | 2 +- .../BuildAgentConfiguration.java | 2 +- .../service}/BuildAgentDockerService.java | 4 ++-- .../service}/BuildAgentSshKeyService.java | 2 +- .../service}/BuildJobContainerService.java | 4 ++-- .../service}/BuildJobExecutionService.java | 14 +++++------ .../service}/BuildJobGitService.java | 4 ++-- .../service}/BuildJobManagementService.java | 6 ++--- .../service}/BuildLogsMap.java | 2 +- .../SharedQueueProcessingService.java | 12 +++++----- .../service}/TestResultXmlParser.java | 4 ++-- .../core/aop/logging/LoggingAspect.java | 2 +- .../core/config/CacheConfiguration.java | 2 +- .../aet/artemis/core/config/MetricsBean.java | 4 ++-- .../config/RestTemplateConfiguration.java | 4 ++-- .../tum/cit/aet/artemis/core/domain/User.java | 2 +- .../core/exception/ExceptionTranslator.java | 3 ++- .../exception/VersionControlException.java | 2 +- .../core/service/UserScheduleService.java | 2 +- ...PyrisChatPipelineExecutionBaseDataDTO.java | 15 ------------ ...PyrisExerciseChatPipelineExecutionDTO.java | 19 --------------- .../DataExportExerciseCreationService.java | 2 +- ...DataExportQuizExerciseCreationService.java | 2 +- .../service/user/UserCreationService.java | 6 ++--- .../core/service/user/UserService.java | 4 ++-- .../aet/artemis/core/web/AccountResource.java | 4 ++-- .../web/admin/AdminBuildJobQueueResource.java | 6 ++--- .../admin/AdminLtiConfigurationResource.java | 4 ++-- .../core/web/filter/Lti13LaunchFilter.java | 2 +- .../aet/artemis/exam/service/ExamService.java | 2 +- .../exercise/service/team/TeamService.java | 4 ++-- .../service/FileUploadSubmissionService.java | 2 +- .../iris/dto/IrisChatWebsocketDTO.java | 2 +- .../IrisCompetencyGenerationService.java | 12 +++++----- .../pyris/PyrisConnectorException.java | 2 +- .../service}/pyris/PyrisConnectorService.java | 8 +++---- .../service}/pyris/PyrisDTOService.java | 16 ++++++------- .../service}/pyris/PyrisHealthIndicator.java | 4 ++-- .../service}/pyris/PyrisJobService.java | 14 +++++------ .../service}/pyris/PyrisPipelineService.java | 18 +++++++------- .../pyris/PyrisStatusUpdateService.java | 20 ++++++++-------- .../service}/pyris/PyrisWebhookService.java | 8 +++---- .../pyris/dto/PyrisErrorResponseDTO.java | 2 +- .../pyris/dto/PyrisHealthStatusDTO.java | 2 +- .../service}/pyris/dto/PyrisModelDTO.java | 2 +- .../pyris/dto/PyrisPipelineExecutionDTO.java | 4 ++-- .../PyrisPipelineExecutionSettingsDTO.java | 2 +- ...PyrisChatPipelineExecutionBaseDataDTO.java | 15 ++++++++++++ .../dto/chat/PyrisChatStatusUpdateDTO.java | 4 ++-- .../PyrisCourseChatPipelineExecutionDTO.java | 12 +++++----- ...PyrisExerciseChatPipelineExecutionDTO.java | 19 +++++++++++++++ .../PyrisCompetencyExtractionInputDTO.java | 2 +- ...petencyExtractionPipelineExecutionDTO.java | 4 ++-- .../PyrisCompetencyRecommendationDTO.java | 2 +- .../PyrisCompetencyStatusUpdateDTO.java | 4 ++-- .../pyris/dto/data/PyrisBuildLogEntryDTO.java | 2 +- .../pyris/dto/data/PyrisCompetencyDTO.java | 2 +- .../pyris/dto/data/PyrisCourseDTO.java | 2 +- .../service}/pyris/dto/data/PyrisExamDTO.java | 2 +- ...yrisExerciseWithStudentSubmissionsDTO.java | 2 +- .../dto/data/PyrisExtendedCourseDTO.java | 2 +- .../pyris/dto/data/PyrisFeedbackDTO.java | 2 +- .../dto/data/PyrisImageMessageContentDTO.java | 2 +- .../dto/data/PyrisJsonMessageContentDTO.java | 2 +- .../pyris/dto/data/PyrisLectureDTO.java | 2 +- .../pyris/dto/data/PyrisLectureUnitDTO.java | 2 +- .../dto/data/PyrisMessageContentBaseDTO.java | 2 +- .../pyris/dto/data/PyrisMessageDTO.java | 2 +- .../dto/data/PyrisProgrammingExerciseDTO.java | 2 +- .../pyris/dto/data/PyrisResultDTO.java | 2 +- .../dto/data/PyrisStudentSubmissionDTO.java | 2 +- .../pyris/dto/data/PyrisSubmissionDTO.java | 2 +- .../dto/data/PyrisTextMessageContentDTO.java | 2 +- .../service}/pyris/dto/data/PyrisUserDTO.java | 2 +- .../PyrisLectureIngestionStatusUpdateDTO.java | 4 ++-- .../PyrisLectureUnitWebhookDTO.java | 2 +- ...isWebhookLectureIngestionExecutionDTO.java | 6 ++--- .../pyris/dto/status/PyrisStageDTO.java | 2 +- .../pyris/dto/status/PyrisStageState.java | 2 +- .../pyris/job/CompetencyExtractionJob.java | 2 +- .../service}/pyris/job/CourseChatJob.java | 2 +- .../service}/pyris/job/ExerciseChatJob.java | 2 +- .../pyris/job/IngestionWebhookJob.java | 2 +- .../service}/pyris/job/PyrisJob.java | 2 +- .../session/IrisCourseChatSessionService.java | 6 ++--- .../IrisExerciseChatSessionService.java | 6 ++--- .../session/IrisHestiaSessionService.java | 2 +- .../websocket/IrisChatWebsocketService.java | 2 +- .../web/IrisCourseChatSessionResource.java | 2 +- .../web/IrisExerciseChatSessionResource.java | 2 +- .../artemis/iris/web/IrisModelsResource.java | 8 +++---- .../aet/artemis/iris/web/IrisResource.java | 2 +- .../lecture/service/LectureImportService.java | 2 +- .../lecture/service/LectureService.java | 2 +- .../lecture/service/LectureUnitService.java | 2 +- .../lti/config/CustomLti13Configurer.java | 2 +- .../ExternalPasswordResetInfoContributor.java | 2 +- .../lti => lti/service}/Lti13Service.java | 2 +- .../service}/LtiDeepLinkingService.java | 2 +- .../LtiDynamicRegistrationService.java | 2 +- .../service}/LtiNewResultService.java | 2 +- .../lti => lti/service}/LtiService.java | 6 ++--- .../open/PublicPyrisStatusUpdateResource.java | 24 +++++++++---------- .../service/ModelingSubmissionService.java | 2 +- .../apollon/ApollonConversionService.java | 4 ++-- .../apollon/ApollonHealthIndicator.java | 2 +- .../service}/apollon/dto/ApollonModelDTO.java | 2 +- ...ProgrammingPlagiarismDetectionService.java | 2 +- .../artemis/programming/domain/BuildJob.java | 2 +- .../ProgrammingExerciseBuildConfig.java | 4 ++-- ...ogrammingExerciseStudentParticipation.java | 2 +- .../programming/domain/Repository.java | 2 +- .../repository/BuildJobRepository.java | 4 ++-- .../service}/AbstractGitService.java | 2 +- ...aticProgrammingExerciseCleanupService.java | 1 - .../service/AuxiliaryRepositoryService.java | 2 +- .../BuildScriptGenerationService.java | 2 +- .../service}/BuildScriptProviderService.java | 4 ++-- .../service/CommitHistoryService.java | 1 - .../service/ConsistencyCheckService.java | 4 ++-- .../GenericBuildScriptGenerationService.java | 2 +- .../service}/GitService.java | 4 ++-- .../service/JavaTemplateUpgradeService.java | 1 - .../ParticipationVcsAccessTokenService.java | 2 +- .../service/ProgrammingAssessmentService.java | 4 ++-- ...mingExerciseCodeReviewFeedbackService.java | 2 +- .../ProgrammingExerciseExportService.java | 5 ++-- .../ProgrammingExerciseGradingService.java | 4 ++-- ...ProgrammingExerciseImportBasicService.java | 2 +- ...grammingExerciseImportFromFileService.java | 1 - .../ProgrammingExerciseImportService.java | 7 +++--- ...ogrammingExerciseParticipationService.java | 5 ++-- .../ProgrammingExerciseRepositoryService.java | 3 +-- .../ProgrammingExerciseScheduleService.java | 1 - .../service/ProgrammingExerciseService.java | 14 +++++------ .../service/ProgrammingMessagingService.java | 2 +- .../service/ProgrammingSubmissionService.java | 7 +++--- .../service/ProgrammingTriggerService.java | 2 +- .../RepositoryParticipationService.java | 3 +-- .../service/RepositoryService.java | 1 - .../service}/aeolus/Action.java | 2 +- .../service}/aeolus/ActionDeserializer.java | 2 +- .../aeolus/AeolusBuildPlanService.java | 6 ++--- .../AeolusBuildScriptGenerationService.java | 6 ++--- .../service}/aeolus/AeolusRepository.java | 2 +- .../service}/aeolus/AeolusResult.java | 2 +- .../aeolus/AeolusTemplateService.java | 4 ++-- .../service}/aeolus/DockerConfig.java | 2 +- .../service}/aeolus/PlatformAction.java | 2 +- .../service}/aeolus/ScriptAction.java | 2 +- .../service}/aeolus/Windfile.java | 2 +- .../service}/aeolus/WindfileMetadata.java | 2 +- .../dto/AeolusGenerationResponseDTO.java | 2 +- .../service}/ci/AbstractBuildPlanCreator.java | 2 +- ...actContinuousIntegrationResultService.java | 2 +- .../AbstractContinuousIntegrationService.java | 2 +- .../service}/ci/CIPermission.java | 2 +- .../service}/ci/CIUserManagementService.java | 2 +- .../ContinuousIntegrationResultService.java | 2 +- ...nuousIntegrationServerHealthIndicator.java | 2 +- .../ci/ContinuousIntegrationService.java | 2 +- .../ContinuousIntegrationTriggerService.java | 2 +- .../ContinuousIntegrationUpdateService.java | 2 +- .../ci/notification/BuildLogParseUtils.java | 2 +- .../ci/notification/dto/CommitDTO.java | 2 +- .../ci/notification/dto/TestCaseDTO.java | 2 +- .../dto/TestCaseDetailMessageDTO.java | 2 +- .../ci/notification/dto/TestResultsDTO.java | 4 ++-- .../ci/notification/dto/TestSuiteDTO.java | 2 +- .../dto/TestwiseCoverageReportDTO.java | 2 +- ...bstractGitLabAuthorizationInterceptor.java | 2 +- .../GitLabAuthorizationInterceptor.java | 2 +- .../service}/gitlab/GitLabException.java | 2 +- ...bPersonalAccessTokenManagementService.java | 6 ++--- .../service}/gitlab/GitLabService.java | 10 ++++---- .../GitLabUserDoesNotExistException.java | 2 +- .../gitlab/GitLabUserManagementService.java | 6 ++--- .../gitlab/GitlabInfoContributor.java | 2 +- .../service}/gitlab/dto/GitLabCommitDTO.java | 2 +- ...LabPersonalAccessTokenListResponseDTO.java | 2 +- .../GitLabPersonalAccessTokenRequestDTO.java | 2 +- .../GitLabPersonalAccessTokenResponseDTO.java | 2 +- .../service}/gitlab/dto/GitLabProjectDTO.java | 2 +- .../gitlab/dto/GitLabPushNotificationDTO.java | 2 +- .../gitlab/dto/GitLabRepositoryDTO.java | 2 +- .../GitLabCIAuthorizationInterceptor.java | 4 ++-- .../gitlabci/GitLabCIBuildPlanService.java | 4 ++-- .../gitlabci/GitLabCIInfoContributor.java | 2 +- ...abCIProgrammingLanguageFeatureService.java | 2 +- .../gitlabci/GitLabCIResultService.java | 6 ++--- .../service}/gitlabci/GitLabCIService.java | 8 +++---- .../gitlabci/GitLabCITriggerService.java | 4 ++-- .../GitLabCIUserManagementService.java | 4 ++-- ...ogrammingExerciseGitDiffReportService.java | 2 +- .../hestia/TestwiseCoverageService.java | 4 ++-- .../behavioral/BehavioralTestCaseService.java | 2 +- .../structural/StructuralTestCaseService.java | 2 +- .../JenkinsAuthorizationInterceptor.java | 2 +- .../service}/jenkins/JenkinsEndpoints.java | 2 +- .../jenkins/JenkinsInfoContributor.java | 2 +- .../jenkins/JenkinsInternalUrlService.java | 2 +- ...kinsProgrammingLanguageFeatureService.java | 2 +- .../jenkins/JenkinsResultService.java | 6 ++--- .../service}/jenkins/JenkinsService.java | 16 ++++++------- .../jenkins/JenkinsTriggerService.java | 6 ++--- .../jenkins/JenkinsUserManagementService.java | 10 ++++---- .../jenkins/JenkinsXmlConfigBuilder.java | 2 +- .../service}/jenkins/JenkinsXmlFileUtils.java | 2 +- .../build_plan/JenkinsBuildPlanCreator.java | 8 +++---- .../JenkinsBuildPlanLinkInfoContributor.java | 2 +- .../build_plan/JenkinsBuildPlanService.java | 24 +++++++++---------- .../build_plan/JenkinsBuildPlanUtils.java | 2 +- .../JenkinsPipelineScriptCreator.java | 4 ++-- .../service}/jenkins/dto/JenkinsUserDTO.java | 2 +- .../jenkins/jobs/JenkinsJobPermission.java | 2 +- .../jobs/JenkinsJobPermissionsService.java | 2 +- .../jobs/JenkinsJobPermissionsUtils.java | 2 +- .../jenkins/jobs/JenkinsJobService.java | 4 ++-- .../LocalCIBuildConfigurationService.java | 8 +++---- .../localci/LocalCIInfoContributor.java | 2 +- .../LocalCIPriorityQueueComparator.java | 4 ++-- ...alCIProgrammingLanguageFeatureService.java | 2 +- .../localci/LocalCIQueueWebsocketService.java | 6 ++--- .../LocalCIResultProcessingService.java | 10 ++++---- .../localci/LocalCIResultService.java | 6 ++--- .../service}/localci/LocalCIService.java | 14 +++++------ .../localci/LocalCITriggerService.java | 22 ++++++++--------- .../localci/SharedQueueManagementService.java | 8 +++---- .../localci/dto/BuildAgentInformation.java | 2 +- .../service}/localci/dto/BuildConfig.java | 2 +- .../localci/dto/BuildJobQueueItem.java | 2 +- .../service}/localci/dto/BuildResult.java | 4 ++-- .../localci/dto/DockerImageBuild.java | 2 +- .../service}/localci/dto/JobTimingInfo.java | 2 +- .../service}/localci/dto/RepositoryInfo.java | 2 +- .../service}/localci/dto/ResultBuildJob.java | 2 +- .../service}/localci/dto/ResultQueueItem.java | 2 +- .../localci/scaparser/ReportParser.java | 16 ++++++------- .../scaparser/exception/ParserException.java | 2 +- .../exception/UnsupportedToolException.java | 2 +- .../scaparser/strategy/CheckstyleParser.java | 2 +- .../scaparser/strategy/PMDCPDParser.java | 2 +- .../localci/scaparser/strategy/PMDParser.java | 2 +- .../scaparser/strategy/ParserPolicy.java | 4 ++-- .../scaparser/strategy/ParserStrategy.java | 2 +- .../scaparser/strategy/SpotbugsParser.java | 2 +- .../localci/scaparser/utils/FileUtils.java | 2 +- .../localci/scaparser/utils/ReportUtils.java | 2 +- .../localvc}/ArtemisGitServletService.java | 7 +----- .../GitPublickeyAuthenticatorService.java | 10 ++++---- .../localvc}/JGitServletConfiguration.java | 4 +--- .../service}/localvc/LocalVCFetchFilter.java | 2 +- .../localvc/LocalVCInfoContributor.java | 2 +- ...CPersonalAccessTokenManagementService.java | 2 +- .../service}/localvc/LocalVCPostPushHook.java | 2 +- .../service}/localvc/LocalVCPrePushHook.java | 2 +- .../service}/localvc/LocalVCPushFilter.java | 2 +- .../localvc/LocalVCRepositoryUri.java | 2 +- .../service}/localvc/LocalVCService.java | 8 +++---- .../localvc/LocalVCServletService.java | 8 +++---- .../localvc}/SshGitCommandFactoryService.java | 5 ++-- .../SshGitLocationResolverService.java | 6 ++--- .../localvc}/ssh/HashUtils.java | 2 +- .../localvc}/ssh/MultipleHostKeyProvider.java | 2 +- .../localvc}/ssh/SshConfiguration.java | 8 +++---- .../localvc}/ssh/SshConstants.java | 2 +- .../localvc}/ssh/SshGitCommand.java | 8 +++---- .../vcs/AbstractVersionControlService.java | 4 ++-- .../vcs/VcsTokenManagementService.java | 2 +- .../service}/vcs/VcsTokenRenewalService.java | 4 ++-- .../vcs/VcsUserManagementService.java | 2 +- .../VersionControlRepositoryPermission.java | 2 +- .../VersionControlServerHealthIndicator.java | 2 +- .../service}/vcs/VersionControlService.java | 2 +- ...ogrammingExerciseExportImportResource.java | 2 +- .../web/ProgrammingExerciseResource.java | 8 +++---- .../web/ProgrammingSubmissionResource.java | 2 +- .../web/localci/AeolusTemplateResource.java | 6 ++--- .../web/localci/BuildJobQueueResource.java | 4 ++-- .../PublicProgrammingSubmissionResource.java | 8 +++---- ...grammingExerciseParticipationResource.java | 6 ++--- .../web/repository/RepositoryResource.java | 6 ++--- .../repository/TestRepositoryResource.java | 6 ++--- ...ragAndDropQuizAnswerConversionService.java | 3 ++- .../quiz/service/QuizStatisticService.java | 2 +- .../service/AttachmentUnitService.java | 2 +- .../artemis/service/BuildLogEntryService.java | 2 +- .../artemis/service/ParticipationService.java | 8 +++---- .../artemis/service/SubmissionService.java | 2 +- .../AbstractBuildResultNotificationDTO.java | 2 +- .../text/service/TextAssessmentService.java | 2 +- .../service/TextExerciseFeedbackService.java | 2 +- .../text/service/TextSubmissionService.java | 2 +- .../text/web/ApollonConversionResource.java | 4 ++-- .../text/web/TextAssessmentResource.java | 2 +- .../text/web/TextExerciseResource.java | 2 +- .../aet/artemis/web/rest/CourseResource.java | 6 ++--- .../cit/aet/artemis/web/rest/LtiResource.java | 4 ++-- .../web/rest/ParticipationResource.java | 2 +- .../aet/artemis/web/rest/UserResource.java | 2 +- .../LocalCIWebsocketMessagingService.java | 4 ++-- .../AbstractArtemisIntegrationTest.java | 4 ++-- ...ringIntegrationGitlabCIGitlabSamlTest.java | 6 ++--- ...actSpringIntegrationJenkinsGitlabTest.java | 4 ++-- ...ctSpringIntegrationLocalCILocalVCTest.java | 4 ++-- .../ManagementResourceIntegrationTest.java | 2 +- .../architecture/ArchitectureTest.java | 2 +- .../UserJenkinsGitlabIntegrationTest.java | 6 ++--- .../connector/GitlabRequestMockProvider.java | 10 ++++---- .../connector/IrisRequestMockProvider.java | 10 ++++---- .../connector/JenkinsRequestMockProvider.java | 4 ++-- ...eolusBuildScriptGenerationServiceTest.java | 10 ++++---- .../artemis/connectors/AeolusServiceTest.java | 16 ++++++------- .../AeolusTemplateResourceTest.java | 4 ++-- .../aet/artemis/connectors/AeolusTest.java | 14 +++++------ .../ApollonConversionServiceTest.java | 2 +- .../ApollonHealthIndicatorTest.java | 2 +- .../artemis/connectors/Lti13ServiceTest.java | 4 ++-- .../LtiDynamicRegistrationServiceTest.java | 3 ++- .../connectors/LtiNewResultServiceTest.java | 4 ++-- .../artemis/connectors/LtiServiceTest.java | 6 ++--- .../cit/aet/artemis/exam/ExamStartTest.java | 2 +- .../ApollonConversionIntegrationTest.java | 4 ++-- .../ContinuousIntegrationTestService.java | 4 ++-- .../ProgrammingExerciseFactory.java | 10 ++++---- ...ProgrammingExerciseGitIntegrationTest.java | 2 +- ...rammingExerciseIntegrationTestService.java | 8 +++---- ...ExerciseLocalVCLocalCIIntegrationTest.java | 2 +- ...gExerciseResultJenkinsIntegrationTest.java | 2 +- .../ProgrammingExerciseResultTestService.java | 2 +- .../ProgrammingExerciseTestService.java | 12 +++++----- .../ProgrammingExerciseUtilService.java | 2 +- ...AndResultGitlabJenkinsIntegrationTest.java | 8 +++---- .../RepositoryIntegrationTest.java | 4 ++-- .../SubmissionPolicyIntegrationTest.java | 2 +- ...TestRepositoryResourceIntegrationTest.java | 2 +- .../iris/IrisChatMessageIntegrationTest.java | 12 +++++----- ...isCompetencyGenerationIntegrationTest.java | 10 ++++---- .../iris/PyrisConnectorServiceTest.java | 4 ++-- .../iris/PyrisLectureIngestionTest.java | 12 +++++----- ...AbstractLocalCILocalVCIntegrationTest.java | 2 +- .../BuildAgentConfigurationTest.java | 2 +- .../BuildAgentDockerServiceTest.java | 8 +++---- ...AgentSshAuthenticationIntegrationTest.java | 6 ++--- .../artemis/localvcci/BuildResultTest.java | 2 +- .../localvcci/LocalCIIntegrationTest.java | 4 ++-- .../LocalCIResourceIntegrationTest.java | 12 +++++----- .../localvcci/LocalCIResultServiceTest.java | 2 +- .../artemis/localvcci/LocalCIServiceTest.java | 18 +++++++------- .../localvcci/LocalVCInfoContributorTest.java | 2 +- .../localvcci/LocalVCIntegrationTest.java | 2 +- .../LocalVCLocalCIIntegrationTest.java | 6 ++--- ...VCLocalCIParticipationIntegrationTest.java | 2 +- .../localvcci/LocalVCLocalCITestService.java | 4 ++-- .../localvcci/LocalVCSshIntegrationTest.java | 6 ++--- .../MultipleHostKeyProviderTest.java | 2 +- .../SharedQueueManagementServiceTest.java | 2 +- .../TestBuildAgentConfiguration.java | 4 ++-- .../ParticipationUtilService.java | 4 ++-- .../security/Lti13LaunchFilterTest.java | 2 +- .../DataExportCreationServiceTest.java | 2 +- .../artemis/service/GitlabCIServiceTest.java | 4 ++-- .../JenkinsAuthorizationInterceptorTest.java | 2 +- .../JenkinsInternalUriServiceTest.java | 2 +- .../JenkinsJobPermissionServiceTest.java | 6 ++--- .../service/JenkinsJobServiceTest.java | 6 ++--- .../artemis/service/JenkinsServiceTest.java | 2 +- .../AthenaFeedbackSendingServiceTest.java | 6 ++--- .../AthenaFeedbackSuggestionsServiceTest.java | 2 +- .../athena/AthenaHealthIndicatorTest.java | 2 +- .../AthenaRepositoryExportServiceTest.java | 2 +- .../AthenaSubmissionSelectionServiceTest.java | 2 +- .../AthenaSubmissionSendingServiceTest.java | 6 ++--- ...sonalAccessTokenManagementServiceTest.java | 6 ++--- .../JenkinsPipelineScriptCreatorTest.java | 2 +- .../jobs/JenkinsJobPermissionsUtilsTest.java | 6 ++--- .../buildagent/TestResultXmlParserTest.java | 4 ++-- .../lti/LtiDeepLinkingServiceTest.java | 2 +- .../vcs/VcsTokenRenewalServiceTest.java | 4 ++-- .../StaticCodeAnalysisParserUnitTest.java | 4 ++-- .../aet/artemis/uri/RepositoryUriTest.java | 2 +- .../cit/aet/artemis/user/UserTestService.java | 6 ++--- .../cit/aet/artemis/util/GitUtilService.java | 2 +- .../artemis/util/HestiaUtilTestService.java | 2 +- .../cit/aet/artemis/util/LocalRepository.java | 2 +- 400 files changed, 802 insertions(+), 824 deletions(-) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors/athena => athena/service}/AthenaConnector.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors/athena => athena/service}/AthenaDTOConverterService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors/athena => athena/service}/AthenaFeedbackSendingService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors/athena => athena/service}/AthenaFeedbackSuggestionsService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors/athena => athena/service}/AthenaHealthIndicator.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors/athena => athena/service}/AthenaModuleService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors/athena => athena/service}/AthenaRepositoryExportService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors/athena => athena/service}/AthenaSubmissionSelectionService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors/athena => athena/service}/AthenaSubmissionSendingService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{programming/icl => buildagent}/BuildAgentConfiguration.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors/localci/buildagent => buildagent/service}/BuildAgentDockerService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors/localci/buildagent => buildagent/service}/BuildAgentSshKeyService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors/localci/buildagent => buildagent/service}/BuildJobContainerService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors/localci/buildagent => buildagent/service}/BuildJobExecutionService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors/localci/buildagent => buildagent/service}/BuildJobGitService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors/localci/buildagent => buildagent/service}/BuildJobManagementService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors/localci/buildagent => buildagent/service}/BuildLogsMap.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors/localci/buildagent => buildagent/service}/SharedQueueProcessingService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors/localci/buildagent => buildagent/service}/TestResultXmlParser.java (97%) delete mode 100644 src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/PyrisChatPipelineExecutionBaseDataDTO.java delete mode 100644 src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/exercise/PyrisExerciseChatPipelineExecutionDTO.java rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/PyrisConnectorException.java (70%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/PyrisConnectorService.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/PyrisDTOService.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/PyrisHealthIndicator.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/PyrisJobService.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/PyrisPipelineService.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/PyrisStatusUpdateService.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/PyrisWebhookService.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/PyrisErrorResponseDTO.java (76%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/PyrisHealthStatusDTO.java (78%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/PyrisModelDTO.java (72%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/PyrisPipelineExecutionDTO.java (61%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/PyrisPipelineExecutionSettingsDTO.java (89%) create mode 100644 src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/PyrisChatPipelineExecutionBaseDataDTO.java rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/chat/PyrisChatStatusUpdateDTO.java (60%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java (51%) create mode 100644 src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/exercise/PyrisExerciseChatPipelineExecutionDTO.java rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/competency/PyrisCompetencyExtractionInputDTO.java (75%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/competency/PyrisCompetencyStatusUpdateDTO.java (78%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/data/PyrisBuildLogEntryDTO.java (73%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/data/PyrisCompetencyDTO.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/data/PyrisCourseDTO.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/data/PyrisExamDTO.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/data/PyrisExerciseWithStudentSubmissionsDTO.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/data/PyrisExtendedCourseDTO.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/data/PyrisFeedbackDTO.java (72%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/data/PyrisImageMessageContentDTO.java (73%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/data/PyrisJsonMessageContentDTO.java (79%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/data/PyrisLectureDTO.java (81%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/data/PyrisLectureUnitDTO.java (77%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/data/PyrisMessageContentBaseDTO.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/data/PyrisMessageDTO.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/data/PyrisProgrammingExerciseDTO.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/data/PyrisResultDTO.java (78%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/data/PyrisStudentSubmissionDTO.java (74%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/data/PyrisSubmissionDTO.java (84%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/data/PyrisTextMessageContentDTO.java (73%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/data/PyrisUserDTO.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java (55%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureIngestionExecutionDTO.java (54%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/status/PyrisStageDTO.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/dto/status/PyrisStageState.java (79%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/job/CompetencyExtractionJob.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/job/CourseChatJob.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/job/ExerciseChatJob.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/job/IngestionWebhookJob.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => iris/service}/pyris/job/PyrisJob.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors/lti => lti/service}/ExternalPasswordResetInfoContributor.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors/lti => lti/service}/Lti13Service.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors/lti => lti/service}/LtiDeepLinkingService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors/lti => lti/service}/LtiDynamicRegistrationService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors/lti => lti/service}/LtiNewResultService.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors/lti => lti/service}/LtiService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => modeling/service}/apollon/ApollonConversionService.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => modeling/service}/apollon/ApollonHealthIndicator.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => modeling/service}/apollon/dto/ApollonModelDTO.java (74%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/AbstractGitService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/BuildScriptGenerationService.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/BuildScriptProviderService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/GenericBuildScriptGenerationService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/GitService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/aeolus/Action.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/aeolus/ActionDeserializer.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/aeolus/AeolusBuildPlanService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/aeolus/AeolusBuildScriptGenerationService.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/aeolus/AeolusRepository.java (84%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/aeolus/AeolusResult.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/aeolus/AeolusTemplateService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/aeolus/DockerConfig.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/aeolus/PlatformAction.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/aeolus/ScriptAction.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/aeolus/Windfile.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/aeolus/WindfileMetadata.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/aeolus/dto/AeolusGenerationResponseDTO.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/ci/AbstractBuildPlanCreator.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/ci/AbstractContinuousIntegrationResultService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/ci/AbstractContinuousIntegrationService.java (63%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/ci/CIPermission.java (56%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/ci/CIUserManagementService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/ci/ContinuousIntegrationResultService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/ci/ContinuousIntegrationServerHealthIndicator.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/ci/ContinuousIntegrationService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/ci/ContinuousIntegrationTriggerService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/ci/ContinuousIntegrationUpdateService.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/ci/notification/BuildLogParseUtils.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/ci/notification/dto/CommitDTO.java (79%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/ci/notification/dto/TestCaseDTO.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/ci/notification/dto/TestCaseDetailMessageDTO.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/ci/notification/dto/TestResultsDTO.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/ci/notification/dto/TestSuiteDTO.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/ci/notification/dto/TestwiseCoverageReportDTO.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/gitlab/AbstractGitLabAuthorizationInterceptor.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/gitlab/GitLabAuthorizationInterceptor.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/gitlab/GitLabException.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/gitlab/GitLabPersonalAccessTokenManagementService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/gitlab/GitLabService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/gitlab/GitLabUserDoesNotExistException.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/gitlab/GitLabUserManagementService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/gitlab/GitlabInfoContributor.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/gitlab/dto/GitLabCommitDTO.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/gitlab/dto/GitLabProjectDTO.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/gitlab/dto/GitLabPushNotificationDTO.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/gitlab/dto/GitLabRepositoryDTO.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/gitlabci/GitLabCIAuthorizationInterceptor.java (71%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/gitlabci/GitLabCIBuildPlanService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/gitlabci/GitLabCIInfoContributor.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/gitlabci/GitLabCIProgrammingLanguageFeatureService.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/gitlabci/GitLabCIResultService.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/gitlabci/GitLabCIService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/gitlabci/GitLabCITriggerService.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/gitlabci/GitLabCIUserManagementService.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/jenkins/JenkinsAuthorizationInterceptor.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/jenkins/JenkinsEndpoints.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/jenkins/JenkinsInfoContributor.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/jenkins/JenkinsInternalUrlService.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/jenkins/JenkinsProgrammingLanguageFeatureService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/jenkins/JenkinsResultService.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/jenkins/JenkinsService.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/jenkins/JenkinsTriggerService.java (77%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/jenkins/JenkinsUserManagementService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/jenkins/JenkinsXmlConfigBuilder.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/jenkins/JenkinsXmlFileUtils.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/jenkins/build_plan/JenkinsBuildPlanCreator.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/jenkins/build_plan/JenkinsBuildPlanLinkInfoContributor.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/jenkins/build_plan/JenkinsBuildPlanService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/jenkins/build_plan/JenkinsBuildPlanUtils.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/jenkins/build_plan/JenkinsPipelineScriptCreator.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/jenkins/dto/JenkinsUserDTO.java (80%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/jenkins/jobs/JenkinsJobPermission.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/jenkins/jobs/JenkinsJobPermissionsService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/jenkins/jobs/JenkinsJobPermissionsUtils.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/jenkins/jobs/JenkinsJobService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/LocalCIBuildConfigurationService.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/LocalCIInfoContributor.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/LocalCIPriorityQueueComparator.java (80%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/LocalCIProgrammingLanguageFeatureService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/LocalCIQueueWebsocketService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/LocalCIResultProcessingService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/LocalCIResultService.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/LocalCIService.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/LocalCITriggerService.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/SharedQueueManagementService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/dto/BuildAgentInformation.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/dto/BuildConfig.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/dto/BuildJobQueueItem.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/dto/BuildResult.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/dto/DockerImageBuild.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/dto/JobTimingInfo.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/dto/RepositoryInfo.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/dto/ResultBuildJob.java (80%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/dto/ResultQueueItem.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/scaparser/ReportParser.java (80%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/scaparser/exception/ParserException.java (79%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/scaparser/exception/UnsupportedToolException.java (79%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/scaparser/strategy/CheckstyleParser.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/scaparser/strategy/PMDCPDParser.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/scaparser/strategy/PMDParser.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/scaparser/strategy/ParserPolicy.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/scaparser/strategy/ParserStrategy.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/scaparser/strategy/SpotbugsParser.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/scaparser/utils/FileUtils.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localci/scaparser/utils/ReportUtils.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{service/icl => programming/service/localvc}/ArtemisGitServletService.java (84%) rename src/main/java/de/tum/cit/aet/artemis/{service/icl => programming/service/localvc}/GitPublickeyAuthenticatorService.java (90%) rename src/main/java/de/tum/cit/aet/artemis/programming/{icl => service/localvc}/JGitServletConfiguration.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localvc/LocalVCFetchFilter.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localvc/LocalVCInfoContributor.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localvc/LocalVCPersonalAccessTokenManagementService.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localvc/LocalVCPostPushHook.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localvc/LocalVCPrePushHook.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localvc/LocalVCPushFilter.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localvc/LocalVCRepositoryUri.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localvc/LocalVCService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/localvc/LocalVCServletService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service/icl => programming/service/localvc}/SshGitCommandFactoryService.java (80%) rename src/main/java/de/tum/cit/aet/artemis/{service/icl => programming/service/localvc}/SshGitLocationResolverService.java (93%) rename src/main/java/de/tum/cit/aet/artemis/programming/{icl => service/localvc}/ssh/HashUtils.java (83%) rename src/main/java/de/tum/cit/aet/artemis/programming/{icl => service/localvc}/ssh/MultipleHostKeyProvider.java (97%) rename src/main/java/de/tum/cit/aet/artemis/programming/{icl => service/localvc}/ssh/SshConfiguration.java (91%) rename src/main/java/de/tum/cit/aet/artemis/programming/{icl => service/localvc}/ssh/SshConstants.java (89%) rename src/main/java/de/tum/cit/aet/artemis/programming/{icl => service/localvc}/ssh/SshGitCommand.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/vcs/AbstractVersionControlService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/vcs/VcsTokenManagementService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/vcs/VcsTokenRenewalService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/vcs/VcsUserManagementService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/vcs/VersionControlRepositoryPermission.java (56%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/vcs/VersionControlServerHealthIndicator.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{core/service/connectors => programming/service}/vcs/VersionControlService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => quiz}/service/DragAndDropQuizAnswerConversionService.java (99%) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentService.java index 96ec5d002772..2f5569ca6176 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentService.java @@ -20,7 +20,6 @@ import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiNewResultService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; @@ -29,6 +28,7 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; +import de.tum.cit.aet.artemis.lti.service.LtiNewResultService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.service.ProgrammingAssessmentService; import de.tum.cit.aet.artemis.service.SubmissionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java index dc5048227108..e1a5d82ec977 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java @@ -40,8 +40,6 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.ResultBuildJob; -import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiNewResultService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; @@ -50,6 +48,7 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; +import de.tum.cit.aet.artemis.lti.service.LtiNewResultService; import de.tum.cit.aet.artemis.programming.domain.BuildPlanType; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; @@ -60,6 +59,7 @@ import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; +import de.tum.cit.aet.artemis.programming.service.localci.dto.ResultBuildJob; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.web.rest.dto.feedback.FeedbackDetailDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/BonusResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/BonusResource.java index f6dd14b08819..59c39b8d7d17 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/BonusResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/BonusResource.java @@ -49,7 +49,7 @@ @Profile(PROFILE_CORE) @RestController @RequestMapping("api/") -public class dBonusResource { +public class BonusResource { private static final Logger log = LoggerFactory.getLogger(BonusResource.class); diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/open/PublicResultResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/open/PublicResultResource.java index 65363e5ea358..f72faeb9771f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/open/PublicResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/open/PublicResultResource.java @@ -20,13 +20,13 @@ import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseGradingService; import de.tum.cit.aet.artemis.programming.service.ProgrammingMessagingService; import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.programming.service.hestia.TestwiseCoverageService; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaConnector.java b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaConnector.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaConnector.java rename to src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaConnector.java index 86d6c656735f..f3edc432e22c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaConnector.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaConnector.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.athena; +package de.tum.cit.aet.artemis.athena.service; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaDTOConverterService.java b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaDTOConverterService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaDTOConverterService.java rename to src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaDTOConverterService.java index a140b16db80a..48359ca5c767 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaDTOConverterService.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaDTOConverterService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.athena; +package de.tum.cit.aet.artemis.athena.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaFeedbackSendingService.java b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaFeedbackSendingService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaFeedbackSendingService.java rename to src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaFeedbackSendingService.java index cdb108c43512..135747bc4583 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaFeedbackSendingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaFeedbackSendingService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.athena; +package de.tum.cit.aet.artemis.athena.service; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaFeedbackSuggestionsService.java b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaFeedbackSuggestionsService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaFeedbackSuggestionsService.java rename to src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaFeedbackSuggestionsService.java index ec6cd3dcffc3..c60fe20a8531 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaFeedbackSuggestionsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaFeedbackSuggestionsService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.athena; +package de.tum.cit.aet.artemis.athena.service; import java.util.List; import java.util.Objects; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaHealthIndicator.java b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaHealthIndicator.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaHealthIndicator.java rename to src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaHealthIndicator.java index 2b1123a06460..00ffd40708f5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaHealthIndicator.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaHealthIndicator.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.athena; +package de.tum.cit.aet.artemis.athena.service; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaModuleService.java b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaModuleService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaModuleService.java rename to src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaModuleService.java index 8fa7d42f87b1..d98ac4f82ae7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaModuleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaModuleService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.athena; +package de.tum.cit.aet.artemis.athena.service; import java.time.ZonedDateTime; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaRepositoryExportService.java b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaRepositoryExportService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaRepositoryExportService.java rename to src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaRepositoryExportService.java index 0a258cf8e8e5..ec701829f365 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaRepositoryExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaRepositoryExportService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.athena; +package de.tum.cit.aet.artemis.athena.service; import java.io.File; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaScheduleService.java index e9b3f7333cdb..0e4f80c3a5f0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaScheduleService.java @@ -21,7 +21,6 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaSubmissionSendingService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseLifecycle; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaSubmissionSelectionService.java b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaSubmissionSelectionService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaSubmissionSelectionService.java rename to src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaSubmissionSelectionService.java index fbc987ad5b62..6de086e2a291 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaSubmissionSelectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaSubmissionSelectionService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.athena; +package de.tum.cit.aet.artemis.athena.service; import java.util.List; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaSubmissionSendingService.java b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaSubmissionSendingService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaSubmissionSendingService.java rename to src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaSubmissionSendingService.java index e3a962cac848..8a5aae325bea 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/athena/AthenaSubmissionSendingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaSubmissionSendingService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.athena; +package de.tum.cit.aet.artemis.athena.service; import java.time.ZonedDateTime; import java.util.HashSet; diff --git a/src/main/java/de/tum/cit/aet/artemis/athena/web/AthenaResource.java b/src/main/java/de/tum/cit/aet/artemis/athena/web/AthenaResource.java index 6a8864a79c9f..064b4c1a2147 100644 --- a/src/main/java/de/tum/cit/aet/artemis/athena/web/AthenaResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/web/AthenaResource.java @@ -20,6 +20,9 @@ import de.tum.cit.aet.artemis.athena.dto.ModelingFeedbackDTO; import de.tum.cit.aet.artemis.athena.dto.ProgrammingFeedbackDTO; import de.tum.cit.aet.artemis.athena.dto.TextFeedbackDTO; +import de.tum.cit.aet.artemis.athena.service.AthenaFeedbackSuggestionsService; +import de.tum.cit.aet.artemis.athena.service.AthenaModuleService; +import de.tum.cit.aet.artemis.athena.service.AthenaRepositoryExportService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.exception.NetworkingException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -29,9 +32,6 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.core.security.annotations.ManualConfig; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaFeedbackSuggestionsService; -import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaModuleService; -import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaRepositoryExportService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; import de.tum.cit.aet.artemis.exercise.domain.Submission; diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/web/CourseCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/CourseCompetencyResource.java index ab5d507d3782..07a945d05d59 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/web/CourseCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/CourseCompetencyResource.java @@ -46,10 +46,10 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionInputDTO; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.iris.service.IrisCompetencyGenerationService; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.competency.PyrisCompetencyExtractionInputDTO; import de.tum.cit.aet.artemis.web.rest.dto.CourseCompetencyProgressDTO; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolPairDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/icl/BuildAgentConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/BuildAgentConfiguration.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/programming/icl/BuildAgentConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/buildagent/BuildAgentConfiguration.java index d4fa8eb607aa..b58d6dbd2fa8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/icl/BuildAgentConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/BuildAgentConfiguration.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.icl; +package de.tum.cit.aet.artemis.buildagent; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildAgentDockerService.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildAgentDockerService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildAgentDockerService.java rename to src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildAgentDockerService.java index c5393ce17556..b26eec61a897 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildAgentDockerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildAgentDockerService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.buildagent.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; @@ -39,8 +39,8 @@ import com.hazelcast.map.IMap; import de.tum.cit.aet.artemis.core.exception.LocalCIException; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; /** * Service for Docker related operations in local CI diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildAgentSshKeyService.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildAgentSshKeyService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildAgentSshKeyService.java rename to src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildAgentSshKeyService.java index fad6a056f835..f7e8f697f470 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildAgentSshKeyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildAgentSshKeyService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.buildagent.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobContainerService.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobContainerService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobContainerService.java rename to src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobContainerService.java index 890f39a0da9a..ddd2f9e05ebc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobContainerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobContainerService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.buildagent.service; import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_WORKING_DIRECTORY; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; @@ -43,9 +43,9 @@ import com.github.dockerjava.api.model.HostConfig; import de.tum.cit.aet.artemis.core.exception.LocalCIException; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService.RepositoryCheckoutPath; import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService.RepositoryCheckoutPath; /** * This service contains methods that are used to interact with the Docker containers when executing build jobs in the local CI system. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobExecutionService.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobExecutionService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobExecutionService.java rename to src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobExecutionService.java index 99abc18cae97..2bef49735268 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobExecutionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobExecutionService.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.buildagent.service; +import static de.tum.cit.aet.artemis.buildagent.service.TestResultXmlParser.processTestResultFile; import static de.tum.cit.aet.artemis.core.config.Constants.CHECKED_OUT_REPOS_TEMP_DIR; import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_RESULTS_DIRECTORY; import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_WORKING_DIRECTORY; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; -import static de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent.TestResultXmlParser.processTestResultFile; import java.io.IOException; import java.net.URISyntaxException; @@ -35,16 +35,16 @@ import de.tum.cit.aet.artemis.core.exception.GitException; import de.tum.cit.aet.artemis.core.exception.LocalCIException; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildResult; -import de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.ReportParser; -import de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.exception.UnsupportedToolException; -import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildResult; +import de.tum.cit.aet.artemis.programming.service.localci.scaparser.ReportParser; +import de.tum.cit.aet.artemis.programming.service.localci.scaparser.exception.UnsupportedToolException; +import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobGitService.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobGitService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobGitService.java rename to src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobGitService.java index 9dde4d3455b3..881a4aa22680 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobGitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobGitService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.buildagent.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; @@ -29,9 +29,9 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.exception.GitException; -import de.tum.cit.aet.artemis.core.service.connectors.AbstractGitService; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.service.AbstractGitService; @Profile(PROFILE_BUILDAGENT) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobManagementService.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobManagementService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobManagementService.java index 8442a4d49a5d..3219e291eb49 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildJobManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobManagementService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.buildagent.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; @@ -32,9 +32,9 @@ import com.hazelcast.topic.ITopic; import de.tum.cit.aet.artemis.core.exception.LocalCIException; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildResult; import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildResult; /** * This service is responsible for adding build jobs to the Integrated Code Lifecycle executor service. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildLogsMap.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildLogsMap.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildLogsMap.java rename to src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildLogsMap.java index 472d67a1b78f..6172bc3fe294 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/BuildLogsMap.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildLogsMap.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.buildagent.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/SharedQueueProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/SharedQueueProcessingService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/SharedQueueProcessingService.java rename to src/main/java/de/tum/cit/aet/artemis/buildagent/service/SharedQueueProcessingService.java index b1cec96e3afd..80bf86586fb4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/SharedQueueProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/SharedQueueProcessingService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.buildagent.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; @@ -35,13 +35,13 @@ import com.hazelcast.map.IMap; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildAgentInformation; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildResult; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.JobTimingInfo; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.ResultQueueItem; import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.BuildStatus; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildResult; +import de.tum.cit.aet.artemis.programming.service.localci.dto.JobTimingInfo; +import de.tum.cit.aet.artemis.programming.service.localci.dto.ResultQueueItem; /** * Includes functionality for processing build jobs from the shared build job queue. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/TestResultXmlParser.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/TestResultXmlParser.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/TestResultXmlParser.java rename to src/main/java/de/tum/cit/aet/artemis/buildagent/service/TestResultXmlParser.java index 8557405ec318..68426c31d002 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/buildagent/TestResultXmlParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/TestResultXmlParser.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent; +package de.tum.cit.aet.artemis.buildagent.service; import java.io.IOException; import java.util.Collections; @@ -11,7 +11,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildResult; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildResult; public class TestResultXmlParser { diff --git a/src/main/java/de/tum/cit/aet/artemis/core/aop/logging/LoggingAspect.java b/src/main/java/de/tum/cit/aet/artemis/core/aop/logging/LoggingAspect.java index 1c2e306b46d6..bd6b1668ca0f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/aop/logging/LoggingAspect.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/aop/logging/LoggingAspect.java @@ -15,7 +15,7 @@ import org.springframework.core.env.Profiles; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCAuthException; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.AbstractVersionControlService; +import de.tum.cit.aet.artemis.programming.service.vcs.AbstractVersionControlService; import tech.jhipster.config.JHipsterConstants; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/CacheConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/CacheConfiguration.java index ac3118103cdd..086d214d90b1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/CacheConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/CacheConfiguration.java @@ -50,7 +50,7 @@ import com.hazelcast.spring.cache.HazelcastCacheManager; import com.hazelcast.spring.context.SpringManagedContext; -import de.tum.cit.aet.artemis.core.service.connectors.localci.LocalCIPriorityQueueComparator; +import de.tum.cit.aet.artemis.programming.service.localci.LocalCIPriorityQueueComparator; import de.tum.cit.aet.artemis.service.HazelcastPathSerializer; import tech.jhipster.config.JHipsterProperties; import tech.jhipster.config.cache.PrefixedKeyGenerator; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java b/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java index 483944677fa2..fb18f7707792 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java @@ -39,14 +39,14 @@ import de.tum.cit.aet.artemis.core.repository.StatisticsRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.core.service.connectors.localci.SharedQueueManagementService; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildAgentInformation; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; import de.tum.cit.aet.artemis.exercise.dto.ExerciseTypeMetricsEntry; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.localci.SharedQueueManagementService; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildAgentInformation; import de.tum.cit.aet.artemis.service.ProfileService; import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.MeterRegistry; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/RestTemplateConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/RestTemplateConfiguration.java index 6d4c79ff08f4..a4d06e96c073 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/RestTemplateConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/RestTemplateConfiguration.java @@ -19,8 +19,8 @@ import de.tum.cit.aet.artemis.core.config.auth.AthenaAuthorizationInterceptor; import de.tum.cit.aet.artemis.core.config.auth.PyrisAuthorizationInterceptor; -import de.tum.cit.aet.artemis.core.service.connectors.gitlab.GitLabAuthorizationInterceptor; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsAuthorizationInterceptor; +import de.tum.cit.aet.artemis.programming.service.gitlab.GitLabAuthorizationInterceptor; +import de.tum.cit.aet.artemis.programming.service.jenkins.JenkinsAuthorizationInterceptor; /** * For now only provides a basic {@link org.springframework.web.client.RestTemplate RestTemplate} bean. Can be extended diff --git a/src/main/java/de/tum/cit/aet/artemis/core/domain/User.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/User.java index e214b06237ca..a8e433f06976 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/domain/User.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/User.java @@ -43,10 +43,10 @@ import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfiguration; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsTokenRenewalService; import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; import de.tum.cit.aet.artemis.lecture.domain.LectureUnitCompletion; +import de.tum.cit.aet.artemis.programming.service.vcs.VcsTokenRenewalService; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/exception/ExceptionTranslator.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/ExceptionTranslator.java index 1fb3d1db9171..e743e93a37e3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/exception/ExceptionTranslator.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/ExceptionTranslator.java @@ -33,7 +33,8 @@ import org.zalando.problem.spring.web.advice.security.SecurityAdviceTrait; import org.zalando.problem.violations.ConstraintViolationProblem; -import de.tum.cit.aet.artemis.core.service.connectors.gitlab.GitLabException; +import de.tum.cit.aet.artemis.core.exception.UsernameAlreadyUsedException; +import de.tum.cit.aet.artemis.programming.service.gitlab.GitLabException; import tech.jhipster.web.util.HeaderUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/exception/VersionControlException.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/VersionControlException.java index 289c7ab8da72..6e965dc5ac47 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/exception/VersionControlException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/VersionControlException.java @@ -8,7 +8,7 @@ * declaring "throws Exception" themselves (Although in the end, we just throw an unchecked RuntimeException). */ -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; /** * Generic exception thrown if there are any errors while communicating with the {@link VersionControlService VersionControlService} diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/UserScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/UserScheduleService.java index 1491df4c49f7..ffbe1ec288fa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/UserScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/UserScheduleService.java @@ -20,7 +20,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsUserManagementService; +import de.tum.cit.aet.artemis.programming.service.vcs.VcsUserManagementService; @Service @Profile(PROFILE_SCHEDULING) diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/PyrisChatPipelineExecutionBaseDataDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/PyrisChatPipelineExecutionBaseDataDTO.java deleted file mode 100644 index a3826373a215..000000000000 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/PyrisChatPipelineExecutionBaseDataDTO.java +++ /dev/null @@ -1,15 +0,0 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.chat; - -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonInclude; - -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisMessageDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisUserDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; - -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public record PyrisChatPipelineExecutionBaseDataDTO(List chatHistory, PyrisUserDTO user, PyrisPipelineExecutionSettingsDTO settings, - List initialStages) { -} diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/exercise/PyrisExerciseChatPipelineExecutionDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/exercise/PyrisExerciseChatPipelineExecutionDTO.java deleted file mode 100644 index 6b9b45bb7fa1..000000000000 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/exercise/PyrisExerciseChatPipelineExecutionDTO.java +++ /dev/null @@ -1,19 +0,0 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.chat.exercise; - -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonInclude; - -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisCourseDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisMessageDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisProgrammingExerciseDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisSubmissionDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisUserDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; - -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public record PyrisExerciseChatPipelineExecutionDTO(PyrisSubmissionDTO submission, PyrisProgrammingExerciseDTO exercise, PyrisCourseDTO course, List chatHistory, - PyrisUserDTO user, PyrisPipelineExecutionSettingsDTO settings, List initialStages) { - -} diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExerciseCreationService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExerciseCreationService.java index dfd77f2ab8c2..c8d698ceabec 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExerciseCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExerciseCreationService.java @@ -34,13 +34,13 @@ import de.tum.cit.aet.artemis.communication.domain.AnswerPost; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.apollon.ApollonConversionService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.modeling.service.apollon.ApollonConversionService; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportQuizExerciseCreationService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportQuizExerciseCreationService.java index 343312727405..4652af3a79a2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportQuizExerciseCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportQuizExerciseCreationService.java @@ -35,7 +35,7 @@ import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedText; import de.tum.cit.aet.artemis.quiz.repository.QuizQuestionRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; -import de.tum.cit.aet.artemis.service.DragAndDropQuizAnswerConversionService; +import de.tum.cit.aet.artemis.quiz.service.DragAndDropQuizAnswerConversionService; /** * A service to create the data export for quiz exercise participations. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserCreationService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserCreationService.java index 1ac2fd2d323d..edf62008b9fc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserCreationService.java @@ -12,6 +12,7 @@ import java.util.Set; import java.util.regex.PatternSyntaxException; +import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; import jakarta.annotation.Nullable; import jakarta.validation.constraints.NotNull; @@ -32,9 +33,8 @@ import de.tum.cit.aet.artemis.core.repository.OrganizationRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.core.service.connectors.ci.CIUserManagementService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsUserManagementService; -import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; +import de.tum.cit.aet.artemis.programming.service.ci.CIUserManagementService; +import de.tum.cit.aet.artemis.programming.service.vcs.VcsUserManagementService; import tech.jhipster.security.RandomUtil; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java index 73561b92f52d..8e0058a02579 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java @@ -49,14 +49,14 @@ import de.tum.cit.aet.artemis.core.repository.GuidedTourSettingsRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.core.service.connectors.ci.CIUserManagementService; import de.tum.cit.aet.artemis.core.service.connectors.ldap.LdapAuthenticationProvider; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsUserManagementService; import de.tum.cit.aet.artemis.core.service.ldap.LdapUserDto; import de.tum.cit.aet.artemis.core.service.ldap.LdapUserService; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.programming.domain.ParticipationVCSAccessToken; import de.tum.cit.aet.artemis.programming.service.ParticipationVcsAccessTokenService; +import de.tum.cit.aet.artemis.programming.service.ci.CIUserManagementService; +import de.tum.cit.aet.artemis.programming.service.vcs.VcsUserManagementService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/AccountResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/AccountResource.java index 0a204800448b..0c3737893042 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/AccountResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/AccountResource.java @@ -35,10 +35,10 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.service.AccountService; -import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCPersonalAccessTokenManagementService; import de.tum.cit.aet.artemis.core.service.user.UserCreationService; import de.tum.cit.aet.artemis.core.service.user.UserService; -import de.tum.cit.aet.artemis.programming.icl.ssh.HashUtils; +import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCPersonalAccessTokenManagementService; +import de.tum.cit.aet.artemis.programming.service.localvc.ssh.HashUtils; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.dto.PasswordChangeDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java index d8f6494fd1ec..bcd672ce26c8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java @@ -21,11 +21,11 @@ import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.core.service.connectors.localci.SharedQueueManagementService; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildAgentInformation; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; import de.tum.cit.aet.artemis.programming.domain.BuildJob; import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; +import de.tum.cit.aet.artemis.programming.service.localci.SharedQueueManagementService; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; import de.tum.cit.aet.artemis.service.dto.BuildJobResultCountDTO; import de.tum.cit.aet.artemis.service.dto.BuildJobsStatisticsDTO; import de.tum.cit.aet.artemis.service.dto.FinishedBuildJobDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java index 8509cc3e2cc0..58132b8606d9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java @@ -2,6 +2,7 @@ import java.util.UUID; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -21,10 +22,9 @@ import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiDynamicRegistrationService; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; +import de.tum.cit.aet.artemis.lti.service.LtiDynamicRegistrationService; /** * REST controller for managing LTI platform configurations. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/filter/Lti13LaunchFilter.java b/src/main/java/de/tum/cit/aet/artemis/core/web/filter/Lti13LaunchFilter.java index c2b340c20cda..1f353be7e19d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/filter/Lti13LaunchFilter.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/filter/Lti13LaunchFilter.java @@ -23,10 +23,10 @@ import de.tum.cit.aet.artemis.core.exception.LtiEmailAlreadyInUseException; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.core.service.connectors.lti.Lti13Service; import de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer; import de.tum.cit.aet.artemis.lti.dto.Claims; import de.tum.cit.aet.artemis.lti.dto.LtiAuthenticationResponse; +import de.tum.cit.aet.artemis.lti.service.Lti13Service; import uk.ac.ox.ctl.lti13.security.oauth2.client.lti.authentication.OidcAuthenticationToken; import uk.ac.ox.ctl.lti13.security.oauth2.client.lti.web.OAuth2LoginAuthenticationFilter; diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamService.java index a97a2f5f6b41..4b6fba997d95 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamService.java @@ -61,7 +61,6 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.core.service.export.CourseExamExportService; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; @@ -90,6 +89,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizPool; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamService.java index c97f95468f1f..82e2844e0d17 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamService.java @@ -19,13 +19,13 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlRepositoryPermission; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.dto.TeamImportStrategyType; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlRepositoryPermission; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.dto.TeamSearchUserDTO; import de.tum.cit.aet.artemis.web.rest.TeamResource; diff --git a/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionService.java index bb39985b653c..98f4c49ca25e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionService.java @@ -23,12 +23,12 @@ import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.service.FeedbackService; +import de.tum.cit.aet.artemis.athena.service.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.EmptyFileException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.Submission; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisChatWebsocketDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisChatWebsocketDTO.java index bc3adb766b19..75b56488e513 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisChatWebsocketDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisChatWebsocketDTO.java @@ -7,9 +7,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; import de.tum.cit.aet.artemis.iris.service.IrisRateLimitService; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageDTO; /** * A DTO for sending status updates of Iris to the client via the websocket diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisCompetencyGenerationService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisCompetencyGenerationService.java index d2e6cca94dab..2efd0f3f7090 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisCompetencyGenerationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisCompetencyGenerationService.java @@ -6,12 +6,12 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisJobService; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisPipelineService; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionPipelineExecutionDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency.PyrisCompetencyRecommendationDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.CompetencyExtractionJob; +import de.tum.cit.aet.artemis.iris.service.pyris.PyrisJobService; +import de.tum.cit.aet.artemis.iris.service.pyris.PyrisPipelineService; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.competency.PyrisCompetencyExtractionPipelineExecutionDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.competency.PyrisCompetencyRecommendationDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.job.CompetencyExtractionJob; import de.tum.cit.aet.artemis.iris.service.websocket.IrisWebsocketService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisConnectorException.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorException.java similarity index 70% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisConnectorException.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorException.java index b7702b3acc9d..96051a3b5262 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisConnectorException.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris; +package de.tum.cit.aet.artemis.iris.service.pyris; public class PyrisConnectorException extends RuntimeException { diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisConnectorService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorService.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisConnectorService.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorService.java index 8d97d36e07da..32d587b3f419 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisConnectorService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorService.java @@ -1,8 +1,9 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris; +package de.tum.cit.aet.artemis.iris.service.pyris; import java.util.Arrays; import java.util.List; +import de.tum.cit.aet.artemis.lti.web.open.PublicPyrisStatusUpdateResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Qualifier; @@ -17,12 +18,11 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.PyrisModelDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; import de.tum.cit.aet.artemis.iris.exception.IrisException; import de.tum.cit.aet.artemis.iris.exception.IrisForbiddenException; import de.tum.cit.aet.artemis.iris.exception.IrisInternalPyrisErrorException; -import de.tum.cit.aet.artemis.lti.web.open.PublicPyrisStatusUpdateResource; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.PyrisModelDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; /** * This service connects to the Python implementation of Iris (called Pyris). diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisDTOService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisDTOService.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisDTOService.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisDTOService.java index d8184493e2a9..0f07d9625b40 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisDTOService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisDTOService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris; +package de.tum.cit.aet.artemis.iris.service.pyris; import static de.tum.cit.aet.artemis.core.util.TimeUtil.toInstant; @@ -15,18 +15,18 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisBuildLogEntryDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisFeedbackDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisMessageDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisProgrammingExerciseDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisResultDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisSubmissionDTO; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisBuildLogEntryDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisFeedbackDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisMessageDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisProgrammingExerciseDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisResultDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisSubmissionDTO; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.Repository; +import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.RepositoryService; import de.tum.cit.aet.artemis.service.ProfileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisHealthIndicator.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisHealthIndicator.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisHealthIndicator.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisHealthIndicator.java index 2c8dd7a2bf51..1d75191b2e56 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisHealthIndicator.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisHealthIndicator.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris; +package de.tum.cit.aet.artemis.iris.service.pyris; import java.net.URI; @@ -12,7 +12,7 @@ import org.springframework.web.client.RestTemplate; import de.tum.cit.aet.artemis.core.service.connectors.ConnectorHealth; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.PyrisHealthStatusDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.PyrisHealthStatusDTO; @Component @Profile("iris") diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisJobService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisJobService.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisJobService.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisJobService.java index f89a492a93fc..17ce4ac99495 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisJobService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisJobService.java @@ -1,9 +1,11 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris; +package de.tum.cit.aet.artemis.iris.service.pyris; import java.security.SecureRandom; import java.util.concurrent.TimeUnit; import java.util.function.Function; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; import jakarta.annotation.PostConstruct; import jakarta.servlet.http.HttpServletRequest; @@ -15,12 +17,10 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.map.IMap; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.CourseChatJob; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.ExerciseChatJob; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.IngestionWebhookJob; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.PyrisJob; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.ConflictException; +import de.tum.cit.aet.artemis.iris.service.pyris.job.CourseChatJob; +import de.tum.cit.aet.artemis.iris.service.pyris.job.ExerciseChatJob; +import de.tum.cit.aet.artemis.iris.service.pyris.job.IngestionWebhookJob; +import de.tum.cit.aet.artemis.iris.service.pyris.job.PyrisJob; /** * The PyrisJobService class is responsible for managing Pyris jobs in the Artemis system. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisPipelineService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisPipelineService.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisPipelineService.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisPipelineService.java index c131cd9237e8..155e396d72b6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisPipelineService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisPipelineService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris; +package de.tum.cit.aet.artemis.iris.service.pyris; import java.util.HashMap; import java.util.HashSet; @@ -18,20 +18,20 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyJol; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.PyrisPipelineExecutionDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.chat.course.PyrisCourseChatPipelineExecutionDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.chat.exercise.PyrisExerciseChatPipelineExecutionDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisCourseDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisExtendedCourseDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisUserDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.service.LearningMetricsService; import de.tum.cit.aet.artemis.iris.domain.session.IrisCourseChatSession; import de.tum.cit.aet.artemis.iris.domain.session.IrisExerciseChatSession; import de.tum.cit.aet.artemis.iris.exception.IrisException; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.PyrisPipelineExecutionDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.PyrisPipelineExecutionSettingsDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.chat.course.PyrisCourseChatPipelineExecutionDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.chat.exercise.PyrisExerciseChatPipelineExecutionDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisCourseDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisExtendedCourseDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisUserDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageDTO; import de.tum.cit.aet.artemis.iris.service.websocket.IrisChatWebsocketService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisStatusUpdateService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisStatusUpdateService.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisStatusUpdateService.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisStatusUpdateService.java index b9db16056a87..b5580932a74e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisStatusUpdateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisStatusUpdateService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris; +package de.tum.cit.aet.artemis.iris.service.pyris; import java.util.List; @@ -7,16 +7,16 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageState; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.CompetencyExtractionJob; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.CourseChatJob; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.ExerciseChatJob; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.IngestionWebhookJob; import de.tum.cit.aet.artemis.iris.service.IrisCompetencyGenerationService; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.chat.PyrisChatStatusUpdateDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageState; +import de.tum.cit.aet.artemis.iris.service.pyris.job.CompetencyExtractionJob; +import de.tum.cit.aet.artemis.iris.service.pyris.job.CourseChatJob; +import de.tum.cit.aet.artemis.iris.service.pyris.job.ExerciseChatJob; +import de.tum.cit.aet.artemis.iris.service.pyris.job.IngestionWebhookJob; import de.tum.cit.aet.artemis.iris.service.session.IrisCourseChatSessionService; import de.tum.cit.aet.artemis.iris.service.session.IrisExerciseChatSessionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisWebhookService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisWebhookService.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisWebhookService.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisWebhookService.java index 7338848f0358..31018290664d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/PyrisWebhookService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisWebhookService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris; +package de.tum.cit.aet.artemis.iris.service.pyris; import java.io.IOException; import java.net.URI; @@ -15,12 +15,12 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.Course; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureUnitWebhookDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; import de.tum.cit.aet.artemis.iris.domain.settings.IrisCourseSettings; import de.tum.cit.aet.artemis.iris.exception.IrisInternalPyrisErrorException; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.PyrisPipelineExecutionSettingsDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.lectureingestionwebhook.PyrisLectureUnitWebhookDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; import de.tum.cit.aet.artemis.lecture.domain.AttachmentType; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisErrorResponseDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/PyrisErrorResponseDTO.java similarity index 76% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisErrorResponseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/PyrisErrorResponseDTO.java index 4c7f54b4db24..afd39d258a2a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisErrorResponseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/PyrisErrorResponseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto; +package de.tum.cit.aet.artemis.iris.service.pyris.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisHealthStatusDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/PyrisHealthStatusDTO.java similarity index 78% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisHealthStatusDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/PyrisHealthStatusDTO.java index 31a023ccbd69..429ff32f9335 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisHealthStatusDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/PyrisHealthStatusDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto; +package de.tum.cit.aet.artemis.iris.service.pyris.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisModelDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/PyrisModelDTO.java similarity index 72% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisModelDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/PyrisModelDTO.java index a8815239a47c..705fada64870 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisModelDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/PyrisModelDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto; +package de.tum.cit.aet.artemis.iris.service.pyris.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisPipelineExecutionDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/PyrisPipelineExecutionDTO.java similarity index 61% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisPipelineExecutionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/PyrisPipelineExecutionDTO.java index e18466b9ffa0..979efe0658f1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisPipelineExecutionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/PyrisPipelineExecutionDTO.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto; +package de.tum.cit.aet.artemis.iris.service.pyris.dto; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisPipelineExecutionDTO(PyrisPipelineExecutionSettingsDTO settings, List initialStages) { diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisPipelineExecutionSettingsDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/PyrisPipelineExecutionSettingsDTO.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisPipelineExecutionSettingsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/PyrisPipelineExecutionSettingsDTO.java index c4b7a31d3823..bc0966e10146 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/PyrisPipelineExecutionSettingsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/PyrisPipelineExecutionSettingsDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto; +package de.tum.cit.aet.artemis.iris.service.pyris.dto; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/PyrisChatPipelineExecutionBaseDataDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/PyrisChatPipelineExecutionBaseDataDTO.java new file mode 100644 index 000000000000..fcd60b66b86b --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/PyrisChatPipelineExecutionBaseDataDTO.java @@ -0,0 +1,15 @@ +package de.tum.cit.aet.artemis.iris.service.pyris.dto.chat; + +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonInclude; + +import de.tum.cit.aet.artemis.iris.service.pyris.dto.PyrisPipelineExecutionSettingsDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisMessageDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisUserDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageDTO; + +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public record PyrisChatPipelineExecutionBaseDataDTO(List chatHistory, PyrisUserDTO user, PyrisPipelineExecutionSettingsDTO settings, + List initialStages) { +} diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/PyrisChatStatusUpdateDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/PyrisChatStatusUpdateDTO.java similarity index 60% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/PyrisChatStatusUpdateDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/PyrisChatStatusUpdateDTO.java index 7dbfb317c36f..cbfa0b2d98dd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/PyrisChatStatusUpdateDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/PyrisChatStatusUpdateDTO.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.chat; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.chat; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisChatStatusUpdateDTO(String result, List stages, List suggestions) { diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java similarity index 51% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java index ab3a90694f5f..6198bfa632e1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java @@ -1,14 +1,14 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.chat.course; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.chat.course; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisExtendedCourseDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisMessageDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data.PyrisUserDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.PyrisPipelineExecutionSettingsDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisExtendedCourseDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisMessageDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisUserDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO; import de.tum.cit.aet.artemis.web.rest.dto.metrics.StudentMetricsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/exercise/PyrisExerciseChatPipelineExecutionDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/exercise/PyrisExerciseChatPipelineExecutionDTO.java new file mode 100644 index 000000000000..e4c609042e6d --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/exercise/PyrisExerciseChatPipelineExecutionDTO.java @@ -0,0 +1,19 @@ +package de.tum.cit.aet.artemis.iris.service.pyris.dto.chat.exercise; + +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonInclude; + +import de.tum.cit.aet.artemis.iris.service.pyris.dto.PyrisPipelineExecutionSettingsDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisCourseDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisMessageDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisProgrammingExerciseDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisSubmissionDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisUserDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageDTO; + +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public record PyrisExerciseChatPipelineExecutionDTO(PyrisSubmissionDTO submission, PyrisProgrammingExerciseDTO exercise, PyrisCourseDTO course, List chatHistory, + PyrisUserDTO user, PyrisPipelineExecutionSettingsDTO settings, List initialStages) { + +} diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionInputDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/competency/PyrisCompetencyExtractionInputDTO.java similarity index 75% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionInputDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/competency/PyrisCompetencyExtractionInputDTO.java index ebd0108e6f18..ab0b03b1ce2f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionInputDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/competency/PyrisCompetencyExtractionInputDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.competency; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java index ddb6f5eec857..22fcaa3c1f9a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java @@ -1,9 +1,9 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.competency; import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.PyrisPipelineExecutionDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.PyrisPipelineExecutionDTO; /** * DTO to execute the Iris competency extraction pipeline on Pyris diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java index daa9d8d390d5..fae4365feed5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.competency; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/competency/PyrisCompetencyStatusUpdateDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/competency/PyrisCompetencyStatusUpdateDTO.java similarity index 78% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/competency/PyrisCompetencyStatusUpdateDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/competency/PyrisCompetencyStatusUpdateDTO.java index dfab26272d67..0956a52f26e8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/competency/PyrisCompetencyStatusUpdateDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/competency/PyrisCompetencyStatusUpdateDTO.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.competency; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageDTO; /** * DTO for the Iris competency generation feature. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisBuildLogEntryDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisBuildLogEntryDTO.java similarity index 73% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisBuildLogEntryDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisBuildLogEntryDTO.java index 084927701f5b..8eaeae27b861 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisBuildLogEntryDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisBuildLogEntryDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.data; import java.time.Instant; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisCompetencyDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisCompetencyDTO.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisCompetencyDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisCompetencyDTO.java index 35f1d103f463..61ed07d77012 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisCompetencyDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisCompetencyDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.data; import static de.tum.cit.aet.artemis.core.util.TimeUtil.toInstant; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisCourseDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisCourseDTO.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisCourseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisCourseDTO.java index e1d82cedbab3..911bf958cee1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisCourseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisCourseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.data; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisExamDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisExamDTO.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisExamDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisExamDTO.java index b12b3f893c3c..4dbc4de37f0a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisExamDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisExamDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.data; import static de.tum.cit.aet.artemis.core.util.TimeUtil.toInstant; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisExerciseWithStudentSubmissionsDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisExerciseWithStudentSubmissionsDTO.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisExerciseWithStudentSubmissionsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisExerciseWithStudentSubmissionsDTO.java index ade99fd328d9..438dd0dfa171 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisExerciseWithStudentSubmissionsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisExerciseWithStudentSubmissionsDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.data; import static de.tum.cit.aet.artemis.core.util.TimeUtil.toInstant; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisExtendedCourseDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisExtendedCourseDTO.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisExtendedCourseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisExtendedCourseDTO.java index d301c937683f..9439793b8887 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisExtendedCourseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisExtendedCourseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.data; import static de.tum.cit.aet.artemis.core.util.TimeUtil.toInstant; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisFeedbackDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisFeedbackDTO.java similarity index 72% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisFeedbackDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisFeedbackDTO.java index fa1bd7a631e4..f153c1a121af 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisFeedbackDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisFeedbackDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.data; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisImageMessageContentDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisImageMessageContentDTO.java similarity index 73% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisImageMessageContentDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisImageMessageContentDTO.java index 59a19c269ee1..1594eb14de29 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisImageMessageContentDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisImageMessageContentDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.data; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisJsonMessageContentDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisJsonMessageContentDTO.java similarity index 79% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisJsonMessageContentDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisJsonMessageContentDTO.java index b66e77da71f2..dbaf59617e06 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisJsonMessageContentDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisJsonMessageContentDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.data; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonRawValue; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisLectureDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisLectureDTO.java similarity index 81% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisLectureDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisLectureDTO.java index fa43b0296440..1bffb1a99369 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisLectureDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisLectureDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.data; import java.time.ZonedDateTime; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisLectureUnitDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisLectureUnitDTO.java similarity index 77% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisLectureUnitDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisLectureUnitDTO.java index 98a23882425e..f14c77f5d162 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisLectureUnitDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisLectureUnitDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.data; import java.time.Instant; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisMessageContentBaseDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisMessageContentBaseDTO.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisMessageContentBaseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisMessageContentBaseDTO.java index dde0e79420be..cba000fe4e57 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisMessageContentBaseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisMessageContentBaseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.data; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonSubTypes; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisMessageDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisMessageDTO.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisMessageDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisMessageDTO.java index 8a2e278ee980..4b7b9f785f4e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisMessageDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisMessageDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.data; import static de.tum.cit.aet.artemis.core.util.TimeUtil.toInstant; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisProgrammingExerciseDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisProgrammingExerciseDTO.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisProgrammingExerciseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisProgrammingExerciseDTO.java index 6674ef570521..ecb84ca7ab8a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisProgrammingExerciseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisProgrammingExerciseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.data; import java.time.Instant; import java.util.Map; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisResultDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisResultDTO.java similarity index 78% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisResultDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisResultDTO.java index 5bead90a9361..b8c94756bc87 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisResultDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisResultDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.data; import java.time.Instant; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisStudentSubmissionDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisStudentSubmissionDTO.java similarity index 74% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisStudentSubmissionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisStudentSubmissionDTO.java index 854939c43845..aa270f0a7e96 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisStudentSubmissionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisStudentSubmissionDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.data; import java.time.Instant; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisSubmissionDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisSubmissionDTO.java similarity index 84% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisSubmissionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisSubmissionDTO.java index 01c97ec21ac5..67fe29dbba2c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisSubmissionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisSubmissionDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.data; import java.time.Instant; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisTextMessageContentDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisTextMessageContentDTO.java similarity index 73% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisTextMessageContentDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisTextMessageContentDTO.java index efd0dbe50ce4..a2703f2e2327 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisTextMessageContentDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisTextMessageContentDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.data; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisUserDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisUserDTO.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisUserDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisUserDTO.java index acc907932045..4a9ec39fd7f8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/data/PyrisUserDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/data/PyrisUserDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.data; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.data; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java similarity index 55% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java index 91ad5329faca..b49aafefac79 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.lectureingestionwebhook; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.lectureingestionwebhook; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisLectureIngestionStatusUpdateDTO(String result, List stages) { diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java index 2825c58e1dd4..1bef48d26c2e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.lectureingestionwebhook; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.lectureingestionwebhook; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureIngestionExecutionDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureIngestionExecutionDTO.java similarity index 54% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureIngestionExecutionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureIngestionExecutionDTO.java index 976a75f99e1f..4ef052e91de3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureIngestionExecutionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureIngestionExecutionDTO.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.lectureingestionwebhook; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.lectureingestionwebhook; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.PyrisPipelineExecutionSettingsDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisWebhookLectureIngestionExecutionDTO(List pyrisLectureUnitWebhookDTOS, PyrisPipelineExecutionSettingsDTO settings, diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/status/PyrisStageDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/status/PyrisStageDTO.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/status/PyrisStageDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/status/PyrisStageDTO.java index 0ff50f937a87..366895c2e7c5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/status/PyrisStageDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/status/PyrisStageDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.status; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/status/PyrisStageState.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/status/PyrisStageState.java similarity index 79% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/status/PyrisStageState.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/status/PyrisStageState.java index 849866d00142..7563a3e3f47e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/dto/status/PyrisStageState.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/status/PyrisStageState.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status; +package de.tum.cit.aet.artemis.iris.service.pyris.dto.status; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/CompetencyExtractionJob.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/job/CompetencyExtractionJob.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/CompetencyExtractionJob.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/job/CompetencyExtractionJob.java index 73d9de481fed..26ab6427a020 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/CompetencyExtractionJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/job/CompetencyExtractionJob.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.job; +package de.tum.cit.aet.artemis.iris.service.pyris.job; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/CourseChatJob.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/job/CourseChatJob.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/CourseChatJob.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/job/CourseChatJob.java index 4a84793d8495..fb4b93a28854 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/CourseChatJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/job/CourseChatJob.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.job; +package de.tum.cit.aet.artemis.iris.service.pyris.job; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/ExerciseChatJob.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/job/ExerciseChatJob.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/ExerciseChatJob.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/job/ExerciseChatJob.java index dc33a35033e9..302ae274d8e2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/ExerciseChatJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/job/ExerciseChatJob.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.job; +package de.tum.cit.aet.artemis.iris.service.pyris.job; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/IngestionWebhookJob.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/job/IngestionWebhookJob.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/IngestionWebhookJob.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/job/IngestionWebhookJob.java index 424bcb0d65c0..e29bb966520f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/IngestionWebhookJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/job/IngestionWebhookJob.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.job; +package de.tum.cit.aet.artemis.iris.service.pyris.job; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.domain.Exercise; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/PyrisJob.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/job/PyrisJob.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/PyrisJob.java rename to src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/job/PyrisJob.java index f49c49b546a7..d61d691beb52 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/pyris/job/PyrisJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/job/PyrisJob.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.pyris.job; +package de.tum.cit.aet.artemis.iris.service.pyris.job; import java.io.Serializable; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisCourseChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisCourseChatSessionService.java index b9e9d740486f..2e76eca547a8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisCourseChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisCourseChatSessionService.java @@ -16,9 +16,6 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisPipelineService; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.CourseChatJob; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessageSender; import de.tum.cit.aet.artemis.iris.domain.message.IrisTextMessageContent; @@ -28,6 +25,9 @@ import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; import de.tum.cit.aet.artemis.iris.service.IrisMessageService; import de.tum.cit.aet.artemis.iris.service.IrisRateLimitService; +import de.tum.cit.aet.artemis.iris.service.pyris.PyrisPipelineService; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.chat.PyrisChatStatusUpdateDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.job.CourseChatJob; import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; import de.tum.cit.aet.artemis.iris.service.websocket.IrisChatWebsocketService; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisExerciseChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisExerciseChatSessionService.java index 36d01d8ebe63..27e402cb7380 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisExerciseChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisExerciseChatSessionService.java @@ -11,9 +11,6 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisPipelineService; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.ExerciseChatJob; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessageSender; @@ -23,6 +20,9 @@ import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; import de.tum.cit.aet.artemis.iris.service.IrisMessageService; import de.tum.cit.aet.artemis.iris.service.IrisRateLimitService; +import de.tum.cit.aet.artemis.iris.service.pyris.PyrisPipelineService; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.chat.PyrisChatStatusUpdateDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.job.ExerciseChatJob; import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; import de.tum.cit.aet.artemis.iris.service.websocket.IrisChatWebsocketService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisHestiaSessionService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisHestiaSessionService.java index b255f5876e50..642cb8df2cd0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisHestiaSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisHestiaSessionService.java @@ -12,11 +12,11 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisConnectorService; import de.tum.cit.aet.artemis.iris.domain.session.IrisHestiaSession; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; import de.tum.cit.aet.artemis.iris.repository.IrisHestiaSessionRepository; import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; +import de.tum.cit.aet.artemis.iris.service.pyris.PyrisConnectorService; import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/websocket/IrisChatWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/websocket/IrisChatWebsocketService.java index e66000260e37..d5e81961f642 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/websocket/IrisChatWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/websocket/IrisChatWebsocketService.java @@ -5,11 +5,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; import de.tum.cit.aet.artemis.iris.domain.session.IrisChatSession; import de.tum.cit.aet.artemis.iris.dto.IrisChatWebsocketDTO; import de.tum.cit.aet.artemis.iris.service.IrisRateLimitService; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageDTO; @Service @Profile("iris") diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisCourseChatSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisCourseChatSessionResource.java index bcdb2d61eb58..37f4c34672b4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisCourseChatSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisCourseChatSessionResource.java @@ -15,12 +15,12 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisHealthIndicator; import de.tum.cit.aet.artemis.iris.domain.session.IrisCourseChatSession; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; import de.tum.cit.aet.artemis.iris.repository.IrisCourseChatSessionRepository; import de.tum.cit.aet.artemis.iris.service.IrisRateLimitService; import de.tum.cit.aet.artemis.iris.service.IrisSessionService; +import de.tum.cit.aet.artemis.iris.service.pyris.PyrisHealthIndicator; import de.tum.cit.aet.artemis.iris.service.session.IrisCourseChatSessionService; import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisExerciseChatSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisExerciseChatSessionResource.java index f2e58739afe1..7e37014b1a82 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisExerciseChatSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisExerciseChatSessionResource.java @@ -15,7 +15,6 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisHealthIndicator; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.iris.domain.session.IrisExerciseChatSession; @@ -23,6 +22,7 @@ import de.tum.cit.aet.artemis.iris.repository.IrisExerciseChatSessionRepository; import de.tum.cit.aet.artemis.iris.service.IrisRateLimitService; import de.tum.cit.aet.artemis.iris.service.IrisSessionService; +import de.tum.cit.aet.artemis.iris.service.pyris.PyrisHealthIndicator; import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.core.exception.ConflictException; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisModelsResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisModelsResource.java index f076cb191fde..5277204b73b2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisModelsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisModelsResource.java @@ -2,6 +2,7 @@ import java.util.List; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import org.springframework.context.annotation.Profile; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; @@ -9,10 +10,9 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisConnectorException; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisConnectorService; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.PyrisModelDTO; -import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; +import de.tum.cit.aet.artemis.iris.service.pyris.PyrisConnectorException; +import de.tum.cit.aet.artemis.iris.service.pyris.PyrisConnectorService; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.PyrisModelDTO; /** * REST controller for managing the models Pyris provides. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisResource.java index e41ee5150f22..e5c4a1d2769a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisResource.java @@ -9,8 +9,8 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisHealthIndicator; import de.tum.cit.aet.artemis.iris.service.IrisRateLimitService; +import de.tum.cit.aet.artemis.iris.service.pyris.PyrisHealthIndicator; @Profile("iris") @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureImportService.java b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureImportService.java index 2306788bbaa3..2412bdceb441 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureImportService.java @@ -17,8 +17,8 @@ import org.springframework.transaction.annotation.Transactional; import de.tum.cit.aet.artemis.core.domain.Course; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisWebhookService; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; +import de.tum.cit.aet.artemis.iris.service.pyris.PyrisWebhookService; import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureService.java b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureService.java index 430089d40fbb..0e3546ecc004 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureService.java @@ -21,7 +21,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisWebhookService; +import de.tum.cit.aet.artemis.iris.service.pyris.PyrisWebhookService; import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitService.java b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitService.java index 577a0bfdca80..648519862e5d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitService.java @@ -25,9 +25,9 @@ import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisWebhookService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.iris.service.pyris.PyrisWebhookService; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; import de.tum.cit.aet.artemis.lecture.domain.Lecture; diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/config/CustomLti13Configurer.java b/src/main/java/de/tum/cit/aet/artemis/lti/config/CustomLti13Configurer.java index f33d4d2aee47..8b10bf04750c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/config/CustomLti13Configurer.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/config/CustomLti13Configurer.java @@ -8,8 +8,8 @@ import org.springframework.stereotype.Component; import de.tum.cit.aet.artemis.core.security.jwt.JWTFilter; -import de.tum.cit.aet.artemis.core.service.connectors.lti.Lti13Service; import de.tum.cit.aet.artemis.core.web.filter.Lti13LaunchFilter; +import de.tum.cit.aet.artemis.lti.service.Lti13Service; import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; import uk.ac.ox.ctl.lti13.Lti13Configurer; import uk.ac.ox.ctl.lti13.security.oauth2.client.lti.authentication.OidcLaunchFlowAuthenticationProvider; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/ExternalPasswordResetInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/lti/service/ExternalPasswordResetInfoContributor.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/ExternalPasswordResetInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/lti/service/ExternalPasswordResetInfoContributor.java index 2603238486f2..3c6cf56f793e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/ExternalPasswordResetInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/service/ExternalPasswordResetInfoContributor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.lti; +package de.tum.cit.aet.artemis.lti.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/Lti13Service.java b/src/main/java/de/tum/cit/aet/artemis/lti/service/Lti13Service.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/Lti13Service.java rename to src/main/java/de/tum/cit/aet/artemis/lti/service/Lti13Service.java index afebd79d5c46..e61ebbf1c477 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/Lti13Service.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/service/Lti13Service.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.lti; +package de.tum.cit.aet.artemis.lti.service; import java.net.URI; import java.net.URISyntaxException; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiDeepLinkingService.java b/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiDeepLinkingService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiDeepLinkingService.java rename to src/main/java/de/tum/cit/aet/artemis/lti/service/LtiDeepLinkingService.java index 791a00bbc083..eefd8ddffa13 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiDeepLinkingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiDeepLinkingService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.lti; +package de.tum.cit.aet.artemis.lti.service; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiDynamicRegistrationService.java b/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiDynamicRegistrationService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiDynamicRegistrationService.java rename to src/main/java/de/tum/cit/aet/artemis/lti/service/LtiDynamicRegistrationService.java index 51463f70ff14..b8864ba32f48 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiDynamicRegistrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiDynamicRegistrationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.lti; +package de.tum.cit.aet.artemis.lti.service; import java.util.UUID; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiNewResultService.java b/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiNewResultService.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiNewResultService.java rename to src/main/java/de/tum/cit/aet/artemis/lti/service/LtiNewResultService.java index f2fdfb2ec8b3..d9bf9b36575b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiNewResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiNewResultService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.lti; +package de.tum.cit.aet.artemis.lti.service; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiService.java b/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiService.java rename to src/main/java/de/tum/cit/aet/artemis/lti/service/LtiService.java index 487ac18281d3..6051e1df5680 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/lti/LtiService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.lti; +package de.tum.cit.aet.artemis.lti.service; import java.util.Collections; import java.util.HashSet; @@ -33,10 +33,10 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.jwt.JWTCookieService; -import de.tum.cit.aet.artemis.core.service.connectors.ci.CIUserManagementService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsUserManagementService; import de.tum.cit.aet.artemis.core.service.user.UserCreationService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.programming.service.ci.CIUserManagementService; +import de.tum.cit.aet.artemis.programming.service.vcs.VcsUserManagementService; import tech.jhipster.security.RandomUtil; @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicPyrisStatusUpdateResource.java b/src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicPyrisStatusUpdateResource.java index ab0b98f8f4e3..d2943a3cefa9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicPyrisStatusUpdateResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicPyrisStatusUpdateResource.java @@ -2,6 +2,8 @@ import java.util.Objects; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; import jakarta.servlet.http.HttpServletRequest; import org.springframework.context.annotation.Profile; @@ -13,18 +15,16 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisJobService; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisStatusUpdateService; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.CompetencyExtractionJob; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.CourseChatJob; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.ExerciseChatJob; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.IngestionWebhookJob; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.job.PyrisJob; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.ConflictException; +import de.tum.cit.aet.artemis.iris.service.pyris.PyrisJobService; +import de.tum.cit.aet.artemis.iris.service.pyris.PyrisStatusUpdateService; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.chat.PyrisChatStatusUpdateDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.job.CompetencyExtractionJob; +import de.tum.cit.aet.artemis.iris.service.pyris.job.CourseChatJob; +import de.tum.cit.aet.artemis.iris.service.pyris.job.ExerciseChatJob; +import de.tum.cit.aet.artemis.iris.service.pyris.job.IngestionWebhookJob; +import de.tum.cit.aet.artemis.iris.service.pyris.job.PyrisJob; /** * REST controller for providing Pyris access to Artemis internal data and status updates. diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java index f987a5565ff0..f5c854abb381 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java @@ -23,11 +23,11 @@ import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.service.FeedbackService; +import de.tum.cit.aet.artemis.athena.service.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/apollon/ApollonConversionService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/apollon/ApollonConversionService.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/apollon/ApollonConversionService.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/apollon/ApollonConversionService.java index 40d7a53358d4..178bc76cdc7a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/apollon/ApollonConversionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/apollon/ApollonConversionService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.apollon; +package de.tum.cit.aet.artemis.modeling.service.apollon; import java.io.IOException; import java.io.InputStream; @@ -12,7 +12,7 @@ import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; -import de.tum.cit.aet.artemis.core.service.connectors.apollon.dto.ApollonModelDTO; +import de.tum.cit.aet.artemis.modeling.service.apollon.dto.ApollonModelDTO; @Service @Profile("apollon") diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/apollon/ApollonHealthIndicator.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/apollon/ApollonHealthIndicator.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/apollon/ApollonHealthIndicator.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/apollon/ApollonHealthIndicator.java index 0eeb3dd66fae..d1d9d107511c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/apollon/ApollonHealthIndicator.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/apollon/ApollonHealthIndicator.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.apollon; +package de.tum.cit.aet.artemis.modeling.service.apollon; import java.util.Map; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/apollon/dto/ApollonModelDTO.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/apollon/dto/ApollonModelDTO.java similarity index 74% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/apollon/dto/ApollonModelDTO.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/service/apollon/dto/ApollonModelDTO.java index 73946354bda7..35fb816ae45d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/apollon/dto/ApollonModelDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/apollon/dto/ApollonModelDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.apollon.dto; +package de.tum.cit.aet.artemis.modeling.service.apollon.dto; import java.io.Serializable; diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ProgrammingPlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ProgrammingPlagiarismDetectionService.java index 97afa474d503..8ef0cf857fe7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ProgrammingPlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ProgrammingPlagiarismDetectionService.java @@ -38,7 +38,6 @@ import de.jplag.reporting.reportobject.ReportObjectFactory; import de.jplag.swift.SwiftLanguage; import de.tum.cit.aet.artemis.core.exception.GitException; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCheckState; @@ -49,6 +48,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseExportService; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseGitDiffReportService; import de.tum.cit.aet.artemis.service.FileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildJob.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildJob.java index c97026c51ba3..59516c3606ae 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildJob.java @@ -15,7 +15,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.domain.DomainObject; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; @Entity @Table(name = "build_job") diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseBuildConfig.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseBuildConfig.java index e7bde4592ba4..e8b5e554c37d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseBuildConfig.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseBuildConfig.java @@ -19,8 +19,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import de.tum.cit.aet.artemis.core.domain.DomainObject; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.Windfile; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.AbstractVersionControlService; +import de.tum.cit.aet.artemis.programming.service.aeolus.Windfile; +import de.tum.cit.aet.artemis.programming.service.vcs.AbstractVersionControlService; @Entity @Table(name = "programming_exercise_build_config") diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseStudentParticipation.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseStudentParticipation.java index b6b72a8588ce..6dcf98ed130a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseStudentParticipation.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExerciseStudentParticipation.java @@ -8,9 +8,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.AbstractVersionControlService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.programming.service.vcs.AbstractVersionControlService; import de.tum.cit.aet.artemis.quiz.config.QuizView; @Entity diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/Repository.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/Repository.java index faa0582a0dbc..f8db60145532 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/Repository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/Repository.java @@ -6,7 +6,7 @@ import org.eclipse.jgit.lib.BaseRepositoryBuilder; -import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCRepositoryUri; +import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCRepositoryUri; /** * This class represents repositories cloned from the VC system to Artemis to then be used in the online editor. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java index 1360e774b4b0..18ea0143b982 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java @@ -21,10 +21,10 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.DockerImageBuild; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.ResultBuildJob; import de.tum.cit.aet.artemis.programming.domain.BuildJob; import de.tum.cit.aet.artemis.programming.domain.BuildStatus; +import de.tum.cit.aet.artemis.programming.service.localci.dto.DockerImageBuild; +import de.tum.cit.aet.artemis.programming.service.localci.dto.ResultBuildJob; import de.tum.cit.aet.artemis.service.dto.BuildJobResultCountDTO; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/AbstractGitService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/AbstractGitService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/AbstractGitService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/AbstractGitService.java index 00fe4ad5ce72..2012a0d57eb2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/AbstractGitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/AbstractGitService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors; +package de.tum.cit.aet.artemis.programming.service; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/AutomaticProgrammingExerciseCleanupService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/AutomaticProgrammingExerciseCleanupService.java index 7b01678ba452..e02d69decd87 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/AutomaticProgrammingExerciseCleanupService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/AutomaticProgrammingExerciseCleanupService.java @@ -21,7 +21,6 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/AuxiliaryRepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/AuxiliaryRepositoryService.java index b9b4259fccc8..ae308a7ee028 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/AuxiliaryRepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/AuxiliaryRepositoryService.java @@ -12,7 +12,6 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; @@ -20,6 +19,7 @@ import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.programming.web.ProgrammingExerciseResourceErrorKeys; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/BuildScriptGenerationService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildScriptGenerationService.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/BuildScriptGenerationService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/BuildScriptGenerationService.java index ee56e45ecbc8..e6a851e04b0a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/BuildScriptGenerationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildScriptGenerationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors; +package de.tum.cit.aet.artemis.programming.service; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/BuildScriptProviderService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildScriptProviderService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/BuildScriptProviderService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/BuildScriptProviderService.java index fc6953f585e4..8ad5a2b92949 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/BuildScriptProviderService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildScriptProviderService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors; +package de.tum.cit.aet.artemis.programming.service; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -18,11 +18,11 @@ import org.springframework.core.io.Resource; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusTemplateService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProjectType; +import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusTemplateService; import de.tum.cit.aet.artemis.service.ResourceLoaderService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/CommitHistoryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/CommitHistoryService.java index 25d620cdbb3b..2c57e38a8ccc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/CommitHistoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/CommitHistoryService.java @@ -18,7 +18,6 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ConsistencyCheckService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ConsistencyCheckService.java index d7bf2cfbc85f..49facc4e3fb1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ConsistencyCheckService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ConsistencyCheckService.java @@ -9,10 +9,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.service.dto.ConsistencyErrorDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/GenericBuildScriptGenerationService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/GenericBuildScriptGenerationService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/GenericBuildScriptGenerationService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/GenericBuildScriptGenerationService.java index 3a4be9d743d7..adabad775f23 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/GenericBuildScriptGenerationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/GenericBuildScriptGenerationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors; +package de.tum.cit.aet.artemis.programming.service; import java.io.IOException; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/GitService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/GitService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/GitService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/GitService.java index 26317267afba..7d734e1b5612 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/GitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/GitService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -73,7 +73,6 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.GitException; -import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.programming.domain.File; @@ -84,6 +83,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.ZipFileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/JavaTemplateUpgradeService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/JavaTemplateUpgradeService.java index fc8a5f79c135..c1cfc62fad3e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/JavaTemplateUpgradeService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/JavaTemplateUpgradeService.java @@ -29,7 +29,6 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.programming.domain.File; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.Repository; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ParticipationVcsAccessTokenService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ParticipationVcsAccessTokenService.java index 9a8428adab24..7c41d9f8452d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ParticipationVcsAccessTokenService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ParticipationVcsAccessTokenService.java @@ -8,11 +8,11 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCPersonalAccessTokenManagementService; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ParticipationVCSAccessToken; import de.tum.cit.aet.artemis.programming.repository.ParticipationVCSAccessTokenRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCPersonalAccessTokenManagementService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingAssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingAssessmentService.java index 0adc0ccdba01..b5ef07ff769f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingAssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingAssessmentService.java @@ -20,16 +20,16 @@ import de.tum.cit.aet.artemis.assessment.service.AssessmentService; import de.tum.cit.aet.artemis.assessment.service.ComplaintResponseService; import de.tum.cit.aet.artemis.assessment.service.ResultService; +import de.tum.cit.aet.artemis.athena.service.AthenaFeedbackSendingService; import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaFeedbackSendingService; -import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiNewResultService; import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; +import de.tum.cit.aet.artemis.lti.service.LtiNewResultService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java index 793feadb36a0..e4618762bb0c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java @@ -20,8 +20,8 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.service.ResultService; +import de.tum.cit.aet.artemis.athena.service.AthenaFeedbackSuggestionsService; import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; -import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaFeedbackSuggestionsService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseExportService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseExportService.java index 9b27ec90fcec..9a7ce6917e2b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseExportService.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService.RepositoryCheckoutPath; -import static de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsXmlFileUtils.getDocumentBuilderFactory; +import static de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService.RepositoryCheckoutPath; +import static de.tum.cit.aet.artemis.programming.service.jenkins.JenkinsXmlFileUtils.getDocumentBuilderFactory; import java.io.File; import java.io.IOException; @@ -55,7 +55,6 @@ import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.exception.GitException; import de.tum.cit.aet.artemis.core.service.ArchivalReportEntry; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java index 0fb9576e7311..1f3021c7adc0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java @@ -43,8 +43,6 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.VersionControlException; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationResultService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; @@ -68,6 +66,8 @@ import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationResultService; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseGradingStatisticsDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportBasicService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportBasicService.java index add9651addc2..bcd23f9ddda3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportBasicService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportBasicService.java @@ -16,7 +16,6 @@ import org.springframework.transaction.annotation.Transactional; import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismDetectionConfig; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; @@ -40,6 +39,7 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.programming.service.hestia.ExerciseHintService; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportFromFileService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportFromFileService.java index cf35694ec06a..7df46466ff0a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportFromFileService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportFromFileService.java @@ -28,7 +28,6 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportService.java index f537f5964000..102c7fd78311 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportService.java @@ -23,10 +23,6 @@ import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationTriggerService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.programming.domain.BuildPlanType; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -36,7 +32,10 @@ import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationTriggerService; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.UriService; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseParticipationService.java index a9fc3c71bf77..3ecd145d1b6a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseParticipationService.java @@ -23,9 +23,6 @@ import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlRepositoryPermission; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; @@ -45,6 +42,8 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlRepositoryPermission; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.web.rest.dto.CommitInfoDTO; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseRepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseRepositoryService.java index 8dffbc00451c..6a77c7732d1e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseRepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseRepositoryService.java @@ -26,8 +26,6 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -37,6 +35,7 @@ import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ResourceLoaderService; import de.tum.cit.aet.artemis.web.rest.SubmissionPolicyResource; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseScheduleService.java index bcfd873e8b5a..9679fbf23593 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseScheduleService.java @@ -42,7 +42,6 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.service.ScheduleService; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.core.util.Tuple; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.StudentExam; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java index 2f9a5e9e1761..5813807c4103 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java @@ -49,14 +49,6 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.core.service.connectors.BuildScriptGenerationService; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusTemplateService; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.Windfile; -import de.tum.cit.aet.artemis.core.service.connectors.ci.CIPermission; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationTriggerService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; @@ -85,8 +77,14 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseGitDiffReportRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.programming.service.aeolus.Windfile; +import de.tum.cit.aet.artemis.programming.service.ci.CIPermission; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationTriggerService; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; import de.tum.cit.aet.artemis.programming.service.structureoraclegenerator.OracleGenerator; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingMessagingService.java index ebc269d71a51..20c46d4107d5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingMessagingService.java @@ -17,11 +17,11 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; -import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiNewResultService; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.lti.service.LtiNewResultService; import de.tum.cit.aet.artemis.programming.domain.BuildRunState; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingSubmissionService.java index 104a6a31699f..59ee646659da 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingSubmissionService.java @@ -28,6 +28,7 @@ import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.service.FeedbackService; +import de.tum.cit.aet.artemis.athena.service.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.VersionControlException; @@ -35,10 +36,6 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; -import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaSubmissionSelectionService; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationTriggerService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exam.service.ExamSubmissionService; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; @@ -64,7 +61,9 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.repository.SubmissionPolicyRepository; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationTriggerService; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseGitDiffReportService; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.SubmissionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingTriggerService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingTriggerService.java index 1dabf291ca32..923273af6dad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingTriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingTriggerService.java @@ -22,7 +22,6 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationTriggerService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; @@ -38,6 +37,7 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationTriggerService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryParticipationService.java index da20429ae49c..3b843cf2627f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryParticipationService.java @@ -9,14 +9,13 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.programming.web.repository.RepositoryActionType; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; /** * Service for managing programming exercise repositories and participations diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryService.java index d9a6cbfe65a3..1921d6816124 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryService.java @@ -35,7 +35,6 @@ import org.springframework.util.FileSystemUtils; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.programming.domain.File; import de.tum.cit.aet.artemis.programming.domain.FileType; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/Action.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/Action.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/Action.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/Action.java index eeae69a1dc36..be22f81ddad9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/Action.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/Action.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.aeolus; +package de.tum.cit.aet.artemis.programming.service.aeolus; import java.util.List; import java.util.Map; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/ActionDeserializer.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/ActionDeserializer.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/ActionDeserializer.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/ActionDeserializer.java index 65f3b7754bf5..65d42487e398 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/ActionDeserializer.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/ActionDeserializer.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.aeolus; +package de.tum.cit.aet.artemis.programming.service.aeolus; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusBuildPlanService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusBuildPlanService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusBuildPlanService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusBuildPlanService.java index 936d9b1f3c97..8485b7ada640 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusBuildPlanService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusBuildPlanService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.aeolus; +package de.tum.cit.aet.artemis.programming.service.aeolus; import static de.tum.cit.aet.artemis.core.config.Constants.ASSIGNMENT_REPO_NAME; import static de.tum.cit.aet.artemis.core.config.Constants.SOLUTION_REPO_NAME; @@ -29,13 +29,13 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.dto.AeolusGenerationResponseDTO; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.programming.domain.AeolusTarget; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.service.InternalUrlService; +import de.tum.cit.aet.artemis.programming.service.aeolus.dto.AeolusGenerationResponseDTO; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; /** * Service for publishing custom build plans using Aeolus diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusBuildScriptGenerationService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusBuildScriptGenerationService.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusBuildScriptGenerationService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusBuildScriptGenerationService.java index 27d88267b614..71a06a68e512 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusBuildScriptGenerationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusBuildScriptGenerationService.java @@ -1,14 +1,14 @@ -package de.tum.cit.aet.artemis.core.service.connectors.aeolus; +package de.tum.cit.aet.artemis.programming.service.aeolus; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; import com.fasterxml.jackson.core.JsonProcessingException; -import de.tum.cit.aet.artemis.core.service.connectors.BuildScriptGenerationService; -import de.tum.cit.aet.artemis.core.service.connectors.BuildScriptProviderService; import de.tum.cit.aet.artemis.programming.domain.AeolusTarget; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.service.BuildScriptGenerationService; +import de.tum.cit.aet.artemis.programming.service.BuildScriptProviderService; import de.tum.cit.aet.artemis.service.ProfileService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusRepository.java similarity index 84% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusRepository.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusRepository.java index 8d561ea05f15..6793fb84db1d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.aeolus; +package de.tum.cit.aet.artemis.programming.service.aeolus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusResult.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusResult.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusResult.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusResult.java index a0018d15d680..12f319121957 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusResult.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusResult.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.aeolus; +package de.tum.cit.aet.artemis.programming.service.aeolus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusTemplateService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusTemplateService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusTemplateService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusTemplateService.java index 96a25d0fa9ed..1787b7672dac 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/AeolusTemplateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusTemplateService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.aeolus; +package de.tum.cit.aet.artemis.programming.service.aeolus; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -21,11 +21,11 @@ import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import de.tum.cit.aet.artemis.core.config.ProgrammingLanguageConfiguration; -import de.tum.cit.aet.artemis.core.service.connectors.BuildScriptProviderService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProjectType; +import de.tum.cit.aet.artemis.programming.service.BuildScriptProviderService; import de.tum.cit.aet.artemis.service.ResourceLoaderService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/DockerConfig.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/DockerConfig.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/DockerConfig.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/DockerConfig.java index d1041ce52958..5f5161737a6a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/DockerConfig.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/DockerConfig.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.aeolus; +package de.tum.cit.aet.artemis.programming.service.aeolus; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/PlatformAction.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/PlatformAction.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/PlatformAction.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/PlatformAction.java index 3ea5281e3b08..5c161ffe798b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/PlatformAction.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/PlatformAction.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.aeolus; +package de.tum.cit.aet.artemis.programming.service.aeolus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/ScriptAction.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/ScriptAction.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/ScriptAction.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/ScriptAction.java index 75ac2b33818e..5006e8a850a6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/ScriptAction.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/ScriptAction.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.aeolus; +package de.tum.cit.aet.artemis.programming.service.aeolus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/Windfile.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/Windfile.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/Windfile.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/Windfile.java index d374e49af20a..a9f2382591d4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/Windfile.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/Windfile.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.aeolus; +package de.tum.cit.aet.artemis.programming.service.aeolus; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/WindfileMetadata.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/WindfileMetadata.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/WindfileMetadata.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/WindfileMetadata.java index 5201b52bcc63..5e9d1547ddfa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/WindfileMetadata.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/WindfileMetadata.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.aeolus; +package de.tum.cit.aet.artemis.programming.service.aeolus; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/dto/AeolusGenerationResponseDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/dto/AeolusGenerationResponseDTO.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/dto/AeolusGenerationResponseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/dto/AeolusGenerationResponseDTO.java index 60a41b7c9b4d..924797bded89 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/aeolus/dto/AeolusGenerationResponseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/dto/AeolusGenerationResponseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.aeolus.dto; +package de.tum.cit.aet.artemis.programming.service.aeolus.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/AbstractBuildPlanCreator.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/AbstractBuildPlanCreator.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/AbstractBuildPlanCreator.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ci/AbstractBuildPlanCreator.java index d0ff049c960b..5aac60f2fca7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/AbstractBuildPlanCreator.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/AbstractBuildPlanCreator.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.ci; +package de.tum.cit.aet.artemis.programming.service.ci; import java.net.URL; import java.util.Map; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/AbstractContinuousIntegrationResultService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/AbstractContinuousIntegrationResultService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/AbstractContinuousIntegrationResultService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ci/AbstractContinuousIntegrationResultService.java index 165933c1cf93..8cf1d2f72149 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/AbstractContinuousIntegrationResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/AbstractContinuousIntegrationResultService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.ci; +package de.tum.cit.aet.artemis.programming.service.ci; import java.time.ZonedDateTime; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/AbstractContinuousIntegrationService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/AbstractContinuousIntegrationService.java similarity index 63% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/AbstractContinuousIntegrationService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ci/AbstractContinuousIntegrationService.java index c218c26d1cdc..30c43b7878a4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/AbstractContinuousIntegrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/AbstractContinuousIntegrationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.ci; +package de.tum.cit.aet.artemis.programming.service.ci; public abstract class AbstractContinuousIntegrationService implements ContinuousIntegrationService { } diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/CIPermission.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/CIPermission.java similarity index 56% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/CIPermission.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ci/CIPermission.java index 46477e07efaf..0bd1ae977faf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/CIPermission.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/CIPermission.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.ci; +package de.tum.cit.aet.artemis.programming.service.ci; public enum CIPermission { READ, EDIT, CREATE, CREATEREPOSITORY, ADMIN diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/CIUserManagementService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/CIUserManagementService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/CIUserManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ci/CIUserManagementService.java index e22076ad816c..883e0c83f63b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/CIUserManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/CIUserManagementService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.ci; +package de.tum.cit.aet.artemis.programming.service.ci; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationResultService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/ContinuousIntegrationResultService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationResultService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ci/ContinuousIntegrationResultService.java index 571c72f332a6..aa8b3959ed67 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/ContinuousIntegrationResultService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.ci; +package de.tum.cit.aet.artemis.programming.service.ci; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationServerHealthIndicator.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/ContinuousIntegrationServerHealthIndicator.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationServerHealthIndicator.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ci/ContinuousIntegrationServerHealthIndicator.java index 1e13a3d80d98..05e50f67e25b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationServerHealthIndicator.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/ContinuousIntegrationServerHealthIndicator.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.ci; +package de.tum.cit.aet.artemis.programming.service.ci; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/ContinuousIntegrationService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ci/ContinuousIntegrationService.java index da094436c5f8..a35b449286a7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/ContinuousIntegrationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.ci; +package de.tum.cit.aet.artemis.programming.service.ci; import static de.tum.cit.aet.artemis.core.config.Constants.ASSIGNMENT_DIRECTORY; import static de.tum.cit.aet.artemis.core.config.Constants.ASSIGNMENT_REPO_NAME; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationTriggerService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/ContinuousIntegrationTriggerService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationTriggerService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ci/ContinuousIntegrationTriggerService.java index 1054a0807701..4420b2bbd994 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationTriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/ContinuousIntegrationTriggerService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.ci; +package de.tum.cit.aet.artemis.programming.service.ci; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationUpdateService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/ContinuousIntegrationUpdateService.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationUpdateService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ci/ContinuousIntegrationUpdateService.java index f22090f97896..733618affe57 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/ContinuousIntegrationUpdateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/ContinuousIntegrationUpdateService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.ci; +package de.tum.cit.aet.artemis.programming.service.ci; /** * This service manages the update of the Build plan on the Continuous Integration Service depending on the current VCS and CI profiles. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/BuildLogParseUtils.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/BuildLogParseUtils.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/BuildLogParseUtils.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/BuildLogParseUtils.java index 0719a2da091d..c5e5a24165fc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/BuildLogParseUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/BuildLogParseUtils.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.ci.notification; +package de.tum.cit.aet.artemis.programming.service.ci.notification; import java.time.ZonedDateTime; import java.time.format.DateTimeParseException; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/CommitDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/CommitDTO.java similarity index 79% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/CommitDTO.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/CommitDTO.java index 296ce19ca590..ebd1af2cbdb1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/CommitDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/CommitDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto; +package de.tum.cit.aet.artemis.programming.service.ci.notification.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestCaseDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/TestCaseDTO.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestCaseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/TestCaseDTO.java index 922a926a58c9..81b67e656bb9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestCaseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/TestCaseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto; +package de.tum.cit.aet.artemis.programming.service.ci.notification.dto; import java.util.Collections; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestCaseDetailMessageDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/TestCaseDetailMessageDTO.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestCaseDetailMessageDTO.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/TestCaseDetailMessageDTO.java index 2215fa65b40f..60d70a9f5081 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestCaseDetailMessageDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/TestCaseDetailMessageDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto; +package de.tum.cit.aet.artemis.programming.service.ci.notification.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestResultsDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/TestResultsDTO.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestResultsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/TestResultsDTO.java index b8d4a7f6234f..a5513131ac24 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestResultsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/TestResultsDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto; +package de.tum.cit.aet.artemis.programming.service.ci.notification.dto; import java.time.ZonedDateTime; import java.util.List; @@ -13,9 +13,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.BuildLogParseUtils; import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +import de.tum.cit.aet.artemis.programming.service.ci.notification.BuildLogParseUtils; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; import de.tum.cit.aet.artemis.service.dto.BuildJobDTOInterface; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestSuiteDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/TestSuiteDTO.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestSuiteDTO.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/TestSuiteDTO.java index fa3df22792f3..20b8ee7c4f51 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestSuiteDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/TestSuiteDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto; +package de.tum.cit.aet.artemis.programming.service.ci.notification.dto; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestwiseCoverageReportDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/TestwiseCoverageReportDTO.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestwiseCoverageReportDTO.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/TestwiseCoverageReportDTO.java index df644b67e1a8..ef94ea89542f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/ci/notification/dto/TestwiseCoverageReportDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/TestwiseCoverageReportDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto; +package de.tum.cit.aet.artemis.programming.service.ci.notification.dto; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/AbstractGitLabAuthorizationInterceptor.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/AbstractGitLabAuthorizationInterceptor.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/AbstractGitLabAuthorizationInterceptor.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/AbstractGitLabAuthorizationInterceptor.java index 8e9eb4885bd9..ea9cb7a2b109 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/AbstractGitLabAuthorizationInterceptor.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/AbstractGitLabAuthorizationInterceptor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.gitlab; +package de.tum.cit.aet.artemis.programming.service.gitlab; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabAuthorizationInterceptor.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/GitLabAuthorizationInterceptor.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabAuthorizationInterceptor.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/GitLabAuthorizationInterceptor.java index b64293dab66a..25a9746c8ffa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabAuthorizationInterceptor.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/GitLabAuthorizationInterceptor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.gitlab; +package de.tum.cit.aet.artemis.programming.service.gitlab; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabException.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/GitLabException.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabException.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/GitLabException.java index c601b64220f1..31095f182e1c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabException.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/GitLabException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.gitlab; +package de.tum.cit.aet.artemis.programming.service.gitlab; import de.tum.cit.aet.artemis.core.exception.VersionControlException; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/GitLabPersonalAccessTokenManagementService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/GitLabPersonalAccessTokenManagementService.java index 680a75d9cd7b..5ea97d98e87d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/GitLabPersonalAccessTokenManagementService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.gitlab; +package de.tum.cit.aet.artemis.programming.service.gitlab; import java.time.Duration; import java.time.Instant; @@ -25,8 +25,8 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.core.service.connectors.gitlab.dto.GitLabPersonalAccessTokenListResponseDTO; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsTokenManagementService; +import de.tum.cit.aet.artemis.programming.service.gitlab.dto.GitLabPersonalAccessTokenListResponseDTO; +import de.tum.cit.aet.artemis.programming.service.vcs.VcsTokenManagementService; /** * Provides VCS access token services for GitLab via means of personal access tokens. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/GitLabService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/GitLabService.java index 3964ea0d15f5..9ec3b8ef3bc6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/GitLabService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.gitlab; +package de.tum.cit.aet.artemis.programming.service.gitlab; import static org.gitlab4j.api.models.AccessLevel.DEVELOPER; import static org.gitlab4j.api.models.AccessLevel.MAINTAINER; @@ -50,10 +50,6 @@ import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.connectors.ConnectorHealth; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; -import de.tum.cit.aet.artemis.core.service.connectors.gitlab.dto.GitLabPushNotificationDTO; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.AbstractVersionControlService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlRepositoryPermission; import de.tum.cit.aet.artemis.core.util.UrlUtils; import de.tum.cit.aet.artemis.programming.domain.Commit; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -64,6 +60,10 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.service.GitService; +import de.tum.cit.aet.artemis.programming.service.gitlab.dto.GitLabPushNotificationDTO; +import de.tum.cit.aet.artemis.programming.service.vcs.AbstractVersionControlService; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlRepositoryPermission; import de.tum.cit.aet.artemis.service.UriService; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabUserDoesNotExistException.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/GitLabUserDoesNotExistException.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabUserDoesNotExistException.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/GitLabUserDoesNotExistException.java index 5c4d5de11e65..a0c5c38749ca 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabUserDoesNotExistException.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/GitLabUserDoesNotExistException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.gitlab; +package de.tum.cit.aet.artemis.programming.service.gitlab; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabUserManagementService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/GitLabUserManagementService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabUserManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/GitLabUserManagementService.java index 505d11352d77..bafda2c5f3a5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitLabUserManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/GitLabUserManagementService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.gitlab; +package de.tum.cit.aet.artemis.programming.service.gitlab; import static org.gitlab4j.api.models.AccessLevel.MAINTAINER; import static org.gitlab4j.api.models.AccessLevel.OWNER; @@ -23,10 +23,10 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsTokenManagementService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsUserManagementService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.vcs.VcsTokenManagementService; +import de.tum.cit.aet.artemis.programming.service.vcs.VcsUserManagementService; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitlabInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/GitlabInfoContributor.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitlabInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/GitlabInfoContributor.java index b3db946103e1..1f815debb06b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/GitlabInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/GitlabInfoContributor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.gitlab; +package de.tum.cit.aet.artemis.programming.service.gitlab; import java.net.URL; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabCommitDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/dto/GitLabCommitDTO.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabCommitDTO.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/dto/GitLabCommitDTO.java index 8b007b97d792..ff5bb743a4d7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabCommitDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/dto/GitLabCommitDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.gitlab.dto; +package de.tum.cit.aet.artemis.programming.service.gitlab.dto; import java.time.ZonedDateTime; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java index e88d664c60a6..83996469215b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.gitlab.dto; +package de.tum.cit.aet.artemis.programming.service.gitlab.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java index 40aa71673169..cc3ddbd50f1e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.gitlab.dto; +package de.tum.cit.aet.artemis.programming.service.gitlab.dto; import java.util.Date; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java index e499845aecfe..35f91802f6ba 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.gitlab.dto; +package de.tum.cit.aet.artemis.programming.service.gitlab.dto; import java.util.Date; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabProjectDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/dto/GitLabProjectDTO.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabProjectDTO.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/dto/GitLabProjectDTO.java index e0cadeb0b27a..84752391e4c2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabProjectDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/dto/GitLabProjectDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.gitlab.dto; +package de.tum.cit.aet.artemis.programming.service.gitlab.dto; import java.net.URL; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/dto/GitLabPushNotificationDTO.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/dto/GitLabPushNotificationDTO.java index 147a0fe9dba9..f42d5d60b004 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/dto/GitLabPushNotificationDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.gitlab.dto; +package de.tum.cit.aet.artemis.programming.service.gitlab.dto; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabRepositoryDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/dto/GitLabRepositoryDTO.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabRepositoryDTO.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/dto/GitLabRepositoryDTO.java index 766cf4c412c9..979dfbd439f9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlab/dto/GitLabRepositoryDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/dto/GitLabRepositoryDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.gitlab.dto; +package de.tum.cit.aet.artemis.programming.service.gitlab.dto; import java.net.URL; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIAuthorizationInterceptor.java similarity index 71% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIAuthorizationInterceptor.java index 3e28ed189bbc..2579c9590a93 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIAuthorizationInterceptor.java @@ -1,9 +1,9 @@ -package de.tum.cit.aet.artemis.core.service.connectors.gitlabci; +package de.tum.cit.aet.artemis.programming.service.gitlabci; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.cit.aet.artemis.core.service.connectors.gitlab.AbstractGitLabAuthorizationInterceptor; +import de.tum.cit.aet.artemis.programming.service.gitlab.AbstractGitLabAuthorizationInterceptor; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIBuildPlanService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIBuildPlanService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIBuildPlanService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIBuildPlanService.java index e0755675f8d6..3b2e3736d0fb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIBuildPlanService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIBuildPlanService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.gitlabci; +package de.tum.cit.aet.artemis.programming.service.gitlabci; import java.io.IOException; import java.nio.charset.Charset; @@ -12,11 +12,11 @@ import org.springframework.stereotype.Service; import org.springframework.util.StreamUtils; -import de.tum.cit.aet.artemis.core.service.connectors.ci.AbstractBuildPlanCreator; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.service.ci.AbstractBuildPlanCreator; import de.tum.cit.aet.artemis.service.ResourceLoaderService; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIInfoContributor.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIInfoContributor.java index 2cf558b4865f..8d2f1e6654cc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIInfoContributor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.gitlabci; +package de.tum.cit.aet.artemis.programming.service.gitlabci; import java.net.URL; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIProgrammingLanguageFeatureService.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIProgrammingLanguageFeatureService.java index 2c4691528ae6..c898b33edb0d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIProgrammingLanguageFeatureService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.gitlabci; +package de.tum.cit.aet.artemis.programming.service.gitlabci; import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.EMPTY; import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.JAVA; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIResultService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIResultService.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIResultService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIResultService.java index 2f0be2f70ab6..f2f560342f89 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIResultService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.gitlabci; +package de.tum.cit.aet.artemis.programming.service.gitlabci; import java.time.ZonedDateTime; import java.util.List; @@ -9,8 +9,6 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.core.service.connectors.ci.AbstractContinuousIntegrationResultService; -import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestResultsDTO; import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.BuildLogStatisticsEntry; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; @@ -21,6 +19,8 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseFeedbackCreationService; +import de.tum.cit.aet.artemis.programming.service.ci.AbstractContinuousIntegrationResultService; +import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestResultsDTO; import de.tum.cit.aet.artemis.programming.service.hestia.TestwiseCoverageService; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIService.java index 6ba65793177c..6e9c189f2c8c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.gitlabci; +package de.tum.cit.aet.artemis.programming.service.gitlabci; import static de.tum.cit.aet.artemis.core.config.Constants.NEW_RESULT_RESOURCE_API_PATH; @@ -27,9 +27,6 @@ import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.GitLabCIException; import de.tum.cit.aet.artemis.core.service.connectors.ConnectorHealth; -import de.tum.cit.aet.artemis.core.service.connectors.ci.AbstractContinuousIntegrationService; -import de.tum.cit.aet.artemis.core.service.connectors.ci.CIPermission; -import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestResultsDTO; import de.tum.cit.aet.artemis.programming.domain.BuildPlan; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; @@ -39,6 +36,9 @@ import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.service.ci.AbstractContinuousIntegrationService; +import de.tum.cit.aet.artemis.programming.service.ci.CIPermission; +import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestResultsDTO; import de.tum.cit.aet.artemis.service.UriService; import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCITriggerService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCITriggerService.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCITriggerService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCITriggerService.java index 78a9c5f90b2c..4974e50055a0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCITriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCITriggerService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.gitlabci; +package de.tum.cit.aet.artemis.programming.service.gitlabci; import org.gitlab4j.api.GitLabApi; import org.gitlab4j.api.GitLabApiException; @@ -8,11 +8,11 @@ import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.GitLabCIException; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationTriggerService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationTriggerService; import de.tum.cit.aet.artemis.service.UriService; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIUserManagementService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIUserManagementService.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIUserManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIUserManagementService.java index 203bb13c3e69..19f37bed1334 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/gitlabci/GitLabCIUserManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIUserManagementService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.gitlabci; +package de.tum.cit.aet.artemis.programming.service.gitlabci; import java.util.Set; @@ -10,7 +10,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; -import de.tum.cit.aet.artemis.core.service.connectors.ci.CIUserManagementService; +import de.tum.cit.aet.artemis.programming.service.ci.CIUserManagementService; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseGitDiffReportService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseGitDiffReportService.java index 72ae44f2b068..07e3b22dd78c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseGitDiffReportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseGitDiffReportService.java @@ -21,7 +21,6 @@ import org.springframework.util.FileSystemUtils; import de.tum.cit.aet.artemis.core.domain.DomainObject; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; @@ -36,6 +35,7 @@ import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseGitDiffReportRepository; +import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.web.rest.GitDiffReportParserService; import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/TestwiseCoverageService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/TestwiseCoverageService.java index c501e65a1273..99092c7e35f2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/TestwiseCoverageService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/TestwiseCoverageService.java @@ -20,8 +20,6 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; -import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestwiseCoverageReportDTO; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; @@ -32,8 +30,10 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageFileReportRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageReportRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.TestwiseCoverageReportEntryRepository; +import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.RepositoryService; import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; +import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestwiseCoverageReportDTO; /** * Service for managing testwise coverage data and interacts with both CoverageReport, CoverageFileReport diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/BehavioralTestCaseService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/BehavioralTestCaseService.java index bc5e679389c2..71df2fdc6690 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/BehavioralTestCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/behavioral/BehavioralTestCaseService.java @@ -14,12 +14,12 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.RepositoryService; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseGitDiffReportService; import de.tum.cit.aet.artemis.programming.service.hestia.TestwiseCoverageService; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralTestCaseService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralTestCaseService.java index 34c87ec5ee2c..889405573cff 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralTestCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/structural/StructuralTestCaseService.java @@ -28,7 +28,6 @@ import com.thoughtworks.qdox.model.JavaClass; import com.thoughtworks.qdox.model.JavaType; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.domain.Repository; @@ -37,6 +36,7 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; +import de.tum.cit.aet.artemis.programming.service.GitService; /** * Service for handling Solution Entries of structural Test Cases. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsAuthorizationInterceptor.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsAuthorizationInterceptor.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsAuthorizationInterceptor.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsAuthorizationInterceptor.java index 5a2b4dec91fa..448b585459c9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsAuthorizationInterceptor.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsAuthorizationInterceptor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.jenkins; +package de.tum.cit.aet.artemis.programming.service.jenkins; import java.io.IOException; import java.net.URL; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsEndpoints.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsEndpoints.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsEndpoints.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsEndpoints.java index cd172d05da46..96c8339f32fe 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsEndpoints.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsEndpoints.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.jenkins; +package de.tum.cit.aet.artemis.programming.service.jenkins; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsInfoContributor.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsInfoContributor.java index ebcafbed9dba..bf07232a64b9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsInfoContributor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.jenkins; +package de.tum.cit.aet.artemis.programming.service.jenkins; import java.net.URL; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsInternalUrlService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsInternalUrlService.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsInternalUrlService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsInternalUrlService.java index e9642b16f808..69f1d5572473 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsInternalUrlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsInternalUrlService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.jenkins; +package de.tum.cit.aet.artemis.programming.service.jenkins; import java.net.URL; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsProgrammingLanguageFeatureService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsProgrammingLanguageFeatureService.java index 44a1fe9cdd32..82c0a9ebf238 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsProgrammingLanguageFeatureService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.jenkins; +package de.tum.cit.aet.artemis.programming.service.jenkins; import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.C; import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.EMPTY; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsResultService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsResultService.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsResultService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsResultService.java index dcb97669082f..1921e289088a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsResultService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.jenkins; +package de.tum.cit.aet.artemis.programming.service.jenkins; import static de.tum.cit.aet.artemis.programming.domain.BuildLogStatisticsEntry.BuildJobPartDuration; @@ -11,8 +11,6 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.core.service.connectors.ci.AbstractContinuousIntegrationResultService; -import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestResultsDTO; import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; @@ -22,6 +20,8 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseFeedbackCreationService; +import de.tum.cit.aet.artemis.programming.service.ci.AbstractContinuousIntegrationResultService; +import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestResultsDTO; import de.tum.cit.aet.artemis.programming.service.hestia.TestwiseCoverageService; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsService.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsService.java index 1707eecde82a..f0a6c4bdbb57 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.jenkins; +package de.tum.cit.aet.artemis.programming.service.jenkins; import java.io.IOException; import java.net.URL; @@ -22,13 +22,6 @@ import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.JenkinsException; import de.tum.cit.aet.artemis.core.service.connectors.ConnectorHealth; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusTemplateService; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.Windfile; -import de.tum.cit.aet.artemis.core.service.connectors.ci.AbstractContinuousIntegrationService; -import de.tum.cit.aet.artemis.core.service.connectors.ci.CIPermission; -import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestResultsDTO; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.build_plan.JenkinsBuildPlanService; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs.JenkinsJobService; import de.tum.cit.aet.artemis.programming.domain.BuildPlanType; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; @@ -36,6 +29,13 @@ import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.programming.service.aeolus.Windfile; +import de.tum.cit.aet.artemis.programming.service.ci.AbstractContinuousIntegrationService; +import de.tum.cit.aet.artemis.programming.service.ci.CIPermission; +import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestResultsDTO; +import de.tum.cit.aet.artemis.programming.service.jenkins.build_plan.JenkinsBuildPlanService; +import de.tum.cit.aet.artemis.programming.service.jenkins.jobs.JenkinsJobService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsTriggerService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsTriggerService.java similarity index 77% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsTriggerService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsTriggerService.java index 1b2b98a2999d..8a837e105700 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsTriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsTriggerService.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.core.service.connectors.jenkins; +package de.tum.cit.aet.artemis.programming.service.jenkins; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationTriggerService; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.build_plan.JenkinsBuildPlanService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationTriggerService; +import de.tum.cit.aet.artemis.programming.service.jenkins.build_plan.JenkinsBuildPlanService; @Profile("jenkins") @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsUserManagementService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsUserManagementService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsUserManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsUserManagementService.java index c21b7397baf4..7fdd00a21cba 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsUserManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsUserManagementService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.jenkins; +package de.tum.cit.aet.artemis.programming.service.jenkins; import java.io.IOException; import java.net.URL; @@ -32,13 +32,13 @@ import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.JenkinsException; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.core.service.connectors.ci.CIUserManagementService; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.dto.JenkinsUserDTO; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs.JenkinsJobPermission; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs.JenkinsJobPermissionsService; import de.tum.cit.aet.artemis.core.service.user.PasswordService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.ci.CIUserManagementService; +import de.tum.cit.aet.artemis.programming.service.jenkins.dto.JenkinsUserDTO; +import de.tum.cit.aet.artemis.programming.service.jenkins.jobs.JenkinsJobPermission; +import de.tum.cit.aet.artemis.programming.service.jenkins.jobs.JenkinsJobPermissionsService; @Service @Profile("jenkins") diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsXmlConfigBuilder.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsXmlConfigBuilder.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsXmlConfigBuilder.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsXmlConfigBuilder.java index f76d41292dfa..092781a3d9dc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsXmlConfigBuilder.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsXmlConfigBuilder.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.jenkins; +package de.tum.cit.aet.artemis.programming.service.jenkins; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsXmlFileUtils.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsXmlFileUtils.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsXmlFileUtils.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsXmlFileUtils.java index f2beba765245..de506b3d2f78 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/JenkinsXmlFileUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsXmlFileUtils.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.jenkins; +package de.tum.cit.aet.artemis.programming.service.jenkins; import java.io.IOException; import java.io.StringReader; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsBuildPlanCreator.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanCreator.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsBuildPlanCreator.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanCreator.java index 58324873b24b..a5470683d247 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsBuildPlanCreator.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanCreator.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.jenkins.build_plan; +package de.tum.cit.aet.artemis.programming.service.jenkins.build_plan; import java.io.IOException; import java.io.InputStream; @@ -19,11 +19,11 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationBuildPlanException; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsXmlConfigBuilder; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsXmlFileUtils; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProjectType; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.programming.service.jenkins.JenkinsXmlConfigBuilder; +import de.tum.cit.aet.artemis.programming.service.jenkins.JenkinsXmlFileUtils; import de.tum.cit.aet.artemis.service.ResourceLoaderService; @Profile("jenkins") diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsBuildPlanLinkInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanLinkInfoContributor.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsBuildPlanLinkInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanLinkInfoContributor.java index 0a3f734a943c..a6e0de6f7385 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsBuildPlanLinkInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanLinkInfoContributor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.jenkins.build_plan; +package de.tum.cit.aet.artemis.programming.service.jenkins.build_plan; import java.net.URL; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanService.java index 8c87bbd139e7..571be75f7624 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.jenkins.build_plan; +package de.tum.cit.aet.artemis.programming.service.jenkins.build_plan; import static de.tum.cit.aet.artemis.core.config.Constants.NEW_RESULT_RESOURCE_API_PATH; @@ -40,17 +40,6 @@ import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationBuildPlanException; import de.tum.cit.aet.artemis.core.exception.JenkinsException; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusBuildPlanService; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusRepository; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.Windfile; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestResultsDTO; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsEndpoints; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsInternalUrlService; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsXmlConfigBuilder; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsXmlFileUtils; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs.JenkinsJobPermissionsService; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs.JenkinsJobService; import de.tum.cit.aet.artemis.programming.domain.AeolusTarget; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; @@ -62,6 +51,17 @@ import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusBuildPlanService; +import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusRepository; +import de.tum.cit.aet.artemis.programming.service.aeolus.Windfile; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestResultsDTO; +import de.tum.cit.aet.artemis.programming.service.jenkins.JenkinsEndpoints; +import de.tum.cit.aet.artemis.programming.service.jenkins.JenkinsInternalUrlService; +import de.tum.cit.aet.artemis.programming.service.jenkins.JenkinsXmlConfigBuilder; +import de.tum.cit.aet.artemis.programming.service.jenkins.JenkinsXmlFileUtils; +import de.tum.cit.aet.artemis.programming.service.jenkins.jobs.JenkinsJobPermissionsService; +import de.tum.cit.aet.artemis.programming.service.jenkins.jobs.JenkinsJobService; @Service @Profile("jenkins") diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsBuildPlanUtils.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanUtils.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsBuildPlanUtils.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanUtils.java index cae75ba9206c..a4770c237c56 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsBuildPlanUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanUtils.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.jenkins.build_plan; +package de.tum.cit.aet.artemis.programming.service.jenkins.build_plan; import org.w3c.dom.Document; import org.w3c.dom.Node; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsPipelineScriptCreator.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsPipelineScriptCreator.java index 10351d3eaadb..46bffb803c84 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreator.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsPipelineScriptCreator.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.jenkins.build_plan; +package de.tum.cit.aet.artemis.programming.service.jenkins.build_plan; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -18,12 +18,12 @@ import de.tum.cit.aet.artemis.core.config.ProgrammingLanguageConfiguration; import de.tum.cit.aet.artemis.core.exception.JenkinsException; -import de.tum.cit.aet.artemis.core.service.connectors.ci.AbstractBuildPlanCreator; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.service.ci.AbstractBuildPlanCreator; import de.tum.cit.aet.artemis.service.ResourceLoaderService; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/dto/JenkinsUserDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/dto/JenkinsUserDTO.java similarity index 80% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/dto/JenkinsUserDTO.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/dto/JenkinsUserDTO.java index 0b79dc3e1ef6..c02260536c7a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/dto/JenkinsUserDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/dto/JenkinsUserDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.jenkins.dto; +package de.tum.cit.aet.artemis.programming.service.jenkins.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/jobs/JenkinsJobPermission.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/jobs/JenkinsJobPermission.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/jobs/JenkinsJobPermission.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/jobs/JenkinsJobPermission.java index 4104474493db..e2590600fc17 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/jobs/JenkinsJobPermission.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/jobs/JenkinsJobPermission.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs; +package de.tum.cit.aet.artemis.programming.service.jenkins.jobs; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/jobs/JenkinsJobPermissionsService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/jobs/JenkinsJobPermissionsService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/jobs/JenkinsJobPermissionsService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/jobs/JenkinsJobPermissionsService.java index 59e0cf691068..1d7bd03b7029 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/jobs/JenkinsJobPermissionsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/jobs/JenkinsJobPermissionsService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs; +package de.tum.cit.aet.artemis.programming.service.jenkins.jobs; import java.io.IOException; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtils.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/jobs/JenkinsJobPermissionsUtils.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtils.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/jobs/JenkinsJobPermissionsUtils.java index 346f2b964a76..aec959eb0b9a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/jobs/JenkinsJobPermissionsUtils.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs; +package de.tum.cit.aet.artemis.programming.service.jenkins.jobs; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/jobs/JenkinsJobService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/jobs/JenkinsJobService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/jobs/JenkinsJobService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/jobs/JenkinsJobService.java index f825d8dce938..334ad5dd8a17 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/jenkins/jobs/JenkinsJobService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/jobs/JenkinsJobService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs; +package de.tum.cit.aet.artemis.programming.service.jenkins.jobs; import java.io.IOException; @@ -17,7 +17,7 @@ import com.offbytwo.jenkins.model.JobWithDetails; import de.tum.cit.aet.artemis.core.exception.JenkinsException; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsXmlFileUtils; +import de.tum.cit.aet.artemis.programming.service.jenkins.JenkinsXmlFileUtils; @Service @Profile("jenkins") diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIBuildConfigurationService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIBuildConfigurationService.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIBuildConfigurationService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIBuildConfigurationService.java index 4bee089aef73..d8c03392661e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIBuildConfigurationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIBuildConfigurationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci; +package de.tum.cit.aet.artemis.programming.service.localci; import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_WORKING_DIRECTORY; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; @@ -9,11 +9,11 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.exception.LocalCIException; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusTemplateService; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.ScriptAction; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.Windfile; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; +import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.programming.service.aeolus.ScriptAction; +import de.tum.cit.aet.artemis.programming.service.aeolus.Windfile; @Service @Profile(PROFILE_LOCALCI) diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIInfoContributor.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIInfoContributor.java index 4b7ae67af1ce..e43721594008 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIInfoContributor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci; +package de.tum.cit.aet.artemis.programming.service.localci; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIPriorityQueueComparator.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIPriorityQueueComparator.java similarity index 80% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIPriorityQueueComparator.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIPriorityQueueComparator.java index 51e10055dae3..961b840c380a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIPriorityQueueComparator.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIPriorityQueueComparator.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci; +package de.tum.cit.aet.artemis.programming.service.localci; import java.util.Comparator; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; /** * This comparator allows to prioritize build jobs in the shared build queue diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIProgrammingLanguageFeatureService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIProgrammingLanguageFeatureService.java index a14853b00c5b..77ebdcabcff9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIProgrammingLanguageFeatureService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci; +package de.tum.cit.aet.artemis.programming.service.localci; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; import static de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage.ASSEMBLER; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIQueueWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIQueueWebsocketService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIQueueWebsocketService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIQueueWebsocketService.java index 26d71fb4e108..e640d7b8d704 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIQueueWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIQueueWebsocketService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci; +package de.tum.cit.aet.artemis.programming.service.localci; import java.util.List; @@ -19,8 +19,8 @@ import com.hazelcast.map.listener.EntryRemovedListener; import com.hazelcast.map.listener.EntryUpdatedListener; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildAgentInformation; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; import de.tum.cit.aet.artemis.web.websocket.localci.LocalCIWebsocketMessagingService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIResultProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultProcessingService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIResultProcessingService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultProcessingService.java index 67d5df9c31f0..c6a306a2e405 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIResultProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultProcessingService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci; +package de.tum.cit.aet.artemis.programming.service.localci; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; @@ -24,10 +24,6 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildAgentInformation; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildResult; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.ResultQueueItem; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; @@ -41,6 +37,10 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseGradingService; import de.tum.cit.aet.artemis.programming.service.ProgrammingMessagingService; import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildResult; +import de.tum.cit.aet.artemis.programming.service.localci.dto.ResultQueueItem; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIResultService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultService.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIResultService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultService.java index c0be363c97e8..18d8ee197a20 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci; +package de.tum.cit.aet.artemis.programming.service.localci; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; @@ -8,8 +8,6 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.exception.LocalCIException; -import de.tum.cit.aet.artemis.core.service.connectors.ci.AbstractContinuousIntegrationResultService; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildResult; import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; @@ -18,7 +16,9 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseFeedbackCreationService; +import de.tum.cit.aet.artemis.programming.service.ci.AbstractContinuousIntegrationResultService; import de.tum.cit.aet.artemis.programming.service.hestia.TestwiseCoverageService; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildResult; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIService.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIService.java index 920fdc32f639..618770248bdb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCIService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci; +package de.tum.cit.aet.artemis.programming.service.localci; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; @@ -17,19 +17,19 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.core.exception.LocalCIException; -import de.tum.cit.aet.artemis.core.service.connectors.BuildScriptProviderService; import de.tum.cit.aet.artemis.core.service.connectors.ConnectorHealth; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusTemplateService; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.Windfile; -import de.tum.cit.aet.artemis.core.service.connectors.ci.AbstractContinuousIntegrationService; -import de.tum.cit.aet.artemis.core.service.connectors.ci.CIPermission; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.service.BuildScriptProviderService; +import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.programming.service.aeolus.Windfile; +import de.tum.cit.aet.artemis.programming.service.ci.AbstractContinuousIntegrationService; +import de.tum.cit.aet.artemis.programming.service.ci.CIPermission; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.web.rest.dto.BuildPlanCheckoutDirectoriesDTO; import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCITriggerService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCITriggerService.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCITriggerService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCITriggerService.java index c68991f5d829..ffe9c0d56ea6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/LocalCITriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCITriggerService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci; +package de.tum.cit.aet.artemis.programming.service.localci; import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_WORKING_DIRECTORY; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; @@ -25,16 +25,6 @@ import de.tum.cit.aet.artemis.core.config.ProgrammingLanguageConfiguration; import de.tum.cit.aet.artemis.core.exception.LocalCIException; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusResult; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusTemplateService; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.Windfile; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationTriggerService; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildConfig; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.JobTimingInfo; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.RepositoryInfo; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; @@ -48,7 +38,17 @@ import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeature; +import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusResult; +import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.programming.service.aeolus.Windfile; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationTriggerService; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildConfig; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.programming.service.localci.dto.JobTimingInfo; +import de.tum.cit.aet.artemis.programming.service.localci.dto.RepositoryInfo; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; /** * Service for triggering builds on the local CI system. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/SharedQueueManagementService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/SharedQueueManagementService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/SharedQueueManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/SharedQueueManagementService.java index db744d9aaaac..bf953cb344c3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/SharedQueueManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/SharedQueueManagementService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci; +package de.tum.cit.aet.artemis.programming.service.localci; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; @@ -31,11 +31,11 @@ import com.hazelcast.topic.ITopic; import de.tum.cit.aet.artemis.core.dto.SortingOrder; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildAgentInformation; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.DockerImageBuild; import de.tum.cit.aet.artemis.programming.domain.BuildJob; import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.programming.service.localci.dto.DockerImageBuild; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.FinishedBuildJobPageableSearchDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/BuildAgentInformation.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildAgentInformation.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/BuildAgentInformation.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildAgentInformation.java index ad39f7713dec..fe462388162f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/BuildAgentInformation.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildAgentInformation.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.dto; +package de.tum.cit.aet.artemis.programming.service.localci.dto; import java.io.Serial; import java.io.Serializable; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/BuildConfig.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildConfig.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/BuildConfig.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildConfig.java index 0f0d22550d68..da47f94703b4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/BuildConfig.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildConfig.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.dto; +package de.tum.cit.aet.artemis.programming.service.localci.dto; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/BuildJobQueueItem.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildJobQueueItem.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/BuildJobQueueItem.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildJobQueueItem.java index 1611daed46be..28b79d40970c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/BuildJobQueueItem.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildJobQueueItem.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.dto; +package de.tum.cit.aet.artemis.programming.service.localci.dto; import java.io.Serial; import java.io.Serializable; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/BuildResult.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildResult.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/BuildResult.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildResult.java index 87a9f78ac6e1..1169b42083b5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/BuildResult.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildResult.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.dto; +package de.tum.cit.aet.artemis.programming.service.localci.dto; import java.io.Serializable; import java.time.ZonedDateTime; @@ -11,8 +11,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestwiseCoverageReportDTO; import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestwiseCoverageReportDTO; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; import de.tum.cit.aet.artemis.service.dto.BuildJobDTOInterface; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/DockerImageBuild.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/DockerImageBuild.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/DockerImageBuild.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/DockerImageBuild.java index 0f9b36d5477b..a44779f477b4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/DockerImageBuild.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/DockerImageBuild.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.dto; +package de.tum.cit.aet.artemis.programming.service.localci.dto; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/JobTimingInfo.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/JobTimingInfo.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/JobTimingInfo.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/JobTimingInfo.java index c47d83ba77c4..33ea1df85916 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/JobTimingInfo.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/JobTimingInfo.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.dto; +package de.tum.cit.aet.artemis.programming.service.localci.dto; import java.io.Serializable; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/RepositoryInfo.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/RepositoryInfo.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/RepositoryInfo.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/RepositoryInfo.java index 9da01c70aa57..3b72b0dd0f1f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/RepositoryInfo.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/RepositoryInfo.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.dto; +package de.tum.cit.aet.artemis.programming.service.localci.dto; import java.io.Serializable; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/ResultBuildJob.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/ResultBuildJob.java similarity index 80% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/ResultBuildJob.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/ResultBuildJob.java index ed4bca900f4b..ad5435048a50 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/ResultBuildJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/ResultBuildJob.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.dto; +package de.tum.cit.aet.artemis.programming.service.localci.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/ResultQueueItem.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/ResultQueueItem.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/ResultQueueItem.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/ResultQueueItem.java index 0d2a111fca67..73fd846ed3f0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/dto/ResultQueueItem.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/ResultQueueItem.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.dto; +package de.tum.cit.aet.artemis.programming.service.localci.dto; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/ReportParser.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/ReportParser.java similarity index 80% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/ReportParser.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/ReportParser.java index 6af13d52b2d9..6540a88a930c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/ReportParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/ReportParser.java @@ -1,7 +1,7 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser; +package de.tum.cit.aet.artemis.programming.service.localci.scaparser; -import static de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.utils.ReportUtils.createErrorReport; -import static de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.utils.ReportUtils.createFileTooLargeReport; +import static de.tum.cit.aet.artemis.programming.service.localci.scaparser.utils.ReportUtils.createErrorReport; +import static de.tum.cit.aet.artemis.programming.service.localci.scaparser.utils.ReportUtils.createFileTooLargeReport; import java.io.File; import java.io.IOException; @@ -9,11 +9,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.exception.ParserException; -import de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.exception.UnsupportedToolException; -import de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.strategy.ParserPolicy; -import de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.strategy.ParserStrategy; -import de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.utils.FileUtils; +import de.tum.cit.aet.artemis.programming.service.localci.scaparser.exception.ParserException; +import de.tum.cit.aet.artemis.programming.service.localci.scaparser.exception.UnsupportedToolException; +import de.tum.cit.aet.artemis.programming.service.localci.scaparser.strategy.ParserPolicy; +import de.tum.cit.aet.artemis.programming.service.localci.scaparser.strategy.ParserStrategy; +import de.tum.cit.aet.artemis.programming.service.localci.scaparser.utils.FileUtils; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/exception/ParserException.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/exception/ParserException.java similarity index 79% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/exception/ParserException.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/exception/ParserException.java index c6ceda17f9e8..f0934ad041f3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/exception/ParserException.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/exception/ParserException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.exception; +package de.tum.cit.aet.artemis.programming.service.localci.scaparser.exception; /** * Exception thrown when an error occurs during parsing. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/exception/UnsupportedToolException.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/exception/UnsupportedToolException.java similarity index 79% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/exception/UnsupportedToolException.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/exception/UnsupportedToolException.java index 719c008d1bf2..f27b2451378f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/exception/UnsupportedToolException.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/exception/UnsupportedToolException.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.exception; +package de.tum.cit.aet.artemis.programming.service.localci.scaparser.exception; /** * Exception thrown if the static code analysis tool which created the report is not supported diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/CheckstyleParser.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/CheckstyleParser.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/CheckstyleParser.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/CheckstyleParser.java index ee2ed5574eab..f0b01e79b1ab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/CheckstyleParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/CheckstyleParser.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.strategy; +package de.tum.cit.aet.artemis.programming.service.localci.scaparser.strategy; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/PMDCPDParser.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/PMDCPDParser.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/PMDCPDParser.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/PMDCPDParser.java index 34cc1b0af6e1..ca68f6ff66aa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/PMDCPDParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/PMDCPDParser.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.strategy; +package de.tum.cit.aet.artemis.programming.service.localci.scaparser.strategy; import java.io.File; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/PMDParser.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/PMDParser.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/PMDParser.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/PMDParser.java index 84fad18e75d2..e39fe9926189 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/PMDParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/PMDParser.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.strategy; +package de.tum.cit.aet.artemis.programming.service.localci.scaparser.strategy; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/ParserPolicy.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/ParserPolicy.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/ParserPolicy.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/ParserPolicy.java index 3736a684e1a9..fa90c31c7c9d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/ParserPolicy.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/ParserPolicy.java @@ -1,9 +1,9 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.strategy; +package de.tum.cit.aet.artemis.programming.service.localci.scaparser.strategy; import java.nio.file.Path; -import de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.exception.UnsupportedToolException; import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.programming.service.localci.scaparser.exception.UnsupportedToolException; /** * Policy class for the parser strategies. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/ParserStrategy.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/ParserStrategy.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/ParserStrategy.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/ParserStrategy.java index 6f2f8d3f609f..847bbd9f5065 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/ParserStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/ParserStrategy.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.strategy; +package de.tum.cit.aet.artemis.programming.service.localci.scaparser.strategy; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/SpotbugsParser.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/SpotbugsParser.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/SpotbugsParser.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/SpotbugsParser.java index 8204bae132d6..92a0c860de9e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/strategy/SpotbugsParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/SpotbugsParser.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.strategy; +package de.tum.cit.aet.artemis.programming.service.localci.scaparser.strategy; import java.io.File; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/utils/FileUtils.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/utils/FileUtils.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/utils/FileUtils.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/utils/FileUtils.java index fbf8198d3e80..066f8bbf2811 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/utils/FileUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/utils/FileUtils.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.utils; +package de.tum.cit.aet.artemis.programming.service.localci.scaparser.utils; import java.io.File; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/utils/ReportUtils.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/utils/ReportUtils.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/utils/ReportUtils.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/utils/ReportUtils.java index 329bf4b2b98a..61172bebbcb0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localci/scaparser/utils/ReportUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/utils/ReportUtils.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.utils; +package de.tum.cit.aet.artemis.programming.service.localci.scaparser.utils; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/icl/ArtemisGitServletService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/ArtemisGitServletService.java similarity index 84% rename from src/main/java/de/tum/cit/aet/artemis/service/icl/ArtemisGitServletService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/ArtemisGitServletService.java index add1d6c1f712..b64406840602 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/icl/ArtemisGitServletService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/ArtemisGitServletService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.icl; +package de.tum.cit.aet.artemis.programming.service.localvc; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; @@ -10,11 +10,6 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCFetchFilter; -import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCPostPushHook; -import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCPrePushHook; -import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCPushFilter; -import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCServletService; /** * This class configures the JGit Servlet, which is used to receive Git push and fetch requests for local VC. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/icl/GitPublickeyAuthenticatorService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/GitPublickeyAuthenticatorService.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/service/icl/GitPublickeyAuthenticatorService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/GitPublickeyAuthenticatorService.java index c29cd74b06eb..94d5332a3908 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/icl/GitPublickeyAuthenticatorService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/GitPublickeyAuthenticatorService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.icl; +package de.tum.cit.aet.artemis.programming.service.localvc; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; @@ -17,10 +17,10 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.core.service.connectors.localci.SharedQueueManagementService; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildAgentInformation; -import de.tum.cit.aet.artemis.programming.icl.ssh.HashUtils; -import de.tum.cit.aet.artemis.programming.icl.ssh.SshConstants; +import de.tum.cit.aet.artemis.programming.service.localci.SharedQueueManagementService; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.programming.service.localvc.ssh.HashUtils; +import de.tum.cit.aet.artemis.programming.service.localvc.ssh.SshConstants; @Profile(PROFILE_LOCALVC) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/icl/JGitServletConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/JGitServletConfiguration.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/programming/icl/JGitServletConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/JGitServletConfiguration.java index ce5451cee5c5..38f59d52ecb2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/icl/JGitServletConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/JGitServletConfiguration.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.icl; +package de.tum.cit.aet.artemis.programming.service.localvc; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; @@ -10,8 +10,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; -import de.tum.cit.aet.artemis.service.icl.ArtemisGitServletService; - /** * Configuration of the JGit Servlet that handles fetch and push requests for local Version Control. */ diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCFetchFilter.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCFetchFilter.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCFetchFilter.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCFetchFilter.java index f8ab737a9d8e..504355f1cdf2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCFetchFilter.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCFetchFilter.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localvc; +package de.tum.cit.aet.artemis.programming.service.localvc; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCInfoContributor.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCInfoContributor.java index a5e069100e58..148eca2b7c41 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCInfoContributor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localvc; +package de.tum.cit.aet.artemis.programming.service.localvc; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPersonalAccessTokenManagementService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCPersonalAccessTokenManagementService.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPersonalAccessTokenManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCPersonalAccessTokenManagementService.java index 54e12eacaa86..676c00099863 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPersonalAccessTokenManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCPersonalAccessTokenManagementService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localvc; +package de.tum.cit.aet.artemis.programming.service.localvc; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPostPushHook.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCPostPushHook.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPostPushHook.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCPostPushHook.java index 4f39de4b41f8..fb925717a387 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPostPushHook.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCPostPushHook.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localvc; +package de.tum.cit.aet.artemis.programming.service.localvc; import java.util.Collection; import java.util.Iterator; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPrePushHook.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCPrePushHook.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPrePushHook.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCPrePushHook.java index 6e14c6036e41..9c4eb9a9e128 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPrePushHook.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCPrePushHook.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localvc; +package de.tum.cit.aet.artemis.programming.service.localvc; import java.io.IOException; import java.util.Collection; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPushFilter.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCPushFilter.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPushFilter.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCPushFilter.java index 0f07f7e7c7ac..3d178b998cdd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCPushFilter.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCPushFilter.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localvc; +package de.tum.cit.aet.artemis.programming.service.localvc; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCRepositoryUri.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCRepositoryUri.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCRepositoryUri.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCRepositoryUri.java index ba04918eee48..796c0df5fc02 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCRepositoryUri.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCRepositoryUri.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localvc; +package de.tum.cit.aet.artemis.programming.service.localvc; import java.net.URI; import java.net.URISyntaxException; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCService.java index d91d0ffccb63..89316bcade92 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localvc; +package de.tum.cit.aet.artemis.programming.service.localvc; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; @@ -33,9 +33,6 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; import de.tum.cit.aet.artemis.core.service.connectors.ConnectorHealth; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.AbstractVersionControlService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlRepositoryPermission; import de.tum.cit.aet.artemis.programming.domain.Commit; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; @@ -45,6 +42,9 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.service.GitService; +import de.tum.cit.aet.artemis.programming.service.vcs.AbstractVersionControlService; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlRepositoryPermission; import de.tum.cit.aet.artemis.service.UriService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCServletService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCServletService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCServletService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCServletService.java index b6d399c231c2..3c9099bfaa20 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/localvc/LocalVCServletService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCServletService.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.core.service.connectors.localvc; +package de.tum.cit.aet.artemis.programming.service.localvc; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; -import static de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCPersonalAccessTokenManagementService.TOKEN_PREFIX; -import static de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCPersonalAccessTokenManagementService.VCS_ACCESS_TOKEN_LENGTH; +import static de.tum.cit.aet.artemis.programming.service.localvc.LocalVCPersonalAccessTokenManagementService.TOKEN_PREFIX; +import static de.tum.cit.aet.artemis.programming.service.localvc.LocalVCPersonalAccessTokenManagementService.VCS_ACCESS_TOKEN_LENGTH; import java.io.IOException; import java.net.URL; @@ -46,7 +46,6 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationTriggerService; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.programming.domain.Commit; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -66,6 +65,7 @@ import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.programming.web.repository.RepositoryActionType; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationTriggerService; /** * This service is responsible for authenticating and authorizing git requests as well as for retrieving the requested Git repositories from disk. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitCommandFactoryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/SshGitCommandFactoryService.java similarity index 80% rename from src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitCommandFactoryService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/SshGitCommandFactoryService.java index aeac76d8348f..29c4717781c5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitCommandFactoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/SshGitCommandFactoryService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.icl; +package de.tum.cit.aet.artemis.programming.service.localvc; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; @@ -7,8 +7,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCServletService; -import de.tum.cit.aet.artemis.programming.icl.ssh.SshGitCommand; +import de.tum.cit.aet.artemis.programming.service.localvc.ssh.SshGitCommand; @Profile(PROFILE_LOCALVC) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitLocationResolverService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/SshGitLocationResolverService.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitLocationResolverService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/SshGitLocationResolverService.java index d2dbefa3b6b1..5208fc3f0be5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/icl/SshGitLocationResolverService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/SshGitLocationResolverService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.icl; +package de.tum.cit.aet.artemis.programming.service.localvc; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; @@ -20,13 +20,11 @@ import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCForbiddenException; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; -import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCRepositoryUri; -import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCServletService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.programming.icl.ssh.SshConstants; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.programming.web.repository.RepositoryActionType; +import de.tum.cit.aet.artemis.programming.service.localvc.ssh.SshConstants; @Profile(PROFILE_LOCALVC) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/HashUtils.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/ssh/HashUtils.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/HashUtils.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/ssh/HashUtils.java index fb88e5b5c957..4312a3b45789 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/HashUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/ssh/HashUtils.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.icl.ssh; +package de.tum.cit.aet.artemis.programming.service.localvc.ssh; import java.security.PublicKey; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/MultipleHostKeyProvider.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/ssh/MultipleHostKeyProvider.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/MultipleHostKeyProvider.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/ssh/MultipleHostKeyProvider.java index b0a04875c4e8..a80ec3cec097 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/MultipleHostKeyProvider.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/ssh/MultipleHostKeyProvider.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.icl.ssh; +package de.tum.cit.aet.artemis.programming.service.localvc.ssh; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/ssh/SshConfiguration.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshConfiguration.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/ssh/SshConfiguration.java index 90df714dac23..190b1732efe1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/ssh/SshConfiguration.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.icl.ssh; +package de.tum.cit.aet.artemis.programming.service.localvc.ssh; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; @@ -18,9 +18,9 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; -import de.tum.cit.aet.artemis.service.icl.GitPublickeyAuthenticatorService; -import de.tum.cit.aet.artemis.service.icl.SshGitCommandFactoryService; -import de.tum.cit.aet.artemis.service.icl.SshGitLocationResolverService; +import de.tum.cit.aet.artemis.programming.service.localvc.GitPublickeyAuthenticatorService; +import de.tum.cit.aet.artemis.programming.service.localvc.SshGitCommandFactoryService; +import de.tum.cit.aet.artemis.programming.service.localvc.SshGitLocationResolverService; @Profile(PROFILE_LOCALVC) @Configuration diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshConstants.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/ssh/SshConstants.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshConstants.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/ssh/SshConstants.java index b335ceccd7a6..1ea41e9d2d6e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshConstants.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/ssh/SshConstants.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.icl.ssh; +package de.tum.cit.aet.artemis.programming.service.localvc.ssh; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshGitCommand.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/ssh/SshGitCommand.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshGitCommand.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/ssh/SshGitCommand.java index 61555a3ae0f9..b0307ec38bb4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/icl/ssh/SshGitCommand.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/ssh/SshGitCommand.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.icl.ssh; +package de.tum.cit.aet.artemis.programming.service.localvc.ssh; import java.io.IOException; import java.nio.file.Path; @@ -21,9 +21,9 @@ import org.eclipse.jgit.util.FS; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCPostPushHook; -import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCPrePushHook; -import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCServletService; +import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCPostPushHook; +import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCPrePushHook; +import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCServletService; public class SshGitCommand extends GitPackCommand { diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/AbstractVersionControlService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/vcs/AbstractVersionControlService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/AbstractVersionControlService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/vcs/AbstractVersionControlService.java index aa54571d6d23..7b033261de37 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/AbstractVersionControlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/vcs/AbstractVersionControlService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.vcs; +package de.tum.cit.aet.artemis.programming.service.vcs; import java.io.IOException; import java.nio.file.Path; @@ -13,7 +13,6 @@ import org.springframework.beans.factory.annotation.Value; import de.tum.cit.aet.artemis.core.exception.VersionControlException; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; @@ -24,6 +23,7 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.service.UriService; public abstract class AbstractVersionControlService implements VersionControlService { diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VcsTokenManagementService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/vcs/VcsTokenManagementService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VcsTokenManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/vcs/VcsTokenManagementService.java index 5ff7bbfc6ed7..1ec2ba4a2216 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VcsTokenManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/vcs/VcsTokenManagementService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.vcs; +package de.tum.cit.aet.artemis.programming.service.vcs; import java.time.Duration; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VcsTokenRenewalService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/vcs/VcsTokenRenewalService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VcsTokenRenewalService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/vcs/VcsTokenRenewalService.java index 517e651be180..74a89d394071 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VcsTokenRenewalService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/vcs/VcsTokenRenewalService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.vcs; +package de.tum.cit.aet.artemis.programming.service.vcs; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; @@ -16,7 +16,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.core.service.connectors.gitlab.GitLabException; +import de.tum.cit.aet.artemis.programming.service.gitlab.GitLabException; /** * Uses the scheduled task {@link #renewAllVcsAccessTokens} to periodically renew all VCS access tokens that have expired or that are about to expire. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VcsUserManagementService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/vcs/VcsUserManagementService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VcsUserManagementService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/vcs/VcsUserManagementService.java index ce70288b282a..591472fa7a12 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VcsUserManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/vcs/VcsUserManagementService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.vcs; +package de.tum.cit.aet.artemis.programming.service.vcs; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VersionControlRepositoryPermission.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/vcs/VersionControlRepositoryPermission.java similarity index 56% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VersionControlRepositoryPermission.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/vcs/VersionControlRepositoryPermission.java index 09b11184ef9b..66f0c3ed8f31 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VersionControlRepositoryPermission.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/vcs/VersionControlRepositoryPermission.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.vcs; +package de.tum.cit.aet.artemis.programming.service.vcs; public enum VersionControlRepositoryPermission { REPO_READ, REPO_WRITE diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VersionControlServerHealthIndicator.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/vcs/VersionControlServerHealthIndicator.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VersionControlServerHealthIndicator.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/vcs/VersionControlServerHealthIndicator.java index 97806edb555e..2dd83670b65d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VersionControlServerHealthIndicator.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/vcs/VersionControlServerHealthIndicator.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.vcs; +package de.tum.cit.aet.artemis.programming.service.vcs; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VersionControlService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/vcs/VersionControlService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VersionControlService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/vcs/VersionControlService.java index 6884e240904b..f467a090dec9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/vcs/VersionControlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/vcs/VersionControlService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.service.connectors.vcs; +package de.tum.cit.aet.artemis.programming.service.vcs; import java.time.ZonedDateTime; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseExportImportResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseExportImportResource.java index d4507230c541..d58f526825dd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseExportImportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseExportImportResource.java @@ -41,6 +41,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import de.tum.cit.aet.artemis.assessment.domain.Visibility; +import de.tum.cit.aet.artemis.athena.service.AthenaModuleService; import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; @@ -52,7 +53,6 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaModuleService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.exam.service.ExamAccessService; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResource.java index 5e54e9a0c99c..6a72f4e3ccfa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResource.java @@ -41,6 +41,7 @@ import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; +import de.tum.cit.aet.artemis.athena.service.AthenaModuleService; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.domain.Course; @@ -54,10 +55,6 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; -import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaModuleService; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -75,11 +72,14 @@ import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.service.AuxiliaryRepositoryService; +import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseRepositoryService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseTestCaseService; import de.tum.cit.aet.artemis.programming.service.StaticCodeAnalysisService; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.web.rest.dto.BuildLogStatisticsDTO; import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingSubmissionResource.java index 570d9d83f405..8f50706118b3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingSubmissionResource.java @@ -31,7 +31,6 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.exercise.domain.Exercise; @@ -52,6 +51,7 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingMessagingService; import de.tum.cit.aet.artemis.programming.service.ProgrammingSubmissionService; import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/AeolusTemplateResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/AeolusTemplateResource.java index 88de52e05ead..9919c2440364 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/AeolusTemplateResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/AeolusTemplateResource.java @@ -19,11 +19,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.core.service.connectors.BuildScriptProviderService; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusTemplateService; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.Windfile; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProjectType; +import de.tum.cit.aet.artemis.programming.service.BuildScriptProviderService; +import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.programming.service.aeolus.Windfile; /** * Service for retrieving aeolus template files based on the programming language, project type, and diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildJobQueueResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildJobQueueResource.java index 8731bda3732d..44e4a90ab26b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildJobQueueResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildJobQueueResource.java @@ -25,10 +25,10 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.localci.SharedQueueManagementService; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; import de.tum.cit.aet.artemis.programming.domain.BuildJob; import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; +import de.tum.cit.aet.artemis.programming.service.localci.SharedQueueManagementService; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; import de.tum.cit.aet.artemis.service.dto.BuildJobResultCountDTO; import de.tum.cit.aet.artemis.service.dto.BuildJobsStatisticsDTO; import de.tum.cit.aet.artemis.service.dto.FinishedBuildJobDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/open/PublicProgrammingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/open/PublicProgrammingSubmissionResource.java index a07d91e6ad01..d13db4dd7a1d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/open/PublicProgrammingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/open/PublicProgrammingSubmissionResource.java @@ -4,6 +4,8 @@ import java.util.Optional; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Profile; @@ -19,8 +21,6 @@ import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationTriggerService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.programming.domain.Commit; @@ -30,8 +30,8 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingMessagingService; import de.tum.cit.aet.artemis.programming.service.ProgrammingSubmissionService; import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationTriggerService; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; /** * REST controller for receiving updates for a ProgrammingSubmission. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryProgrammingExerciseParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryProgrammingExerciseParticipationResource.java index dff6b92d5dc8..9bbc4e434a45 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryProgrammingExerciseParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryProgrammingExerciseParticipationResource.java @@ -34,9 +34,6 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; -import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCServletService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; @@ -53,10 +50,13 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.repository.SubmissionPolicyRepository; +import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseParticipationService; import de.tum.cit.aet.artemis.programming.service.RepositoryAccessService; import de.tum.cit.aet.artemis.programming.service.RepositoryParticipationService; import de.tum.cit.aet.artemis.programming.service.RepositoryService; +import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCServletService; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.service.ProfileService; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryResource.java index 0c5a3cb498b8..d25b1b533326 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryResource.java @@ -31,16 +31,16 @@ import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; -import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCServletService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.programming.domain.File; import de.tum.cit.aet.artemis.programming.domain.FileType; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.RepositoryAccessService; import de.tum.cit.aet.artemis.programming.service.RepositoryService; +import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCServletService; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.web.rest.dto.FileMove; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/TestRepositoryResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/TestRepositoryResource.java index a206bc8e32ff..2400377b7b16 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/TestRepositoryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/TestRepositoryResource.java @@ -31,9 +31,6 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; -import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCServletService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.programming.domain.FileType; @@ -41,8 +38,11 @@ import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.RepositoryAccessService; import de.tum.cit.aet.artemis.programming.service.RepositoryService; +import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCServletService; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.web.rest.dto.FileMove; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/DragAndDropQuizAnswerConversionService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/DragAndDropQuizAnswerConversionService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/DragAndDropQuizAnswerConversionService.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/service/DragAndDropQuizAnswerConversionService.java index 31428bc2516f..69deb6071f52 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/DragAndDropQuizAnswerConversionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/DragAndDropQuizAnswerConversionService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.quiz.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -31,6 +31,7 @@ import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; import de.tum.cit.aet.artemis.quiz.domain.DragAndDropSubmittedAnswer; import de.tum.cit.aet.artemis.quiz.domain.DropLocation; +import de.tum.cit.aet.artemis.service.FilePathService; /** * Service for converting a DragAndDropSubmittedAnswer to a PDF file displaying the submitted answer. diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizStatisticService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizStatisticService.java index eb7af35b4b2d..264a4d2261a0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizStatisticService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizStatisticService.java @@ -14,9 +14,9 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; -import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiNewResultService; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.lti.service.LtiNewResultService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizPointStatistic; import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java b/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java index d39210d5d124..c0ff32e92369 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java @@ -17,8 +17,8 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisWebhookService; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; +import de.tum.cit.aet.artemis.iris.service.pyris.PyrisWebhookService; import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.Lecture; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/BuildLogEntryService.java b/src/main/java/de/tum/cit/aet/artemis/service/BuildLogEntryService.java index d84d33f15bb2..f4456adb2c9d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/BuildLogEntryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/BuildLogEntryService.java @@ -23,12 +23,12 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.BuildLogEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java index 387246252eca..987d95c6fbb2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java @@ -28,10 +28,6 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.VersionControlException; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.core.service.connectors.localci.SharedQueueManagementService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.Submission; @@ -54,7 +50,11 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageReportRepository; +import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.ParticipationVcsAccessTokenService; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.programming.service.localci.SharedQueueManagementService; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java index aa7fd4b0bda3..74805d242299 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java @@ -31,11 +31,11 @@ import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.service.FeedbackService; +import de.tum.cit.aet.artemis.athena.service.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/AbstractBuildResultNotificationDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/AbstractBuildResultNotificationDTO.java index a3dd75a7f71d..78e521900d3d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/AbstractBuildResultNotificationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/AbstractBuildResultNotificationDTO.java @@ -9,9 +9,9 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestwiseCoverageReportDTO; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestwiseCoverageReportDTO; @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/text/service/TextAssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextAssessmentService.java index 9af2cb7ce199..eb011ad9ac3a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/service/TextAssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextAssessmentService.java @@ -22,11 +22,11 @@ import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiNewResultService; import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.lti.service.LtiNewResultService; import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; diff --git a/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseFeedbackService.java index 1199d46dfaf7..e9601277266c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseFeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseFeedbackService.java @@ -18,7 +18,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.service.ResultService; -import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaFeedbackSuggestionsService; +import de.tum.cit.aet.artemis.athena.service.AthenaFeedbackSuggestionsService; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.service.ParticipationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionService.java index 7665583d9fba..f30ba55c43e7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionService.java @@ -17,11 +17,11 @@ import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.service.FeedbackService; +import de.tum.cit.aet.artemis.athena.service.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; diff --git a/src/main/java/de/tum/cit/aet/artemis/text/web/ApollonConversionResource.java b/src/main/java/de/tum/cit/aet/artemis/text/web/ApollonConversionResource.java index 8dfa95bdc119..ebb13152ec6c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/web/ApollonConversionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/web/ApollonConversionResource.java @@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.core.service.connectors.apollon.ApollonConversionService; -import de.tum.cit.aet.artemis.core.service.connectors.apollon.dto.ApollonModelDTO; +import de.tum.cit.aet.artemis.modeling.service.apollon.ApollonConversionService; +import de.tum.cit.aet.artemis.modeling.service.apollon.dto.ApollonModelDTO; /** * REST controller for managing ApollonDiagram. diff --git a/src/main/java/de/tum/cit/aet/artemis/text/web/TextAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/text/web/TextAssessmentResource.java index c98fc1dd22f3..22b840194aaa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/web/TextAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/web/TextAssessmentResource.java @@ -40,13 +40,13 @@ import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.service.ResultService; +import de.tum.cit.aet.artemis.athena.service.AthenaFeedbackSendingService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaFeedbackSendingService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; diff --git a/src/main/java/de/tum/cit/aet/artemis/text/web/TextExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/text/web/TextExerciseResource.java index ca48f01dc26c..c676d1e7f27c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/web/TextExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/web/TextExerciseResource.java @@ -39,6 +39,7 @@ import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.repository.TextBlockRepository; +import de.tum.cit.aet.artemis.athena.service.AthenaModuleService; import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; @@ -54,7 +55,6 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaModuleService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java index 462261c7a4ef..341cbd303c28 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java @@ -64,6 +64,7 @@ import de.tum.cit.aet.artemis.assessment.service.ComplaintService; import de.tum.cit.aet.artemis.assessment.service.CourseScoreCalculationService; import de.tum.cit.aet.artemis.assessment.service.GradingScaleService; +import de.tum.cit.aet.artemis.athena.service.AthenaModuleService; import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; @@ -76,9 +77,6 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaModuleService; -import de.tum.cit.aet.artemis.core.service.connectors.ci.CIUserManagementService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsUserManagementService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; @@ -92,6 +90,8 @@ import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseService; import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; +import de.tum.cit.aet.artemis.programming.service.ci.CIUserManagementService; +import de.tum.cit.aet.artemis.programming.service.vcs.VcsUserManagementService; import de.tum.cit.aet.artemis.service.ConductAgreementService; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.FilePathService; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java index 75224c024263..30f611e0dbde 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Set; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Profile; @@ -30,10 +31,9 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiDeepLinkingService; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.lti.service.LtiDeepLinkingService; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.PaginationUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java index 39048538db2a..d78985f5b8df 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java @@ -58,7 +58,6 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggleService; @@ -84,6 +83,7 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseCodeReviewFeedbackService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseParticipationService; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/UserResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/UserResource.java index 1693aee836e2..c9dccd0ad40e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/UserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/UserResource.java @@ -27,9 +27,9 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiService; import de.tum.cit.aet.artemis.core.service.user.UserCreationService; import de.tum.cit.aet.artemis.core.service.user.UserService; +import de.tum.cit.aet.artemis.lti.service.LtiService; import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.service.dto.UserInitializationDTO; import tech.jhipster.web.util.PaginationUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/localci/LocalCIWebsocketMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/localci/LocalCIWebsocketMessagingService.java index 972166478f91..d7aab6809ef9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/localci/LocalCIWebsocketMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/websocket/localci/LocalCIWebsocketMessagingService.java @@ -12,8 +12,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildAgentInformation; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractArtemisIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractArtemisIntegrationTest.java index 0576660cb16d..2a5651592456 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractArtemisIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractArtemisIntegrationTest.java @@ -38,16 +38,16 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.ScheduleService; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; -import de.tum.cit.aet.artemis.core.service.connectors.lti.Lti13Service; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exam.service.ExamAccessService; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.MockDelegate; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.lti.service.Lti13Service; import de.tum.cit.aet.artemis.modeling.service.ModelingSubmissionService; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseGradingService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseParticipationService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseScheduleService; diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java index 5d78b6b10592..fc28b43216aa 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java @@ -32,9 +32,6 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; -import de.tum.cit.aet.artemis.core.service.connectors.gitlab.GitLabService; -import de.tum.cit.aet.artemis.core.service.connectors.gitlabci.GitLabCIService; -import de.tum.cit.aet.artemis.core.service.connectors.gitlabci.GitLabCITriggerService; import de.tum.cit.aet.artemis.core.service.user.PasswordService; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.programming.domain.AbstractBaseProgrammingExerciseParticipation; @@ -43,6 +40,9 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.service.gitlab.GitLabService; +import de.tum.cit.aet.artemis.programming.service.gitlabci.GitLabCIService; +import de.tum.cit.aet.artemis.programming.service.gitlabci.GitLabCITriggerService; @ResourceLock("AbstractSpringIntegrationGitlabCIGitlabSamlTest") // NOTE: we use a common set of active profiles to reduce the number of application launches during testing. This significantly saves time and memory! diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java index 759a36369087..dd07afb40424 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java @@ -35,8 +35,6 @@ import de.tum.cit.aet.artemis.connector.JenkinsRequestMockProvider; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.service.connectors.gitlab.GitLabService; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsService; import de.tum.cit.aet.artemis.exam.service.ExamLiveEventsService; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.programming.domain.AbstractBaseProgrammingExerciseParticipation; @@ -47,6 +45,8 @@ import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.service.ProgrammingMessagingService; +import de.tum.cit.aet.artemis.programming.service.gitlab.GitLabService; +import de.tum.cit.aet.artemis.programming.service.jenkins.JenkinsService; import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; @ResourceLock("AbstractSpringIntegrationJenkinsGitlabTest") diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java index 436261b7f449..b87eff59c1cf 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java @@ -29,8 +29,6 @@ import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.service.connectors.localci.LocalCIService; -import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCService; import de.tum.cit.aet.artemis.core.service.ldap.LdapUserService; import de.tum.cit.aet.artemis.exam.service.ExamLiveEventsService; import de.tum.cit.aet.artemis.exercise.domain.Team; @@ -48,6 +46,8 @@ import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingMessagingService; +import de.tum.cit.aet.artemis.programming.service.localci.LocalCIService; +import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCService; import de.tum.cit.aet.artemis.service.ResourceLoaderService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/ManagementResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/ManagementResourceIntegrationTest.java index 73208708d9b9..dea3d80e425b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/ManagementResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/ManagementResourceIntegrationTest.java @@ -23,7 +23,6 @@ import de.tum.cit.aet.artemis.core.domain.PersistentAuditEvent; import de.tum.cit.aet.artemis.core.repository.PersistenceAuditEventRepository; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggleService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; @@ -32,6 +31,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; class ManagementResourceIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java index 05b76561d90b..d993f5f199eb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java @@ -75,7 +75,7 @@ import de.tum.cit.aet.artemis.authorization.AuthorizationTestService; import de.tum.cit.aet.artemis.core.config.ApplicationConfiguration; import de.tum.cit.aet.artemis.core.config.ConditionalMetricsExclusionConfiguration; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.programming.web.repository.RepositoryResource; diff --git a/src/test/java/de/tum/cit/aet/artemis/authentication/UserJenkinsGitlabIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/UserJenkinsGitlabIntegrationTest.java index 3d47901529d5..bce2316f4d44 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authentication/UserJenkinsGitlabIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/UserJenkinsGitlabIntegrationTest.java @@ -21,12 +21,12 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.core.service.connectors.gitlab.GitLabPersonalAccessTokenManagementService; -import de.tum.cit.aet.artemis.core.service.connectors.gitlab.GitLabUserManagementService; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsUserManagementService; import de.tum.cit.aet.artemis.core.service.user.PasswordService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.service.gitlab.GitLabPersonalAccessTokenManagementService; +import de.tum.cit.aet.artemis.programming.service.gitlab.GitLabUserManagementService; +import de.tum.cit.aet.artemis.programming.service.jenkins.JenkinsUserManagementService; import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.user.UserTestService; import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; diff --git a/src/test/java/de/tum/cit/aet/artemis/connector/GitlabRequestMockProvider.java b/src/test/java/de/tum/cit/aet/artemis/connector/GitlabRequestMockProvider.java index f131fac42556..7f659fc6914a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connector/GitlabRequestMockProvider.java +++ b/src/test/java/de/tum/cit/aet/artemis/connector/GitlabRequestMockProvider.java @@ -92,16 +92,16 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.core.service.connectors.gitlab.GitLabException; -import de.tum.cit.aet.artemis.core.service.connectors.gitlab.GitLabUserDoesNotExistException; -import de.tum.cit.aet.artemis.core.service.connectors.gitlab.GitLabUserManagementService; -import de.tum.cit.aet.artemis.core.service.connectors.gitlab.dto.GitLabPersonalAccessTokenListResponseDTO; -import de.tum.cit.aet.artemis.core.service.connectors.gitlab.dto.GitLabPersonalAccessTokenResponseDTO; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.gitlab.GitLabException; +import de.tum.cit.aet.artemis.programming.service.gitlab.GitLabUserDoesNotExistException; +import de.tum.cit.aet.artemis.programming.service.gitlab.GitLabUserManagementService; +import de.tum.cit.aet.artemis.programming.service.gitlab.dto.GitLabPersonalAccessTokenListResponseDTO; +import de.tum.cit.aet.artemis.programming.service.gitlab.dto.GitLabPersonalAccessTokenResponseDTO; import de.tum.cit.aet.artemis.service.UriService; @Component diff --git a/src/test/java/de/tum/cit/aet/artemis/connector/IrisRequestMockProvider.java b/src/test/java/de/tum/cit/aet/artemis/connector/IrisRequestMockProvider.java index f9970deb951c..c305784ca463 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connector/IrisRequestMockProvider.java +++ b/src/test/java/de/tum/cit/aet/artemis/connector/IrisRequestMockProvider.java @@ -27,11 +27,11 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.PyrisHealthStatusDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.PyrisModelDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.chat.exercise.PyrisExerciseChatPipelineExecutionDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionPipelineExecutionDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.PyrisHealthStatusDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.PyrisModelDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.chat.exercise.PyrisExerciseChatPipelineExecutionDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.competency.PyrisCompetencyExtractionPipelineExecutionDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; @Component @Profile("iris") diff --git a/src/test/java/de/tum/cit/aet/artemis/connector/JenkinsRequestMockProvider.java b/src/test/java/de/tum/cit/aet/artemis/connector/JenkinsRequestMockProvider.java index 162b8df92a0d..857d73618eb0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connector/JenkinsRequestMockProvider.java +++ b/src/test/java/de/tum/cit/aet/artemis/connector/JenkinsRequestMockProvider.java @@ -47,10 +47,10 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.dto.JenkinsUserDTO; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs.JenkinsJobPermissionsService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.jenkins.dto.JenkinsUserDTO; +import de.tum.cit.aet.artemis.programming.service.jenkins.jobs.JenkinsJobPermissionsService; @Component @Profile("jenkins") diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusBuildScriptGenerationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusBuildScriptGenerationServiceTest.java index 64209adad3bc..25a06cb9c199 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusBuildScriptGenerationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusBuildScriptGenerationServiceTest.java @@ -18,16 +18,16 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; import de.tum.cit.aet.artemis.connector.AeolusRequestMockProvider; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusBuildPlanService; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusBuildScriptGenerationService; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusTemplateService; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.Windfile; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.WindfileMetadata; import de.tum.cit.aet.artemis.programming.domain.AeolusTarget; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProjectType; +import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusBuildPlanService; +import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusBuildScriptGenerationService; +import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.programming.service.aeolus.Windfile; +import de.tum.cit.aet.artemis.programming.service.aeolus.WindfileMetadata; class AeolusBuildScriptGenerationServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusServiceTest.java index 7934f72cd649..256b4db68dbe 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusServiceTest.java @@ -25,14 +25,6 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.connector.AeolusRequestMockProvider; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusBuildPlanService; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusBuildScriptGenerationService; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusRepository; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusTemplateService; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.ScriptAction; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.Windfile; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.WindfileMetadata; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.programming.domain.AeolusTarget; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -40,6 +32,14 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusBuildPlanService; +import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusBuildScriptGenerationService; +import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusRepository; +import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.programming.service.aeolus.ScriptAction; +import de.tum.cit.aet.artemis.programming.service.aeolus.Windfile; +import de.tum.cit.aet.artemis.programming.service.aeolus.WindfileMetadata; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; class AeolusServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusTemplateResourceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusTemplateResourceTest.java index a9cfd4e7f93e..e68db42104a3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusTemplateResourceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusTemplateResourceTest.java @@ -17,8 +17,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.ScriptAction; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.Windfile; +import de.tum.cit.aet.artemis.programming.service.aeolus.ScriptAction; +import de.tum.cit.aet.artemis.programming.service.aeolus.Windfile; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.RequestUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusTest.java index a1421302a5a3..b01394b7ff89 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/AeolusTest.java @@ -8,13 +8,13 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusRepository; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusResult; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.DockerConfig; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.PlatformAction; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.ScriptAction; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.Windfile; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.WindfileMetadata; +import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusRepository; +import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusResult; +import de.tum.cit.aet.artemis.programming.service.aeolus.DockerConfig; +import de.tum.cit.aet.artemis.programming.service.aeolus.PlatformAction; +import de.tum.cit.aet.artemis.programming.service.aeolus.ScriptAction; +import de.tum.cit.aet.artemis.programming.service.aeolus.Windfile; +import de.tum.cit.aet.artemis.programming.service.aeolus.WindfileMetadata; class AeolusTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/ApollonConversionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/ApollonConversionServiceTest.java index b44432191703..1a6c66ba0d1d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/ApollonConversionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/ApollonConversionServiceTest.java @@ -23,7 +23,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.connector.apollon.ApollonRequestMockProvider; -import de.tum.cit.aet.artemis.core.service.connectors.apollon.ApollonConversionService; +import de.tum.cit.aet.artemis.modeling.service.apollon.ApollonConversionService; class ApollonConversionServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/ApollonHealthIndicatorTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/ApollonHealthIndicatorTest.java index 990a57d8fa17..ed504bbf2955 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/ApollonHealthIndicatorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/ApollonHealthIndicatorTest.java @@ -11,7 +11,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.connector.apollon.ApollonRequestMockProvider; -import de.tum.cit.aet.artemis.core.service.connectors.apollon.ApollonHealthIndicator; +import de.tum.cit.aet.artemis.modeling.service.apollon.ApollonHealthIndicator; class ApollonHealthIndicatorTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java index 58451c02a207..bf0f5696493b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java @@ -52,8 +52,6 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProvider; import de.tum.cit.aet.artemis.core.security.lti.Lti13TokenRetriever; -import de.tum.cit.aet.artemis.core.service.connectors.lti.Lti13Service; -import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; @@ -63,6 +61,8 @@ import de.tum.cit.aet.artemis.lti.dto.Scopes; import de.tum.cit.aet.artemis.lti.repository.Lti13ResourceLaunchRepository; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; +import de.tum.cit.aet.artemis.lti.service.Lti13Service; +import de.tum.cit.aet.artemis.lti.service.LtiService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; import de.tum.cit.aet.artemis.text.domain.TextExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java index b743f0b7c099..826c3162f6aa 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java @@ -26,7 +26,8 @@ import de.tum.cit.aet.artemis.lti.dto.Lti13ClientRegistration; import de.tum.cit.aet.artemis.lti.dto.Lti13PlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.lti.service.LtiDynamicRegistrationService; +import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; class LtiDynamicRegistrationServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiNewResultServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiNewResultServiceTest.java index 8c755d570b2f..141f0392b7c3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiNewResultServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiNewResultServiceTest.java @@ -12,10 +12,10 @@ import org.springframework.security.core.context.SecurityContextHolder; import de.tum.cit.aet.artemis.core.domain.Course; -import de.tum.cit.aet.artemis.core.service.connectors.lti.Lti13Service; -import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiNewResultService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.lti.service.Lti13Service; +import de.tum.cit.aet.artemis.lti.service.LtiNewResultService; import de.tum.cit.aet.artemis.text.domain.TextExercise; class LtiNewResultServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiServiceTest.java index 23503c7b0c64..87f929423bcd 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiServiceTest.java @@ -34,12 +34,12 @@ import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProvider; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.jwt.JWTCookieService; -import de.tum.cit.aet.artemis.core.service.connectors.ci.CIUserManagementService; -import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsUserManagementService; import de.tum.cit.aet.artemis.core.service.user.UserCreationService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; +import de.tum.cit.aet.artemis.lti.service.LtiService; +import de.tum.cit.aet.artemis.programming.service.ci.CIUserManagementService; +import de.tum.cit.aet.artemis.programming.service.vcs.VcsUserManagementService; import de.tum.cit.aet.artemis.text.domain.TextExercise; class LtiServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java index ebfdc3e771a8..738a489715de 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java @@ -30,7 +30,6 @@ import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlRepositoryPermission; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; @@ -53,6 +52,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlRepositoryPermission; import de.tum.cit.aet.artemis.repository.ParticipationTestRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonConversionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonConversionIntegrationTest.java index 2692fa48ef30..d95203373779 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonConversionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonConversionIntegrationTest.java @@ -20,8 +20,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.connector.apollon.ApollonRequestMockProvider; -import de.tum.cit.aet.artemis.core.service.connectors.apollon.ApollonConversionService; -import de.tum.cit.aet.artemis.core.service.connectors.apollon.dto.ApollonModelDTO; +import de.tum.cit.aet.artemis.modeling.service.apollon.ApollonConversionService; +import de.tum.cit.aet.artemis.modeling.service.apollon.dto.ApollonModelDTO; class ApollonConversionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ContinuousIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ContinuousIntegrationTestService.java index eca71a4475a4..72a43c35849d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ContinuousIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ContinuousIntegrationTestService.java @@ -18,11 +18,11 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.Course; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.service.GitService; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.GitUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseFactory.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseFactory.java index f5778d4fa929..d1bf0593b5df 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseFactory.java @@ -16,11 +16,6 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; -import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.CommitDTO; -import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestCaseDTO; -import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestCaseDetailMessageDTO; -import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestResultsDTO; -import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestSuiteDTO; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.ExerciseFactory; import de.tum.cit.aet.artemis.exercise.domain.DifficultyLevel; @@ -32,6 +27,11 @@ import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisCategory; import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.CommitDTO; +import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestCaseDTO; +import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestCaseDetailMessageDTO; +import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestResultsDTO; +import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestSuiteDTO; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; import de.tum.cit.aet.artemis.util.TestConstants; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java index 7c85a232e61f..bb6dbf5f99c7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java @@ -27,11 +27,11 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.util.GitUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java index 967873f1ec66..9716c1cd9ac7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java @@ -74,10 +74,6 @@ import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlRepositoryPermission; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; @@ -106,6 +102,10 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.service.GitService; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlRepositoryPermission; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestRepository; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.UriService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java index 8592835f4fcf..cdd5340f1476 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java @@ -35,7 +35,6 @@ import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.connector.AeolusRequestMockProvider; import de.tum.cit.aet.artemis.core.domain.Course; -import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.domain.AeolusTarget; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -43,6 +42,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.util.LocalRepository; import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultJenkinsIntegrationTest.java index 615e2a74a021..95d5355726cd 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultJenkinsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultJenkinsIntegrationTest.java @@ -21,9 +21,9 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.core.config.Constants; -import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.CommitDTO; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.CommitDTO; import de.tum.cit.aet.artemis.util.TestConstants; class ProgrammingExerciseResultJenkinsIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java index 1a194c0f6ef1..176f684732c9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java @@ -40,7 +40,6 @@ import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.domain.Course; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.hestia.TestwiseCoverageTestUtil; @@ -60,6 +59,7 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseGradingService; import de.tum.cit.aet.artemis.programming.service.StaticCodeAnalysisService; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java index d745cd42a279..6d80f316bb49 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java @@ -80,12 +80,6 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.core.service.connectors.gitlab.GitLabException; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.build_plan.JenkinsBuildPlanUtils; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlRepositoryPermission; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.core.service.export.CourseExamExportService; import de.tum.cit.aet.artemis.core.service.user.PasswordService; import de.tum.cit.aet.artemis.course.CourseUtilService; @@ -136,8 +130,14 @@ import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.programming.service.AutomaticProgrammingExerciseCleanupService; +import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.JavaTemplateUpgradeService; import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeature; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.programming.service.gitlab.GitLabException; +import de.tum.cit.aet.artemis.programming.service.jenkins.build_plan.JenkinsBuildPlanUtils; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlRepositoryPermission; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationTestRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java index 4bd84e34343e..3662db7bd6a0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java @@ -33,7 +33,6 @@ import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; @@ -76,6 +75,7 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java index 6e732322f24d..66aef2fe9e81 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java @@ -30,10 +30,6 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.CommitDTO; -import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestCaseDTO; -import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestCaseDetailMessageDTO; -import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.TestResultsDTO; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -43,6 +39,10 @@ import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.CommitDTO; +import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestCaseDTO; +import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestCaseDetailMessageDTO; +import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestResultsDTO; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; class ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java index df10178fced7..454658fb477c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java @@ -57,8 +57,6 @@ import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.core.domain.Course; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlRepositoryPermission; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; @@ -84,7 +82,9 @@ import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseParticipationService; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlRepositoryPermission; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.util.GitUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java index 6856fcbd3c18..da59b229dae1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java @@ -21,7 +21,6 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.service.connectors.ci.notification.dto.CommitDTO; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; @@ -34,6 +33,7 @@ import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseGradingService; +import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.CommitDTO; class SubmissionPolicyIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java index 4ac910e2a68e..f07424db4af0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java @@ -33,13 +33,13 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.core.domain.Course; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.programming.domain.File; import de.tum.cit.aet.artemis.programming.domain.FileType; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.util.GitUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; import de.tum.cit.aet.artemis.web.rest.dto.FileMove; diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatMessageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatMessageIntegrationTest.java index e27084665456..1a8ab50d721c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatMessageIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatMessageIntegrationTest.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.iris; -import static de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageState.DONE; -import static de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageState.IN_PROGRESS; -import static de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageState.NOT_STARTED; +import static de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageState.DONE; +import static de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageState.IN_PROGRESS; +import static de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageState.NOT_STARTED; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatNoException; import static org.awaitility.Awaitility.await; @@ -31,9 +31,6 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.core.domain.Course; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageState; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessageContent; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessageSender; @@ -43,6 +40,9 @@ import de.tum.cit.aet.artemis.iris.repository.IrisMessageRepository; import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; import de.tum.cit.aet.artemis.iris.service.IrisMessageService; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.chat.PyrisChatStatusUpdateDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageState; import de.tum.cit.aet.artemis.iris.service.session.IrisExerciseChatSessionService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/IrisCompetencyGenerationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisCompetencyGenerationIntegrationTest.java index 0456222fa6ff..b4fef850f439 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/IrisCompetencyGenerationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisCompetencyGenerationIntegrationTest.java @@ -16,12 +16,12 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; import de.tum.cit.aet.artemis.core.domain.Course; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionInputDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency.PyrisCompetencyRecommendationDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageState; import de.tum.cit.aet.artemis.iris.service.IrisCompetencyGenerationService; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.competency.PyrisCompetencyExtractionInputDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.competency.PyrisCompetencyRecommendationDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageState; class IrisCompetencyGenerationIntegrationTest extends AbstractIrisIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/PyrisConnectorServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/PyrisConnectorServiceTest.java index 27aae3e10ce3..413b0b77c046 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/PyrisConnectorServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/PyrisConnectorServiceTest.java @@ -11,10 +11,10 @@ import org.junit.jupiter.params.provider.MethodSource; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisConnectorException; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisConnectorService; import de.tum.cit.aet.artemis.iris.exception.IrisForbiddenException; import de.tum.cit.aet.artemis.iris.exception.IrisInternalPyrisErrorException; +import de.tum.cit.aet.artemis.iris.service.pyris.PyrisConnectorException; +import de.tum.cit.aet.artemis.iris.service.pyris.PyrisConnectorService; class PyrisConnectorServiceTest extends AbstractIrisIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/PyrisLectureIngestionTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/PyrisLectureIngestionTest.java index 1ea153ebc49d..748df0fc67e7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/PyrisLectureIngestionTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/PyrisLectureIngestionTest.java @@ -16,15 +16,15 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.core.domain.Course; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisJobService; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisStatusUpdateService; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.PyrisWebhookService; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.cit.aet.artemis.core.service.connectors.pyris.dto.status.PyrisStageState; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.iris.domain.settings.IrisCourseSettings; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; +import de.tum.cit.aet.artemis.iris.service.pyris.PyrisJobService; +import de.tum.cit.aet.artemis.iris.service.pyris.PyrisStatusUpdateService; +import de.tum.cit.aet.artemis.iris.service.pyris.PyrisWebhookService; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageDTO; +import de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageState; import de.tum.cit.aet.artemis.lecture.LectureUtilService; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.Lecture; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java index 9b58e14aa2bc..f7de03ae7e54 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java @@ -16,7 +16,6 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusTemplateService; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; @@ -28,6 +27,7 @@ import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.service.StaticCodeAnalysisService; +import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusTemplateService; import de.tum.cit.aet.artemis.user.UserUtilService; public class AbstractLocalCILocalVCIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentConfigurationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentConfigurationTest.java index 8c34bc4e980b..6e25e8a943e9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentConfigurationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentConfigurationTest.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.programming.icl.BuildAgentConfiguration; +import de.tum.cit.aet.artemis.buildagent.BuildAgentConfiguration; class BuildAgentConfigurationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentDockerServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentDockerServiceTest.java index 5230d6834c10..556131553f76 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentDockerServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentDockerServiceTest.java @@ -29,13 +29,13 @@ import com.hazelcast.map.IMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.buildagent.service.BuildAgentDockerService; +import de.tum.cit.aet.artemis.buildagent.service.BuildLogsMap; import de.tum.cit.aet.artemis.core.exception.LocalCIException; -import de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent.BuildAgentDockerService; -import de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent.BuildLogsMap; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildConfig; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; import de.tum.cit.aet.artemis.programming.domain.BuildJob; import de.tum.cit.aet.artemis.programming.domain.BuildStatus; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildConfig; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) class BuildAgentDockerServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentSshAuthenticationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentSshAuthenticationIntegrationTest.java index 86b77892b549..b56bfd78cb0c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentSshAuthenticationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentSshAuthenticationIntegrationTest.java @@ -14,9 +14,9 @@ import com.hazelcast.map.IMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent.BuildAgentSshKeyService; -import de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent.SharedQueueProcessingService; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.buildagent.service.BuildAgentSshKeyService; +import de.tum.cit.aet.artemis.buildagent.service.SharedQueueProcessingService; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildAgentInformation; class BuildAgentSshAuthenticationIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildResultTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildResultTest.java index 00a8e1132b4c..0e2136a13d34 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildResultTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildResultTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildResult; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildResult; class BuildResultTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java index 3a61ae6bb7a2..316338b4ef32 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java @@ -52,8 +52,6 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.exception.VersionControlException; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.ResultBuildJob; -import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCServletService; import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.programming.domain.BuildJob; @@ -62,6 +60,8 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.service.ParticipationVcsAccessTokenService; +import de.tum.cit.aet.artemis.programming.service.localci.dto.ResultBuildJob; +import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCServletService; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResourceIntegrationTest.java index be472198c7ac..27675a15878a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResourceIntegrationTest.java @@ -23,17 +23,17 @@ import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.buildagent.service.SharedQueueProcessingService; import de.tum.cit.aet.artemis.core.dto.SortingOrder; -import de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent.SharedQueueProcessingService; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildAgentInformation; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildConfig; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.JobTimingInfo; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.RepositoryInfo; import de.tum.cit.aet.artemis.programming.domain.BuildJob; import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.BuildStatus; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildConfig; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.programming.service.localci.dto.JobTimingInfo; +import de.tum.cit.aet.artemis.programming.service.localci.dto.RepositoryInfo; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.service.dto.BuildJobsStatisticsDTO; import de.tum.cit.aet.artemis.service.dto.FinishedBuildJobDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResultServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResultServiceTest.java index 653893ed2d05..4c0536c082ff 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResultServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResultServiceTest.java @@ -9,8 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.core.exception.LocalCIException; -import de.tum.cit.aet.artemis.core.service.connectors.localci.LocalCIResultService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; +import de.tum.cit.aet.artemis.programming.service.localci.LocalCIResultService; class LocalCIResultServiceTest extends AbstractLocalCILocalVCIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIServiceTest.java index 56e7e3bb5673..e0c2a0d4db4d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIServiceTest.java @@ -24,16 +24,8 @@ import com.hazelcast.map.IMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.buildagent.service.SharedQueueProcessingService; import de.tum.cit.aet.artemis.core.domain.Course; -import de.tum.cit.aet.artemis.core.service.connectors.BuildScriptProviderService; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.AeolusTemplateService; -import de.tum.cit.aet.artemis.core.service.connectors.aeolus.Windfile; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService.BuildStatus; -import de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent.SharedQueueProcessingService; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildConfig; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.JobTimingInfo; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.RepositoryInfo; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; @@ -42,6 +34,14 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +import de.tum.cit.aet.artemis.programming.service.BuildScriptProviderService; +import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusTemplateService; +import de.tum.cit.aet.artemis.programming.service.aeolus.Windfile; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService.BuildStatus; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildConfig; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.programming.service.localci.dto.JobTimingInfo; +import de.tum.cit.aet.artemis.programming.service.localci.dto.RepositoryInfo; import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; class LocalCIServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCInfoContributorTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCInfoContributorTest.java index 9938ed5664ca..59dca0af7aa4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCInfoContributorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCInfoContributorTest.java @@ -9,7 +9,7 @@ import org.springframework.boot.test.mock.mockito.SpyBean; import org.springframework.test.context.ActiveProfiles; -import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCInfoContributor; +import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCInfoContributor; @ActiveProfiles({ "artemis", PROFILE_LOCALVC, PROFILE_BUILDAGENT }) class LocalVCInfoContributorTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCIntegrationTest.java index b2995b5c5ae2..574d6c378628 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCIntegrationTest.java @@ -29,8 +29,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.core.service.ldap.LdapUserDto; +import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIIntegrationTest.java index a16209aa0ce6..fd48b4837cb2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIIntegrationTest.java @@ -2,9 +2,9 @@ import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_RESULTS_DIRECTORY; import static de.tum.cit.aet.artemis.core.config.Constants.LOCALCI_WORKING_DIRECTORY; -import static de.tum.cit.aet.artemis.core.service.connectors.localci.LocalCITriggerService.PRIORITY_EXAM_CONDUCTION; -import static de.tum.cit.aet.artemis.core.service.connectors.localci.LocalCITriggerService.PRIORITY_NORMAL; -import static de.tum.cit.aet.artemis.core.service.connectors.localci.LocalCITriggerService.PRIORITY_OPTIONAL_EXERCISE; +import static de.tum.cit.aet.artemis.programming.service.localci.LocalCITriggerService.PRIORITY_EXAM_CONDUCTION; +import static de.tum.cit.aet.artemis.programming.service.localci.LocalCITriggerService.PRIORITY_NORMAL; +import static de.tum.cit.aet.artemis.programming.service.localci.LocalCITriggerService.PRIORITY_OPTIONAL_EXERCISE; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java index 9d086327dfb1..4ccddacc3fbf 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java @@ -12,11 +12,11 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.util.LocalRepository; class LocalVCLocalCIParticipationIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java index 61d891d244cd..e13d91c8ab3c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java @@ -56,8 +56,6 @@ import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; -import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.domain.ParticipationVCSAccessToken; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -66,7 +64,9 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.ParticipationVcsAccessTokenService; +import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCSshIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCSshIntegrationTest.java index 7652aa8336d5..0cd28557c201 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCSshIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCSshIntegrationTest.java @@ -28,9 +28,9 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.programming.icl.ssh.HashUtils; -import de.tum.cit.aet.artemis.programming.icl.ssh.SshGitCommand; -import de.tum.cit.aet.artemis.service.icl.SshGitCommandFactoryService; +import de.tum.cit.aet.artemis.programming.service.localvc.SshGitCommandFactoryService; +import de.tum.cit.aet.artemis.programming.service.localvc.ssh.HashUtils; +import de.tum.cit.aet.artemis.programming.service.localvc.ssh.SshGitCommand; @Profile(PROFILE_LOCALVC) class LocalVCSshIntegrationTest extends LocalVCIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/MultipleHostKeyProviderTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/MultipleHostKeyProviderTest.java index b277a9acecee..fa14a05e9a08 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/MultipleHostKeyProviderTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/MultipleHostKeyProviderTest.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Profile; -import de.tum.cit.aet.artemis.programming.icl.ssh.MultipleHostKeyProvider; +import de.tum.cit.aet.artemis.programming.service.localvc.ssh.MultipleHostKeyProvider; @Profile(PROFILE_LOCALVC) class MultipleHostKeyProviderTest extends LocalVCIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/SharedQueueManagementServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/SharedQueueManagementServiceTest.java index 72f2e924f186..3fdb6e26685c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/SharedQueueManagementServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/SharedQueueManagementServiceTest.java @@ -12,8 +12,8 @@ import com.hazelcast.map.IMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.cit.aet.artemis.core.service.connectors.localci.SharedQueueManagementService; import de.tum.cit.aet.artemis.programming.domain.BuildJob; +import de.tum.cit.aet.artemis.programming.service.localci.SharedQueueManagementService; class SharedQueueManagementServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/TestBuildAgentConfiguration.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/TestBuildAgentConfiguration.java index 13f212884575..0053033c9485 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/TestBuildAgentConfiguration.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/TestBuildAgentConfiguration.java @@ -36,8 +36,8 @@ import com.github.dockerjava.api.model.Container; import com.github.dockerjava.api.model.Image; -import de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent.BuildAgentDockerService; -import de.tum.cit.aet.artemis.programming.icl.BuildAgentConfiguration; +import de.tum.cit.aet.artemis.buildagent.BuildAgentConfiguration; +import de.tum.cit.aet.artemis.buildagent.service.BuildAgentDockerService; import de.tum.cit.aet.artemis.util.FixMissingServletPathProcessor; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java index b7eff3b4d72a..5590f435bc75 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java @@ -36,8 +36,6 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VersionControlService; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; @@ -62,6 +60,8 @@ import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.service.ParticipationVcsAccessTokenService; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java b/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java index 7eca212b575c..fa838ef9877c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java @@ -45,11 +45,11 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import de.tum.cit.aet.artemis.core.exception.LtiEmailAlreadyInUseException; -import de.tum.cit.aet.artemis.core.service.connectors.lti.Lti13Service; import de.tum.cit.aet.artemis.core.web.filter.Lti13LaunchFilter; import de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; +import de.tum.cit.aet.artemis.lti.service.Lti13Service; import uk.ac.ox.ctl.lti13.lti.Claims; import uk.ac.ox.ctl.lti13.security.oauth2.client.lti.authentication.OidcAuthenticationToken; import uk.ac.ox.ctl.lti13.security.oauth2.client.lti.web.OAuth2LoginAuthenticationFilter; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/DataExportCreationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/DataExportCreationServiceTest.java index cf243856e7de..fc0a0b948021 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/DataExportCreationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/DataExportCreationServiceTest.java @@ -55,7 +55,6 @@ import de.tum.cit.aet.artemis.core.domain.DataExportState; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.DataExportRepository; -import de.tum.cit.aet.artemis.core.service.connectors.apollon.ApollonConversionService; import de.tum.cit.aet.artemis.core.service.export.DataExportCreationService; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exam.ExamUtilService; @@ -70,6 +69,7 @@ import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; +import de.tum.cit.aet.artemis.modeling.service.apollon.ApollonConversionService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.post.ConversationUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java index c2624728168a..1e61825b78da 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java @@ -30,8 +30,6 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationGitlabCIGitlabSamlTest; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.exception.GitLabCIException; -import de.tum.cit.aet.artemis.core.service.connectors.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.core.service.connectors.gitlabci.GitLabCIResultService; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; @@ -47,6 +45,8 @@ import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.programming.service.gitlabci.GitLabCIResultService; import de.tum.cit.aet.artemis.user.UserUtilService; class GitlabCIServiceTest extends AbstractSpringIntegrationGitlabCIGitlabSamlTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsAuthorizationInterceptorTest.java b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsAuthorizationInterceptorTest.java index 7420e626d9e0..53c33512d950 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsAuthorizationInterceptorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsAuthorizationInterceptorTest.java @@ -31,7 +31,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsAuthorizationInterceptor; +import de.tum.cit.aet.artemis.programming.service.jenkins.JenkinsAuthorizationInterceptor; class JenkinsAuthorizationInterceptorTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsInternalUriServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsInternalUriServiceTest.java index b0212397c3d6..3cdbda0029b6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsInternalUriServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsInternalUriServiceTest.java @@ -18,8 +18,8 @@ import org.springframework.test.util.ReflectionTestUtils; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsInternalUrlService; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.service.jenkins.JenkinsInternalUrlService; class JenkinsInternalUriServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsJobPermissionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsJobPermissionServiceTest.java index bd532bdcbac3..b5cc173d97ec 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsJobPermissionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsJobPermissionServiceTest.java @@ -18,9 +18,9 @@ import org.w3c.dom.Document; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs.JenkinsJobPermission; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs.JenkinsJobPermissionsService; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs.JenkinsJobPermissionsUtils; +import de.tum.cit.aet.artemis.programming.service.jenkins.jobs.JenkinsJobPermission; +import de.tum.cit.aet.artemis.programming.service.jenkins.jobs.JenkinsJobPermissionsService; +import de.tum.cit.aet.artemis.programming.service.jenkins.jobs.JenkinsJobPermissionsUtils; class JenkinsJobPermissionServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsJobServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsJobServiceTest.java index 8562ef6e5acf..699ce3f666fb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsJobServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsJobServiceTest.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.service; -import static de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsXmlFileUtils.getDocumentBuilderFactory; +import static de.tum.cit.aet.artemis.programming.service.jenkins.JenkinsXmlFileUtils.getDocumentBuilderFactory; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIOException; import static org.mockito.Mockito.any; @@ -29,8 +29,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.core.exception.JenkinsException; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsXmlFileUtils; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs.JenkinsJobService; +import de.tum.cit.aet.artemis.programming.service.jenkins.JenkinsXmlFileUtils; +import de.tum.cit.aet.artemis.programming.service.jenkins.jobs.JenkinsJobService; import de.tum.cit.aet.artemis.user.UserUtilService; class JenkinsJobServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsServiceTest.java index 33e834469d00..5c2547c46e80 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsServiceTest.java @@ -33,7 +33,6 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.core.exception.JenkinsException; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.build_plan.JenkinsBuildPlanUtils; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ContinuousIntegrationTestService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; @@ -46,6 +45,7 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseImportService; +import de.tum.cit.aet.artemis.programming.service.jenkins.build_plan.JenkinsBuildPlanUtils; class JenkinsServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java index 435b255ba4f9..c31ad49de404 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java @@ -23,9 +23,9 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.repository.TextBlockRepository; -import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaDTOConverterService; -import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaFeedbackSendingService; -import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaModuleService; +import de.tum.cit.aet.artemis.athena.service.AthenaDTOConverterService; +import de.tum.cit.aet.artemis.athena.service.AthenaFeedbackSendingService; +import de.tum.cit.aet.artemis.athena.service.AthenaModuleService; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java index a0d5ec3621ec..75177e4a658d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java @@ -16,8 +16,8 @@ import de.tum.cit.aet.artemis.AbstractAthenaTest; import de.tum.cit.aet.artemis.athena.dto.ProgrammingFeedbackDTO; import de.tum.cit.aet.artemis.athena.dto.TextFeedbackDTO; +import de.tum.cit.aet.artemis.athena.service.AthenaFeedbackSuggestionsService; import de.tum.cit.aet.artemis.core.exception.NetworkingException; -import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaFeedbackSuggestionsService; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaHealthIndicatorTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaHealthIndicatorTest.java index 12dc1db90196..ca87e67bb774 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaHealthIndicatorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaHealthIndicatorTest.java @@ -8,7 +8,7 @@ import org.springframework.boot.actuate.health.Status; import de.tum.cit.aet.artemis.AbstractAthenaTest; -import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaHealthIndicator; +import de.tum.cit.aet.artemis.athena.service.AthenaHealthIndicator; class AthenaHealthIndicatorTest extends AbstractAthenaTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java index 2708f1e258c9..5f83010b4a25 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java @@ -17,8 +17,8 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.athena.service.AthenaRepositoryExportService; import de.tum.cit.aet.artemis.core.domain.Course; -import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaRepositoryExportService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java index e56752fb91fe..57206c6a6b6f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java @@ -17,7 +17,7 @@ import de.tum.cit.aet.artemis.AbstractAthenaTest; import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; -import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaSubmissionSelectionService; +import de.tum.cit.aet.artemis.athena.service.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java index a102d958c0bb..74e0faa5835b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java @@ -12,10 +12,10 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractAthenaTest; +import de.tum.cit.aet.artemis.athena.service.AthenaDTOConverterService; +import de.tum.cit.aet.artemis.athena.service.AthenaModuleService; +import de.tum.cit.aet.artemis.athena.service.AthenaSubmissionSendingService; import de.tum.cit.aet.artemis.core.domain.Language; -import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaDTOConverterService; -import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaModuleService; -import de.tum.cit.aet.artemis.core.service.connectors.athena.AthenaSubmissionSendingService; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementServiceTest.java index e7b4de6db008..6a21f767586c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementServiceTest.java @@ -32,9 +32,9 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.core.service.connectors.gitlab.GitLabException; -import de.tum.cit.aet.artemis.core.service.connectors.gitlab.GitLabPersonalAccessTokenManagementService; -import de.tum.cit.aet.artemis.core.service.connectors.gitlab.dto.GitLabPersonalAccessTokenListResponseDTO; +import de.tum.cit.aet.artemis.programming.service.gitlab.GitLabException; +import de.tum.cit.aet.artemis.programming.service.gitlab.GitLabPersonalAccessTokenManagementService; +import de.tum.cit.aet.artemis.programming.service.gitlab.dto.GitLabPersonalAccessTokenListResponseDTO; import de.tum.cit.aet.artemis.user.UserUtilService; class GitLabPersonalAccessTokenManagementServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreatorTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreatorTest.java index 86246f643786..6f4b64454c26 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreatorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreatorTest.java @@ -9,7 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.build_plan.JenkinsPipelineScriptCreator; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.programming.domain.BuildPlan; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -19,6 +18,7 @@ import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.jenkins.build_plan.JenkinsPipelineScriptCreator; class JenkinsPipelineScriptCreatorTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtilsTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtilsTest.java index 5a82eb93c834..d8489aefbe8a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtilsTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/jobs/JenkinsJobPermissionsUtilsTest.java @@ -13,9 +13,9 @@ import org.w3c.dom.Document; import org.w3c.dom.NodeList; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.JenkinsXmlFileUtils; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs.JenkinsJobPermission; -import de.tum.cit.aet.artemis.core.service.connectors.jenkins.jobs.JenkinsJobPermissionsUtils; +import de.tum.cit.aet.artemis.programming.service.jenkins.JenkinsXmlFileUtils; +import de.tum.cit.aet.artemis.programming.service.jenkins.jobs.JenkinsJobPermission; +import de.tum.cit.aet.artemis.programming.service.jenkins.jobs.JenkinsJobPermissionsUtils; class JenkinsJobPermissionsUtilsTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/TestResultXmlParserTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/TestResultXmlParserTest.java index 397c5c890085..87b065616cf7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/TestResultXmlParserTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/TestResultXmlParserTest.java @@ -8,8 +8,8 @@ import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.core.service.connectors.localci.buildagent.TestResultXmlParser; -import de.tum.cit.aet.artemis.core.service.connectors.localci.dto.BuildResult; +import de.tum.cit.aet.artemis.buildagent.service.TestResultXmlParser; +import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildResult; class TestResultXmlParserTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java index e8e8c6f692aa..f9a83021bab9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java @@ -34,10 +34,10 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.security.lti.Lti13TokenRetriever; -import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiDeepLinkingService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; +import de.tum.cit.aet.artemis.lti.service.LtiDeepLinkingService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import uk.ac.ox.ctl.lti13.lti.Claims; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalServiceTest.java index 355409a3c064..14a7e31c8b12 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/vcs/VcsTokenRenewalServiceTest.java @@ -24,8 +24,8 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsTokenManagementService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsTokenRenewalService; +import de.tum.cit.aet.artemis.programming.service.vcs.VcsTokenManagementService; +import de.tum.cit.aet.artemis.programming.service.vcs.VcsTokenRenewalService; class VcsTokenRenewalServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/staticcodeanalysis/StaticCodeAnalysisParserUnitTest.java b/src/test/java/de/tum/cit/aet/artemis/staticcodeanalysis/StaticCodeAnalysisParserUnitTest.java index 6c645e0c4fe2..0ef968ed73d1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/staticcodeanalysis/StaticCodeAnalysisParserUnitTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/staticcodeanalysis/StaticCodeAnalysisParserUnitTest.java @@ -15,8 +15,8 @@ import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.ReportParser; -import de.tum.cit.aet.artemis.core.service.connectors.localci.scaparser.exception.ParserException; +import de.tum.cit.aet.artemis.programming.service.localci.scaparser.ReportParser; +import de.tum.cit.aet.artemis.programming.service.localci.scaparser.exception.ParserException; /** * Tests each parser with an example file diff --git a/src/test/java/de/tum/cit/aet/artemis/uri/RepositoryUriTest.java b/src/test/java/de/tum/cit/aet/artemis/uri/RepositoryUriTest.java index 234374be8cb0..29919ccded74 100644 --- a/src/test/java/de/tum/cit/aet/artemis/uri/RepositoryUriTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/uri/RepositoryUriTest.java @@ -16,8 +16,8 @@ import org.junit.jupiter.api.Test; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; -import de.tum.cit.aet.artemis.core.service.connectors.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCRepositoryUri; class RepositoryUriTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java b/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java index 1d62d8c20df4..c0224dc9d9c4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java @@ -38,9 +38,6 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; -import de.tum.cit.aet.artemis.core.service.connectors.ci.CIUserManagementService; -import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiService; -import de.tum.cit.aet.artemis.core.service.connectors.vcs.VcsUserManagementService; import de.tum.cit.aet.artemis.core.service.user.PasswordService; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; @@ -48,8 +45,11 @@ import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.lti.service.LtiService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ParticipationVCSAccessTokenRepository; +import de.tum.cit.aet.artemis.programming.service.ci.CIUserManagementService; +import de.tum.cit.aet.artemis.programming.service.vcs.VcsUserManagementService; import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.service.dto.UserInitializationDTO; import de.tum.cit.aet.artemis.util.RequestUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/util/GitUtilService.java b/src/test/java/de/tum/cit/aet/artemis/util/GitUtilService.java index 8a41e7adc3c3..afda253a9b0e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/util/GitUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/GitUtilService.java @@ -24,7 +24,6 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; @@ -33,6 +32,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.service.GitService; @Service public class GitUtilService { diff --git a/src/test/java/de/tum/cit/aet/artemis/util/HestiaUtilTestService.java b/src/test/java/de/tum/cit/aet/artemis/util/HestiaUtilTestService.java index 09462b381b29..b864bf4b9957 100644 --- a/src/test/java/de/tum/cit/aet/artemis/util/HestiaUtilTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/HestiaUtilTestService.java @@ -18,7 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; @@ -31,6 +30,7 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/util/LocalRepository.java b/src/test/java/de/tum/cit/aet/artemis/util/LocalRepository.java index 1fe311d64e5c..978282c30044 100644 --- a/src/test/java/de/tum/cit/aet/artemis/util/LocalRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/LocalRepository.java @@ -17,7 +17,7 @@ import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.transport.URIish; -import de.tum.cit.aet.artemis.core.service.connectors.GitService; +import de.tum.cit.aet.artemis.programming.service.GitService; /** * This class describes a local repository cloned from an origin repository. From 93fc94cba7f9b880fe60e89d900b613bd51e2514 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Wed, 11 Sep 2024 17:39:02 +0200 Subject: [PATCH 16/43] remove unwanted changes and fix imports --- .../assessment/domain/BonusStrategy.java | 2 +- .../repository/GradingScaleRepository.java | 2 +- .../assessment/service/AssessmentService.java | 4 +- .../assessment/service/BonusService.java | 2 +- .../service/ComplaintResponseService.java | 6 +- .../assessment/service/ComplaintService.java | 2 +- .../service/ExampleSubmissionService.java | 2 +- .../service/GradingScaleService.java | 4 +- .../service/ParticipantScoreService.java | 2 +- .../assessment/service/ResultService.java | 2 +- .../service/TutorParticipationService.java | 2 +- .../artemis/assessment/web/BonusResource.java | 8 +- .../assessment/web/ComplaintResource.java | 6 +- .../web/ComplaintResponseResource.java | 4 +- .../assessment/web/GradeStepResource.java | 2 +- .../assessment/web/GradingScaleResource.java | 4 +- .../assessment/web/ResultResource.java | 4 +- .../web/open/PublicResultResource.java | 6 +- .../AthenaFeedbackSuggestionsService.java | 2 +- .../athena/service/AthenaModuleService.java | 2 +- .../AthenaRepositoryExportService.java | 4 +- .../artemis/athena/web/AthenaResource.java | 6 +- .../competency/KnowledgeAreaRepository.java | 2 +- .../competency/CompetencyJolService.java | 2 +- .../competency/CourseCompetencyService.java | 6 +- .../competency/KnowledgeAreaService.java | 2 +- .../StandardizedCompetencyService.java | 4 +- .../learningpath/LearningPathService.java | 4 +- .../artemis/atlas/web/CompetencyResource.java | 4 +- .../atlas/web/CourseCompetencyResource.java | 2 +- .../atlas/web/PrerequisiteResource.java | 4 +- .../web/science/ScienceSettingsResource.java | 2 +- .../service/BuildJobExecutionService.java | 2 +- .../ConversationMessageRepository.java | 2 +- .../repository/PostRepository.java | 2 +- .../conversation/OneToOneChatRepository.java | 2 +- .../service/AnswerMessageService.java | 4 +- .../service/ConversationMessagingService.java | 4 +- .../communication/service/PostingService.java | 2 +- .../service/ReactionService.java | 4 +- .../service/conversation/ChannelService.java | 4 +- .../conversation/ConversationDTOService.java | 10 +- .../conversation/ConversationService.java | 6 +- .../conversation/GroupChatService.java | 4 +- .../auth/ChannelAuthorizationService.java | 2 +- .../auth/GroupChatAuthorizationService.java | 2 +- .../OneToOneChatAuthorizationService.java | 2 +- .../web/ConversationMessageResource.java | 2 +- .../web/conversation/ChannelResource.java | 10 +- .../conversation/ConversationResource.java | 8 +- .../web/conversation/GroupChatResource.java | 4 +- .../conversation/OneToOneChatResource.java | 4 +- .../core/config/GuidedTourConfiguration.java | 2 +- .../websocket/WebsocketConfiguration.java | 2 +- .../cit/aet/artemis/core/domain/Course.java | 2 +- .../tum/cit/aet/artemis/core/domain/User.java | 2 +- .../core/exception/ExceptionTranslator.java | 1 - .../core/repository/CourseRepository.java | 2 +- .../repository/OrganizationRepository.java | 2 +- .../core/repository/UserRepository.java | 2 +- .../artemis/core/service/AccountService.java | 4 +- .../service/AuthorizationCheckService.java | 2 +- .../core/service/connectors/SAML2Service.java | 2 +- .../service/export/DataExportService.java | 6 +- .../service/user/UserCreationService.java | 2 +- .../core/service/user/UserService.java | 8 +- .../aet/artemis/core/web/AccountResource.java | 8 +- .../artemis/core/web/AttachmentResource.java | 2 +- .../core/web/admin/AdminCourseResource.java | 4 +- .../admin/AdminLtiConfigurationResource.java | 2 +- .../admin/AdminModelingExerciseResource.java | 2 +- .../web/admin/AdminOrganizationResource.java | 4 +- .../AdminSystemNotificationResource.java | 4 +- .../core/web/admin/AdminUserResource.java | 10 +- .../artemis/core/web/admin/LogResource.java | 2 +- .../core/web/open/PublicAccountResource.java | 16 +- .../core/web/open/PublicUserJwtResource.java | 4 +- .../exam/repository/ExamRepository.java | 2 +- .../repository/StudentExamRepository.java | 2 +- .../exam/service/ExamAccessService.java | 8 +- .../artemis/exam/service/ExamDateService.java | 2 +- .../exam/service/ExamImportService.java | 2 +- .../artemis/exam/service/ExamQuizService.java | 2 +- .../exam/service/ExamRegistrationService.java | 6 +- .../aet/artemis/exam/service/ExamService.java | 8 +- .../exam/service/ExamSubmissionService.java | 4 +- .../artemis/exam/service/ExamUserService.java | 2 +- .../artemis/exam/service/ImageExtractor.java | 2 +- .../service/StudentExamAccessService.java | 4 +- .../exam/service/StudentExamService.java | 4 +- .../artemis/exercise/domain/BaseExercise.java | 2 +- .../aet/artemis/exercise/domain/Exercise.java | 2 +- .../repository/ExerciseRepository.java | 2 +- .../repository/SubmissionRepository.java | 2 +- .../exercise/repository/TeamRepository.java | 4 +- .../exercise/service/ExerciseService.java | 4 +- .../service/SubmissionExportService.java | 2 +- .../exercise/service/team/TeamService.java | 6 +- .../exercise/web/AssessmentResource.java | 6 +- .../service/FileUploadExerciseService.java | 2 +- .../service/FileUploadSubmissionService.java | 4 +- .../IrisCourseChatSessionRepository.java | 2 +- .../IrisExerciseChatSessionRepository.java | 2 +- .../repository/IrisSessionRepository.java | 2 +- .../iris/service/IrisSessionService.java | 2 +- .../service/pyris/PyrisConnectorService.java | 2 +- .../iris/service/pyris/PyrisJobService.java | 4 +- .../session/IrisCourseChatSessionService.java | 2 +- .../IrisExerciseChatSessionService.java | 4 +- .../service/settings/IrisSettingsService.java | 6 +- .../web/IrisExerciseChatSessionResource.java | 2 +- .../artemis/iris/web/IrisMessageResource.java | 2 +- .../artemis/iris/web/IrisModelsResource.java | 2 +- .../repository/AttachmentUnitRepository.java | 2 +- .../lecture/service/LectureService.java | 2 +- .../service/LectureUnitProcessingService.java | 2 +- .../lecture/web/AttachmentUnitResource.java | 6 +- .../lecture/web/ExerciseUnitResource.java | 2 +- .../lecture/web/LectureUnitResource.java | 6 +- .../lecture/web/OnlineUnitResource.java | 4 +- .../artemis/lecture/web/TextUnitResource.java | 4 +- .../lecture/web/VideoUnitResource.java | 2 +- .../LtiPlatformConfigurationRepository.java | 2 +- .../aet/artemis/lti/service/Lti13Service.java | 2 +- .../lti/service/LtiDeepLinkingService.java | 2 +- .../LtiDynamicRegistrationService.java | 2 +- .../open/PublicPyrisStatusUpdateResource.java | 4 +- .../ModelingExerciseScheduleService.java | 2 +- .../service/ModelingExerciseService.java | 2 +- .../service/ModelingSubmissionService.java | 2 +- .../ModelingPlagiarismDetectionService.java | 2 +- .../service/PlagiarismAnswerPostService.java | 4 +- .../service/PlagiarismPostService.java | 4 +- .../plagiarism/service/PlagiarismService.java | 2 +- ...ProgrammingPlagiarismDetectionService.java | 2 +- .../TextPlagiarismDetectionService.java | 2 +- .../web/PlagiarismCaseResource.java | 4 +- .../web/PlagiarismPostResource.java | 4 +- .../plagiarism/web/PlagiarismResource.java | 4 +- .../domain/ProgrammingExercise.java | 2 +- .../ProgrammingExerciseRepository.java | 4 +- ...ammingExerciseParticipationRepository.java | 2 +- ...ammingExerciseParticipationRepository.java | 2 +- .../repository/hestia/CodeHintRepository.java | 2 +- .../hestia/ExerciseHintRepository.java | 2 +- ...ammingExerciseSolutionEntryRepository.java | 2 +- .../ProgrammingExerciseTaskRepository.java | 2 +- .../service/AbstractGitService.java | 2 +- .../service/AuxiliaryRepositoryService.java | 4 +- .../programming/service/GitService.java | 2 +- ...mingExerciseCodeReviewFeedbackService.java | 2 +- .../ProgrammingExerciseGradingService.java | 2 +- ...grammingExerciseImportFromFileService.java | 2 +- ...ogrammingExerciseParticipationService.java | 2 +- .../ProgrammingExerciseScheduleService.java | 2 +- .../service/ProgrammingExerciseService.java | 6 +- .../ProgrammingExerciseTestCaseService.java | 6 +- .../service/ProgrammingSubmissionService.java | 2 +- .../service/ProgrammingTriggerService.java | 2 +- .../service/RepositoryAccessService.java | 2 +- .../RepositoryParticipationService.java | 4 +- .../service/RepositoryService.java | 2 +- .../service/SubmissionPolicyService.java | 4 +- .../service/aeolus/AeolusTemplateService.java | 2 +- .../service/hestia/CodeHintService.java | 2 +- .../service/hestia/ExerciseHintService.java | 4 +- ...ogrammingExerciseGitDiffReportService.java | 2 +- .../hestia/TestwiseCoverageService.java | 2 +- .../LocalCIResultProcessingService.java | 2 +- .../localvc/LocalVCServletService.java | 6 +- .../SshGitLocationResolverService.java | 4 +- .../web/ProgrammingAssessmentResource.java | 8 +- ...ogrammingExerciseExportImportResource.java | 16 +- ...grammingExerciseParticipationResource.java | 6 +- ...ProgrammingExercisePlagiarismResource.java | 2 +- .../web/ProgrammingExerciseResource.java | 8 +- .../web/ProgrammingSubmissionResource.java | 6 +- .../web/hestia/CodeHintResource.java | 4 +- .../web/hestia/CoverageReportResource.java | 2 +- .../web/hestia/ExerciseHintResource.java | 4 +- ...grammingExerciseGitDiffReportResource.java | 2 +- ...grammingExerciseSolutionEntryResource.java | 4 +- .../web/localci/BuildJobQueueResource.java | 2 +- .../web/localci/BuildPlanResource.java | 2 +- .../web/open/PublicBuildPlanResource.java | 4 +- .../PublicProgrammingSubmissionResource.java | 4 +- ...grammingExerciseParticipationResource.java | 4 +- .../web/repository/RepositoryResource.java | 8 +- .../repository/TestRepositoryResource.java | 2 +- .../aet/artemis/quiz/domain/QuizExercise.java | 2 +- .../quiz/service/QuizExerciseService.java | 4 +- .../artemis/quiz/service/QuizPoolService.java | 4 +- .../quiz/service/QuizSubmissionService.java | 2 +- .../service/AttachmentUnitService.java | 2 +- .../aet/artemis/service/CourseService.java | 2 +- .../cit/aet/artemis/service/FileService.java | 4 +- .../artemis/service/LegalDocumentService.java | 4 +- .../OnlineCourseConfigurationService.java | 2 +- ...articipationAuthorizationCheckService.java | 2 +- .../artemis/service/ParticipationService.java | 2 +- .../artemis/service/SlideSplitterService.java | 2 +- .../artemis/service/StatisticsService.java | 2 +- .../artemis/service/SubmissionService.java | 6 +- .../service/SystemNotificationService.java | 2 +- .../service/TextExerciseFeedbackService.java | 4 +- .../text/service/TextExerciseService.java | 2 +- .../text/service/TextSubmissionService.java | 2 +- .../text/web/ApollonDiagramResource.java | 4 +- .../text/web/TextAssessmentResource.java | 8 +- .../text/web/TextExerciseResource.java | 12 +- .../text/web/TextSubmissionResource.java | 6 +- .../tutorialgroup/domain/TutorialGroup.java | 2 +- .../ScheduleOverlapsWithSessionException.java | 2 +- .../SessionOverlapsWithSessionException.java | 2 +- .../service/TutorialGroupScheduleService.java | 4 +- .../service/TutorialGroupService.java | 4 +- .../web/TutorialGroupFreePeriodResource.java | 2 +- .../web/TutorialGroupResource.java | 4 +- .../web/TutorialGroupSessionResource.java | 6 +- .../TutorialGroupsConfigurationResource.java | 2 +- .../aet/artemis/web/rest/CourseResource.java | 10 +- .../artemis/web/rest/DataExportResource.java | 4 +- .../aet/artemis/web/rest/ExamResource.java | 12 +- .../artemis/web/rest/ExamUserResource.java | 2 +- .../web/rest/ExampleSubmissionResource.java | 6 +- .../web/rest/ExerciseGroupResource.java | 6 +- .../artemis/web/rest/ExerciseResource.java | 4 +- .../aet/artemis/web/rest/FileResource.java | 4 +- .../rest/FileUploadAssessmentResource.java | 2 +- .../web/rest/FileUploadExerciseResource.java | 8 +- .../rest/FileUploadSubmissionResource.java | 8 +- .../web/rest/LearningPathResource.java | 2 +- .../aet/artemis/web/rest/LectureResource.java | 4 +- .../web/rest/LongFeedbackTextResource.java | 2 +- .../cit/aet/artemis/web/rest/LtiResource.java | 2 +- .../web/rest/ModelingAssessmentResource.java | 4 +- .../web/rest/ModelingExerciseResource.java | 8 +- .../web/rest/ModelingSubmissionResource.java | 10 +- .../rest/NotificationSettingsResource.java | 4 +- .../web/rest/ParticipationResource.java | 8 +- .../web/rest/QuizExerciseResource.java | 6 +- .../web/rest/QuizParticipationResource.java | 2 +- .../artemis/web/rest/QuizPoolResource.java | 2 +- .../web/rest/QuizSubmissionResource.java | 2 +- .../aet/artemis/web/rest/RatingResource.java | 4 +- .../web/rest/StaticCodeAnalysisResource.java | 4 +- .../artemis/web/rest/StudentExamResource.java | 10 +- .../web/rest/SubmissionPolicyResource.java | 4 +- .../artemis/web/rest/SubmissionResource.java | 4 +- .../aet/artemis/web/rest/TeamResource.java | 6 +- .../web/rest/TutorParticipationResource.java | 2 +- .../webapp/app/course/manage/faq.component.ts | 145 ------------------ .../cit/aet/artemis/LtiIntegrationTest.java | 2 +- .../architecture/ArchitectureTest.java | 2 +- .../ResultServiceIntegrationTest.java | 2 +- ...InternalAuthenticationIntegrationTest.java | 4 +- .../LdapAuthenticationIntegrationTest.java | 2 +- .../UserJenkinsGitlabIntegrationTest.java | 2 +- .../UserSaml2IntegrationTest.java | 2 +- .../artemis/connectors/Lti13ServiceTest.java | 4 +- .../LtiDynamicRegistrationServiceTest.java | 7 +- .../aet/artemis/course/CourseTestService.java | 4 +- .../aet/artemis/exam/ExamIntegrationTest.java | 2 +- .../exam/ExamRegistrationIntegrationTest.java | 2 +- .../exam/StudentExamIntegrationTest.java | 2 +- .../exercise/ExerciseIntegrationTest.java | 2 +- .../FileUploadSubmissionIntegrationTest.java | 2 +- .../ModelingSubmissionIntegrationTest.java | 2 +- .../AuxiliaryRepositoryServiceTest.java | 2 +- ...ProgrammingExerciseGitIntegrationTest.java | 2 +- ...rammingExerciseIntegrationTestService.java | 2 +- .../ProgrammingSubmissionIntegrationTest.java | 2 +- .../RepositoryIntegrationTest.java | 2 +- ...TestRepositoryResourceIntegrationTest.java | 2 +- .../artemis/hestia/CodeHintServiceTest.java | 2 +- ...risExerciseChatSessionIntegrationTest.java | 2 +- .../metis/AbstractConversationTest.java | 4 +- .../artemis/metis/ChannelIntegrationTest.java | 4 +- .../metis/ConversationIntegrationTest.java | 10 +- .../metis/GroupChatIntegrationTest.java | 2 +- .../metis/OneToOneChatIntegrationTest.java | 2 +- .../artemis/metis/PostingServiceUnitTest.java | 2 +- .../PushNotificationResourceTest.java | 6 +- .../OrganizationIntegrationTest.java | 2 +- .../AuthorizationCheckServiceTest.java | 2 +- .../service/GradingScaleServiceTest.java | 4 +- .../OnlineCourseConfigurationServiceTest.java | 4 +- ...cipationAuthorizationCheckServiceTest.java | 2 +- .../service/ParticipationServiceTest.java | 2 +- .../service/RepositoryAccessServiceTest.java | 4 +- .../service/SubmissionServiceTest.java | 2 +- .../AthenaFeedbackSuggestionsServiceTest.java | 2 +- .../AthenaRepositoryExportServiceTest.java | 2 +- .../lti/LtiDeepLinkingServiceTest.java | 2 +- .../service/exam/ExamAccessServiceTest.java | 8 +- .../artemis/service/exam/ExamServiceTest.java | 4 +- .../exam/ExamSubmissionServiceTest.java | 4 +- .../exam/StudentExamAccessServiceTest.java | 6 +- .../text/TextSubmissionIntegrationTest.java | 2 +- .../TutorialGroupIntegrationTest.java | 2 +- .../user/AccountResourceIntegrationTest.java | 8 +- .../cit/aet/artemis/user/UserTestService.java | 4 +- .../util/ExerciseIntegrationTestService.java | 2 +- ...AndroidAppSiteAssociationResourceTest.java | 2 +- .../AppleAppSiteAssociationResourceTest.java | 2 +- .../PlagiarismResultResponseBuilderTest.java | 2 +- .../config/application-buildagent.yml | 0 src/test/resources/config/application-dev.yml | 0 308 files changed, 539 insertions(+), 688 deletions(-) delete mode 100644 src/main/webapp/app/course/manage/faq.component.ts delete mode 100644 src/test/resources/config/application-buildagent.yml delete mode 100644 src/test/resources/config/application-dev.yml diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/BonusStrategy.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/BonusStrategy.java index b1131ddb802e..b58100d1dc88 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/BonusStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/BonusStrategy.java @@ -6,8 +6,8 @@ import org.apache.commons.lang3.NotImplementedException; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; -import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; public enum BonusStrategy implements IBonusStrategy { diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingScaleRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingScaleRepository.java index db99353a1ba1..75668fde72e5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingScaleRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/GradingScaleRepository.java @@ -21,9 +21,9 @@ import de.tum.cit.aet.artemis.assessment.domain.GradeStep; import de.tum.cit.aet.artemis.assessment.domain.GradingScale; -import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; /** * Spring Data JPA for the GradingScale entity diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentService.java index 2f5569ca6176..c673b132924c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentService.java @@ -19,6 +19,8 @@ import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.service.ExamDateService; @@ -33,8 +35,6 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingAssessmentService; import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateBaseDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/BonusService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/BonusService.java index bec1624947b1..52e0a56dc9da 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/BonusService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/BonusService.java @@ -12,8 +12,8 @@ import de.tum.cit.aet.artemis.assessment.domain.IBonusStrategy; import de.tum.cit.aet.artemis.assessment.repository.BonusRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; -import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintResponseService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintResponseService.java index 0f04518e8bf3..1f631b9efadc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintResponseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintResponseService.java @@ -17,14 +17,14 @@ import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ComplaintResponseLockedException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.ComplaintResponseLockedException; /** * Service for managing complaint responses. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintService.java index e2563a2fa5d7..acd8dd0597f3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintService.java @@ -26,6 +26,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; @@ -36,7 +37,6 @@ import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.dto.ComplaintRequestDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * Service for managing complaints. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ExampleSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ExampleSubmissionService.java index c4693be803b8..73e961df3855 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ExampleSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ExampleSubmissionService.java @@ -15,6 +15,7 @@ import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; @@ -26,7 +27,6 @@ import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.text.service.TextExerciseImportService; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/GradingScaleService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/GradingScaleService.java index bc71b944164e..e5a7245ec3b7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/GradingScaleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/GradingScaleService.java @@ -8,7 +8,6 @@ import java.util.Set; import java.util.stream.IntStream; -import de.tum.cit.aet.artemis.core.util.PageUtil; import org.springframework.context.annotation.Profile; import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; @@ -17,10 +16,11 @@ import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.util.PageUtil; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreService.java index c2552c24f22b..ed2e23781ca3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreService.java @@ -26,6 +26,7 @@ import de.tum.cit.aet.artemis.assessment.repository.TeamScoreRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; @@ -36,7 +37,6 @@ import de.tum.cit.aet.artemis.web.rest.dto.score.ScoreDTO; import de.tum.cit.aet.artemis.web.rest.dto.score.StudentScoreSum; import de.tum.cit.aet.artemis.web.rest.dto.score.TeamScoreSum; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java index e1a5d82ec977..4276bc1f4896 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java @@ -37,6 +37,7 @@ import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; @@ -62,7 +63,6 @@ import de.tum.cit.aet.artemis.programming.service.localci.dto.ResultBuildJob; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.web.rest.dto.feedback.FeedbackDetailDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/TutorParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/TutorParticipationService.java index 3973d27f0965..c990ab72f1cc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/TutorParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/TutorParticipationService.java @@ -30,9 +30,9 @@ import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; /** * Service Implementation for managing TutorParticipation. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/BonusResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/BonusResource.java index 59c39b8d7d17..462d26f262af 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/BonusResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/BonusResource.java @@ -29,6 +29,9 @@ import de.tum.cit.aet.artemis.assessment.service.BonusService; import de.tum.cit.aet.artemis.assessment.service.CourseScoreCalculationService; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; @@ -36,12 +39,9 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.ManualConfig; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.exam.service.ExamAccessService; import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.ConflictException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing bonus diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ComplaintResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ComplaintResource.java index 44688a1d248a..bdcb26195a79 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ComplaintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ComplaintResource.java @@ -29,6 +29,8 @@ import de.tum.cit.aet.artemis.assessment.service.ComplaintService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -36,6 +38,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.Team; @@ -50,9 +53,6 @@ import de.tum.cit.aet.artemis.service.dto.ComplaintRequestDTO; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing complaints. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ComplaintResponseResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ComplaintResponseResource.java index c90de6ceb034..131b6d338ee0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ComplaintResponseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ComplaintResponseResource.java @@ -22,12 +22,12 @@ import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.service.ComplaintResponseService; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.service.dto.ComplaintAction; import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * REST controller for managing complaints. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradeStepResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradeStepResource.java index 4852916c33e1..689cad3556fb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradeStepResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradeStepResource.java @@ -21,6 +21,7 @@ import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -34,7 +35,6 @@ import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.web.rest.dto.GradeDTO; import de.tum.cit.aet.artemis.web.rest.dto.GradeStepsDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; /** * REST controller for managing grade steps of a grading scale diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradingScaleResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradingScaleResource.java index b5873244d9c5..b385b460ff3d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradingScaleResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradingScaleResource.java @@ -27,17 +27,17 @@ import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.assessment.service.GradingScaleService; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing grading scale diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java index 1219a56ebea9..23ba38d2675f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java @@ -31,6 +31,7 @@ import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; @@ -38,6 +39,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; @@ -53,8 +55,6 @@ import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.web.rest.dto.ResultWithPointsPerGradingCriterionDTO; import de.tum.cit.aet.artemis.web.rest.dto.feedback.FeedbackDetailDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing Result. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/open/PublicResultResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/open/PublicResultResource.java index f72faeb9771f..a346594c409f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/open/PublicResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/open/PublicResultResource.java @@ -17,7 +17,10 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.service.ResultService; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; @@ -28,9 +31,6 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.programming.service.hestia.TestwiseCoverageService; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * REST controller for receiving build results. diff --git a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaFeedbackSuggestionsService.java b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaFeedbackSuggestionsService.java index c60fe20a8531..0fa25a3970a2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaFeedbackSuggestionsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaFeedbackSuggestionsService.java @@ -17,6 +17,7 @@ import de.tum.cit.aet.artemis.athena.dto.ProgrammingFeedbackDTO; import de.tum.cit.aet.artemis.athena.dto.SubmissionBaseDTO; import de.tum.cit.aet.artemis.athena.dto.TextFeedbackDTO; +import de.tum.cit.aet.artemis.core.exception.ConflictException; import de.tum.cit.aet.artemis.core.exception.NetworkingException; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; @@ -24,7 +25,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; -import de.tum.cit.aet.artemis.core.exception.ConflictException; /** * Service for receiving feedback suggestions from the Athena service. diff --git a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaModuleService.java b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaModuleService.java index d98ac4f82ae7..a150666f7d08 100644 --- a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaModuleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaModuleService.java @@ -21,11 +21,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.NetworkingException; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * Service to get the URL for an Athena module, depending on the type of exercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaRepositoryExportService.java b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaRepositoryExportService.java index ec701829f365..38a3801cf7bd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaRepositoryExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaRepositoryExportService.java @@ -12,6 +12,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.ServiceUnavailableException; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; @@ -21,8 +23,6 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseExportService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryExportOptionsDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.ServiceUnavailableException; /** * Service for exporting programming exercise repositories for Athena. diff --git a/src/main/java/de/tum/cit/aet/artemis/athena/web/AthenaResource.java b/src/main/java/de/tum/cit/aet/artemis/athena/web/AthenaResource.java index 064b4c1a2147..32cc9f05d51b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/athena/web/AthenaResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/web/AthenaResource.java @@ -24,6 +24,8 @@ import de.tum.cit.aet.artemis.athena.service.AthenaModuleService; import de.tum.cit.aet.artemis.athena.service.AthenaRepositoryExportService; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import de.tum.cit.aet.artemis.core.exception.NetworkingException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -32,6 +34,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.core.security.annotations.ManualConfig; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.util.ResponseUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; import de.tum.cit.aet.artemis.exercise.domain.Submission; @@ -42,9 +45,6 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; -import de.tum.cit.aet.artemis.core.util.ResponseUtil; /** * REST controller for Athena feedback suggestions. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/KnowledgeAreaRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/KnowledgeAreaRepository.java index 1eea8725ba49..ca6935f33dee 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/KnowledgeAreaRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/KnowledgeAreaRepository.java @@ -15,8 +15,8 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.atlas.domain.competency.KnowledgeArea; -import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the {@link KnowledgeArea} entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyJolService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyJolService.java index b3deba89ebd3..cdd23dbda2b2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyJolService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyJolService.java @@ -19,11 +19,11 @@ import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.competency.CompetencyJolRepository; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.iris.service.session.IrisCourseChatSessionService; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolPairDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * Service Implementation for managing CompetencyJol. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java index 0e7c33bb07fe..08f81fdabbaa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java @@ -31,7 +31,10 @@ import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.util.PageUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.service.ExerciseService; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; @@ -40,9 +43,6 @@ import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyRelationDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.CompetencyPageableSearchDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; -import de.tum.cit.aet.artemis.core.util.PageUtil; /** * Service for managing competencies. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/KnowledgeAreaService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/KnowledgeAreaService.java index 13568741ac97..71c3d03ea3b1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/KnowledgeAreaService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/KnowledgeAreaService.java @@ -9,8 +9,8 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.KnowledgeArea; import de.tum.cit.aet.artemis.atlas.repository.competency.KnowledgeAreaRepository; -import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaRequestDTO; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaRequestDTO; /** * Service for managing {@link KnowledgeArea} entities. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/StandardizedCompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/StandardizedCompetencyService.java index 59c8c1f2f9bd..6156af1890a0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/StandardizedCompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/StandardizedCompetencyService.java @@ -26,13 +26,13 @@ import de.tum.cit.aet.artemis.atlas.repository.SourceRepository; import de.tum.cit.aet.artemis.atlas.repository.competency.KnowledgeAreaRepository; import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.SourceDTO; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO.KnowledgeAreaForCatalogDTO; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO.StandardizedCompetencyForCatalogDTO; import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyRequestDTO; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; -import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; /** * Service for managing {@link StandardizedCompetency} entities. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathService.java index 39d45b86cbe6..2e714b863cfa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathService.java @@ -29,8 +29,10 @@ import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.util.PageUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; @@ -47,8 +49,6 @@ import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationOverviewDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.NgxLearningPathDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.util.PageUtil; /** * Service Implementation for managing Learning Paths. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/web/CompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/CompetencyResource.java index bb4e5909a5dc..4d5775f053a1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/web/CompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/CompetencyResource.java @@ -33,6 +33,7 @@ import de.tum.cit.aet.artemis.atlas.service.competency.CourseCompetencyService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -40,11 +41,10 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/web/CourseCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/CourseCompetencyResource.java index 07a945d05d59..1da430390162 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/web/CourseCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/CourseCompetencyResource.java @@ -37,6 +37,7 @@ import de.tum.cit.aet.artemis.atlas.service.competency.CourseCompetencyService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -56,7 +57,6 @@ import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyRelationDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.CompetencyPageableSearchDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/web/PrerequisiteResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/PrerequisiteResource.java index 14b6638651bc..2c65bddd8dea 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/web/PrerequisiteResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/PrerequisiteResource.java @@ -33,6 +33,7 @@ import de.tum.cit.aet.artemis.atlas.service.competency.PrerequisiteService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -40,11 +41,10 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing {@link Prerequisite Prerequisite} entities. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/web/science/ScienceSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/science/ScienceSettingsResource.java index f0f6149bfdb3..11d93c5a686f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/web/science/ScienceSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/science/ScienceSettingsResource.java @@ -23,9 +23,9 @@ import de.tum.cit.aet.artemis.atlas.domain.science.ScienceSetting; import de.tum.cit.aet.artemis.atlas.repository.science.ScienceSettingRepository; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobExecutionService.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobExecutionService.java index 2bef49735268..962216ae245e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobExecutionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobExecutionService.java @@ -33,6 +33,7 @@ import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.exception.NotFoundException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.exception.GitException; import de.tum.cit.aet.artemis.core.exception.LocalCIException; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; @@ -46,7 +47,6 @@ import de.tum.cit.aet.artemis.programming.service.localci.scaparser.exception.UnsupportedToolException; import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * This service contains the logic to execute a build job for a programming exercise participation in the local CI system. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java index 55253321ed40..18de552f404d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java @@ -28,10 +28,10 @@ import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data repository for the Message (Post) entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/PostRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/PostRepository.java index a7b9236def03..f78854c2818b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/PostRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/PostRepository.java @@ -13,8 +13,8 @@ import org.springframework.transaction.annotation.Transactional; import de.tum.cit.aet.artemis.communication.domain.Post; -import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; /** * Spring Data repository for the Post entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/OneToOneChatRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/OneToOneChatRepository.java index 46e9648ec222..cdd92f56c014 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/OneToOneChatRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/conversation/OneToOneChatRepository.java @@ -11,8 +11,8 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.communication.domain.conversation.OneToOneChat; -import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java index ff6927d16ecc..f538f58a711e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java @@ -25,6 +25,8 @@ import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -32,8 +34,6 @@ import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java index 5e969c51caf1..3106df353ca2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java @@ -49,6 +49,8 @@ import de.tum.cit.aet.artemis.communication.service.similarity.PostSimilarityComparisonStrategy; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -58,8 +60,6 @@ import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/PostingService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/PostingService.java index 083fbc9b0759..bccce31e6e15 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/PostingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/PostingService.java @@ -30,6 +30,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -38,7 +39,6 @@ import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.dto.UserRoleDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/ReactionService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/ReactionService.java index b1b671278266..40f92969a1b8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/ReactionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/ReactionService.java @@ -17,12 +17,12 @@ import de.tum.cit.aet.artemis.communication.service.conversation.ConversationService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismAnswerPostService; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismPostService; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java index 1d7010dbac39..988f763d150d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java @@ -21,14 +21,14 @@ import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.communication.service.conversation.errors.ChannelNameDuplicateException; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.lecture.domain.Lecture; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationDTOService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationDTOService.java index 6e4ce6857ee5..1665711ac299 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationDTOService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationDTOService.java @@ -21,17 +21,17 @@ import de.tum.cit.aet.artemis.communication.dto.ConversationSummary; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.service.conversation.auth.ChannelAuthorizationService; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationUserDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.GroupChatDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.OneToOneChatDTO; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.service.dto.UserPublicInfoDTO; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationDTO; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationUserDTO; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.GroupChatDTO; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.OneToOneChatDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationService.java index 1c9dec7aef1e..fffff1497228 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationService.java @@ -33,15 +33,15 @@ import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.GroupChatRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.OneToOneChatRepository; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationDTO; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationDTO; import de.tum.cit.aet.artemis.web.websocket.dto.metis.ConversationWebsocketDTO; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/GroupChatService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/GroupChatService.java index 61de1b1410fb..2dddbede2c05 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/GroupChatService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/GroupChatService.java @@ -13,11 +13,11 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.GroupChat; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.GroupChatRepository; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.GroupChatDTO; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.GroupChatDTO; +import de.tum.cit.aet.artemis.core.repository.UserRepository; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/ChannelAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/ChannelAuthorizationService.java index 9e3049a53ed6..5069a67dd5f4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/ChannelAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/ChannelAuthorizationService.java @@ -19,10 +19,10 @@ import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/GroupChatAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/GroupChatAuthorizationService.java index 323668f523c7..49fd5282418d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/GroupChatAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/GroupChatAuthorizationService.java @@ -13,10 +13,10 @@ import de.tum.cit.aet.artemis.communication.repository.conversation.GroupChatRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/OneToOneChatAuthorizationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/OneToOneChatAuthorizationService.java index e902174e8704..e22903e868e7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/OneToOneChatAuthorizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/auth/OneToOneChatAuthorizationService.java @@ -12,10 +12,10 @@ import de.tum.cit.aet.artemis.communication.repository.conversation.OneToOneChatRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/ConversationMessageResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/ConversationMessageResource.java index 9654ed2ed22e..f695e76bdcc6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/ConversationMessageResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/ConversationMessageResource.java @@ -32,6 +32,7 @@ import de.tum.cit.aet.artemis.communication.domain.DisplayPriority; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.service.ConversationMessagingService; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -39,7 +40,6 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.PaginationUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java index 88e61a456dc1..b9f33bcb15d3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java @@ -40,18 +40,18 @@ import de.tum.cit.aet.artemis.communication.service.conversation.ConversationService; import de.tum.cit.aet.artemis.communication.service.conversation.auth.ChannelAuthorizationService; import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelIdAndNameDTO; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ErrorConstants; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupChannelManagementService; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenAlertException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.ErrorConstants; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelIdAndNameDTO; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ConversationResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ConversationResource.java index 721d03aba1fc..ef9d891241d2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ConversationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ConversationResource.java @@ -30,7 +30,11 @@ import de.tum.cit.aet.artemis.communication.service.conversation.ConversationService; import de.tum.cit.aet.artemis.communication.service.conversation.ConversationService.ConversationMemberSearchFilters; import de.tum.cit.aet.artemis.communication.service.conversation.auth.ChannelAuthorizationService; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationUserDTO; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -39,10 +43,6 @@ import de.tum.cit.aet.artemis.service.ConductAgreementService; import de.tum.cit.aet.artemis.service.dto.ResponsibleUserDTO; import de.tum.cit.aet.artemis.service.dto.UserPublicInfoDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationDTO; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationUserDTO; import tech.jhipster.web.util.PaginationUtil; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/GroupChatResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/GroupChatResource.java index 9ba29531d42d..a10554818734 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/GroupChatResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/GroupChatResource.java @@ -29,11 +29,11 @@ import de.tum.cit.aet.artemis.communication.service.conversation.GroupChatService; import de.tum.cit.aet.artemis.communication.service.conversation.auth.GroupChatAuthorizationService; import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.GroupChatDTO; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.GroupChatDTO; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/OneToOneChatResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/OneToOneChatResource.java index e752a1d25038..7533a91ccb39 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/OneToOneChatResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/OneToOneChatResource.java @@ -24,11 +24,11 @@ import de.tum.cit.aet.artemis.communication.service.conversation.OneToOneChatService; import de.tum.cit.aet.artemis.communication.service.conversation.auth.OneToOneChatAuthorizationService; import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.OneToOneChatDTO; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.OneToOneChatDTO; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/GuidedTourConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/GuidedTourConfiguration.java index a4c4303124ce..b620de50a18f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/GuidedTourConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/GuidedTourConfiguration.java @@ -11,9 +11,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; @Profile(PROFILE_CORE) @Component diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java index 96e7745e980b..a96aa5761728 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java @@ -57,6 +57,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Iterators; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.jwt.JWTFilter; import de.tum.cit.aet.artemis.core.security.jwt.TokenProvider; @@ -67,7 +68,6 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @Configuration diff --git a/src/main/java/de/tum/cit/aet/artemis/core/domain/Course.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/Course.java index 0b70bdb68f38..beacc4af0aa0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/domain/Course.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/Course.java @@ -38,6 +38,7 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.lecture.domain.Lecture; @@ -46,7 +47,6 @@ import de.tum.cit.aet.artemis.quiz.config.QuizView; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * A Course. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/domain/User.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/User.java index a8e433f06976..1c95e5f1841d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/domain/User.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/User.java @@ -42,13 +42,13 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfiguration; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; import de.tum.cit.aet.artemis.lecture.domain.LectureUnitCompletion; import de.tum.cit.aet.artemis.programming.service.vcs.VcsTokenRenewalService; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; /** * A user. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/exception/ExceptionTranslator.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/ExceptionTranslator.java index e743e93a37e3..18700f6abb5d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/exception/ExceptionTranslator.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/ExceptionTranslator.java @@ -33,7 +33,6 @@ import org.zalando.problem.spring.web.advice.security.SecurityAdviceTrait; import org.zalando.problem.violations.ConstraintViolationProblem; -import de.tum.cit.aet.artemis.core.exception.UsernameAlreadyUsedException; import de.tum.cit.aet.artemis.programming.service.gitlab.GitLabException; import tech.jhipster.web.util.HeaderUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/CourseRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/CourseRepository.java index 3672f195e42c..fb6db0e164b3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/CourseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/CourseRepository.java @@ -26,13 +26,13 @@ import de.tum.cit.aet.artemis.core.domain.Organization; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.dto.StatisticsEntry; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.text.domain.TextExercise; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data JPA repository for the Course entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/OrganizationRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/OrganizationRepository.java index e6a68e72d1ac..f0e8a940b117 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/OrganizationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/OrganizationRepository.java @@ -17,8 +17,8 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.domain.Organization; -import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; /** * Spring JPA repository for Organization entities diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java index 5932319c0252..34d880add6d7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java @@ -44,13 +44,13 @@ import de.tum.cit.aet.artemis.core.domain.Organization; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.dto.SortingOrder; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.service.dto.UserRoleDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.UserPageableSearchDTO; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data JPA repository for the User entity.
diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/AccountService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/AccountService.java index 569154b797cd..e9d37ded74f7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/AccountService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/AccountService.java @@ -4,14 +4,14 @@ import java.util.Optional; -import de.tum.cit.aet.artemis.core.web.AccountResource; -import de.tum.cit.aet.artemis.core.web.open.PublicAccountResource; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.web.AccountResource; +import de.tum.cit.aet.artemis.core.web.open.PublicAccountResource; /** * Service class for {@link AccountResource} and {@link PublicAccountResource}. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/AuthorizationCheckService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/AuthorizationCheckService.java index b4603c9dcfba..d75d3a5668bf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/AuthorizationCheckService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/AuthorizationCheckService.java @@ -24,6 +24,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.Organization; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -37,7 +38,6 @@ import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; /** * Service used to check whether user is authorized to perform actions on the entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/SAML2Service.java b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/SAML2Service.java index 68c610c315d1..8ecc8a081106 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/SAML2Service.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/connectors/SAML2Service.java @@ -25,12 +25,12 @@ import de.tum.cit.aet.artemis.core.config.SAML2Properties; import de.tum.cit.aet.artemis.core.domain.Authority; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.UserNotActivatedException; import de.tum.cit.aet.artemis.core.service.user.UserCreationService; import de.tum.cit.aet.artemis.core.service.user.UserService; -import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; /** * This class describes a service for SAML2 authentication. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportService.java index 50904474d32e..f6feb923e16d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportService.java @@ -8,7 +8,6 @@ import java.time.ZoneId; import java.time.ZonedDateTime; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import jakarta.validation.constraints.NotNull; import org.slf4j.Logger; @@ -22,13 +21,14 @@ import de.tum.cit.aet.artemis.core.domain.DataExport; import de.tum.cit.aet.artemis.core.domain.DataExportState; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import de.tum.cit.aet.artemis.core.repository.DataExportRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.web.rest.dto.DataExportDTO; import de.tum.cit.aet.artemis.web.rest.dto.RequestDataExportDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; /** * Service Implementation for managing the data export in accordance with Art. 15 GDPR. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserCreationService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserCreationService.java index edf62008b9fc..12133bfb8800 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserCreationService.java @@ -12,7 +12,6 @@ import java.util.Set; import java.util.regex.PatternSyntaxException; -import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; import jakarta.annotation.Nullable; import jakarta.validation.constraints.NotNull; @@ -28,6 +27,7 @@ import de.tum.cit.aet.artemis.core.domain.Authority; import de.tum.cit.aet.artemis.core.domain.Organization; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; import de.tum.cit.aet.artemis.core.repository.AuthorityRepository; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.OrganizationRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java index 8e0058a02579..4dbd9669e99e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java @@ -42,7 +42,11 @@ import de.tum.cit.aet.artemis.core.domain.Authority; import de.tum.cit.aet.artemis.core.domain.GuidedTourSetting; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.exception.AccountRegistrationBlockedException; +import de.tum.cit.aet.artemis.core.exception.EmailAlreadyUsedException; +import de.tum.cit.aet.artemis.core.exception.PasswordViolatesRequirementsException; import de.tum.cit.aet.artemis.core.exception.UsernameAlreadyUsedException; import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.core.repository.AuthorityRepository; @@ -61,10 +65,6 @@ import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.dto.UserDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.EmailAlreadyUsedException; -import de.tum.cit.aet.artemis.core.exception.PasswordViolatesRequirementsException; -import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; import tech.jhipster.security.RandomUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/AccountResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/AccountResource.java index 0c3737893042..b39e43f95aa1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/AccountResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/AccountResource.java @@ -32,6 +32,10 @@ import org.springframework.web.multipart.MultipartFile; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EmailAlreadyUsedException; +import de.tum.cit.aet.artemis.core.exception.PasswordViolatesRequirementsException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.service.AccountService; @@ -43,10 +47,6 @@ import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.dto.PasswordChangeDTO; import de.tum.cit.aet.artemis.service.dto.UserDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EmailAlreadyUsedException; -import de.tum.cit.aet.artemis.core.exception.PasswordViolatesRequirementsException; /** * REST controller for managing the current user's account. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/AttachmentResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/AttachmentResource.java index 8792e34fbd47..7b017d468f75 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/AttachmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/AttachmentResource.java @@ -35,12 +35,12 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.lecture.domain.AttachmentType; import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; import tech.jhipster.web.util.ResponseUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java index c3e4df5aa30d..d52b8d567150 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java @@ -34,15 +34,15 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing Course. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java index 58132b8606d9..2f8b5e988236 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java @@ -2,7 +2,6 @@ import java.util.UUID; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -22,6 +21,7 @@ import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.lti.service.LtiDynamicRegistrationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminModelingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminModelingExerciseResource.java index babecc9b0572..abeb50c89b39 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminModelingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminModelingExerciseResource.java @@ -16,10 +16,10 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.modeling.repository.ModelClusterRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.modeling.service.ModelingExerciseService; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for administrating ModelingExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminOrganizationResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminOrganizationResource.java index e952ee1f62d3..5b2c8df0e4ae 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminOrganizationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminOrganizationResource.java @@ -23,14 +23,14 @@ import de.tum.cit.aet.artemis.core.domain.Organization; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.OrganizationRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.service.OrganizationService; import de.tum.cit.aet.artemis.web.rest.dto.OrganizationCountDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for administrating the Organization entities diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminSystemNotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminSystemNotificationResource.java index 4c67f174df2f..24a15f1b5f97 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminSystemNotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminSystemNotificationResource.java @@ -21,10 +21,10 @@ import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.communication.domain.notification.SystemNotification; import de.tum.cit.aet.artemis.communication.repository.SystemNotificationRepository; -import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.service.SystemNotificationService; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.core.util.HeaderUtil; +import de.tum.cit.aet.artemis.service.SystemNotificationService; /** * REST controller for administrating system notifications. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java index e1638e04231b..50b2260cf191 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java @@ -31,20 +31,20 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EmailAlreadyUsedException; +import de.tum.cit.aet.artemis.core.exception.LoginAlreadyUsedException; import de.tum.cit.aet.artemis.core.repository.AuthorityRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.core.service.ldap.LdapUserService; import de.tum.cit.aet.artemis.core.service.user.UserCreationService; import de.tum.cit.aet.artemis.core.service.user.UserService; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.UserPageableSearchDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EmailAlreadyUsedException; -import de.tum.cit.aet.artemis.core.exception.LoginAlreadyUsedException; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; -import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.PaginationUtil; import tech.jhipster.web.util.ResponseUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/LogResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/LogResource.java index 4d25cac75287..375deea352f6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/LogResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/LogResource.java @@ -16,8 +16,8 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; -import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.core.dto.vm.LoggerVM; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; /** * Controller for view and managing Log Level at runtime. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicAccountResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicAccountResource.java index 5949ed3533ed..edf8c4ff2d92 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicAccountResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicAccountResource.java @@ -27,12 +27,8 @@ import de.tum.cit.aet.artemis.communication.service.notifications.MailService; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; -import de.tum.cit.aet.artemis.core.service.AccountService; -import de.tum.cit.aet.artemis.core.service.user.UserService; -import de.tum.cit.aet.artemis.service.dto.UserDTO; +import de.tum.cit.aet.artemis.core.dto.vm.KeyAndPasswordVM; +import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.EmailAlreadyUsedException; @@ -40,8 +36,12 @@ import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import de.tum.cit.aet.artemis.core.exception.LoginAlreadyUsedException; import de.tum.cit.aet.artemis.core.exception.PasswordViolatesRequirementsException; -import de.tum.cit.aet.artemis.core.dto.vm.KeyAndPasswordVM; -import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; +import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.core.service.AccountService; +import de.tum.cit.aet.artemis.core.service.user.UserService; +import de.tum.cit.aet.artemis.service.dto.UserDTO; /** * REST controller for public endpoints regarding the current user's account. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicUserJwtResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicUserJwtResource.java index 8f9f97c1e318..bef3b235459f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicUserJwtResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicUserJwtResource.java @@ -29,13 +29,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.dto.vm.LoginVM; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.UserNotActivatedException; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.core.security.jwt.JWTCookieService; import de.tum.cit.aet.artemis.core.service.connectors.SAML2Service; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.dto.vm.LoginVM; /** * REST controller to authenticate users. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamRepository.java b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamRepository.java index 0300b9281f07..1940dd2c3a1d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamRepository.java @@ -23,12 +23,12 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.web.rest.dto.CourseContentCount; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data JPA repository for the ExamRepository entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/repository/StudentExamRepository.java b/src/main/java/de/tum/cit/aet/artemis/exam/repository/StudentExamRepository.java index 6dfaf26b7837..1b0ee4c7ff9e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/repository/StudentExamRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/repository/StudentExamRepository.java @@ -22,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; @@ -30,7 +31,6 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.quiz.domain.QuizQuestion; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data JPA repository for the StudentExam entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamAccessService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamAccessService.java index 659ae9af8f56..b16e5af39eff 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamAccessService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamAccessService.java @@ -10,6 +10,10 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -20,10 +24,6 @@ import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.ConflictException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Service implementation to check exam access. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDateService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDateService.java index 673d70b00ab5..dc95c653f6b0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDateService.java @@ -13,6 +13,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; @@ -20,7 +21,6 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamImportService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamImportService.java index b7f431710386..92430d5ef7f1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamImportService.java @@ -16,6 +16,7 @@ import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.exception.ExamConfigurationException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; @@ -41,7 +42,6 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.text.service.TextExerciseImportService; -import de.tum.cit.aet.artemis.core.exception.ExamConfigurationException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamQuizService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamQuizService.java index aa099a89ce15..2caca569baf7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamQuizService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamQuizService.java @@ -14,6 +14,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.service.ResultService; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; @@ -23,7 +24,6 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.quiz.service.QuizStatisticService; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamRegistrationService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamRegistrationService.java index 44e763ea05fd..04c099de29e0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamRegistrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamRegistrationService.java @@ -20,6 +20,9 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -35,9 +38,6 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.web.rest.dto.ExamUserDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Service Implementation for registering students in the exam. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamService.java index 4b6fba997d95..5dd16037f669 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamService.java @@ -57,12 +57,16 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.export.CourseExamExportService; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.core.util.PageUtil; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; @@ -111,10 +115,6 @@ import de.tum.cit.aet.artemis.web.rest.dto.StudentExamWithGradeDTO; import de.tum.cit.aet.artemis.web.rest.dto.TutorLeaderboardDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; -import de.tum.cit.aet.artemis.core.util.PageUtil; /** * Service Implementation for managing exams. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSubmissionService.java index 09cd68dcdd00..ed6d7e1123d5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSubmissionService.java @@ -12,6 +12,8 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.StudentExam; @@ -23,8 +25,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamUserService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamUserService.java index 6aa18e744474..187a01b5628e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamUserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamUserService.java @@ -25,6 +25,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; @@ -32,7 +33,6 @@ import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.web.rest.dto.ExamUsersNotFoundDTO; import de.tum.cit.aet.artemis.web.rest.dto.ImageDTO; -import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; /** * Service Implementation for managing Exam Users. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ImageExtractor.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ImageExtractor.java index 14c38f26ed7f..5fbb35ed340f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ImageExtractor.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ImageExtractor.java @@ -25,8 +25,8 @@ import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject; import org.apache.pdfbox.util.Matrix; -import de.tum.cit.aet.artemis.web.rest.dto.ImageDTO; import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; +import de.tum.cit.aet.artemis.web.rest.dto.ImageDTO; /** * Processor to extract images from a PDF and get information. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamAccessService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamAccessService.java index ea620cc7edcc..4e99fac0344c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamAccessService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamAccessService.java @@ -9,6 +9,8 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; @@ -16,8 +18,6 @@ import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.ConflictException; /** * Service implementation to check student exam access. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamService.java index b96c6ca93a04..23e2e8c05dcf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamService.java @@ -34,6 +34,8 @@ import org.springframework.transaction.annotation.Transactional; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.util.ExamExerciseStartPreparationStatus; @@ -74,8 +76,6 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Service Implementation for managing StudentExam. diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/BaseExercise.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/BaseExercise.java index ac3c91248235..c96d9153e5cf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/BaseExercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/BaseExercise.java @@ -13,8 +13,8 @@ import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.core.domain.DomainObject; -import de.tum.cit.aet.artemis.quiz.config.QuizView; import de.tum.cit.aet.artemis.core.util.StringUtil; +import de.tum.cit.aet.artemis.quiz.config.QuizView; @MappedSuperclass public abstract class BaseExercise extends DomainObject { diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java index 279d3d05efd7..8d3bc00d2a23 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java @@ -59,6 +59,7 @@ import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; @@ -74,7 +75,6 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * An Exercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java index 69eb2a60f559..e72cc563b504 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java @@ -21,10 +21,10 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.dto.ExerciseTypeMetricsEntry; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data JPA repository for the Exercise entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java index 0551856fcaf5..d9b6f96973e1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java @@ -17,6 +17,7 @@ import de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntry; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; @@ -33,7 +34,6 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data repository for the Submission entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/TeamRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/TeamRepository.java index eb31f770f361..b6a17585eab3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/TeamRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/TeamRepository.java @@ -17,11 +17,11 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.StudentsAlreadyAssignedException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Team; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; -import de.tum.cit.aet.artemis.core.exception.StudentsAlreadyAssignedException; /** * Spring Data repository for the Team entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseService.java index 428835058ccb..bccad3d8a998 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseService.java @@ -48,6 +48,8 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.service.ExamLiveEventsService; @@ -70,8 +72,6 @@ import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; import de.tum.cit.aet.artemis.web.rest.dto.TutorLeaderboardDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Service Implementation for managing Exercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionExportService.java index d0b40b7056d3..f1aeb5a5cd75 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionExportService.java @@ -26,6 +26,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.service.ArchivalReportEntry; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; @@ -34,7 +35,6 @@ import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ZipFileService; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamService.java index 82e2844e0d17..08cee3f54661 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamService.java @@ -18,6 +18,9 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.StudentsAppearMultipleTimesException; +import de.tum.cit.aet.artemis.core.exception.StudentsNotFoundException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Team; @@ -29,9 +32,6 @@ import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.dto.TeamSearchUserDTO; import de.tum.cit.aet.artemis.web.rest.TeamResource; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.StudentsAppearMultipleTimesException; -import de.tum.cit.aet.artemis.core.exception.StudentsNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/web/AssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/AssessmentResource.java index 1a7d4db7ba78..08b8b4438671 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/web/AssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/AssessmentResource.java @@ -15,6 +15,9 @@ import de.tum.cit.aet.artemis.assessment.service.AssessmentService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; @@ -24,9 +27,6 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; public abstract class AssessmentResource { diff --git a/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseService.java index 0754303bc324..79e534678d2d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseService.java @@ -4,13 +4,13 @@ import java.util.Collections; -import de.tum.cit.aet.artemis.core.util.PageUtil; import org.springframework.context.annotation.Profile; import org.springframework.data.domain.Page; import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.util.PageUtil; import de.tum.cit.aet.artemis.exercise.service.ExerciseSpecificationService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionService.java index 98f4c49ca25e..2a8337344771 100644 --- a/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionService.java @@ -25,7 +25,9 @@ import de.tum.cit.aet.artemis.assessment.service.FeedbackService; import de.tum.cit.aet.artemis.athena.service.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.exception.EmptyFileException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; @@ -45,8 +47,6 @@ import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.SubmissionService; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisCourseChatSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisCourseChatSessionRepository.java index ab865ca09897..2c1ae6a49f39 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisCourseChatSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisCourseChatSessionRepository.java @@ -13,9 +13,9 @@ import org.springframework.data.repository.query.Param; import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.iris.domain.session.IrisCourseChatSession; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Repository interface for managing {@link IrisCourseChatSession} entities. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisExerciseChatSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisExerciseChatSessionRepository.java index ee267b0b7378..e12ade2c368b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisExerciseChatSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisExerciseChatSessionRepository.java @@ -13,9 +13,9 @@ import org.springframework.data.repository.query.Param; import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.iris.domain.session.IrisExerciseChatSession; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Repository interface for managing {@link IrisExerciseChatSession} entities. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSessionRepository.java index 2d17b71efbf4..245d3029ad4d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSessionRepository.java @@ -7,9 +7,9 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data repository for the IrisSession entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisSessionService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisSessionService.java index 631e734413c2..6c113b773ff1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisSessionService.java @@ -7,6 +7,7 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; import de.tum.cit.aet.artemis.iris.domain.session.IrisCourseChatSession; @@ -19,7 +20,6 @@ import de.tum.cit.aet.artemis.iris.service.session.IrisHestiaSessionService; import de.tum.cit.aet.artemis.iris.service.session.IrisRateLimitedFeatureInterface; import de.tum.cit.aet.artemis.iris.service.session.IrisSubFeatureInterface; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; /** * Service for managing Iris sessions. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorService.java index 32d587b3f419..35940f9ce2e2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorService.java @@ -3,7 +3,6 @@ import java.util.Arrays; import java.util.List; -import de.tum.cit.aet.artemis.lti.web.open.PublicPyrisStatusUpdateResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Qualifier; @@ -23,6 +22,7 @@ import de.tum.cit.aet.artemis.iris.exception.IrisInternalPyrisErrorException; import de.tum.cit.aet.artemis.iris.service.pyris.dto.PyrisModelDTO; import de.tum.cit.aet.artemis.iris.service.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; +import de.tum.cit.aet.artemis.lti.web.open.PublicPyrisStatusUpdateResource; /** * This service connects to the Python implementation of Iris (called Pyris). diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisJobService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisJobService.java index 17ce4ac99495..be84daeafc2a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisJobService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisJobService.java @@ -4,8 +4,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.Function; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.ConflictException; import jakarta.annotation.PostConstruct; import jakarta.servlet.http.HttpServletRequest; @@ -17,6 +15,8 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.map.IMap; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; import de.tum.cit.aet.artemis.iris.service.pyris.job.CourseChatJob; import de.tum.cit.aet.artemis.iris.service.pyris.job.ExerciseChatJob; import de.tum.cit.aet.artemis.iris.service.pyris.job.IngestionWebhookJob; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisCourseChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisCourseChatSessionService.java index 2e76eca547a8..1e85d31d57d7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisCourseChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisCourseChatSessionService.java @@ -14,6 +14,7 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyJol; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; @@ -30,7 +31,6 @@ import de.tum.cit.aet.artemis.iris.service.pyris.job.CourseChatJob; import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; import de.tum.cit.aet.artemis.iris.service.websocket.IrisChatWebsocketService; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; /** * Service to handle the course chat subsystem of Iris. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisExerciseChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisExerciseChatSessionService.java index 27e402cb7380..0b6c3d4942ab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisExerciseChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisExerciseChatSessionService.java @@ -9,6 +9,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Submission; @@ -30,8 +32,6 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.ConflictException; /** * Service to handle the chat subsystem of Iris. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSettingsService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSettingsService.java index 1418e07ecc73..4cb89a2cf4c6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSettingsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSettingsService.java @@ -18,6 +18,9 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenAlertException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; @@ -34,9 +37,6 @@ import de.tum.cit.aet.artemis.iris.dto.IrisCombinedSettingsDTO; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; import de.tum.cit.aet.artemis.iris.service.IrisDefaultTemplateService; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenAlertException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.ConflictException; /** * Service for managing {@link IrisSettings}. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisExerciseChatSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisExerciseChatSessionResource.java index 7e37014b1a82..90248c992688 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisExerciseChatSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisExerciseChatSessionResource.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.exception.ConflictException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; import de.tum.cit.aet.artemis.exercise.domain.Exercise; @@ -25,7 +26,6 @@ import de.tum.cit.aet.artemis.iris.service.pyris.PyrisHealthIndicator; import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.core.exception.ConflictException; /** * REST controller for managing {@link IrisExerciseChatSession}. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisMessageResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisMessageResource.java index 8d96b1e46467..4e8a3e7c3c5a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisMessageResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisMessageResource.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.exception.ConflictException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; @@ -26,7 +27,6 @@ import de.tum.cit.aet.artemis.iris.repository.IrisSessionRepository; import de.tum.cit.aet.artemis.iris.service.IrisMessageService; import de.tum.cit.aet.artemis.iris.service.IrisSessionService; -import de.tum.cit.aet.artemis.core.exception.ConflictException; /** * REST controller for managing {@link IrisMessage}. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisModelsResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisModelsResource.java index 5277204b73b2..8fce02b0d4e5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisModelsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisModelsResource.java @@ -2,13 +2,13 @@ import java.util.List; -import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import org.springframework.context.annotation.Profile; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.iris.service.pyris.PyrisConnectorException; import de.tum.cit.aet.artemis.iris.service.pyris.PyrisConnectorService; diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentUnitRepository.java index 81f19e4659d4..0fef3fef3512 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentUnitRepository.java @@ -11,10 +11,10 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.lecture.domain.AttachmentType; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data JPA repository for the Attachment Unit entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureService.java b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureService.java index 0e3546ecc004..9ab6a73c9a92 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureService.java @@ -9,7 +9,6 @@ import java.util.Optional; import java.util.Set; -import de.tum.cit.aet.artemis.core.util.PageUtil; import org.springframework.context.annotation.Profile; import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; @@ -21,6 +20,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.util.PageUtil; import de.tum.cit.aet.artemis.iris.service.pyris.PyrisWebhookService; import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitProcessingService.java index 6aadb7d7845c..06192b53783f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitProcessingService.java @@ -28,6 +28,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.lecture.domain.AttachmentType; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; @@ -39,7 +40,6 @@ import de.tum.cit.aet.artemis.service.SlideSplitterService; import de.tum.cit.aet.artemis.web.rest.dto.LectureUnitInformationDTO; import de.tum.cit.aet.artemis.web.rest.dto.LectureUnitSplitDTO; -import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/web/AttachmentUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/lecture/web/AttachmentUnitResource.java index 5263a5a98ef0..b616a51ef006 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/web/AttachmentUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/web/AttachmentUnitResource.java @@ -31,6 +31,9 @@ import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; @@ -44,9 +47,6 @@ import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.SlideSplitterService; import de.tum.cit.aet.artemis.web.rest.dto.LectureUnitInformationDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; -import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/web/ExerciseUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/lecture/web/ExerciseUnitResource.java index a2f511f2363f..c932dd84da59 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/web/ExerciseUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/web/ExerciseUnitResource.java @@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; @@ -26,7 +27,6 @@ import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.repository.ExerciseUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/web/LectureUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/lecture/web/LectureUnitResource.java index f1150ae21f42..13526b764070 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/web/LectureUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/web/LectureUnitResource.java @@ -24,6 +24,8 @@ import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; @@ -31,15 +33,13 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.user.UserService; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; import de.tum.cit.aet.artemis.web.rest.dto.lectureunit.LectureUnitForLearningPathNodeDetailsDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/web/OnlineUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/lecture/web/OnlineUnitResource.java index f6750a5eee9b..d1d5cdb45d85 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/web/OnlineUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/web/OnlineUnitResource.java @@ -29,6 +29,8 @@ import com.google.common.net.InternetDomainName; import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; @@ -38,8 +40,6 @@ import de.tum.cit.aet.artemis.lecture.repository.OnlineUnitRepository; import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; import de.tum.cit.aet.artemis.web.rest.dto.OnlineResourceDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/web/TextUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/lecture/web/TextUnitResource.java index 56d44475dc71..02bfaf149839 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/web/TextUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/web/TextUnitResource.java @@ -19,6 +19,8 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; @@ -26,8 +28,6 @@ import de.tum.cit.aet.artemis.lecture.domain.TextUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/web/VideoUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/lecture/web/VideoUnitResource.java index b57876936bc7..ae67b82c02e1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/web/VideoUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/web/VideoUnitResource.java @@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; @@ -29,7 +30,6 @@ import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.VideoUnitRepository; import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/repository/LtiPlatformConfigurationRepository.java b/src/main/java/de/tum/cit/aet/artemis/lti/repository/LtiPlatformConfigurationRepository.java index d79b14ff39c9..82e991ca8940 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/repository/LtiPlatformConfigurationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/repository/LtiPlatformConfigurationRepository.java @@ -11,9 +11,9 @@ import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Repository for managing LtiPlatformConfiguration entities. diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/service/Lti13Service.java b/src/main/java/de/tum/cit/aet/artemis/lti/service/Lti13Service.java index e61ebbf1c477..db6b6bf3991f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/service/Lti13Service.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/service/Lti13Service.java @@ -36,6 +36,7 @@ import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProvider; @@ -53,7 +54,6 @@ import de.tum.cit.aet.artemis.lti.repository.Lti13ResourceLaunchRepository; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Service @Profile("lti") diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiDeepLinkingService.java b/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiDeepLinkingService.java index eefd8ddffa13..4f5c88112468 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiDeepLinkingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiDeepLinkingService.java @@ -13,12 +13,12 @@ import org.springframework.stereotype.Service; import org.springframework.web.util.UriComponentsBuilder; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.security.lti.Lti13TokenRetriever; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lti.dto.Lti13DeepLinkingResponse; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * Service for handling LTI deep linking functionality. diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiDynamicRegistrationService.java b/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiDynamicRegistrationService.java index b8864ba32f48..c1b128a1a7dd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiDynamicRegistrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiDynamicRegistrationService.java @@ -15,12 +15,12 @@ import org.springframework.web.client.HttpServerErrorException; import org.springframework.web.client.RestTemplate; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.dto.Lti13ClientRegistration; import de.tum.cit.aet.artemis.lti.dto.Lti13PlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Service @Profile("lti") diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicPyrisStatusUpdateResource.java b/src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicPyrisStatusUpdateResource.java index d2943a3cefa9..7c578a6bb687 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicPyrisStatusUpdateResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicPyrisStatusUpdateResource.java @@ -2,8 +2,6 @@ import java.util.Objects; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.ConflictException; import jakarta.servlet.http.HttpServletRequest; import org.springframework.context.annotation.Profile; @@ -14,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.iris.service.pyris.PyrisJobService; import de.tum.cit.aet.artemis.iris.service.pyris.PyrisStatusUpdateService; diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseScheduleService.java index a90639efc073..c6a911757e45 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseScheduleService.java @@ -25,6 +25,7 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.service.ScheduleService; import de.tum.cit.aet.artemis.exam.service.ExamDateService; @@ -33,7 +34,6 @@ import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.modeling.service.compass.CompassService; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import tech.jhipster.config.JHipsterConstants; @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseService.java index 76de18036228..62c3447cbbb9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseService.java @@ -5,7 +5,6 @@ import java.util.Collections; import java.util.List; -import de.tum.cit.aet.artemis.core.util.PageUtil; import org.springframework.context.annotation.Profile; import org.springframework.data.domain.Page; import org.springframework.data.jpa.domain.Specification; @@ -13,6 +12,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.core.util.PageUtil; import de.tum.cit.aet.artemis.exercise.service.ExerciseSpecificationService; import de.tum.cit.aet.artemis.modeling.domain.ModelCluster; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java index f5c854abb381..694e73d837ab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java @@ -25,6 +25,7 @@ import de.tum.cit.aet.artemis.assessment.service.FeedbackService; import de.tum.cit.aet.artemis.athena.service.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; @@ -45,7 +46,6 @@ import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.service.SubmissionVersionService; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ModelingPlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ModelingPlagiarismDetectionService.java index 5580bfe74950..2178f3affbbe 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ModelingPlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ModelingPlagiarismDetectionService.java @@ -19,6 +19,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; @@ -30,7 +31,6 @@ import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingSubmissionElement; import de.tum.cit.aet.artemis.plagiarism.service.cache.PlagiarismCacheService; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismAnswerPostService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismAnswerPostService.java index de98517ac8db..495c8bd013ab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismAnswerPostService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismAnswerPostService.java @@ -16,6 +16,8 @@ import de.tum.cit.aet.artemis.communication.service.PostingService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -23,8 +25,6 @@ import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismPostService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismPostService.java index e299693bcdb1..2f81b2ad9483 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismPostService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismPostService.java @@ -16,6 +16,8 @@ import de.tum.cit.aet.artemis.communication.service.PostingService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -26,8 +28,6 @@ import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismService.java index 3014184a4e95..4fd789fe1551 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismService.java @@ -15,6 +15,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Submission; @@ -27,7 +28,6 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmission; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ProgrammingPlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ProgrammingPlagiarismDetectionService.java index 8ef0cf857fe7..d4f1c51f5171 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ProgrammingPlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ProgrammingPlagiarismDetectionService.java @@ -37,6 +37,7 @@ import de.jplag.python3.PythonLanguage; import de.jplag.reporting.reportobject.ReportObjectFactory; import de.jplag.swift.SwiftLanguage; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.GitException; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; @@ -53,7 +54,6 @@ import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseGitDiffReportService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.UriService; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/TextPlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/TextPlagiarismDetectionService.java index 8548312556f5..6a5bbe7e945c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/TextPlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/TextPlagiarismDetectionService.java @@ -24,6 +24,7 @@ import de.jplag.exceptions.ExitException; import de.jplag.options.JPlagOptions; import de.jplag.text.NaturalLanguage; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -33,7 +34,6 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.service.TextSubmissionExportService; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismCaseResource.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismCaseResource.java index 623e89c5666e..f7caae4ed972 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismCaseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismCaseResource.java @@ -22,6 +22,8 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -34,8 +36,6 @@ import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismCaseService; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismVerdictDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.ConflictException; /** * REST controller for managing Plagiarism Cases. diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismPostResource.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismPostResource.java index 4141402372e5..fa0f5105274a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismPostResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismPostResource.java @@ -28,13 +28,13 @@ import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismPostService; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; import tech.jhipster.web.util.PaginationUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismResource.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismResource.java index d93458351a6c..fba92e6896cf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismResource.java @@ -19,6 +19,8 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -34,8 +36,6 @@ import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismService; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismComparisonStatusDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * REST controller for managing Plagiarism Cases. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java index 98a0738a5b85..7e0680126916 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java @@ -40,6 +40,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; import de.tum.cit.aet.artemis.exercise.domain.Submission; @@ -51,7 +52,6 @@ import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeature; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * A ProgrammingExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java index 59177c13bdf6..f943d7824b84 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java @@ -25,6 +25,8 @@ import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntry; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.base.DynamicSpecificationRepository; import de.tum.cit.aet.artemis.core.repository.base.FetchOptions; import de.tum.cit.aet.artemis.exercise.domain.Exercise_; @@ -34,8 +36,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise_; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data JPA repository for the ProgrammingExercise entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/SolutionProgrammingExerciseParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/SolutionProgrammingExerciseParticipationRepository.java index 4ace16e9be96..2949576a13cb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/SolutionProgrammingExerciseParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/SolutionProgrammingExerciseParticipationRepository.java @@ -17,13 +17,13 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.domain.DomainObject_; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.base.DynamicSpecificationRepository; import de.tum.cit.aet.artemis.core.repository.base.FetchOptions; import de.tum.cit.aet.artemis.exercise.domain.Submission_; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation_; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation_; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data JPA repository for the Participation entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/TemplateProgrammingExerciseParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/TemplateProgrammingExerciseParticipationRepository.java index 1a711803dc52..bc609dcd06fa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/TemplateProgrammingExerciseParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/TemplateProgrammingExerciseParticipationRepository.java @@ -17,12 +17,12 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.domain.DomainObject_; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.base.DynamicSpecificationRepository; import de.tum.cit.aet.artemis.core.repository.base.FetchOptions; import de.tum.cit.aet.artemis.exercise.domain.Submission_; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation_; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data JPA repository for the Participation entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CodeHintRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CodeHintRepository.java index 98fb27b672d3..7c78408aedb6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CodeHintRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CodeHintRepository.java @@ -8,9 +8,9 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data repository for the CodeHint entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ExerciseHintRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ExerciseHintRepository.java index 2cb4d79f71c0..a5f0eb4942ca 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ExerciseHintRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ExerciseHintRepository.java @@ -12,9 +12,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data repository for the ExerciseHint entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseSolutionEntryRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseSolutionEntryRepository.java index f9bf30a51bc8..839a7d67dc49 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseSolutionEntryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseSolutionEntryRepository.java @@ -8,9 +8,9 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data repository for the ProgrammingExerciseSolutionEntry entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseTaskRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseTaskRepository.java index b766a9e6560f..2c8db4544456 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseTaskRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/ProgrammingExerciseTaskRepository.java @@ -8,9 +8,9 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Spring Data repository for the ProgrammingExerciseTask entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/AbstractGitService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/AbstractGitService.java index 2012a0d57eb2..950247b1976f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/AbstractGitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/AbstractGitService.java @@ -47,9 +47,9 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; public abstract class AbstractGitService { diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/AuxiliaryRepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/AuxiliaryRepositoryService.java index ae308a7ee028..7d9a21297e75 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/AuxiliaryRepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/AuxiliaryRepositoryService.java @@ -12,14 +12,14 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.programming.web.ProgrammingExerciseResourceErrorKeys; import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; +import de.tum.cit.aet.artemis.programming.web.ProgrammingExerciseResourceErrorKeys; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/GitService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/GitService.java index 7d734e1b5612..25599ae7266a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/GitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/GitService.java @@ -72,6 +72,7 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.exception.GitException; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -88,7 +89,6 @@ import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.ZipFileService; import de.tum.cit.aet.artemis.web.rest.dto.CommitInfoDTO; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java index e4618762bb0c..13577848449c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java @@ -22,12 +22,12 @@ import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.athena.service.AthenaFeedbackSuggestionsService; import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.service.SubmissionService; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * Service class for managing code review feedback on programming exercises. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java index 1f3021c7adc0..ad1ce7670300 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java @@ -42,6 +42,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; @@ -71,7 +72,6 @@ import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseGradingStatisticsDTO; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportFromFileService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportFromFileService.java index 7df46466ff0a..8f947133106b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportFromFileService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportFromFileService.java @@ -28,6 +28,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; @@ -37,7 +38,6 @@ import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.ZipFileService; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseParticipationService.java index 3ecd145d1b6a..1107221cd1cc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseParticipationService.java @@ -20,6 +20,7 @@ import org.springframework.util.FileSystemUtils; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; @@ -45,7 +46,6 @@ import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlRepositoryPermission; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.web.rest.dto.CommitInfoDTO; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseScheduleService.java index 9679fbf23593..7fb35b6b1d66 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseScheduleService.java @@ -40,6 +40,7 @@ import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.service.ScheduleService; import de.tum.cit.aet.artemis.core.util.Tuple; @@ -59,7 +60,6 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import tech.jhipster.config.JHipsterConstants; @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java index 5813807c4103..541bef1c641a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java @@ -48,8 +48,11 @@ import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.core.util.PageUtil; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseService; @@ -89,9 +92,6 @@ import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; -import de.tum.cit.aet.artemis.core.util.PageUtil; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseTestCaseService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseTestCaseService.java index 9ecd91a03cf0..897c10f60561 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseTestCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseTestCaseService.java @@ -19,15 +19,15 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.ErrorConstants; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseTestCaseDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; -import de.tum.cit.aet.artemis.core.exception.ErrorConstants; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingSubmissionService.java index 59ee646659da..70336c385636 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingSubmissionService.java @@ -31,6 +31,7 @@ import de.tum.cit.aet.artemis.athena.service.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -67,7 +68,6 @@ import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.SubmissionService; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; // TODO: this class has too many dependencies to other services. We should reduce this @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingTriggerService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingTriggerService.java index 923273af6dad..47db93d6d30d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingTriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingTriggerService.java @@ -21,6 +21,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; @@ -40,7 +41,6 @@ import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationTriggerService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.web.websocket.programmingSubmission.BuildTriggerWebsocketError; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryAccessService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryAccessService.java index d001e33df105..30b67a9d2f9e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryAccessService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryAccessService.java @@ -6,6 +6,7 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -13,7 +14,6 @@ import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.programming.web.repository.RepositoryActionType; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryParticipationService.java index 3b843cf2627f..9048ded87542 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryParticipationService.java @@ -8,14 +8,14 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.Repository; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.programming.web.repository.RepositoryActionType; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; +import de.tum.cit.aet.artemis.programming.web.repository.RepositoryActionType; /** * Service for managing programming exercise repositories and participations diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryService.java index 1921d6816124..8d73cb6cfef7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryService.java @@ -35,6 +35,7 @@ import org.springframework.util.FileSystemUtils; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.ConflictException; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.programming.domain.File; import de.tum.cit.aet.artemis.programming.domain.FileType; @@ -46,7 +47,6 @@ import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.web.rest.dto.FileMove; -import de.tum.cit.aet.artemis.core.exception.ConflictException; /** * Service that provides utilities for managing files in a git repository. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/SubmissionPolicyService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/SubmissionPolicyService.java index 9f60233fbeb3..5675a39c8522 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/SubmissionPolicyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/SubmissionPolicyService.java @@ -9,6 +9,8 @@ import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -23,8 +25,6 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.repository.SubmissionPolicyRepository; import de.tum.cit.aet.artemis.web.rest.SubmissionPolicyResource; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusTemplateService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusTemplateService.java index 1787b7672dac..c0b51a9377d3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusTemplateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusTemplateService.java @@ -7,7 +7,6 @@ import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; -import de.tum.cit.aet.artemis.programming.web.localci.AeolusTemplateResource; import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,6 +25,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.programming.service.BuildScriptProviderService; +import de.tum.cit.aet.artemis.programming.web.localci.AeolusTemplateResource; import de.tum.cit.aet.artemis.service.ResourceLoaderService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/CodeHintService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/CodeHintService.java index a4c2d67b7245..ac73fae28454 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/CodeHintService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/CodeHintService.java @@ -12,6 +12,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.iris.domain.session.IrisHestiaSession; import de.tum.cit.aet.artemis.iris.service.session.IrisHestiaSessionService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -21,7 +22,6 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.CodeHintRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ExerciseHintService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ExerciseHintService.java index a6d50cf1bdcc..477bcaf88749 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ExerciseHintService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ExerciseHintService.java @@ -20,6 +20,8 @@ import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Submission; @@ -31,8 +33,6 @@ import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintActivationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintRepository; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.ConflictException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseGitDiffReportService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseGitDiffReportService.java index 07e3b22dd78c..913a096ca8f8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseGitDiffReportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseGitDiffReportService.java @@ -21,6 +21,7 @@ import org.springframework.util.FileSystemUtils; import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; @@ -38,7 +39,6 @@ import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.web.rest.GitDiffReportParserService; -import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; /** * The service handling ProgrammingExerciseGitDiffReport and their ProgrammingExerciseGitDiffEntries. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/TestwiseCoverageService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/TestwiseCoverageService.java index 99092c7e35f2..9fd6b6ca59f8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/TestwiseCoverageService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/TestwiseCoverageService.java @@ -20,6 +20,7 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; @@ -32,7 +33,6 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.TestwiseCoverageReportEntryRepository; import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.RepositoryService; -import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestwiseCoverageReportDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultProcessingService.java index c6a306a2e405..b7a7fe5a4c77 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultProcessingService.java @@ -23,6 +23,7 @@ import com.hazelcast.map.IMap; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; @@ -43,7 +44,6 @@ import de.tum.cit.aet.artemis.programming.service.localci.dto.ResultQueueItem; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.web.websocket.programmingSubmission.BuildTriggerWebsocketError; @Profile(PROFILE_LOCALCI) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCServletService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCServletService.java index 3c9099bfaa20..f331ead9ad44 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCServletService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCServletService.java @@ -38,7 +38,9 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCAuthException; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCForbiddenException; @@ -62,10 +64,8 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingSubmissionService; import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; import de.tum.cit.aet.artemis.programming.service.RepositoryAccessService; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; -import de.tum.cit.aet.artemis.programming.web.repository.RepositoryActionType; import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationTriggerService; +import de.tum.cit.aet.artemis.programming.web.repository.RepositoryActionType; /** * This service is responsible for authenticating and authorizing git requests as well as for retrieving the requested Git repositories from disk. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/SshGitLocationResolverService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/SshGitLocationResolverService.java index 5208fc3f0be5..99b90e06425d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/SshGitLocationResolverService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/SshGitLocationResolverService.java @@ -18,13 +18,13 @@ import org.springframework.security.access.AccessDeniedException; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCForbiddenException; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; -import de.tum.cit.aet.artemis.programming.web.repository.RepositoryActionType; import de.tum.cit.aet.artemis.programming.service.localvc.ssh.SshConstants; +import de.tum.cit.aet.artemis.programming.web.repository.RepositoryActionType; @Profile(PROFILE_LOCALVC) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingAssessmentResource.java index ea22cebd7438..1f11412a07f1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingAssessmentResource.java @@ -24,6 +24,9 @@ import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; @@ -33,15 +36,12 @@ import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.web.AssessmentResource; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingAssessmentService; -import de.tum.cit.aet.artemis.exercise.web.AssessmentResource; import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * REST controller for managing ProgrammingAssessment. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseExportImportResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseExportImportResource.java index d58f526825dd..4eeb25f8505c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseExportImportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseExportImportResource.java @@ -45,6 +45,13 @@ import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.HttpStatusException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorAlertException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -55,6 +62,7 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.exam.service.ExamAccessService; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; @@ -73,14 +81,6 @@ import de.tum.cit.aet.artemis.programming.service.SubmissionPolicyService; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryExportOptionsDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.ConflictException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; -import de.tum.cit.aet.artemis.core.exception.HttpStatusException; -import de.tum.cit.aet.artemis.core.exception.InternalServerErrorAlertException; -import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing ProgrammingExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseParticipationResource.java index 41b0a86f5bb6..41ea08d3c3de 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseParticipationResource.java @@ -24,6 +24,9 @@ import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; @@ -46,9 +49,6 @@ import de.tum.cit.aet.artemis.programming.service.RepositoryService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.dto.CommitInfoDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExercisePlagiarismResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExercisePlagiarismResource.java index eb8b4bea595c..2e71fa83d7a0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExercisePlagiarismResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExercisePlagiarismResource.java @@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController; import de.jplag.exceptions.ExitException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; @@ -34,7 +35,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * REST controller for managing ProgrammingExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResource.java index 6a72f4e3ccfa..e03521e3380c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResource.java @@ -46,7 +46,10 @@ import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -57,6 +60,7 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDeletionService; @@ -86,10 +90,6 @@ import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseResetOptionsDTO; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.ConflictException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.web.websocket.dto.ProgrammingExerciseTestCaseStateDTO; import io.jsonwebtoken.lang.Arrays; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingSubmissionResource.java index 8f50706118b3..26eebf7c7c56 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingSubmissionResource.java @@ -25,6 +25,9 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; @@ -53,9 +56,6 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * REST controller for managing ProgrammingSubmission. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/CodeHintResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/CodeHintResource.java index a0db6bdf6643..16c41978dda2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/CodeHintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/CodeHintResource.java @@ -19,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettingsType; import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; @@ -28,8 +30,6 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.CodeHintRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; import de.tum.cit.aet.artemis.programming.service.hestia.CodeHintService; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.ConflictException; /** * REST controller for managing {@link CodeHint}. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/CoverageReportResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/CoverageReportResource.java index b4cb6af4da79..ad2c9a574268 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/CoverageReportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/CoverageReportResource.java @@ -11,10 +11,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageReport; import de.tum.cit.aet.artemis.programming.service.hestia.TestwiseCoverageService; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * REST controller for managing ProgrammingExerciseTestwiseCoverageReports and its entries. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ExerciseHintResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ExerciseHintResource.java index 3dc059dd3182..029a374a2a87 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ExerciseHintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ExerciseHintResource.java @@ -20,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; @@ -34,8 +36,6 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintRepository; import de.tum.cit.aet.artemis.programming.service.hestia.CodeHintService; import de.tum.cit.aet.artemis.programming.service.hestia.ExerciseHintService; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.ConflictException; import tech.jhipster.web.util.HeaderUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ProgrammingExerciseGitDiffReportResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ProgrammingExerciseGitDiffReportResource.java index 9609e6d64d21..fbed393589e6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ProgrammingExerciseGitDiffReportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ProgrammingExerciseGitDiffReportResource.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; @@ -33,7 +34,6 @@ import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseGitDiffReportService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseGitDiffReportDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * REST controller for managing ProgrammingExerciseGitDiffReports and its entries. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ProgrammingExerciseSolutionEntryResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ProgrammingExerciseSolutionEntryResource.java index af6240b5375a..c18e84806672 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ProgrammingExerciseSolutionEntryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ProgrammingExerciseSolutionEntryResource.java @@ -21,6 +21,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.exception.ConflictException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; @@ -38,8 +40,6 @@ import de.tum.cit.aet.artemis.programming.service.hestia.behavioral.BehavioralTestCaseService; import de.tum.cit.aet.artemis.programming.service.hestia.structural.StructuralSolutionEntryGenerationException; import de.tum.cit.aet.artemis.programming.service.hestia.structural.StructuralTestCaseService; -import de.tum.cit.aet.artemis.core.exception.ConflictException; -import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import tech.jhipster.web.util.HeaderUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildJobQueueResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildJobQueueResource.java index 44e4a90ab26b..c8a68ca1f948 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildJobQueueResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildJobQueueResource.java @@ -21,6 +21,7 @@ import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; @@ -33,7 +34,6 @@ import de.tum.cit.aet.artemis.service.dto.BuildJobsStatisticsDTO; import de.tum.cit.aet.artemis.service.dto.FinishedBuildJobDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.FinishedBuildJobPageableSearchDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import tech.jhipster.web.util.PaginationUtil; @Profile(PROFILE_LOCALCI) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildPlanResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildPlanResource.java index c9a6182c60f5..89c1c974fc48 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildPlanResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildPlanResource.java @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; @@ -19,7 +20,6 @@ import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile("gitlabci | jenkins") @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/open/PublicBuildPlanResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/open/PublicBuildPlanResource.java index 6d4129eb8821..1db51890110e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/open/PublicBuildPlanResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/open/PublicBuildPlanResource.java @@ -10,12 +10,12 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.programming.domain.BuildPlan; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile("gitlabci | jenkins") @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/open/PublicProgrammingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/open/PublicProgrammingSubmissionResource.java index d13db4dd7a1d..ef5de183b9aa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/open/PublicProgrammingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/open/PublicProgrammingSubmissionResource.java @@ -4,8 +4,6 @@ import java.util.Optional; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Profile; @@ -17,7 +15,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryProgrammingExerciseParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryProgrammingExerciseParticipationResource.java index 9bbc4e434a45..d9e56824cf4b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryProgrammingExerciseParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryProgrammingExerciseParticipationResource.java @@ -30,6 +30,8 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.server.ResponseStatusException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; @@ -62,8 +64,6 @@ import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.web.rest.dto.FileMove; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Executes repository actions on repositories related to the participation id transmitted. Available to the owner of the participation, TAs/Instructors of the exercise and Admins. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryResource.java index d25b1b533326..a6ef7f4971fd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryResource.java @@ -28,7 +28,10 @@ import org.springframework.web.server.ResponseStatusException; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.programming.domain.File; @@ -41,14 +44,11 @@ import de.tum.cit.aet.artemis.programming.service.RepositoryService; import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCServletService; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; +import de.tum.cit.aet.artemis.programming.web.repository.util.RepositoryExecutor; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.web.rest.dto.FileMove; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTO; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTOType; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; -import de.tum.cit.aet.artemis.programming.web.repository.util.RepositoryExecutor; /** * Abstract class that can be extended to make repository endpoints available that retrieve the repository based on the implemented method getRepository. This way the retrieval of diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/TestRepositoryResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/TestRepositoryResource.java index 2400377b7b16..1f3ad147121d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/TestRepositoryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/TestRepositoryResource.java @@ -28,6 +28,7 @@ import org.springframework.web.server.ResponseStatusException; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; @@ -46,7 +47,6 @@ import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.web.rest.dto.FileMove; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; /** * Executes requested actions on the test repository of a programming exercise. Only available to TAs, Instructors and Admins. diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizExercise.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizExercise.java index e6a8cf8009b9..1eb22237ff8e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizExercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/QuizExercise.java @@ -35,13 +35,13 @@ import com.fasterxml.jackson.annotation.JsonView; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.quiz.config.QuizView; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * A QuizExercise contains multiple quiz quizQuestions, which can be either multiple choice, drag and drop or short answer. Artemis supports live quizzes with a start and end time diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseService.java index 4e4bc1a7769f..4c1f124d8378 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseService.java @@ -35,8 +35,10 @@ import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.core.util.PageUtil; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.service.ExerciseSpecificationService; import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; @@ -56,8 +58,6 @@ import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.util.PageUtil; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizPoolService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizPoolService.java index 069a039759db..04209cfa37ca 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizPoolService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizPoolService.java @@ -18,6 +18,8 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.service.ExamQuizQuestionsGenerator; @@ -28,8 +30,6 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizGroupRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizPoolRepository; import de.tum.cit.aet.artemis.quiz.repository.ShortAnswerMappingRepository; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * This service contains the functions to manage QuizPool entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizSubmissionService.java index b9ad36b51143..04b6865f279b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizSubmissionService.java @@ -15,6 +15,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.exception.QuizSubmissionException; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; @@ -33,7 +34,6 @@ import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.SubmissionVersionService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java b/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java index c0ff32e92369..ef9072f281c5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java @@ -17,6 +17,7 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; import de.tum.cit.aet.artemis.iris.service.pyris.PyrisWebhookService; import de.tum.cit.aet.artemis.lecture.domain.Attachment; @@ -26,7 +27,6 @@ import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.SlideRepository; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java b/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java index 689ac382fe03..ceb4a3b91252 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java @@ -75,6 +75,7 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.export.CourseExamExportService; import de.tum.cit.aet.artemis.core.service.user.UserService; +import de.tum.cit.aet.artemis.core.util.PageUtil; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; @@ -107,7 +108,6 @@ import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; import de.tum.cit.aet.artemis.web.rest.dto.TutorLeaderboardDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.core.util.PageUtil; /** * Service Implementation for managing Course. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/FileService.java b/src/main/java/de/tum/cit/aet/artemis/service/FileService.java index 687a78f212a3..23a5fee39d7c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/FileService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/FileService.java @@ -63,10 +63,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.ibm.icu.text.CharsetDetector; -import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; -import de.tum.cit.aet.artemis.core.util.CommonsMultipartFile; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; +import de.tum.cit.aet.artemis.core.util.CommonsMultipartFile; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LegalDocumentService.java b/src/main/java/de/tum/cit/aet/artemis/service/LegalDocumentService.java index e3f4e51856ab..44b8c73fd35a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LegalDocumentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LegalDocumentService.java @@ -17,11 +17,11 @@ import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.domain.LegalDocumentType; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import de.tum.cit.aet.artemis.web.rest.dto.ImprintDTO; import de.tum.cit.aet.artemis.web.rest.dto.LegalDocument; import de.tum.cit.aet.artemis.web.rest.dto.PrivacyStatementDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; /** * Service class responsible for providing and managing legal documents (privacy statment, imprint). diff --git a/src/main/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationService.java b/src/main/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationService.java index d90fa409a9f0..b3d36ccd0010 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationService.java @@ -18,11 +18,11 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * Service Implementation for OnlineCourseConfiguration. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java index 4108f72ce0bd..3acaf4c87e4b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java @@ -11,6 +11,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Team; @@ -21,7 +22,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java index 987d95c6fbb2..0e13ea05feaf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java @@ -27,6 +27,7 @@ import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; @@ -56,7 +57,6 @@ import de.tum.cit.aet.artemis.programming.service.localci.SharedQueueManagementService; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * Service Implementation for managing Participation. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SlideSplitterService.java b/src/main/java/de/tum/cit/aet/artemis/service/SlideSplitterService.java index eeea44b757ba..a96a46658af4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SlideSplitterService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SlideSplitterService.java @@ -23,10 +23,10 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.Slide; import de.tum.cit.aet.artemis.lecture.repository.SlideRepository; -import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; /** * Service Implementation for managing the split of AttachmentUnit into single slides and save them as PNG. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java b/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java index 1c288dbfadd4..1d8c37cf78e5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java @@ -33,6 +33,7 @@ import de.tum.cit.aet.artemis.core.domain.StatisticsView; import de.tum.cit.aet.artemis.core.dto.CourseStatisticsAverageScore; import de.tum.cit.aet.artemis.core.dto.StatisticsEntry; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.StatisticsRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -43,7 +44,6 @@ import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementStatisticsDTO; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseManagementStatisticsDTO; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java index 74805d242299..ed075ce2297b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java @@ -33,9 +33,12 @@ import de.tum.cit.aet.artemis.assessment.service.FeedbackService; import de.tum.cit.aet.artemis.athena.service.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.util.PageUtil; import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; @@ -53,9 +56,6 @@ import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionWithComplaintDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.util.PageUtil; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SystemNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/service/SystemNotificationService.java index 79b895419a07..56c26166a692 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SystemNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SystemNotificationService.java @@ -10,8 +10,8 @@ import de.tum.cit.aet.artemis.communication.domain.notification.SystemNotification; import de.tum.cit.aet.artemis.communication.repository.SystemNotificationRepository; -import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.security.SecurityUtils; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseFeedbackService.java index e9601277266c..d888afcb17a7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseFeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseFeedbackService.java @@ -19,14 +19,14 @@ import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.athena.service.AthenaFeedbackSuggestionsService; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseService.java index 6146ee7dce67..11aaab826cef 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseService.java @@ -4,7 +4,6 @@ import java.util.Collections; -import de.tum.cit.aet.artemis.core.util.PageUtil; import org.springframework.context.annotation.Profile; import org.springframework.data.domain.Page; import org.springframework.data.jpa.domain.Specification; @@ -12,6 +11,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.core.util.PageUtil; import de.tum.cit.aet.artemis.exercise.service.ExerciseSpecificationService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionService.java index f30ba55c43e7..b137177a27b1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionService.java @@ -19,6 +19,7 @@ import de.tum.cit.aet.artemis.assessment.service.FeedbackService; import de.tum.cit.aet.artemis.athena.service.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; @@ -36,7 +37,6 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/text/web/ApollonDiagramResource.java b/src/main/java/de/tum/cit/aet/artemis/text/web/ApollonDiagramResource.java index 8372b0958ae9..55fa957b8efc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/web/ApollonDiagramResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/web/ApollonDiagramResource.java @@ -21,6 +21,8 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; @@ -29,8 +31,6 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.modeling.domain.ApollonDiagram; import de.tum.cit.aet.artemis.modeling.repository.ApollonDiagramRepository; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.ConflictException; /** * REST controller for managing ApollonDiagram. diff --git a/src/main/java/de/tum/cit/aet/artemis/text/web/TextAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/text/web/TextAssessmentResource.java index 22b840194aaa..f92d64a0a3e3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/web/TextAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/web/TextAssessmentResource.java @@ -11,7 +11,6 @@ import java.util.function.Function; import java.util.stream.Collectors; -import de.tum.cit.aet.artemis.exercise.web.AssessmentResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -42,17 +41,21 @@ import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.athena.service.AthenaFeedbackSendingService; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ErrorConstants; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.web.AssessmentResource; import de.tum.cit.aet.artemis.text.domain.TextBlock; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; @@ -63,9 +66,6 @@ import de.tum.cit.aet.artemis.text.service.TextSubmissionService; import de.tum.cit.aet.artemis.web.rest.dto.TextAssessmentDTO; import de.tum.cit.aet.artemis.web.rest.dto.TextAssessmentUpdateDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.ErrorConstants; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; diff --git a/src/main/java/de/tum/cit/aet/artemis/text/web/TextExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/text/web/TextExerciseResource.java index c676d1e7f27c..c48ccaba4c42 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/web/TextExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/web/TextExerciseResource.java @@ -47,6 +47,10 @@ import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -58,6 +62,8 @@ import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.util.ResponseUtil; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; @@ -82,12 +88,6 @@ import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.ConflictException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; -import de.tum.cit.aet.artemis.core.util.ResponseUtil; /** * REST controller for managing TextExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/text/web/TextSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/text/web/TextSubmissionResource.java index 8819a9d46cae..359077783330 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/web/TextSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/web/TextSubmissionResource.java @@ -6,7 +6,6 @@ import java.util.Optional; import java.util.Set; -import de.tum.cit.aet.artemis.exercise.web.AbstractSubmissionResource; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; @@ -26,6 +25,8 @@ import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.service.ResultService; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; @@ -38,6 +39,7 @@ import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.web.AbstractSubmissionResource; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; @@ -45,8 +47,6 @@ import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.text.service.TextAssessmentService; import de.tum.cit.aet.artemis.text.service.TextSubmissionService; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * REST controller for managing TextSubmission. diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroup.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroup.java index e73979c3eeeb..620affb2f254 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroup.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroup.java @@ -27,11 +27,11 @@ import com.fasterxml.jackson.annotation.JsonProperty; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupService; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; @Entity @Table(name = "tutorial_group") diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/exception/ScheduleOverlapsWithSessionException.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/exception/ScheduleOverlapsWithSessionException.java index e88807a1f2ab..ff2e42150a3d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/exception/ScheduleOverlapsWithSessionException.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/exception/ScheduleOverlapsWithSessionException.java @@ -8,9 +8,9 @@ import java.util.Map; import java.util.Set; -import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.ErrorConstants; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; import de.tum.cit.aet.artemis.tutorialgroup.web.TutorialGroupResource; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/exception/SessionOverlapsWithSessionException.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/exception/SessionOverlapsWithSessionException.java index 78d1c0f63534..5f855efde727 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/exception/SessionOverlapsWithSessionException.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/exception/SessionOverlapsWithSessionException.java @@ -8,9 +8,9 @@ import java.util.Map; import java.util.Set; -import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.ErrorConstants; +import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; import de.tum.cit.aet.artemis.tutorialgroup.web.TutorialGroupResource; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupScheduleService.java index b8c9f720250b..5ebf0e8f5ca3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupScheduleService.java @@ -19,16 +19,16 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.util.DateUtil; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupFreePeriod; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSchedule; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSessionStatus; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; +import de.tum.cit.aet.artemis.tutorialgroup.exception.ScheduleOverlapsWithSessionException; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupScheduleRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupSessionRepository; -import de.tum.cit.aet.artemis.tutorialgroup.exception.ScheduleOverlapsWithSessionException; -import de.tum.cit.aet.artemis.core.util.DateUtil; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupService.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupService.java index 4a31fcabdc4d..386c3ed3b725 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupService.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupService.java @@ -38,6 +38,8 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; @@ -49,8 +51,6 @@ import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRegistrationRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupSessionRepository; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.tutorialgroup.web.TutorialGroupResource.TutorialGroupImportErrors; import de.tum.cit.aet.artemis.tutorialgroup.web.TutorialGroupResource.TutorialGroupRegistrationImportDTO; diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupFreePeriodResource.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupFreePeriodResource.java index 5eab789a4191..fb53d4012815 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupFreePeriodResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupFreePeriodResource.java @@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; @@ -34,7 +35,6 @@ import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupsConfigurationRepository; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupFreePeriodService; import de.tum.cit.aet.artemis.web.rest.dto.TutorialGroupFreePeriodDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupResource.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupResource.java index 896f96dae847..01fdf3778250 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupResource.java @@ -46,6 +46,8 @@ import de.tum.cit.aet.artemis.communication.service.notifications.TutorialGroupNotificationService; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -67,8 +69,6 @@ import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupChannelManagementService; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupScheduleService; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupService; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupSessionResource.java index c0d2988ba335..54790e628ba9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupSessionResource.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.tutorialgroup.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupScheduleService.updateTutorialGroupSession; import static de.tum.cit.aet.artemis.core.util.DateUtil.interpretInTimeZone; +import static de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupScheduleService.updateTutorialGroupSession; import java.net.URI; import java.net.URISyntaxException; @@ -36,6 +36,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; @@ -46,14 +47,13 @@ import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSessionStatus; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; +import de.tum.cit.aet.artemis.tutorialgroup.exception.SessionOverlapsWithSessionException; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupFreePeriodRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupScheduleRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupSessionRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupsConfigurationRepository; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupService; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.tutorialgroup.exception.SessionOverlapsWithSessionException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupsConfigurationResource.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupsConfigurationResource.java index 583266931f28..4e9c9212ee4b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupsConfigurationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupsConfigurationResource.java @@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; @@ -33,7 +34,6 @@ import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupsConfigurationRepository; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupChannelManagementService; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java index 341cbd303c28..3fd42aea8817 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java @@ -69,6 +69,11 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenAlertException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.ErrorConstants; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -112,11 +117,6 @@ import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.web.rest.dto.user.UserNameAndLoginDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenAlertException; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; -import de.tum.cit.aet.artemis.core.exception.ErrorConstants; import tech.jhipster.web.util.PaginationUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java index b01f320e04a6..c995ff0656ad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java @@ -25,14 +25,14 @@ import de.tum.cit.aet.artemis.core.domain.DataExport; import de.tum.cit.aet.artemis.core.domain.DataExportState; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.DataExportRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.service.export.DataExportService; import de.tum.cit.aet.artemis.web.rest.dto.DataExportDTO; import de.tum.cit.aet.artemis.web.rest.dto.RequestDataExportDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * REST controller for data exports. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java index 70918bf9f8bd..37b4e0488133 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java @@ -59,6 +59,11 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenAlertException; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.CustomAuditEventRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -71,6 +76,7 @@ import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; @@ -106,12 +112,6 @@ import de.tum.cit.aet.artemis.web.rest.dto.SuspiciousExamSessionsDTO; import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamWideAnnouncementEventDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenAlertException; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.ConflictException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.PaginationUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java index 045d8e144f63..40ec4ec5ca25 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java @@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; @@ -32,7 +33,6 @@ import de.tum.cit.aet.artemis.web.rest.dto.ExamUserAttendanceCheckDTO; import de.tum.cit.aet.artemis.web.rest.dto.ExamUserDTO; import de.tum.cit.aet.artemis.web.rest.dto.ExamUsersNotFoundDTO; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * REST controller for managing ExamUser. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java index 866b6004dda9..f52384d727fc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java @@ -24,11 +24,14 @@ import de.tum.cit.aet.artemis.assessment.domain.ExampleSubmission; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.service.ExampleSubmissionService; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; @@ -36,9 +39,6 @@ import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.text.service.TextBlockService; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing ExampleSubmission. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java index e27542b0ea3d..31db34b67cf0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java @@ -26,10 +26,13 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; @@ -38,9 +41,6 @@ import de.tum.cit.aet.artemis.exam.service.ExamImportService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.service.ExerciseDeletionService; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.ConflictException; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing ExerciseGroup. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java index 98fe2055cd1d..0663cf07386f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java @@ -30,6 +30,8 @@ import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.service.TutorParticipationService; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; @@ -59,8 +61,6 @@ import de.tum.cit.aet.artemis.web.rest.dto.ExerciseDetailsDTO; import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * REST controller for managing Exercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java index 5992f698795a..be7ca6c5eac2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java @@ -41,6 +41,8 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -75,8 +77,6 @@ import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ResourceLoaderService; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** * REST controller for managing Files. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java index a55ef202ae85..92d616e214da 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java @@ -2,7 +2,6 @@ import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import de.tum.cit.aet.artemis.exercise.web.AssessmentResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Profile; @@ -32,6 +31,7 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.web.AssessmentResource; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java index 56b6ffdfcb45..33d63acc8f23 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java @@ -35,6 +35,8 @@ import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -44,6 +46,8 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.util.ResponseUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDeletionService; @@ -57,10 +61,6 @@ import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; -import de.tum.cit.aet.artemis.core.util.ResponseUtil; /** * REST controller for managing FileUploadExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java index 189ef513ab9d..36cde9acfd88 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java @@ -8,7 +8,6 @@ import java.util.Optional; import java.util.Set; -import de.tum.cit.aet.artemis.exercise.web.AbstractSubmissionResource; import jakarta.validation.constraints.NotNull; import org.slf4j.Logger; @@ -34,12 +33,15 @@ import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.EmptyFileException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.exam.service.ExamSubmissionService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; @@ -48,14 +50,12 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; +import de.tum.cit.aet.artemis.exercise.web.AbstractSubmissionResource; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadSubmissionRepository; import de.tum.cit.aet.artemis.fileupload.service.FileUploadSubmissionService; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing FileUploadSubmission. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java index c61d98fb5fa8..a9d143891584 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java @@ -32,6 +32,7 @@ import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; @@ -54,7 +55,6 @@ import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationOverviewDTO; import de.tum.cit.aet.artemis.web.rest.dto.competency.NgxLearningPathDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java index 9d707e01d899..d6c7c9322d5a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java @@ -31,6 +31,7 @@ import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -38,6 +39,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.service.ExerciseService; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; @@ -49,8 +51,6 @@ import de.tum.cit.aet.artemis.lecture.service.LectureService; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing Lecture. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java index 84289ae92c46..2f256e1eb039 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java @@ -15,10 +15,10 @@ import de.tum.cit.aet.artemis.assessment.domain.LongFeedbackText; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.LongFeedbackTextRepository; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java index 30f611e0dbde..71bf88ab1402 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.Set; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Profile; @@ -27,6 +26,7 @@ import com.nimbusds.jwt.SignedJWT; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java index 6ef9fac28f00..2ef6e3ee79c8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingAssessmentResource.java @@ -4,7 +4,6 @@ import java.util.List; -import de.tum.cit.aet.artemis.exercise.web.AssessmentResource; import org.hibernate.Hibernate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,6 +26,7 @@ import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.service.AssessmentService; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.ErrorConstants; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; @@ -36,13 +36,13 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.web.AssessmentResource; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; import de.tum.cit.aet.artemis.web.rest.dto.ModelingAssessmentDTO; -import de.tum.cit.aet.artemis.core.exception.ErrorConstants; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java index 6de06c43c4ef..0e0e3959a99c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingExerciseResource.java @@ -36,6 +36,8 @@ import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -45,6 +47,8 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.util.ResponseUtil; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; @@ -64,10 +68,6 @@ import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.ConflictException; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; -import de.tum.cit.aet.artemis.core.util.ResponseUtil; /** * REST controller for managing ModelingExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java index 2384bf1febd6..5c7f98761822 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ModelingSubmissionResource.java @@ -7,7 +7,6 @@ import java.util.Optional; import java.util.Set; -import de.tum.cit.aet.artemis.exercise.web.AbstractSubmissionResource; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; @@ -32,27 +31,28 @@ import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ErrorConstants; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.exam.service.ExamSubmissionService; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.web.AbstractSubmissionResource; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; import de.tum.cit.aet.artemis.modeling.service.ModelingSubmissionService; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismService; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.ErrorConstants; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java index f1e2255e7881..ec59ce4a5857 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java @@ -24,11 +24,11 @@ import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; import de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.core.util.TimeLogUtil; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.util.TimeLogUtil; /** * REST controller for managing NotificationSettings (NotificationSettings). diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java index d78985f5b8df..db05960a1b42 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java @@ -50,6 +50,9 @@ import de.tum.cit.aet.artemis.core.config.GuidedTourConfiguration; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -62,6 +65,7 @@ import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggleService; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; @@ -95,10 +99,6 @@ import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.service.TextExerciseFeedbackService; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.ConflictException; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing Participation. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java index e71967fcd35d..0ad904097716 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java @@ -47,6 +47,8 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; import de.tum.cit.aet.artemis.core.exception.QuizJoinException; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -60,6 +62,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDeletionService; @@ -85,9 +88,6 @@ import de.tum.cit.aet.artemis.web.rest.dto.QuizBatchJoinDTO; import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing QuizExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java index 4d9f1819305d..b15a0fcd6969 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java @@ -21,6 +21,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -31,7 +32,6 @@ import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.quiz.service.QuizBatchService; import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; /** * REST controller for managing quiz participations. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java index 5a36fc9fb9c7..9a2c23794329 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java @@ -19,10 +19,10 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.exam.service.ExamAccessService; import de.tum.cit.aet.artemis.quiz.domain.QuizPool; import de.tum.cit.aet.artemis.quiz.service.QuizPoolService; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing QuizPool. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java index dc67c0a39bcc..fdc6ebdc3d0e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java @@ -29,6 +29,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.exam.service.ExamSubmissionService; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; @@ -40,7 +41,6 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.service.QuizSubmissionService; import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java index f7d895a2d7ab..b3be5728757e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java @@ -25,6 +25,8 @@ import de.tum.cit.aet.artemis.assessment.service.RatingService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -32,8 +34,6 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; /** * REST controller for managing Rating. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java index b8447a87a45b..01893c2c1d8c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java @@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; @@ -26,8 +28,6 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; import de.tum.cit.aet.artemis.programming.service.StaticCodeAnalysisService; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.ConflictException; /** * REST controller for managing static code analysis. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java index aef26a9ab905..ff260a33bed7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java @@ -38,12 +38,17 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.core.util.ExamExerciseStartPreparationStatus; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.core.util.HttpRequestUtils; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExamSession; @@ -70,11 +75,6 @@ import de.tum.cit.aet.artemis.web.rest.dto.StudentExamWithGradeDTO; import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamAttendanceCheckEventDTO; import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamLiveEventBaseDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.ConflictException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing ExerciseGroup. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java index 7afe38ae4161..3fa9625c015f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java @@ -22,18 +22,18 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.service.SubmissionPolicyService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java index 2d6f30207d0a..dc0fa61bacd5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java @@ -21,12 +21,14 @@ import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.SubmissionVersion; @@ -43,8 +45,6 @@ import de.tum.cit.aet.artemis.web.rest.dto.SubmissionVersionDTO; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionWithComplaintDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing Submission. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java index 346691a1b9ca..0ded5a2ed8e5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java @@ -38,6 +38,8 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -46,6 +48,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -58,9 +61,6 @@ import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.service.dto.TeamSearchUserDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.web.websocket.team.TeamWebsocketService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java index 1b375185a91a..ae579205fcb6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java @@ -27,9 +27,9 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.core.util.HeaderUtil; /** * REST controller for managing TutorParticipation. diff --git a/src/main/webapp/app/course/manage/faq.component.ts b/src/main/webapp/app/course/manage/faq.component.ts deleted file mode 100644 index d9eaa4ce81b8..000000000000 --- a/src/main/webapp/app/course/manage/faq.component.ts +++ /dev/null @@ -1,145 +0,0 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; -import { Faq } from 'app/entities/faq.model'; -import { - faEdit, - faFile, - faFileExport, - faFileImport, - faFilter, - faPencilAlt, - faPlus, - faPuzzlePiece, - faSort, - faTrash -} from '@fortawesome/free-solid-svg-icons'; -import { Subject } from 'rxjs'; -import { map } from 'rxjs/operators'; -import { AlertService } from 'app/core/util/alert.service'; -import { ActivatedRoute } from '@angular/router'; -import { FaqService } from 'app/faq/faq.service'; -import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; -import { onError } from 'app/shared/util/global.utils'; -import { FaqCategory } from 'app/entities/faq-category.model'; -import { loadCourseFaqCategories } from 'app/faq/faq.utils'; -import { SortService } from 'app/shared/service/sort.service'; - -@Component({ - selector: 'jhi-faq', - templateUrl: './faq.component.html' - -}) - -export class FAQComponent implements OnInit, OnDestroy { - faqs: Faq[]; - filteredFaq: Faq[]; - existingCategories: FaqCategory[] - courseId: number; - - private dialogErrorSource = new Subject(); - dialogError$ = this.dialogErrorSource.asObservable(); - - activeFilters = new Set(); - predicate: string; - ascending: boolean; - - irisEnabled = false; - - // Icons - faEdit = faEdit; - faPlus = faPlus; - faFileImport = faFileImport; - faFileExport = faFileExport; - faTrash = faTrash; - faPencilAlt = faPencilAlt; - faFile = faFile; - faPuzzlePiece = faPuzzlePiece; - faFilter = faFilter; - faSort = faSort; - - constructor( - protected faqService: FaqService, - private route: ActivatedRoute, - private alertService: AlertService, - private sortService: SortService, - ) { - this.predicate = 'id'; - this.ascending = true; - } - - ngOnInit() { - this.courseId = Number(this.route.snapshot.paramMap.get('courseId')); - this.loadAll() - this.loadCourseExerciseCategories(this.courseId) - } - - ngOnDestroy(): void { - this.dialogErrorSource.unsubscribe(); - } - - trackId(index: number, item: Faq) { - return item.id; - } - - deleteFaq(faqId: number) { - this.faqService.delete(faqId).subscribe({ - next: () => { - this.handleDeleteSuccess(faqId); - }, - error: (error: HttpErrorResponse) => this.dialogErrorSource.next(error.message), - }); - } - - private handleDeleteSuccess(faqId: number) { - this.faqs = this.faqs.filter(faq => faq.id !== faqId); - this.dialogErrorSource.next(''); - this.applyFilters(); - } - - toggleFilters(category: String) { - this.activeFilters.has(category) ? this.activeFilters.delete(category) : this.activeFilters.add(category) - this.applyFilters(); - } - - sortRows() { - this.sortService.sortByProperty(this.filteredFaq, this.predicate, this.ascending); - } - - private loadAll() { - this.faqService.findAllByCourseId(this.courseId) - .pipe( - map((res: HttpResponse) => res.body), - ) - .subscribe({ - next: (res: Faq[]) => { - this.faqs = res; - this.applyFilters() - }, - error: (res: HttpErrorResponse) => onError(this.alertService, res), - }); - } - - private loadCourseExerciseCategories(courseId: number) { - loadCourseFaqCategories(courseId, this.alertService, this.faqService).subscribe((existingCategories) => { - this.existingCategories = existingCategories; - }); - } - - - private applyFilters(): void { - if (this.activeFilters.size === 0) { - // If no filters selected, show all faqs - this.filteredFaq = this.faqs; - } else { - this.filteredFaq = this.faqs.filter((faq) => this.hasFilteredCategory(faq, this.activeFilters)); - } - - } - - public hasFilteredCategory(faq: Faq, filteredCategory: Set){ - let categories = faq.categories?.map((category) => category.category) - if(categories){ - return categories.some(category => filteredCategory.has(category!)); - } - - } -} diff --git a/src/test/java/de/tum/cit/aet/artemis/LtiIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/LtiIntegrationTest.java index a0f4b7954922..b1bc1f8e1003 100644 --- a/src/test/java/de/tum/cit/aet/artemis/LtiIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/LtiIntegrationTest.java @@ -30,8 +30,8 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; class LtiIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java index d993f5f199eb..d551b480c338 100644 --- a/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java @@ -76,8 +76,8 @@ import de.tum.cit.aet.artemis.core.config.ApplicationConfiguration; import de.tum.cit.aet.artemis.core.config.ConditionalMetricsExclusionConfiguration; import de.tum.cit.aet.artemis.programming.service.GitService; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.programming.web.repository.RepositoryResource; +import de.tum.cit.aet.artemis.service.WebsocketMessagingService; /** * This class contains architecture tests that apply for the whole project. diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java index 02ca3b6b5d79..dcaf22cb975f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java @@ -35,6 +35,7 @@ import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; @@ -74,7 +75,6 @@ import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.web.rest.dto.ResultWithPointsPerGradingCriterionDTO; import de.tum.cit.aet.artemis.web.rest.dto.feedback.FeedbackDetailDTO; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class ResultServiceIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/authentication/InternalAuthenticationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/InternalAuthenticationIntegrationTest.java index c6ad4d46a3d7..dfc22c4e0b93 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authentication/InternalAuthenticationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/InternalAuthenticationIntegrationTest.java @@ -31,6 +31,8 @@ import de.tum.cit.aet.artemis.core.domain.Authority; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.vm.LoginVM; +import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; import de.tum.cit.aet.artemis.core.repository.AuthorityRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.SecurityUtils; @@ -40,8 +42,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.tutorialgroups.TutorialGroupUtilService; -import de.tum.cit.aet.artemis.core.dto.vm.LoginVM; -import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; class InternalAuthenticationIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java index 91176cc3f785..ab16169890e2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java @@ -24,6 +24,7 @@ import de.tum.cit.aet.artemis.core.domain.Authority; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.vm.LoginVM; import de.tum.cit.aet.artemis.core.repository.AuthorityRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -33,7 +34,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.service.dto.StudentDTO; -import de.tum.cit.aet.artemis.core.dto.vm.LoginVM; class LdapAuthenticationIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/authentication/UserJenkinsGitlabIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/UserJenkinsGitlabIntegrationTest.java index bce2316f4d44..1a60caa60657 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authentication/UserJenkinsGitlabIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/UserJenkinsGitlabIntegrationTest.java @@ -20,6 +20,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.user.PasswordService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; @@ -29,7 +30,6 @@ import de.tum.cit.aet.artemis.programming.service.jenkins.JenkinsUserManagementService; import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.user.UserTestService; -import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; class UserJenkinsGitlabIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/authentication/UserSaml2IntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/UserSaml2IntegrationTest.java index 9a17b5d245c9..b18ca84ff183 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authentication/UserSaml2IntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/UserSaml2IntegrationTest.java @@ -21,10 +21,10 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationGitlabCIGitlabSamlTest; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.vm.LoginVM; import de.tum.cit.aet.artemis.core.service.connectors.SAML2Service; import de.tum.cit.aet.artemis.core.service.user.PasswordService; import de.tum.cit.aet.artemis.core.web.open.PublicUserJwtResource; -import de.tum.cit.aet.artemis.core.dto.vm.LoginVM; /** * Tests for {@link PublicUserJwtResource} and {@link SAML2Service}. diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java index bf0f5696493b..61c0478451c1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java @@ -48,6 +48,8 @@ import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProvider; @@ -66,8 +68,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; import de.tum.cit.aet.artemis.text.domain.TextExercise; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import uk.ac.ox.ctl.lti13.lti.Claims; class Lti13ServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java index 826c3162f6aa..be1b729386dc 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java @@ -20,14 +20,13 @@ import org.springframework.web.client.RestTemplate; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; -import de.tum.cit.aet.artemis.core.service.connectors.lti.LtiDynamicRegistrationService; import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.lti.dto.Lti13ClientRegistration; import de.tum.cit.aet.artemis.lti.dto.Lti13PlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.lti.service.LtiDynamicRegistrationService; -import de.tum.cit.aet.artemis.web.rest.errors.BadRequestAlertException; class LtiDynamicRegistrationServiceTest { @@ -42,8 +41,6 @@ class LtiDynamicRegistrationServiceTest { private LtiDynamicRegistrationService ltiDynamicRegistrationService; - private Course course; - private String openIdConfigurationUrl; private String registrationToken; @@ -61,7 +58,7 @@ void init() { ltiDynamicRegistrationService = new LtiDynamicRegistrationService(ltiPlatformConfigurationRepository, oAuth2JWKSService, restTemplate); ReflectionTestUtils.setField(ltiDynamicRegistrationService, "artemisServerUrl", "http://artemis.com"); - course = new Course(); + Course course = new Course(); course.setOnlineCourseConfiguration(new OnlineCourseConfiguration()); course.setOnlineCourse(true); course.setShortName("shortName"); diff --git a/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java b/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java index 8547e0cad240..004adde1417c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java @@ -81,6 +81,7 @@ import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.competency.PrerequisiteUtilService; import de.tum.cit.aet.artemis.core.config.Constants; @@ -88,6 +89,7 @@ import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.core.domain.Organization; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.CustomAuditEventRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -165,8 +167,6 @@ import de.tum.cit.aet.artemis.web.rest.dto.TextAssessmentUpdateDTO; import de.tum.cit.aet.artemis.web.rest.dto.TutorLeaderboardDTO; import de.tum.cit.aet.artemis.web.rest.dto.user.UserNameAndLoginDTO; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; @Service public class CourseTestService { diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java index 2f26668ec653..4404d4bb7a63 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java @@ -46,6 +46,7 @@ import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.service.user.PasswordService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExamUser; @@ -94,7 +95,6 @@ import de.tum.cit.aet.artemis.web.rest.dto.ExerciseGroupWithIdAndExamDTO; import de.tum.cit.aet.artemis.web.rest.dto.SuspiciousExamSessionsDTO; import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @TestInstance(TestInstance.Lifecycle.PER_CLASS) class ExamIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java index 420433b989c7..c2b1453da4fd 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java @@ -24,6 +24,7 @@ import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.service.ldap.LdapUserDto; import de.tum.cit.aet.artemis.core.service.user.PasswordService; import de.tum.cit.aet.artemis.exam.domain.Exam; @@ -33,7 +34,6 @@ import de.tum.cit.aet.artemis.exam.service.ExamRegistrationService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.user.UserFactory; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; class ExamRegistrationIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java index b2f06a7f3e66..d227d69d34bf 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java @@ -71,6 +71,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.util.RoundingUtil; import de.tum.cit.aet.artemis.exam.domain.Exam; @@ -132,7 +133,6 @@ import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamLiveEventBaseDTO; import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamWideAnnouncementEventDTO; import de.tum.cit.aet.artemis.web.rest.dto.examevent.WorkingTimeUpdateEventDTO; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class StudentExamIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java index 8e714fae1a86..054b2c4d7982 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java @@ -28,6 +28,7 @@ import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; @@ -56,7 +57,6 @@ import de.tum.cit.aet.artemis.util.TestResourceUtils; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseDetailsDTO; import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class ExerciseIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java index 44287c60b459..cd62f97af7a5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java @@ -33,6 +33,7 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -46,7 +47,6 @@ import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class FileUploadSubmissionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java index 897e70bc9caf..1d0a96ae201c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java @@ -27,6 +27,7 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; @@ -57,7 +58,6 @@ import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.util.TestResourceUtils; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class ModelingSubmissionIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java index e4edb3f50744..4ef78e883309 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java @@ -11,13 +11,13 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.AuxiliaryRepositoryService; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; class AuxiliaryRepositoryServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java index bb6dbf5f99c7..2a04be6da5f8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java @@ -27,6 +27,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; @@ -34,7 +35,6 @@ import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.util.GitUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class ProgrammingExerciseGitIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java index 9716c1cd9ac7..8df1bdad0315 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java @@ -2,11 +2,11 @@ import static de.tum.cit.aet.artemis.programming.domain.BuildPlanType.SOLUTION; import static de.tum.cit.aet.artemis.programming.domain.BuildPlanType.TEMPLATE; -import static de.tum.cit.aet.artemis.util.TestResourceUtils.HalfSecond; import static de.tum.cit.aet.artemis.programming.web.ProgrammingExerciseResourceErrorKeys.INVALID_SOLUTION_BUILD_PLAN_ID; import static de.tum.cit.aet.artemis.programming.web.ProgrammingExerciseResourceErrorKeys.INVALID_SOLUTION_REPOSITORY_URL; import static de.tum.cit.aet.artemis.programming.web.ProgrammingExerciseResourceErrorKeys.INVALID_TEMPLATE_BUILD_PLAN_ID; import static de.tum.cit.aet.artemis.programming.web.ProgrammingExerciseResourceErrorKeys.INVALID_TEMPLATE_REPOSITORY_URL; +import static de.tum.cit.aet.artemis.util.TestResourceUtils.HalfSecond; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; import static org.mockito.Mockito.any; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java index dca8d0fcf9bc..9c25ca166953 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java @@ -43,6 +43,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -63,7 +64,6 @@ import de.tum.cit.aet.artemis.util.TestConstants; import de.tum.cit.aet.artemis.util.TestResourceUtils; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionDTO; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class ProgrammingSubmissionIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java index 454658fb477c..fa9b2e7894f9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java @@ -85,13 +85,13 @@ import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseParticipationService; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlRepositoryPermission; +import de.tum.cit.aet.artemis.programming.web.repository.FileSubmission; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.util.GitUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; import de.tum.cit.aet.artemis.util.TestConstants; import de.tum.cit.aet.artemis.web.rest.dto.FileMove; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTO; -import de.tum.cit.aet.artemis.programming.web.repository.FileSubmission; class RepositoryIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java index f07424db4af0..d01c0542d6ca 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java @@ -40,11 +40,11 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.GitService; +import de.tum.cit.aet.artemis.programming.web.repository.FileSubmission; import de.tum.cit.aet.artemis.util.GitUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; import de.tum.cit.aet.artemis.web.rest.dto.FileMove; import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTO; -import de.tum.cit.aet.artemis.programming.web.repository.FileSubmission; class TestRepositoryResourceIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintServiceTest.java index 21d43cf31e6e..ff2cac9f0c21 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/CodeHintServiceTest.java @@ -18,6 +18,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -32,7 +33,6 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.programming.service.hestia.CodeHintService; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @SuppressWarnings("ArraysAsListWithZeroOrOneArgument") class CodeHintServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/IrisExerciseChatSessionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisExerciseChatSessionIntegrationTest.java index 5475f3e4518b..c1d0169b621a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/IrisExerciseChatSessionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisExerciseChatSessionIntegrationTest.java @@ -14,8 +14,8 @@ import de.tum.cit.aet.artemis.iris.domain.session.IrisExerciseChatSession; import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; import de.tum.cit.aet.artemis.iris.repository.IrisExerciseChatSessionRepository; -import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.iris.web.IrisStatusDTO; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; class IrisExerciseChatSessionIntegrationTest extends AbstractIrisIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java index 8f78886c211a..df9f55446058 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java @@ -29,6 +29,8 @@ import de.tum.cit.aet.artemis.communication.repository.conversation.GroupChatRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.OneToOneChatRepository; import de.tum.cit.aet.artemis.communication.service.conversation.ConversationService; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.GroupChatDTO; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.core.domain.User; @@ -37,8 +39,6 @@ import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.GroupChatDTO; import de.tum.cit.aet.artemis.web.websocket.dto.metis.ConversationWebsocketDTO; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java index d4ad0b0b47ac..d5f68fab1ff2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java @@ -20,6 +20,8 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelIdAndNameDTO; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.core.domain.Language; @@ -34,8 +36,6 @@ import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupChannelManagementService; import de.tum.cit.aet.artemis.tutorialgroups.TutorialGroupUtilService; import de.tum.cit.aet.artemis.user.UserFactory; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelIdAndNameDTO; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; class ChannelIntegrationTest extends AbstractConversationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/ConversationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/ConversationIntegrationTest.java index 157318280e97..795c3e1bfae8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/ConversationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/ConversationIntegrationTest.java @@ -19,6 +19,11 @@ import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationUserDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.GroupChatDTO; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.OneToOneChatDTO; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.core.domain.User; @@ -32,11 +37,6 @@ import de.tum.cit.aet.artemis.service.dto.ResponsibleUserDTO; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.user.UserFactory; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationDTO; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationUserDTO; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.GroupChatDTO; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.OneToOneChatDTO; class ConversationIntegrationTest extends AbstractConversationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/GroupChatIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/GroupChatIntegrationTest.java index d75be1b30647..13e785611768 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/GroupChatIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/GroupChatIntegrationTest.java @@ -16,9 +16,9 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.GroupChatDTO; import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.user.UserFactory; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.GroupChatDTO; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/OneToOneChatIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/OneToOneChatIntegrationTest.java index c991a940d298..f8eddd47335b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/OneToOneChatIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/OneToOneChatIntegrationTest.java @@ -16,9 +16,9 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; +import de.tum.cit.aet.artemis.communication.web.conversation.dtos.OneToOneChatDTO; import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.user.UserFactory; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.OneToOneChatDTO; import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/PostingServiceUnitTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/PostingServiceUnitTest.java index 54d9c3db1b06..ecd465a0f5ec 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/PostingServiceUnitTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/PostingServiceUnitTest.java @@ -24,9 +24,9 @@ import de.tum.cit.aet.artemis.communication.service.PostingService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; class PostingServiceUnitTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/PushNotificationResourceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/PushNotificationResourceTest.java index 6a44a2196a45..db956a220af0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/PushNotificationResourceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/PushNotificationResourceTest.java @@ -17,12 +17,12 @@ import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfiguration; import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceType; import de.tum.cit.aet.artemis.communication.repository.PushNotificationDeviceConfigurationRepository; -import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.communication.web.push_notification.PushNotificationRegisterBody; import de.tum.cit.aet.artemis.communication.web.push_notification.PushNotificationRegisterDTO; import de.tum.cit.aet.artemis.communication.web.push_notification.PushNotificationUnregisterRequest; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.user.UserUtilService; @TestInstance(TestInstance.Lifecycle.PER_CLASS) class PushNotificationResourceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationIntegrationTest.java index 06c371ee923d..3d2f15650aee 100644 --- a/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationIntegrationTest.java @@ -17,10 +17,10 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.Organization; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.OrganizationRepository; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.web.rest.dto.OrganizationCountDTO; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class OrganizationIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/AuthorizationCheckServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/AuthorizationCheckServiceTest.java index 28683737b429..ad12373c554e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/AuthorizationCheckServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/AuthorizationCheckServiceTest.java @@ -17,6 +17,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; @@ -25,7 +26,6 @@ import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; class AuthorizationCheckServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java index 04221b10fe4a..d8bdeecf5648 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/GradingScaleServiceTest.java @@ -23,13 +23,13 @@ import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.assessment.service.GradingScaleService; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class GradingScaleServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationServiceTest.java index 1407111a6725..6346be15408f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationServiceTest.java @@ -18,11 +18,11 @@ import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.core.AuthorizationGrantType; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class OnlineCourseConfigurationServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckServiceTest.java index dad44ef404c3..ef4104d948ee 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckServiceTest.java @@ -12,6 +12,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.domain.participation.ParticipationInterface; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; @@ -22,7 +23,6 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; class ParticipationAuthorizationCheckServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java index a441f786ca7c..79fd94d6bf61 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java @@ -8,7 +8,6 @@ import java.util.Map; import java.util.Optional; -import de.tum.cit.aet.artemis.assessment.web.ResultResource; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -22,6 +21,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.service.ResultService; +import de.tum.cit.aet.artemis.assessment.web.ResultResource; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/RepositoryAccessServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/RepositoryAccessServiceTest.java index d824405410da..5b3469528876 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/RepositoryAccessServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/RepositoryAccessServiceTest.java @@ -21,6 +21,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; @@ -31,10 +32,9 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseGradingService; import de.tum.cit.aet.artemis.programming.service.RepositoryAccessService; +import de.tum.cit.aet.artemis.programming.web.repository.RepositoryActionType; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.TestConstants; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.programming.web.repository.RepositoryActionType; class RepositoryAccessServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java index e38ad1cdf47b..e8c362c17522 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java @@ -27,6 +27,7 @@ import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exam.ExamUtilService; @@ -46,7 +47,6 @@ import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.dto.SubmissionWithComplaintDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; class SubmissionServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java index 75177e4a658d..5bc53379f4fa 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java @@ -17,6 +17,7 @@ import de.tum.cit.aet.artemis.athena.dto.ProgrammingFeedbackDTO; import de.tum.cit.aet.artemis.athena.dto.TextFeedbackDTO; import de.tum.cit.aet.artemis.athena.service.AthenaFeedbackSuggestionsService; +import de.tum.cit.aet.artemis.core.exception.ConflictException; import de.tum.cit.aet.artemis.core.exception.NetworkingException; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; @@ -25,7 +26,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; -import de.tum.cit.aet.artemis.core.exception.ConflictException; class AthenaFeedbackSuggestionsServiceTest extends AbstractAthenaTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java index 5f83010b4a25..23182fb48c16 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java @@ -19,6 +19,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.athena.service.AthenaRepositoryExportService; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.exception.ServiceUnavailableException; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; @@ -27,7 +28,6 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; -import de.tum.cit.aet.artemis.core.exception.ServiceUnavailableException; class AthenaRepositoryExportServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java index f9a83021bab9..09dc3ce8f6f5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java @@ -33,13 +33,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.security.lti.Lti13TokenRetriever; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.lti.service.LtiDeepLinkingService; import de.tum.cit.aet.artemis.text.domain.TextExercise; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import uk.ac.ox.ctl.lti13.lti.Claims; class LtiDeepLinkingServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java index ca5ddb3070f9..9450f201ad75 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamAccessServiceTest.java @@ -18,6 +18,10 @@ import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.course.CourseUtilService; @@ -30,10 +34,6 @@ import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.ConflictException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class ExamAccessServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java index 96d4ae9c52ee..eb84e85fe5d1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java @@ -17,6 +17,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; @@ -32,8 +34,6 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.web.rest.dto.ExamChecklistDTO; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; class ExamServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionServiceTest.java index dc78c77a8b68..4402b3489eb2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamSubmissionServiceTest.java @@ -14,6 +14,8 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exam.ExamUtilService; @@ -30,8 +32,6 @@ import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class ExamSubmissionServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessServiceTest.java index 20aa389de269..a5e76f5f98af 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/StudentExamAccessServiceTest.java @@ -13,6 +13,9 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.core.exception.ConflictException; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; @@ -20,9 +23,6 @@ import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exam.service.StudentExamAccessService; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; -import de.tum.cit.aet.artemis.core.exception.ConflictException; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class StudentExamAccessServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java index 3135ae1a969d..248617d93fc6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java @@ -26,6 +26,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.SubmissionVersion; @@ -49,7 +50,6 @@ import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.web.rest.dto.ExerciseDetailsDTO; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; class TextSubmissionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java index c62d16d6220f..9dc8845ee2b2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java @@ -41,9 +41,9 @@ import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistrationType; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; -import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.tutorialgroup.web.TutorialGroupResource; import de.tum.cit.aet.artemis.tutorialgroup.web.TutorialGroupResource.TutorialGroupRegistrationImportDTO; +import de.tum.cit.aet.artemis.user.UserFactory; class TutorialGroupIntegrationTest extends AbstractTutorialGroupIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java index c20677403fe2..65e60d10ad92 100644 --- a/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java @@ -16,15 +16,15 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.vm.KeyAndPasswordVM; +import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; import de.tum.cit.aet.artemis.core.service.AccountService; import de.tum.cit.aet.artemis.core.service.user.PasswordService; +import de.tum.cit.aet.artemis.core.web.AccountResource; +import de.tum.cit.aet.artemis.core.web.open.PublicAccountResource; import de.tum.cit.aet.artemis.service.dto.PasswordChangeDTO; import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.util.ConfigUtil; -import de.tum.cit.aet.artemis.core.web.AccountResource; -import de.tum.cit.aet.artemis.core.web.open.PublicAccountResource; -import de.tum.cit.aet.artemis.core.dto.vm.KeyAndPasswordVM; -import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; /** * Tests {@link AccountResource}. Several Tests rely on overwriting AccountResource.registrationEnabled and other attributes with reflections. Any changes to the internal diff --git a/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java b/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java index c0224dc9d9c4..2fdf41d4115d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java @@ -34,6 +34,8 @@ import de.tum.cit.aet.artemis.core.domain.Authority; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.AuthorityRepository; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -53,8 +55,6 @@ import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.service.dto.UserInitializationDTO; import de.tum.cit.aet.artemis.util.RequestUtilService; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; -import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; /** * Note: this class should be independent of the actual VCS and CIS and contains common test logic for scenarios: diff --git a/src/test/java/de/tum/cit/aet/artemis/util/ExerciseIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/util/ExerciseIntegrationTestService.java index a822c033173a..f233addde06f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/util/ExerciseIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/ExerciseIntegrationTestService.java @@ -11,9 +11,9 @@ import org.springframework.util.MultiValueMap; import de.tum.cit.aet.artemis.core.dto.SortingOrder; +import de.tum.cit.aet.artemis.core.util.PageUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.core.util.PageUtil; /** * Service responsible for util methods / shared code that is helpful or common for testing all exercise types diff --git a/src/test/java/de/tum/cit/aet/artemis/web/rest/AndroidAppSiteAssociationResourceTest.java b/src/test/java/de/tum/cit/aet/artemis/web/rest/AndroidAppSiteAssociationResourceTest.java index fb28372f40ca..baa6de6737b7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/web/rest/AndroidAppSiteAssociationResourceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/web/rest/AndroidAppSiteAssociationResourceTest.java @@ -4,11 +4,11 @@ import java.util.List; -import de.tum.cit.aet.artemis.core.web.AndroidAppSiteAssociationResource; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.web.AndroidAppSiteAssociationResource; class AndroidAppSiteAssociationResourceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/web/rest/AppleAppSiteAssociationResourceTest.java b/src/test/java/de/tum/cit/aet/artemis/web/rest/AppleAppSiteAssociationResourceTest.java index fd599498026d..0ff3ff7edb2e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/web/rest/AppleAppSiteAssociationResourceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/web/rest/AppleAppSiteAssociationResourceTest.java @@ -2,11 +2,11 @@ import static org.assertj.core.api.Assertions.assertThat; -import de.tum.cit.aet.artemis.core.web.AppleAppSiteAssociationResource; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.web.AppleAppSiteAssociationResource; class AppleAppSiteAssociationResourceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilderTest.java b/src/test/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilderTest.java index 12171faf0f87..a223703c32b2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilderTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/web/rest/plagiarism/PlagiarismResultResponseBuilderTest.java @@ -4,7 +4,6 @@ import java.util.Set; -import de.tum.cit.aet.artemis.plagiarism.web.PlagiarismResultResponseBuilder; import org.junit.jupiter.api.Test; import org.springframework.http.HttpStatus; @@ -12,6 +11,7 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmission; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextSubmissionElement; +import de.tum.cit.aet.artemis.plagiarism.web.PlagiarismResultResponseBuilder; class PlagiarismResultResponseBuilderTest { diff --git a/src/test/resources/config/application-buildagent.yml b/src/test/resources/config/application-buildagent.yml deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/src/test/resources/config/application-dev.yml b/src/test/resources/config/application-dev.yml deleted file mode 100644 index e69de29bb2d1..000000000000 From 36e4fc8eeb70ca2c47a8afc22bbce8da252ee3c7 Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Wed, 11 Sep 2024 18:44:49 +0200 Subject: [PATCH 17/43] Move web layer (part 2) --- .../assessment/domain/BonusStrategy.java | 3 +- .../assessment/domain/IBonusStrategy.java | 2 +- .../aet/artemis/assessment/domain/Result.java | 2 +- .../dto/AssessmentUpdateBaseDTO.java | 2 +- .../dto/AssessmentUpdateDTO.java | 2 +- .../dto/BonusExampleDTO.java | 2 +- .../dto/BonusResultDTO.java | 2 +- .../dto/BonusSourceResultDTO.java | 2 +- .../dto}/FeedbackDetailDTO.java | 2 +- .../rest => assessment}/dto/GradeDTO.java | 2 +- .../dto/GradeStepsDTO.java | 2 +- ...esultWithPointsPerGradingCriterionDTO.java | 2 +- .../dto}/UserNameAndLoginDTO.java | 2 +- .../dto/score/ScoreDTO.java | 2 +- .../dto/score/StudentScoreSum.java | 2 +- .../dto/score/StudentScoresDTO.java | 2 +- .../dto/score/TeamScoreSum.java | 2 +- .../ParticipantScoreRepository.java | 6 ++-- .../repository/ResultRepository.java | 4 +-- .../repository/StudentScoreRepository.java | 4 +-- .../repository/TeamScoreRepository.java | 4 +-- .../service/AssessmentDashboardService.java | 2 +- .../assessment/service/AssessmentService.java | 4 +-- .../assessment/service/BonusService.java | 3 +- .../CourseScoreCalculationService.java | 10 +++---- .../service/GradingScaleService.java | 4 +-- .../service/ParticipantScoreService.java | 6 ++-- .../assessment/service/ResultService.java | 4 +-- .../service/TutorLeaderboardService.java | 2 +- .../artemis/assessment/web/BonusResource.java | 2 +- .../assessment/web/GradeStepResource.java | 4 +-- .../assessment/web/GradingScaleResource.java | 4 +-- .../web}/MetricsResource.java | 4 +-- .../web}/RatingResource.java | 2 +- .../assessment/web/ResultResource.java | 4 +-- .../web}/ResultWebsocketService.java | 4 +-- .../web}/TutorEffortResource.java | 2 +- .../web}/TutorParticipationResource.java | 2 +- .../AthenaRepositoryExportService.java | 2 +- .../dto}/CompetencyGraphEdgeDTO.java | 2 +- .../dto}/CompetencyGraphNodeDTO.java | 2 +- .../dto}/CompetencyImportResponseDTO.java | 2 +- .../dto}/CompetencyJolDTO.java | 2 +- .../dto}/CompetencyJolPairDTO.java | 2 +- .../dto}/CompetencyNameDTO.java | 2 +- .../CompetencyProgressForLearningPathDTO.java | 2 +- .../dto}/CompetencyRelationDTO.java | 2 +- .../dto}/CompetencyWithTailRelationDTO.java | 2 +- .../dto}/LearningPathCompetencyGraphDTO.java | 2 +- .../dto}/LearningPathHealthDTO.java | 2 +- .../dto}/LearningPathInformationDTO.java | 4 +-- .../dto}/LearningPathNavigationDTO.java | 2 +- .../dto}/LearningPathNavigationObjectDTO.java | 2 +- .../LearningPathNavigationOverviewDTO.java | 2 +- .../dto}/LinkedCourseCompetencyDTO.java | 2 +- .../dto}/NgxLearningPathDTO.java | 2 +- ...mpetencyExerciseMasteryCalculationDTO.java | 2 +- .../dto/metrics/CompetencyInformationDTO.java | 2 +- .../dto/metrics/CompetencyProgressDTO.java | 2 +- .../metrics/CompetencyStudentMetricsDTO.java | 4 +-- .../metrics/ExerciseStudentMetricsDTO.java | 5 ++-- .../metrics/LectureUnitInformationDTO.java | 2 +- .../metrics/LectureUnitStudentMetricsDTO.java | 2 +- .../dto/metrics/MapEntryLongLong.java | 2 +- .../dto/metrics/ResourceTimestampDTO.java | 2 +- .../rest => atlas}/dto/metrics/ScoreDTO.java | 2 +- .../dto/metrics/StudentMetricsDTO.java | 2 +- .../dto/science/ScienceEventDTO.java | 2 +- .../KnowledgeAreaRequestDTO.java | 2 +- .../KnowledgeAreaResultDTO.java | 2 +- .../dto/standardizedCompetency/SourceDTO.java | 2 +- .../StandardizedCompetencyCatalogDTO.java | 2 +- .../StandardizedCompetencyRequestDTO.java | 2 +- .../StandardizedCompetencyResultDTO.java | 2 +- .../CompetencyMetricsRepository.java | 20 ++++++------- .../CourseCompetencyRepository.java | 4 +-- .../competency/CompetencyJolRepository.java | 6 ++-- .../atlas/service/ScienceEventService.java | 2 +- .../competency/CompetencyJolService.java | 4 +-- .../competency/CompetencyProgressService.java | 4 +-- .../service/competency/CompetencyService.java | 2 +- .../competency/CourseCompetencyService.java | 8 +++--- .../competency/KnowledgeAreaService.java | 2 +- .../competency/PrerequisiteService.java | 2 +- .../StandardizedCompetencyService.java | 10 +++---- .../LearningPathNavigationService.java | 8 +++--- .../learningpath/LearningPathNgxService.java | 2 +- .../learningpath/LearningPathService.java | 18 ++++++------ .../artemis/atlas/web/CompetencyResource.java | 4 +-- .../atlas/web/CourseCompetencyResource.java | 12 ++++---- .../web}/LearningPathResource.java | 26 ++++++++--------- .../{web/rest => atlas/web}/LtiResource.java | 2 +- .../atlas/web/PrerequisiteResource.java | 4 +-- .../web/StandardizedCompetencyResource.java | 4 +-- .../atlas/web/science/ScienceResource.java | 2 +- .../dto}/ConversationWebsocketDTO.java | 2 +- .../dto/LinkPreviewDTO.java | 2 +- .../dto}/MetisCrudAction.java | 2 +- .../dto/PostContextFilterDTO.java | 2 +- .../metis => communication/dto}/PostDTO.java | 2 +- .../ConversationMessageRepository.java | 2 +- .../service/AnswerMessageService.java | 4 +-- .../service/ConversationMessagingService.java | 6 ++-- .../communication/service/PostingService.java | 4 +-- .../service/ReactionService.java | 4 +-- .../service/conversation/ChannelService.java | 2 +- .../conversation/ConversationService.java | 4 +-- .../linkpreview/LinkPreviewService.java | 2 +- .../web/ConversationMessageResource.java | 2 +- .../web/LinkPreviewResource.java | 2 +- .../web}/NotificationResource.java | 2 +- .../web}/NotificationSettingsResource.java | 2 +- .../web}/SystemNotificationResource.java | 2 +- .../web/conversation/GroupChatResource.java | 2 +- .../core/aop/logging/LoggingAspect.java | 3 +- .../aet/artemis/core/config/Constants.java | 3 +- .../CustomMetricsExtensionConfiguration.java | 2 +- .../websocket/WebsocketConfiguration.java | 14 +++++----- .../dto/CourseCompetencyProgressDTO.java | 2 +- .../rest => core}/dto/CourseContentCount.java | 2 +- .../dto/CourseForDashboardDTO.java | 5 ++-- .../rest => core}/dto/CourseForImportDTO.java | 2 +- .../dto/CourseManagementDetailViewDTO.java | 2 +- ...nagementOverviewExerciseStatisticsDTO.java | 2 +- ...CourseManagementOverviewStatisticsDTO.java | 2 +- .../dto/CourseManagementStatisticsDTO.java | 2 +- .../rest => core}/dto/CourseScoresDTO.java | 4 +-- .../rest => core}/dto/CourseWithIdDTO.java | 2 +- .../dto/CoursesForDashboardDTO.java | 3 +- .../{web/rest => core}/dto/DataExportDTO.java | 2 +- .../{web/rest => core}/dto/DueDateStat.java | 2 +- .../{web/rest => core}/dto/ImageDTO.java | 2 +- .../{web/rest => core}/dto/ImprintDTO.java | 2 +- .../{web/rest => core}/dto/LegalDocument.java | 2 +- .../rest => core}/dto/OnlineCourseDTO.java | 2 +- .../rest => core}/dto/OnlineResourceDTO.java | 2 +- .../dto/OrganizationCountDTO.java | 2 +- .../dto/PrivacyStatementDTO.java | 3 +- .../dto/RepositoryExportOptionsDTO.java | 2 +- .../dto/RequestDataExportDTO.java | 2 +- .../dto/SearchResultPageDTO.java | 4 +-- .../dto/StatsForDashboardDTO.java | 2 +- .../dto/TutorLeaderboardDTO.java | 2 +- .../dto/UserWithIdAndLoginDTO.java | 2 +- .../CompetencyPageableSearchDTO.java | 4 +-- .../FinishedBuildJobPageableSearchDTO.java | 2 +- .../dto/pageablesearch/PageableSearchDTO.java | 4 +-- .../SearchTermPageableSearchDTO.java | 4 +-- .../pageablesearch/UserPageableSearchDTO.java | 2 +- .../StudentsAlreadyAssignedException.java | 2 +- .../StudentsAppearMultipleTimesException.java | 2 +- .../exception/StudentsNotFoundException.java | 2 +- .../exception}/WebsocketError.java | 2 +- .../core/repository/UserRepository.java | 2 +- .../export/CourseExamExportService.java | 2 +- .../export/DataExportExamCreationService.java | 2 +- .../DataExportExerciseCreationService.java | 2 +- .../service/export/DataExportService.java | 4 +-- .../cit/aet/artemis/core/util/PageUtil.java | 2 +- .../rest => core/web}/CourseResource.java | 22 +++++++-------- .../web}/CustomMetricsExtension.java | 2 +- .../rest => core/web}/DataExportResource.java | 6 ++-- .../{web/rest => core/web}/FileResource.java | 2 +- .../web}/GuidedTourSettingsResource.java | 2 +- .../rest => core/web}/LectureResource.java | 6 ++-- .../web}/OrganizationResource.java | 2 +- .../rest => core/web}/PlantUmlResource.java | 2 +- .../rest => core/web}/StatisticsResource.java | 6 ++-- .../web}/TeamWebsocketService.java | 4 +-- .../{web/rest => core/web}/UserResource.java | 2 +- .../web/admin/AdminBuildJobQueueResource.java | 2 +- .../web/admin/AdminDataExportResource.java | 2 +- .../core/web/admin/AdminImprintResource.java | 2 +- .../web/admin/AdminOrganizationResource.java | 2 +- .../admin/AdminPrivacyStatementResource.java | 2 +- .../AdminStandardizedCompetencyResource.java | 10 +++---- .../core/web/admin/AdminUserResource.java | 2 +- .../core/web/open/PublicImprintResource.java | 2 +- .../open/PublicPrivacyStatementResource.java | 2 +- .../event/ExamAttendanceCheckEvent.java | 2 +- .../exam/domain/event/ExamLiveEvent.java | 2 +- .../event/ExamWideAnnouncementEvent.java | 2 +- .../event/ProblemStatementUpdateEvent.java | 2 +- .../domain/event/WorkingTimeUpdateEvent.java | 2 +- .../rest => exam}/dto/ExamChecklistDTO.java | 2 +- .../rest => exam}/dto/ExamInformationDTO.java | 2 +- .../{web/rest => exam}/dto/ExamScoresDTO.java | 7 +++-- .../rest => exam}/dto/ExamSessionDTO.java | 2 +- .../dto/ExamUserAttendanceCheckDTO.java | 2 +- .../{web/rest => exam}/dto/ExamUserDTO.java | 2 +- .../dto/ExamUsersNotFoundDTO.java | 2 +- .../dto/ExamWithIdAndCourseDTO.java | 3 +- .../dto/StudentExamWithGradeDTO.java | 2 +- .../StudentExamWithIdAndExamAndUserDTO.java | 3 +- .../dto/SuspiciousExamSessionsDTO.java | 3 +- .../ExamAttendanceCheckEventDTO.java | 2 +- .../dto/examevent/ExamLiveEventBaseDTO.java | 2 +- .../ExamWideAnnouncementEventDTO.java | 2 +- .../ProblemStatementUpdateEventDTO.java | 2 +- .../examevent/WorkingTimeUpdateEventDTO.java | 2 +- .../exam/repository/ExamRepository.java | 4 +-- .../exam/repository/ExamUserRepository.java | 4 +-- .../exam/service/ExamRegistrationService.java | 2 +- .../aet/artemis/exam/service/ExamService.java | 22 +++++++-------- .../exam/service/ExamSessionService.java | 12 ++++---- .../artemis/exam/service/ExamUserService.java | 4 +-- .../artemis/exam/service/ImageExtractor.java | 3 +- .../rest => exam/web}/ExamLockResource.java | 2 +- .../{web/rest => exam/web}/ExamResource.java | 28 +++++++++---------- .../rest => exam/web}/ExamUserResource.java | 8 +++--- .../web}/ExampleSubmissionResource.java | 2 +- .../web}/ExerciseGroupResource.java | 2 +- .../web}/StudentExamResource.java | 8 +++--- .../aet/artemis/exercise/domain/Exercise.java | 2 +- .../rest => exercise}/dto/ExerciseDTO.java | 2 +- .../dto/ExerciseDetailsDTO.java | 4 +-- ...ExerciseForPlagiarismCasesOverviewDTO.java | 2 +- .../dto/ExerciseGroupWithIdAndExamDTO.java | 3 +- .../dto}/ExerciseInformationDTO.java | 2 +- .../dto/ExerciseManagementStatisticsDTO.java | 2 +- .../ExerciseScoresAggregatedInformation.java | 2 +- .../dto/ExerciseScoresDTO.java | 2 +- .../dto/ParticipationDTO.java | 2 +- .../dto/ParticipationResultDTO.java | 2 +- .../dto/ParticipationWithExerciseDTO.java | 2 +- .../rest => exercise}/dto/SubmissionDTO.java | 4 +-- .../dto/SubmissionExportOptionsDTO.java | 2 +- .../dto/SubmissionPatch.java | 2 +- .../dto/SubmissionPatchPayload.java | 2 +- .../dto/SubmissionSyncPayload.java | 2 +- .../dto/SubmissionVersionDTO.java | 2 +- .../dto/SubmissionWithComplaintDTO.java | 2 +- .../dto/SubmissionWithParticipationDTO.java | 2 +- .../dto/TeamAssignmentPayload.java | 2 +- .../repository/ExerciseMetricsRepository.java | 20 ++++++------- .../repository/ExerciseRepository.java | 3 +- .../StudentParticipationRepository.java | 4 +-- .../repository/SubmissionRepository.java | 2 +- .../service/ExerciseScoresChartService.java | 4 +-- .../exercise/service/ExerciseService.java | 8 +++--- .../service/ExerciseSpecificationService.java | 2 +- .../ExerciseWithSubmissionsExportService.java | 2 +- .../service/LearningMetricsService.java | 24 ++++++++-------- .../service/SubmissionExportService.java | 2 +- .../exercise/service/team/TeamService.java | 2 +- .../web}/ConsistencyCheckResource.java | 2 +- .../web}/ExerciseResource.java | 8 +++--- .../web}/ExerciseScoresChartResource.java | 4 +-- .../web}/ParticipantScoreResource.java | 4 +-- .../web}/ParticipationResource.java | 2 +- .../ParticipationTeamWebsocketService.java | 10 +++---- .../web}/SubmissionPolicyResource.java | 2 +- .../web}/SubmissionResource.java | 10 +++---- .../rest => exercise/web}/TeamResource.java | 4 +-- .../dto/FileUploadAssessmentDTO.java | 2 +- .../service/FileUploadExerciseService.java | 4 +-- ...dExerciseWithSubmissionsExportService.java | 2 +- .../web}/FileUploadAssessmentResource.java | 6 ++-- .../web}/FileUploadExerciseResource.java | 8 +++--- .../web}/FileUploadSubmissionResource.java | 2 +- .../service/pyris/PyrisPipelineService.java | 2 +- .../PyrisCourseChatPipelineExecutionDTO.java | 6 ++-- ...tureUnitForLearningPathNodeDetailsDTO.java | 2 +- .../dto/LectureUnitInformationDTO.java | 2 +- .../dto/LectureUnitSplitDTO.java | 2 +- .../lecture/repository/LectureRepository.java | 4 +-- .../LectureUnitMetricsRepository.java | 4 +-- .../lecture/service/LectureService.java | 4 +-- .../service/LectureUnitProcessingService.java | 4 +-- .../lecture/web/AttachmentUnitResource.java | 2 +- .../lecture/web/LectureUnitResource.java | 2 +- .../lecture/web/OnlineUnitResource.java | 2 +- .../dto/ModelingAssessmentDTO.java | 2 +- .../service/ModelingExerciseService.java | 4 +-- ...gExerciseWithSubmissionsExportService.java | 2 +- .../web}/ModelingAssessmentResource.java | 6 ++-- .../web}/ModelingExerciseResource.java | 10 +++---- .../web}/ModelingSubmissionResource.java | 2 +- .../dto}/PlagiarismCaseInfoDTO.java | 2 +- .../dto}/PlagiarismComparisonStatusDTO.java | 2 +- .../dto}/PlagiarismResultDTO.java | 2 +- .../dto}/PlagiarismVerdictDTO.java | 2 +- .../service/PlagiarismAnswerPostService.java | 4 +-- .../service/PlagiarismCaseService.java | 4 +-- .../service/PlagiarismPostService.java | 6 ++-- .../web/PlagiarismCaseResource.java | 4 +-- .../web/PlagiarismPostResource.java | 2 +- .../plagiarism/web/PlagiarismResource.java | 2 +- .../web/PlagiarismResultResponseBuilder.java | 2 +- .../dto/BuildLogStatisticsDTO.java | 2 +- .../dto/BuildPlanCheckoutDirectoriesDTO.java | 2 +- .../dto/CheckoutDirectoriesDTO.java | 3 +- .../dto/CommitInfoDTO.java | 2 +- .../rest => programming}/dto/FileMove.java | 2 +- .../ide => programming/dto}/IdeDTO.java | 2 +- .../dto}/IdeMappingDTO.java | 2 +- .../dto/OnlineTeamStudentDTO.java | 2 +- .../ProgrammingExerciseGitDiffEntryDTO.java | 2 +- .../ProgrammingExerciseGitDiffReportDTO.java | 2 +- ...ogrammingExerciseGradingStatisticsDTO.java | 2 +- .../ProgrammingExerciseResetOptionsDTO.java | 2 +- .../dto/ProgrammingExerciseTestCaseDTO.java | 2 +- .../ProgrammingExerciseTestCaseStateDTO.java | 2 +- .../dto/RepositoryStatusDTO.java | 2 +- .../dto/RepositoryStatusDTOType.java | 2 +- .../rest => programming}/dto/ResultDTO.java | 8 ++++-- .../BuildTriggerWebsocketError.java | 4 +-- .../repository/BuildJobRepository.java | 4 +-- .../BuildLogStatisticsEntryRepository.java | 4 +-- .../service/CommitHistoryService.java | 2 +- .../programming/service/GitService.java | 2 +- .../service/ProgrammingAssessmentService.java | 2 +- .../ProgrammingExerciseExportService.java | 2 +- .../ProgrammingExerciseGradingService.java | 2 +- ...ogrammingExerciseParticipationService.java | 3 +- .../ProgrammingExerciseRepositoryService.java | 2 +- .../service/ProgrammingExerciseService.java | 4 +-- .../ProgrammingExerciseTestCaseService.java | 2 +- .../service/ProgrammingMessagingService.java | 6 ++-- .../service/ProgrammingTriggerService.java | 2 +- .../service/RepositoryService.java | 2 +- .../service/SubmissionPolicyService.java | 2 +- .../ci/ContinuousIntegrationService.java | 2 +- .../service/gitlabci/GitLabCIService.java | 2 +- ...ogrammingExerciseGitDiffReportService.java | 2 +- .../service/jenkins/JenkinsService.java | 2 +- .../localci/LocalCIQueueWebsocketService.java | 2 +- .../LocalCIResultProcessingService.java | 4 +-- .../service/localci/LocalCIService.java | 4 +-- .../localci/SharedQueueManagementService.java | 2 +- .../localci/dto/BuildJobQueueItem.java | 2 +- .../web}/GitDiffReportParserService.java | 2 +- .../programming/web/IdeSettingsResource.java | 4 +-- .../LocalCIWebsocketMessagingService.java | 2 +- .../web/ProgrammingAssessmentResource.java | 2 +- ...ogrammingExerciseExportImportResource.java | 2 +- .../ProgrammingExerciseGradingResource.java | 2 +- ...grammingExerciseParticipationResource.java | 2 +- ...ProgrammingExercisePlagiarismResource.java | 2 +- .../web/ProgrammingExerciseResource.java | 12 ++++---- .../ProgrammingExerciseTestCaseResource.java | 2 +- .../web}/StaticCodeAnalysisResource.java | 2 +- ...grammingExerciseGitDiffReportResource.java | 2 +- .../web/localci/BuildJobQueueResource.java | 2 +- ...grammingExerciseParticipationResource.java | 4 +-- .../web/repository/RepositoryResource.java | 12 ++++---- .../repository/TestRepositoryResource.java | 4 +-- .../rest => quiz}/dto/QuizBatchJoinDTO.java | 2 +- .../quiz/service/QuizExerciseService.java | 4 +-- .../web}/QuizExerciseResource.java | 8 +++--- .../web}/QuizParticipationResource.java | 2 +- .../rest => quiz/web}/QuizPoolResource.java | 2 +- .../web}/QuizSubmissionResource.java | 4 +-- .../aet/artemis/service/CourseService.java | 14 +++++----- .../service/LearningObjectService.java | 2 +- .../artemis/service/LegalDocumentService.java | 6 ++-- .../artemis/service/StatisticsService.java | 4 +-- .../artemis/service/SubmissionService.java | 6 ++-- .../service/dto/FinishedBuildJobDTO.java | 4 +-- .../rest => text}/dto/TextAssessmentDTO.java | 2 +- .../dto/TextAssessmentUpdateDTO.java | 3 +- .../text/service/TextAssessmentService.java | 2 +- .../service/TextExerciseFeedbackService.java | 2 +- .../text/service/TextExerciseService.java | 4 +-- ...tExerciseWithSubmissionsExportService.java | 2 +- .../web}/LongFeedbackTextResource.java | 2 +- .../text/web/TextAssessmentResource.java | 4 +-- .../text/web/TextExerciseResource.java | 8 +++--- .../dto/TutorialGroupFreePeriodDTO.java | 2 +- .../web/TutorialGroupFreePeriodResource.java | 2 +- .../aet/artemis/web/rest/package-info.java | 4 --- .../web/websocket/dto/package-info.java | 4 --- .../artemis/web/websocket/package-info.java | 4 --- ...actSpringIntegrationJenkinsGitlabTest.java | 2 +- .../aet/artemis/DatabaseQueryCountTest.java | 2 +- .../cit/aet/artemis/FileIntegrationTest.java | 2 +- .../ImprintResourceIntegrationTest.java | 2 +- .../aet/artemis/MetricsIntegrationTest.java | 6 ++-- ...ivacyStatementResourceIntegrationTest.java | 2 +- .../artemis/StatisticsIntegrationTest.java | 4 +-- .../architecture/ServiceArchitectureTest.java | 6 ++-- .../AssessmentComplaintIntegrationTest.java | 4 +-- ...ssessmentTeamComplaintIntegrationTest.java | 2 +- .../assessment/ComplaintUtilService.java | 2 +- .../ExampleSubmissionIntegrationTest.java | 2 +- .../ExerciseScoresChartIntegrationTest.java | 2 +- .../assessment/GradeStepIntegrationTest.java | 4 +-- .../ParticipantScoreIntegrationTest.java | 2 +- .../ResultServiceIntegrationTest.java | 4 +-- ...utorLeaderboardServiceIntegrationTest.java | 2 +- .../artemis/bonus/BonusIntegrationTest.java | 2 +- ...CompetencyPrerequisiteIntegrationTest.java | 4 +-- .../competency/CompetencyIntegrationTest.java | 4 +-- .../CompetencyJolIntegrationTest.java | 2 +- .../CourseCompetencyIntegrationTest.java | 8 +++--- .../LearningPathIntegrationTest.java | 22 +++++++-------- .../PrerequisiteIntegrationTest.java | 4 +-- ...StandardizedCompetencyIntegrationTest.java | 12 ++++---- .../StandardizedCompetencyUtilService.java | 4 +-- .../aet/artemis/course/CourseTestService.java | 22 +++++++-------- .../DataExportResourceIntegrationTest.java | 4 +-- .../tum/cit/aet/artemis/exam/ExamFactory.java | 10 +++---- .../aet/artemis/exam/ExamIntegrationTest.java | 20 ++++++------- .../ExamParticipationIntegrationTest.java | 8 +++--- .../artemis/exam/ExamUserIntegrationTest.java | 6 ++-- .../exam/StudentExamIntegrationTest.java | 10 +++---- .../exercise/ExerciseIntegrationTest.java | 4 +-- .../FileUploadAssessmentIntegrationTest.java | 6 ++-- .../FileUploadExerciseIntegrationTest.java | 4 +-- .../ModelingAssessmentIntegrationTest.java | 8 +++--- .../ModelingExerciseIntegrationTest.java | 4 +-- .../ProgrammingAssessmentIntegrationTest.java | 4 +-- ...ProgrammingExerciseGradingServiceTest.java | 2 +- ...rammingExerciseIntegrationTestService.java | 10 +++---- ...ExerciseLocalVCLocalCIIntegrationTest.java | 2 +- ...gExerciseParticipationIntegrationTest.java | 2 +- .../ProgrammingExerciseResultTestService.java | 2 +- ...rogrammingExerciseTestCaseServiceTest.java | 2 +- .../ProgrammingExerciseTestService.java | 4 +-- .../ProgrammingSubmissionIntegrationTest.java | 2 +- .../RepositoryIntegrationTest.java | 4 +-- ...TestRepositoryResourceIntegrationTest.java | 4 +-- .../quiz/QuizExerciseIntegrationTest.java | 4 +-- .../quiz/QuizSubmissionIntegrationTest.java | 2 +- .../AttachmentUnitsIntegrationTest.java | 4 +-- .../lecture/LectureUnitIntegrationTest.java | 2 +- .../lecture/OnlineUnitIntegrationTest.java | 2 +- .../LocalCIResourceIntegrationTest.java | 2 +- .../artemis/localvcci/LocalCIServiceTest.java | 2 +- .../metis/AbstractConversationTest.java | 6 ++-- .../metis/AnswerMessageIntegrationTest.java | 2 +- .../artemis/metis/ChannelIntegrationTest.java | 2 +- .../metis/GroupChatIntegrationTest.java | 4 +-- .../artemis/metis/MessageIntegrationTest.java | 4 +-- .../metis/OneToOneChatIntegrationTest.java | 4 +-- .../LinkPreviewIntegrationTest.java | 2 +- .../OrganizationIntegrationTest.java | 2 +- .../ParticipationIntegrationTest.java | 2 +- .../SubmissionExportIntegrationTest.java | 2 +- .../SubmissionIntegrationTest.java | 4 +-- .../PlagiarismCaseIntegrationTest.java | 4 +-- .../PlagiarismCheckIntegrationTest.java | 2 +- .../plagiarism/PlagiarismIntegrationTest.java | 2 +- .../PlagiarismPostIntegrationTest.java | 4 +-- .../science/ScienceIntegrationTest.java | 2 +- .../CourseScoreCalculationServiceTest.java | 8 +++--- .../service/LearningPathServiceTest.java | 6 ++-- .../artemis/service/LectureServiceTest.java | 4 +-- ...ParticipationTeamWebsocketServiceTest.java | 4 +-- .../service/SubmissionServiceTest.java | 2 +- .../service/TeamWebsocketServiceTest.java | 2 +- .../artemis/service/exam/ExamServiceTest.java | 2 +- .../ide/IdePreferencesIntegrationTest.java | 4 +-- .../aet/artemis/team/TeamIntegrationTest.java | 4 +-- .../text/TextAssessmentIntegrationTest.java | 8 +++--- .../text/TextExerciseIntegrationTest.java | 6 ++-- .../text/TextSubmissionIntegrationTest.java | 2 +- ...utorialGroupFreePeriodIntegrationTest.java | 2 +- .../util/PageableSearchUtilService.java | 6 ++-- .../aet/artemis/util/RequestUtilService.java | 2 +- 460 files changed, 845 insertions(+), 837 deletions(-) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => assessment}/dto/AssessmentUpdateBaseDTO.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => assessment}/dto/AssessmentUpdateDTO.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => assessment}/dto/BonusExampleDTO.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => assessment}/dto/BonusResultDTO.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => assessment}/dto/BonusSourceResultDTO.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/dto/feedback => assessment/dto}/FeedbackDetailDTO.java (80%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => assessment}/dto/GradeDTO.java (84%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => assessment}/dto/GradeStepsDTO.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => assessment}/dto/ResultWithPointsPerGradingCriterionDTO.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/dto/user => assessment/dto}/UserNameAndLoginDTO.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => assessment}/dto/score/ScoreDTO.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => assessment}/dto/score/StudentScoreSum.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => assessment}/dto/score/StudentScoresDTO.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => assessment}/dto/score/TeamScoreSum.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => assessment/web}/MetricsResource.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => assessment/web}/RatingResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/websocket => assessment/web}/ResultWebsocketService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => assessment/web}/TutorEffortResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => assessment/web}/TutorParticipationResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/dto/competency => atlas/dto}/CompetencyGraphEdgeDTO.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/dto/competency => atlas/dto}/CompetencyGraphNodeDTO.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/dto/competency => atlas/dto}/CompetencyImportResponseDTO.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/dto/competency => atlas/dto}/CompetencyJolDTO.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/dto/competency => atlas/dto}/CompetencyJolPairDTO.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/dto/competency => atlas/dto}/CompetencyNameDTO.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/dto/competency => atlas/dto}/CompetencyProgressForLearningPathDTO.java (80%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/dto/competency => atlas/dto}/CompetencyRelationDTO.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/dto/competency => atlas/dto}/CompetencyWithTailRelationDTO.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/dto/competency => atlas/dto}/LearningPathCompetencyGraphDTO.java (81%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/dto/competency => atlas/dto}/LearningPathHealthDTO.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/dto/competency => atlas/dto}/LearningPathInformationDTO.java (79%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/dto/competency => atlas/dto}/LearningPathNavigationDTO.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/dto/competency => atlas/dto}/LearningPathNavigationObjectDTO.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/dto/competency => atlas/dto}/LearningPathNavigationOverviewDTO.java (80%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/dto/competency => atlas/dto}/LinkedCourseCompetencyDTO.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/dto/competency => atlas/dto}/NgxLearningPathDTO.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => atlas}/dto/metrics/CompetencyExerciseMasteryCalculationDTO.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => atlas}/dto/metrics/CompetencyInformationDTO.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => atlas}/dto/metrics/CompetencyProgressDTO.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => atlas}/dto/metrics/CompetencyStudentMetricsDTO.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => atlas}/dto/metrics/ExerciseStudentMetricsDTO.java (77%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => atlas}/dto/metrics/LectureUnitInformationDTO.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => atlas}/dto/metrics/LectureUnitStudentMetricsDTO.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => atlas}/dto/metrics/MapEntryLongLong.java (78%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => atlas}/dto/metrics/ResourceTimestampDTO.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => atlas}/dto/metrics/ScoreDTO.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => atlas}/dto/metrics/StudentMetricsDTO.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => atlas}/dto/science/ScienceEventDTO.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => atlas}/dto/standardizedCompetency/KnowledgeAreaRequestDTO.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => atlas}/dto/standardizedCompetency/KnowledgeAreaResultDTO.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => atlas}/dto/standardizedCompetency/SourceDTO.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => atlas}/dto/standardizedCompetency/StandardizedCompetencyCatalogDTO.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => atlas}/dto/standardizedCompetency/StandardizedCompetencyRequestDTO.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => atlas}/dto/standardizedCompetency/StandardizedCompetencyResultDTO.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => atlas/web}/LearningPathResource.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => atlas/web}/LtiResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/websocket/dto/metis => communication/dto}/ConversationWebsocketDTO.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => communication}/dto/LinkPreviewDTO.java (81%) rename src/main/java/de/tum/cit/aet/artemis/{web/websocket/dto/metis => communication/dto}/MetisCrudAction.java (81%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => communication}/dto/PostContextFilterDTO.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{web/websocket/dto/metis => communication/dto}/PostDTO.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => communication/web}/NotificationResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => communication/web}/NotificationSettingsResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => communication/web}/SystemNotificationResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/CourseCompetencyProgressDTO.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/CourseContentCount.java (78%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/CourseForDashboardDTO.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/CourseForImportDTO.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/CourseManagementDetailViewDTO.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/CourseManagementOverviewExerciseStatisticsDTO.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/CourseManagementOverviewStatisticsDTO.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/CourseManagementStatisticsDTO.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/CourseScoresDTO.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/CourseWithIdDTO.java (75%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/CoursesForDashboardDTO.java (72%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/DataExportDTO.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/DueDateStat.java (84%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/ImageDTO.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/ImprintDTO.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/LegalDocument.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/OnlineCourseDTO.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/OnlineResourceDTO.java (80%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/OrganizationCountDTO.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/PrivacyStatementDTO.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/RepositoryExportOptionsDTO.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/RequestDataExportDTO.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/SearchResultPageDTO.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/StatsForDashboardDTO.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/TutorLeaderboardDTO.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/UserWithIdAndLoginDTO.java (78%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/pageablesearch/CompetencyPageableSearchDTO.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/pageablesearch/FinishedBuildJobPageableSearchDTO.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/pageablesearch/PageableSearchDTO.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/pageablesearch/SearchTermPageableSearchDTO.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core}/dto/pageablesearch/UserPageableSearchDTO.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{web/websocket => core/exception}/WebsocketError.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/CourseResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/CustomMetricsExtension.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/DataExportResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/FileResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/GuidedTourSettingsResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/LectureResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/OrganizationResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/PlantUmlResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/StatisticsResource.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{web/websocket/team => core/web}/TeamWebsocketService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => core/web}/UserResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exam}/dto/ExamChecklistDTO.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exam}/dto/ExamInformationDTO.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exam}/dto/ExamScoresDTO.java (74%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exam}/dto/ExamSessionDTO.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exam}/dto/ExamUserAttendanceCheckDTO.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exam}/dto/ExamUserDTO.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exam}/dto/ExamUsersNotFoundDTO.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exam}/dto/ExamWithIdAndCourseDTO.java (64%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exam}/dto/StudentExamWithGradeDTO.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exam}/dto/StudentExamWithIdAndExamAndUserDTO.java (67%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exam}/dto/SuspiciousExamSessionsDTO.java (67%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exam}/dto/examevent/ExamAttendanceCheckEventDTO.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exam}/dto/examevent/ExamLiveEventBaseDTO.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exam}/dto/examevent/ExamWideAnnouncementEventDTO.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exam}/dto/examevent/ProblemStatementUpdateEventDTO.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exam}/dto/examevent/WorkingTimeUpdateEventDTO.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exam/web}/ExamLockResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exam/web}/ExamResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exam/web}/ExamUserResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exam/web}/ExampleSubmissionResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exam/web}/ExerciseGroupResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exam/web}/StudentExamResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exercise}/dto/ExerciseDTO.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exercise}/dto/ExerciseDetailsDTO.java (81%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exercise}/dto/ExerciseForPlagiarismCasesOverviewDTO.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exercise}/dto/ExerciseGroupWithIdAndExamDTO.java (63%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/dto/metrics => exercise/dto}/ExerciseInformationDTO.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exercise}/dto/ExerciseManagementStatisticsDTO.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exercise}/dto/ExerciseScoresAggregatedInformation.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exercise}/dto/ExerciseScoresDTO.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exercise}/dto/ParticipationDTO.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exercise}/dto/ParticipationResultDTO.java (80%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exercise}/dto/ParticipationWithExerciseDTO.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exercise}/dto/SubmissionDTO.java (91%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exercise}/dto/SubmissionExportOptionsDTO.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{web/websocket => exercise}/dto/SubmissionPatch.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{web/websocket => exercise}/dto/SubmissionPatchPayload.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{web/websocket => exercise}/dto/SubmissionSyncPayload.java (84%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exercise}/dto/SubmissionVersionDTO.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exercise}/dto/SubmissionWithComplaintDTO.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exercise}/dto/SubmissionWithParticipationDTO.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{web/websocket => exercise}/dto/TeamAssignmentPayload.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exercise/web}/ConsistencyCheckResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exercise/web}/ExerciseResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exercise/web}/ExerciseScoresChartResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exercise/web}/ParticipantScoreResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exercise/web}/ParticipationResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/websocket/team => exercise/web}/ParticipationTeamWebsocketService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exercise/web}/SubmissionPolicyResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exercise/web}/SubmissionResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => exercise/web}/TeamResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => fileupload}/dto/FileUploadAssessmentDTO.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => fileupload/web}/FileUploadAssessmentResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => fileupload/web}/FileUploadExerciseResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => fileupload/web}/FileUploadSubmissionResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/dto/lectureunit => lecture/dto}/LectureUnitForLearningPathNodeDetailsDTO.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => lecture}/dto/LectureUnitInformationDTO.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => lecture}/dto/LectureUnitSplitDTO.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => modeling}/dto/ModelingAssessmentDTO.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => modeling/web}/ModelingAssessmentResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => modeling/web}/ModelingExerciseResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => modeling/web}/ModelingSubmissionResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/dto/plagiarism => plagiarism/dto}/PlagiarismCaseInfoDTO.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/dto/plagiarism => plagiarism/dto}/PlagiarismComparisonStatusDTO.java (81%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/dto/plagiarism => plagiarism/dto}/PlagiarismResultDTO.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/dto/plagiarism => plagiarism/dto}/PlagiarismVerdictDTO.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming}/dto/BuildLogStatisticsDTO.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming}/dto/BuildPlanCheckoutDirectoriesDTO.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming}/dto/CheckoutDirectoriesDTO.java (68%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming}/dto/CommitInfoDTO.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming}/dto/FileMove.java (77%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/dto/settings/ide => programming/dto}/IdeDTO.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest/dto/settings/ide => programming/dto}/IdeMappingDTO.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{web/websocket => programming}/dto/OnlineTeamStudentDTO.java (81%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming}/dto/ProgrammingExerciseGitDiffEntryDTO.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming}/dto/ProgrammingExerciseGitDiffReportDTO.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming}/dto/ProgrammingExerciseGradingStatisticsDTO.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming}/dto/ProgrammingExerciseResetOptionsDTO.java (88%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming}/dto/ProgrammingExerciseTestCaseDTO.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{web/websocket => programming}/dto/ProgrammingExerciseTestCaseStateDTO.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming}/dto/RepositoryStatusDTO.java (78%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming}/dto/RepositoryStatusDTOType.java (63%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming}/dto/ResultDTO.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{web/websocket/programmingSubmission => programming/exceptions}/BuildTriggerWebsocketError.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming/web}/GitDiffReportParserService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/websocket/localci => programming/web}/LocalCIWebsocketMessagingService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => programming/web}/StaticCodeAnalysisResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => quiz}/dto/QuizBatchJoinDTO.java (81%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => quiz/web}/QuizExerciseResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => quiz/web}/QuizParticipationResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => quiz/web}/QuizPoolResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => quiz/web}/QuizSubmissionResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => text}/dto/TextAssessmentDTO.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => text}/dto/TextAssessmentUpdateDTO.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => text/web}/LongFeedbackTextResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{web/rest => tutorialgroup}/dto/TutorialGroupFreePeriodDTO.java (90%) delete mode 100644 src/main/java/de/tum/cit/aet/artemis/web/rest/package-info.java delete mode 100644 src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/package-info.java delete mode 100644 src/main/java/de/tum/cit/aet/artemis/web/websocket/package-info.java diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/BonusStrategy.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/BonusStrategy.java index b58100d1dc88..fad7e7f73de2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/BonusStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/BonusStrategy.java @@ -6,8 +6,9 @@ import org.apache.commons.lang3.NotImplementedException; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.assessment.dto.BonusExampleDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; +import de.tum.cit.aet.artemis.assessment.dto.BonusExampleDTO; public enum BonusStrategy implements IBonusStrategy { diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/IBonusStrategy.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/IBonusStrategy.java index 9ab1e4520bde..51d43f2e83ee 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/IBonusStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/IBonusStrategy.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.assessment.domain; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; -import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; +import de.tum.cit.aet.artemis.assessment.dto.BonusExampleDTO; public interface IBonusStrategy { diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java index 4cd6777b73e6..cbfcff34ecab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java @@ -57,7 +57,7 @@ import de.tum.cit.aet.artemis.quiz.config.QuizView; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; -import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; +import de.tum.cit.aet.artemis.programming.dto.ResultDTO; /** * A Result. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/AssessmentUpdateBaseDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/AssessmentUpdateBaseDTO.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/AssessmentUpdateBaseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/AssessmentUpdateBaseDTO.java index a8dc4e094d27..65eedf47d575 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/AssessmentUpdateBaseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/AssessmentUpdateBaseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.assessment.dto; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/AssessmentUpdateDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/AssessmentUpdateDTO.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/AssessmentUpdateDTO.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/AssessmentUpdateDTO.java index 9686a24037ec..19b749f6be0c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/AssessmentUpdateDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/AssessmentUpdateDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.assessment.dto; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusExampleDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/BonusExampleDTO.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusExampleDTO.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/BonusExampleDTO.java index 300d3ea1a861..2c47b9fc8fa5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusExampleDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/BonusExampleDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.assessment.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusResultDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/BonusResultDTO.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusResultDTO.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/BonusResultDTO.java index 35d46ecf191e..0d1d2e6c7ba3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusResultDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/BonusResultDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.assessment.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusSourceResultDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/BonusSourceResultDTO.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusSourceResultDTO.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/BonusSourceResultDTO.java index ceb73f3eb6df..392bf4054a42 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/BonusSourceResultDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/BonusSourceResultDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.assessment.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/feedback/FeedbackDetailDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java similarity index 80% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/feedback/FeedbackDetailDTO.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java index 8e9e88afad82..23ea64b409b4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/feedback/FeedbackDetailDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.feedback; +package de.tum.cit.aet.artemis.assessment.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/GradeDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/GradeDTO.java similarity index 84% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/GradeDTO.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/GradeDTO.java index b02c26fe2b80..553d0fc18163 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/GradeDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/GradeDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.assessment.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/GradeStepsDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/GradeStepsDTO.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/GradeStepsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/GradeStepsDTO.java index 908360e9906b..6b6e21c415e1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/GradeStepsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/GradeStepsDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.assessment.dto; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ResultWithPointsPerGradingCriterionDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/ResultWithPointsPerGradingCriterionDTO.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ResultWithPointsPerGradingCriterionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/ResultWithPointsPerGradingCriterionDTO.java index 8a2befdae200..8ae6ed295f5b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ResultWithPointsPerGradingCriterionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/ResultWithPointsPerGradingCriterionDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.assessment.dto; import java.util.Map; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/user/UserNameAndLoginDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/UserNameAndLoginDTO.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/user/UserNameAndLoginDTO.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/UserNameAndLoginDTO.java index 3f3b90d0668f..cf4926b1a368 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/user/UserNameAndLoginDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/UserNameAndLoginDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.user; +package de.tum.cit.aet.artemis.assessment.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/ScoreDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/score/ScoreDTO.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/ScoreDTO.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/score/ScoreDTO.java index 927b9bbd17d8..e68bc561dd42 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/ScoreDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/score/ScoreDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.score; +package de.tum.cit.aet.artemis.assessment.dto.score; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/StudentScoreSum.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/score/StudentScoreSum.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/StudentScoreSum.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/score/StudentScoreSum.java index 07dbaa291809..dad7ccd6ce8c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/StudentScoreSum.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/score/StudentScoreSum.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.score; +package de.tum.cit.aet.artemis.assessment.dto.score; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/StudentScoresDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/score/StudentScoresDTO.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/StudentScoresDTO.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/score/StudentScoresDTO.java index 8c2cca0d8e48..c4b454385211 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/StudentScoresDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/score/StudentScoresDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.score; +package de.tum.cit.aet.artemis.assessment.dto.score; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/TeamScoreSum.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/score/TeamScoreSum.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/TeamScoreSum.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/score/TeamScoreSum.java index cb7983a414f7..05e3e4baddfb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/score/TeamScoreSum.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/score/TeamScoreSum.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.score; +package de.tum.cit.aet.artemis.assessment.dto.score; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java index bbf7c0865e7e..8731d9effc7c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java @@ -26,8 +26,8 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; -import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementOverviewExerciseStatisticsDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExerciseScoresAggregatedInformation; +import de.tum.cit.aet.artemis.core.dto.CourseManagementOverviewExerciseStatisticsDTO; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseScoresAggregatedInformation; @Profile(PROFILE_CORE) @Repository @@ -107,7 +107,7 @@ SELECT MAX(ps.lastModifiedDate) AS latestModifiedDate Optional getLatestModifiedDate(); @Query(""" - SELECT new de.tum.cit.aet.artemis.web.rest.dto.ExerciseScoresAggregatedInformation( + SELECT new de.tum.cit.aet.artemis.exercise.dto.ExerciseScoresAggregatedInformation( p.exercise.id, AVG(p.lastRatedScore), MAX(p.lastRatedScore) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java index 09fe121ea5ce..698f04c36d02 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java @@ -36,8 +36,8 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; -import de.tum.cit.aet.artemis.web.rest.dto.ResultWithPointsPerGradingCriterionDTO; +import de.tum.cit.aet.artemis.core.dto.DueDateStat; +import de.tum.cit.aet.artemis.assessment.dto.ResultWithPointsPerGradingCriterionDTO; /** * Spring Data JPA repository for the Result entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/StudentScoreRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/StudentScoreRepository.java index 847a180ba9e9..63aae8a54263 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/StudentScoreRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/StudentScoreRepository.java @@ -19,7 +19,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.web.rest.dto.score.StudentScoreSum; +import de.tum.cit.aet.artemis.assessment.dto.score.StudentScoreSum; @Profile(PROFILE_CORE) @Repository @@ -33,7 +33,7 @@ public interface StudentScoreRepository extends ArtemisJpaRepository findByExercise_IdAndUser_Id(long exerciseId, long userId); @Query(""" - SELECT new de.tum.cit.aet.artemis.web.rest.dto.score.StudentScoreSum(u.id, COALESCE(SUM(s.lastRatedPoints), 0)) + SELECT new de.tum.cit.aet.artemis.assessment.dto.score.StudentScoreSum(u.id, COALESCE(SUM(s.lastRatedPoints), 0)) FROM StudentScore s LEFT JOIN s.user u WHERE s.exercise IN :exercises diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TeamScoreRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TeamScoreRepository.java index 88d57074e486..4f101894a652 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TeamScoreRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TeamScoreRepository.java @@ -20,7 +20,7 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Team; -import de.tum.cit.aet.artemis.web.rest.dto.score.TeamScoreSum; +import de.tum.cit.aet.artemis.assessment.dto.score.TeamScoreSum; @Profile(PROFILE_CORE) @Repository @@ -34,7 +34,7 @@ public interface TeamScoreRepository extends ArtemisJpaRepository findByExercise_IdAndTeam_Id(Long exerciseId, Long teamId); @Query(""" - SELECT new de.tum.cit.aet.artemis.web.rest.dto.score.TeamScoreSum(t.id, COALESCE(SUM(s.lastRatedPoints), 0)) + SELECT new de.tum.cit.aet.artemis.assessment.dto.score.TeamScoreSum(t.id, COALESCE(SUM(s.lastRatedPoints), 0)) FROM TeamScore s LEFT JOIN s.team t WHERE s.exercise IN :exercises diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentDashboardService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentDashboardService.java index c89d4bfcf6c4..e223fc8d0aa6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentDashboardService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentDashboardService.java @@ -24,7 +24,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorParticipationStatus; -import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; +import de.tum.cit.aet.artemis.core.dto.DueDateStat; /** * Service Implementation for managing Tutor-Assessment-Dashboard. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentService.java index c673b132924c..1cd4999b1868 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentService.java @@ -34,8 +34,8 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.service.ProgrammingAssessmentService; import de.tum.cit.aet.artemis.service.SubmissionService; -import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateBaseDTO; -import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; +import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateBaseDTO; +import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/BonusService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/BonusService.java index 52e0a56dc9da..43575b726868 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/BonusService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/BonusService.java @@ -12,8 +12,9 @@ import de.tum.cit.aet.artemis.assessment.domain.IBonusStrategy; import de.tum.cit.aet.artemis.assessment.repository.BonusRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; +import de.tum.cit.aet.artemis.assessment.dto.BonusExampleDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; +import de.tum.cit.aet.artemis.assessment.dto.BonusExampleDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/CourseScoreCalculationService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/CourseScoreCalculationService.java index 8ecbe91e04f7..13b88cf0c7f1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/CourseScoreCalculationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/CourseScoreCalculationService.java @@ -42,11 +42,11 @@ import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismCaseService.PlagiarismMapping; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.dto.MaxAndReachablePoints; -import de.tum.cit.aet.artemis.web.rest.dto.BonusSourceResultDTO; -import de.tum.cit.aet.artemis.web.rest.dto.CourseForDashboardDTO; -import de.tum.cit.aet.artemis.web.rest.dto.CourseScoresDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ParticipationResultDTO; -import de.tum.cit.aet.artemis.web.rest.dto.score.StudentScoresDTO; +import de.tum.cit.aet.artemis.assessment.dto.BonusSourceResultDTO; +import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO; +import de.tum.cit.aet.artemis.core.dto.CourseScoresDTO; +import de.tum.cit.aet.artemis.exercise.dto.ParticipationResultDTO; +import de.tum.cit.aet.artemis.assessment.dto.score.StudentScoresDTO; /** * Service Implementation for calculating course scores. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/GradingScaleService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/GradingScaleService.java index e5a7245ec3b7..b2eddbed3dd6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/GradingScaleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/GradingScaleService.java @@ -19,8 +19,8 @@ import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.util.PageUtil; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreService.java index ed2e23781ca3..408d3297075e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreService.java @@ -34,9 +34,9 @@ import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; -import de.tum.cit.aet.artemis.web.rest.dto.score.ScoreDTO; -import de.tum.cit.aet.artemis.web.rest.dto.score.StudentScoreSum; -import de.tum.cit.aet.artemis.web.rest.dto.score.TeamScoreSum; +import de.tum.cit.aet.artemis.assessment.dto.score.ScoreDTO; +import de.tum.cit.aet.artemis.assessment.dto.score.StudentScoreSum; +import de.tum.cit.aet.artemis.assessment.dto.score.TeamScoreSum; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java index 4276bc1f4896..35b7072c4980 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java @@ -62,8 +62,8 @@ import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; import de.tum.cit.aet.artemis.programming.service.localci.dto.ResultBuildJob; import de.tum.cit.aet.artemis.service.BuildLogEntryService; -import de.tum.cit.aet.artemis.web.rest.dto.feedback.FeedbackDetailDTO; -import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; +import de.tum.cit.aet.artemis.assessment.dto.FeedbackDetailDTO; +import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/TutorLeaderboardService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/TutorLeaderboardService.java index d16a62255a88..802b3d665cfc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/TutorLeaderboardService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/TutorLeaderboardService.java @@ -24,7 +24,7 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.web.rest.dto.TutorLeaderboardDTO; +import de.tum.cit.aet.artemis.core.dto.TutorLeaderboardDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/BonusResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/BonusResource.java index 462d26f262af..891f974d781e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/BonusResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/BonusResource.java @@ -41,7 +41,7 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.exam.service.ExamAccessService; -import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; +import de.tum.cit.aet.artemis.assessment.dto.BonusExampleDTO; /** * REST controller for managing bonus diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradeStepResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradeStepResource.java index 689cad3556fb..49898c247bd2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradeStepResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradeStepResource.java @@ -33,8 +33,8 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; -import de.tum.cit.aet.artemis.web.rest.dto.GradeDTO; -import de.tum.cit.aet.artemis.web.rest.dto.GradeStepsDTO; +import de.tum.cit.aet.artemis.assessment.dto.GradeDTO; +import de.tum.cit.aet.artemis.assessment.dto.GradeStepsDTO; /** * REST controller for managing grade steps of a grading scale diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradingScaleResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradingScaleResource.java index b385b460ff3d..824d007644da 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradingScaleResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradingScaleResource.java @@ -36,8 +36,8 @@ import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; /** * REST controller for managing grading scale diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/MetricsResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/MetricsResource.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/MetricsResource.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/web/MetricsResource.java index cc8a498f27d8..c96a3d8beb68 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/MetricsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/MetricsResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.assessment.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -14,7 +14,7 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; import de.tum.cit.aet.artemis.exercise.service.LearningMetricsService; -import de.tum.cit.aet.artemis.web.rest.dto.metrics.StudentMetricsDTO; +import de.tum.cit.aet.artemis.atlas.dto.metrics.StudentMetricsDTO; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/RatingResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/web/RatingResource.java index b3be5728757e..f09b676cc39d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/RatingResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/RatingResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.assessment.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java index 23ba38d2675f..e468f980d438 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java @@ -53,8 +53,8 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.web.rest.dto.ResultWithPointsPerGradingCriterionDTO; -import de.tum.cit.aet.artemis.web.rest.dto.feedback.FeedbackDetailDTO; +import de.tum.cit.aet.artemis.assessment.dto.ResultWithPointsPerGradingCriterionDTO; +import de.tum.cit.aet.artemis.assessment.dto.FeedbackDetailDTO; /** * REST controller for managing Result. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultWebsocketService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultWebsocketService.java index df787f28cab5..a4a6258babdc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/ResultWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultWebsocketService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.websocket; +package de.tum.cit.aet.artemis.assessment.web; import static de.tum.cit.aet.artemis.core.config.Constants.EXERCISE_TOPIC_ROOT; import static de.tum.cit.aet.artemis.core.config.Constants.NEW_RESULT_TOPIC; @@ -24,7 +24,7 @@ import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; +import de.tum.cit.aet.artemis.programming.dto.ResultDTO; /** * This service is responsible for sending websocket notifications when a new result got created. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorEffortResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/TutorEffortResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/TutorEffortResource.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/web/TutorEffortResource.java index 03d61414b82c..ca31436a4e62 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorEffortResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/TutorEffortResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.assessment.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/TutorParticipationResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/web/TutorParticipationResource.java index ae579205fcb6..4ad9b07d8cb1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TutorParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/TutorParticipationResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.assessment.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaRepositoryExportService.java b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaRepositoryExportService.java index 38a3801cf7bd..6730f5043163 100644 --- a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaRepositoryExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaRepositoryExportService.java @@ -22,7 +22,7 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseExportService; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.web.rest.dto.RepositoryExportOptionsDTO; +import de.tum.cit.aet.artemis.core.dto.RepositoryExportOptionsDTO; /** * Service for exporting programming exercise repositories for Athena. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyGraphEdgeDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyGraphEdgeDTO.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyGraphEdgeDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyGraphEdgeDTO.java index d963fb03d32d..36ad403e5667 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyGraphEdgeDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyGraphEdgeDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.atlas.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyGraphNodeDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyGraphNodeDTO.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyGraphNodeDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyGraphNodeDTO.java index 1e30979692bf..59feee0edd6b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyGraphNodeDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyGraphNodeDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.atlas.dto; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyImportResponseDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyImportResponseDTO.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyImportResponseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyImportResponseDTO.java index 34712f7b8c60..24198b82d2e8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyImportResponseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyImportResponseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.atlas.dto; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyJolDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyJolDTO.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyJolDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyJolDTO.java index 2c4d3b357827..aba792f2025c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyJolDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyJolDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.atlas.dto; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyJolPairDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyJolPairDTO.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyJolPairDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyJolPairDTO.java index 189bc123aac3..1f8a195498cc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyJolPairDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyJolPairDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.atlas.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyNameDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyNameDTO.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyNameDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyNameDTO.java index da8faef0f378..a70a95964f96 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyNameDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyNameDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.atlas.dto; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyProgressForLearningPathDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyProgressForLearningPathDTO.java similarity index 80% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyProgressForLearningPathDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyProgressForLearningPathDTO.java index e3b5c96e2b7d..3a9d490c7487 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyProgressForLearningPathDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyProgressForLearningPathDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.atlas.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyRelationDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyRelationDTO.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyRelationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyRelationDTO.java index a6ba326890e0..a7c6b6613e61 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyRelationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyRelationDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.atlas.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyWithTailRelationDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyWithTailRelationDTO.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyWithTailRelationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyWithTailRelationDTO.java index 8fbbf2ccd3d5..ff25966841c0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/CompetencyWithTailRelationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/CompetencyWithTailRelationDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.atlas.dto; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathCompetencyGraphDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/LearningPathCompetencyGraphDTO.java similarity index 81% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathCompetencyGraphDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/LearningPathCompetencyGraphDTO.java index d364ef1e58ab..e4f814d5a98f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathCompetencyGraphDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/LearningPathCompetencyGraphDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.atlas.dto; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathHealthDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/LearningPathHealthDTO.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathHealthDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/LearningPathHealthDTO.java index 179375f3a0df..8592378c6a50 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathHealthDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/LearningPathHealthDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.atlas.dto; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathInformationDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/LearningPathInformationDTO.java similarity index 79% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathInformationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/LearningPathInformationDTO.java index a598bc183ea9..b9f0e96082ec 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathInformationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/LearningPathInformationDTO.java @@ -1,9 +1,9 @@ -package de.tum.cit.aet.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.atlas.dto; import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; -import de.tum.cit.aet.artemis.web.rest.dto.user.UserNameAndLoginDTO; +import de.tum.cit.aet.artemis.assessment.dto.UserNameAndLoginDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record LearningPathInformationDTO(long id, UserNameAndLoginDTO user, int progress) { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathNavigationDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/LearningPathNavigationDTO.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathNavigationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/LearningPathNavigationDTO.java index 1cd98b319c13..44109cdd8205 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathNavigationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/LearningPathNavigationDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.atlas.dto; import jakarta.annotation.Nullable; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathNavigationObjectDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/LearningPathNavigationObjectDTO.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathNavigationObjectDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/LearningPathNavigationObjectDTO.java index 8ee1e06fea4e..cc76fb4b5c33 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathNavigationObjectDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/LearningPathNavigationObjectDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.atlas.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathNavigationOverviewDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/LearningPathNavigationOverviewDTO.java similarity index 80% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathNavigationOverviewDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/LearningPathNavigationOverviewDTO.java index 8eb81f20b65e..f09fef77a420 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LearningPathNavigationOverviewDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/LearningPathNavigationOverviewDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.atlas.dto; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LinkedCourseCompetencyDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/LinkedCourseCompetencyDTO.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LinkedCourseCompetencyDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/LinkedCourseCompetencyDTO.java index 872c5ab5ddff..336cc2976ebc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/LinkedCourseCompetencyDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/LinkedCourseCompetencyDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.atlas.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/NgxLearningPathDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/NgxLearningPathDTO.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/NgxLearningPathDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/NgxLearningPathDTO.java index 6d1ed0bc35af..71e04139223d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/competency/NgxLearningPathDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/NgxLearningPathDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.competency; +package de.tum.cit.aet.artemis.atlas.dto; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyExerciseMasteryCalculationDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/CompetencyExerciseMasteryCalculationDTO.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyExerciseMasteryCalculationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/CompetencyExerciseMasteryCalculationDTO.java index 287d4b3742a8..a0482e7f4d30 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyExerciseMasteryCalculationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/CompetencyExerciseMasteryCalculationDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.metrics; +package de.tum.cit.aet.artemis.atlas.dto.metrics; import java.time.Instant; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyInformationDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/CompetencyInformationDTO.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyInformationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/CompetencyInformationDTO.java index da9e3c5afa5e..02e0fc7edeb2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyInformationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/CompetencyInformationDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.metrics; +package de.tum.cit.aet.artemis.atlas.dto.metrics; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyProgressDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/CompetencyProgressDTO.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyProgressDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/CompetencyProgressDTO.java index ae2feb5661e4..20f949f60932 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyProgressDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/CompetencyProgressDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.metrics; +package de.tum.cit.aet.artemis.atlas.dto.metrics; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyStudentMetricsDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/CompetencyStudentMetricsDTO.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyStudentMetricsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/CompetencyStudentMetricsDTO.java index b4da3f64fb89..e413853b7586 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/CompetencyStudentMetricsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/CompetencyStudentMetricsDTO.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.web.rest.dto.metrics; +package de.tum.cit.aet.artemis.atlas.dto.metrics; import java.util.Map; import java.util.Set; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyJolDTO; /** * A DTO representing the metrics for a student regarding competencies. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ExerciseStudentMetricsDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/ExerciseStudentMetricsDTO.java similarity index 77% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ExerciseStudentMetricsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/ExerciseStudentMetricsDTO.java index 5137ecead82c..4646af13d16b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ExerciseStudentMetricsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/ExerciseStudentMetricsDTO.java @@ -1,9 +1,10 @@ -package de.tum.cit.aet.artemis.web.rest.dto.metrics; +package de.tum.cit.aet.artemis.atlas.dto.metrics; import java.util.Map; import java.util.Set; import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseInformationDTO; /** * DTO for exercise student metrics. @@ -21,5 +22,5 @@ */ @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ExerciseStudentMetricsDTO(Map exerciseInformation, Map> categories, Map averageScore, - Map score, Map averageLatestSubmission, Map latestSubmission, Set completed, Map teamId) { + Map score, Map averageLatestSubmission, Map latestSubmission, Set completed, Map teamId) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/LectureUnitInformationDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/LectureUnitInformationDTO.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/LectureUnitInformationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/LectureUnitInformationDTO.java index bd2b53b37345..3a5d9cc8bcb4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/LectureUnitInformationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/LectureUnitInformationDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.metrics; +package de.tum.cit.aet.artemis.atlas.dto.metrics; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/LectureUnitStudentMetricsDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/LectureUnitStudentMetricsDTO.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/LectureUnitStudentMetricsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/LectureUnitStudentMetricsDTO.java index e1fa761e513a..8834d2fac3b6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/LectureUnitStudentMetricsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/LectureUnitStudentMetricsDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.metrics; +package de.tum.cit.aet.artemis.atlas.dto.metrics; import java.util.Map; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/MapEntryLongLong.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/MapEntryLongLong.java similarity index 78% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/MapEntryLongLong.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/MapEntryLongLong.java index 2d97b9b9ae30..983415ba6e2e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/MapEntryLongLong.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/MapEntryLongLong.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.metrics; +package de.tum.cit.aet.artemis.atlas.dto.metrics; /** * DTO for a map entry (key : long -> value : long). diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ResourceTimestampDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/ResourceTimestampDTO.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ResourceTimestampDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/ResourceTimestampDTO.java index d9f7988012fc..e95555fd784c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ResourceTimestampDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/ResourceTimestampDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.metrics; +package de.tum.cit.aet.artemis.atlas.dto.metrics; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ScoreDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/ScoreDTO.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ScoreDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/ScoreDTO.java index c8cac515dfba..5654b35d6ef7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ScoreDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/ScoreDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.metrics; +package de.tum.cit.aet.artemis.atlas.dto.metrics; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/StudentMetricsDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/StudentMetricsDTO.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/StudentMetricsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/StudentMetricsDTO.java index 007b4b932562..15bc324e3b5d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/StudentMetricsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/StudentMetricsDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.metrics; +package de.tum.cit.aet.artemis.atlas.dto.metrics; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/science/ScienceEventDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/science/ScienceEventDTO.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/science/ScienceEventDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/science/ScienceEventDTO.java index ab4942416f28..bd89b4045ed1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/science/ScienceEventDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/science/ScienceEventDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.science; +package de.tum.cit.aet.artemis.atlas.dto.science; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaRequestDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/standardizedCompetency/KnowledgeAreaRequestDTO.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaRequestDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/standardizedCompetency/KnowledgeAreaRequestDTO.java index 9de293aacaf1..957301b6f014 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaRequestDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/standardizedCompetency/KnowledgeAreaRequestDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency; +package de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaResultDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/standardizedCompetency/KnowledgeAreaResultDTO.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaResultDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/standardizedCompetency/KnowledgeAreaResultDTO.java index 15a5ed6d66b2..87037bf039a2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/KnowledgeAreaResultDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/standardizedCompetency/KnowledgeAreaResultDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency; +package de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/SourceDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/standardizedCompetency/SourceDTO.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/SourceDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/standardizedCompetency/SourceDTO.java index d1428c58c852..d64aa570e47f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/SourceDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/standardizedCompetency/SourceDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency; +package de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyCatalogDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/standardizedCompetency/StandardizedCompetencyCatalogDTO.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyCatalogDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/standardizedCompetency/StandardizedCompetencyCatalogDTO.java index e50b97905c2a..cf5110929b9f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyCatalogDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/standardizedCompetency/StandardizedCompetencyCatalogDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency; +package de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyRequestDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/standardizedCompetency/StandardizedCompetencyRequestDTO.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyRequestDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/standardizedCompetency/StandardizedCompetencyRequestDTO.java index 3a8e92dd2977..f84bdd30caf8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyRequestDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/standardizedCompetency/StandardizedCompetencyRequestDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency; +package de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyResultDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/standardizedCompetency/StandardizedCompetencyResultDTO.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyResultDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/standardizedCompetency/StandardizedCompetencyResultDTO.java index 9d4a6b7c82b2..b943fb355517 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/standardizedCompetency/StandardizedCompetencyResultDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/standardizedCompetency/StandardizedCompetencyResultDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency; +package de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyMetricsRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyMetricsRepository.java index d840b9cba5ea..b439697f7f9b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyMetricsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyMetricsRepository.java @@ -11,10 +11,10 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO; -import de.tum.cit.aet.artemis.web.rest.dto.metrics.CompetencyInformationDTO; -import de.tum.cit.aet.artemis.web.rest.dto.metrics.CompetencyProgressDTO; -import de.tum.cit.aet.artemis.web.rest.dto.metrics.MapEntryLongLong; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyJolDTO; +import de.tum.cit.aet.artemis.atlas.dto.metrics.CompetencyInformationDTO; +import de.tum.cit.aet.artemis.atlas.dto.metrics.CompetencyProgressDTO; +import de.tum.cit.aet.artemis.atlas.dto.metrics.MapEntryLongLong; /** * Spring Data JPA repository to fetch competency related metrics. @@ -30,7 +30,7 @@ public interface CompetencyMetricsRepository extends ArtemisJpaRepository findLatestByCompetencyIdAndUserIdExceptJolId(@Param("com @Param("jolIdToExclude") long jolIdToExclude); @Query(""" - SELECT new de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO(jol.id, jol.competency.id, jol.value, jol.judgementTime, jol.competencyProgress, jol.competencyConfidence) + SELECT new de.tum.cit.aet.artemis.atlas.dto.CompetencyJolDTO(jol.id, jol.competency.id, jol.value, jol.judgementTime, jol.competencyProgress, jol.competencyConfidence) FROM CompetencyJol jol WHERE jol.user.id = :userId AND jol.competency.course.id = :courseId @@ -67,7 +67,7 @@ SELECT MAX(jol2.judgementTime) Set findLatestJolValuesForUserByCourseId(@Param("userId") long userId, @Param("courseId") long courseId); @Query(""" - SELECT new de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO(jol.id, jol.competency.id, jol.value, jol.judgementTime, jol.competencyProgress, jol.competencyConfidence) + SELECT new de.tum.cit.aet.artemis.atlas.dto.CompetencyJolDTO(jol.id, jol.competency.id, jol.value, jol.judgementTime, jol.competencyProgress, jol.competencyConfidence) FROM CompetencyJol jol WHERE jol.user.id = :userId AND jol.competency.course.id = :courseId diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/ScienceEventService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/ScienceEventService.java index 9104a2c9718b..3bd3acd5ee1f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/ScienceEventService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/ScienceEventService.java @@ -11,7 +11,7 @@ import de.tum.cit.aet.artemis.atlas.domain.science.ScienceEvent; import de.tum.cit.aet.artemis.atlas.repository.science.ScienceEventRepository; -import de.tum.cit.aet.artemis.web.rest.dto.science.ScienceEventDTO; +import de.tum.cit.aet.artemis.atlas.dto.science.ScienceEventDTO; /** * Service class for {@link ScienceEvent}. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyJolService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyJolService.java index cdd23dbda2b2..aff710da3bc5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyJolService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyJolService.java @@ -22,8 +22,8 @@ import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.iris.service.session.IrisCourseChatSessionService; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolPairDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyJolDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyJolPairDTO; /** * Service Implementation for managing CompetencyJol. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyProgressService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyProgressService.java index 1fadb21f1d49..81c3b9bdc141 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyProgressService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyProgressService.java @@ -38,8 +38,8 @@ import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; -import de.tum.cit.aet.artemis.web.rest.dto.CourseCompetencyProgressDTO; -import de.tum.cit.aet.artemis.web.rest.dto.metrics.CompetencyExerciseMasteryCalculationDTO; +import de.tum.cit.aet.artemis.core.dto.CourseCompetencyProgressDTO; +import de.tum.cit.aet.artemis.atlas.dto.metrics.CompetencyExerciseMasteryCalculationDTO; /** * Service for calculating the progress of a student in a competency. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java index f9ccdf48d864..84630b322c49 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java @@ -24,7 +24,7 @@ import de.tum.cit.aet.artemis.exercise.service.ExerciseService; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; /** * Service for managing competencies. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java index 08f81fdabbaa..a516afb07b97 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java @@ -39,10 +39,10 @@ import de.tum.cit.aet.artemis.exercise.service.ExerciseService; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyRelationDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.CompetencyPageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyRelationDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.CompetencyPageableSearchDTO; /** * Service for managing competencies. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/KnowledgeAreaService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/KnowledgeAreaService.java index 71c3d03ea3b1..0430b940ff57 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/KnowledgeAreaService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/KnowledgeAreaService.java @@ -9,8 +9,8 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.KnowledgeArea; import de.tum.cit.aet.artemis.atlas.repository.competency.KnowledgeAreaRepository; +import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.KnowledgeAreaRequestDTO; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; -import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaRequestDTO; /** * Service for managing {@link KnowledgeArea} entities. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java index a13c4742f266..be31a21e501b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java @@ -24,7 +24,7 @@ import de.tum.cit.aet.artemis.exercise.service.ExerciseService; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; /** * Service for managing prerequisites. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/StandardizedCompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/StandardizedCompetencyService.java index 6156af1890a0..3b3bcd4912a4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/StandardizedCompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/StandardizedCompetencyService.java @@ -28,11 +28,11 @@ import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; -import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.SourceDTO; -import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO; -import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO.KnowledgeAreaForCatalogDTO; -import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO.StandardizedCompetencyForCatalogDTO; -import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyRequestDTO; +import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.SourceDTO; +import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO; +import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO.KnowledgeAreaForCatalogDTO; +import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO.StandardizedCompetencyForCatalogDTO; +import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyRequestDTO; /** * Service for managing {@link StandardizedCompetency} entities. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathNavigationService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathNavigationService.java index b892742e9110..564355f5ba60 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathNavigationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathNavigationService.java @@ -15,10 +15,10 @@ import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathRecommendationService.RecommendationState; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.service.LearningObjectService; -import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationObjectDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationObjectDTO.LearningObjectType; -import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationOverviewDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationObjectDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationObjectDTO.LearningObjectType; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationOverviewDTO; /** * Service for navigating through a learning path. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathNgxService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathNgxService.java index 96285229efcb..7420a8cfc115 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathNgxService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathNgxService.java @@ -26,7 +26,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; -import de.tum.cit.aet.artemis.web.rest.dto.competency.NgxLearningPathDTO; +import de.tum.cit.aet.artemis.atlas.dto.NgxLearningPathDTO; /** * Service Implementation for the generation of ngx representations of learning paths. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathService.java index 2e714b863cfa..13a459258f63 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathService.java @@ -40,15 +40,15 @@ import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.domain.LectureUnitCompletion; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyGraphEdgeDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyGraphNodeDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathCompetencyGraphDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathHealthDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathInformationDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationOverviewDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.NgxLearningPathDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyGraphEdgeDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyGraphNodeDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathCompetencyGraphDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathHealthDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathInformationDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationOverviewDTO; +import de.tum.cit.aet.artemis.atlas.dto.NgxLearningPathDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; /** * Service Implementation for managing Learning Paths. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/web/CompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/CompetencyResource.java index 4d5775f053a1..f3cb0dce1357 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/web/CompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/CompetencyResource.java @@ -43,8 +43,8 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportResponseDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/web/CourseCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/CourseCompetencyResource.java index 1da430390162..9b2cf71aeb34 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/web/CourseCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/CourseCompetencyResource.java @@ -51,12 +51,12 @@ import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.iris.service.IrisCompetencyGenerationService; import de.tum.cit.aet.artemis.iris.service.pyris.dto.competency.PyrisCompetencyExtractionInputDTO; -import de.tum.cit.aet.artemis.web.rest.dto.CourseCompetencyProgressDTO; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolPairDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyRelationDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.CompetencyPageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.CourseCompetencyProgressDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyJolPairDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyRelationDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.CompetencyPageableSearchDTO; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/LearningPathResource.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/web/LearningPathResource.java index a9d143891584..58349267dbd9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LearningPathResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/LearningPathResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.atlas.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -43,18 +43,18 @@ import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.LearningObjectService; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyNameDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyProgressForLearningPathDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathCompetencyGraphDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathHealthDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathInformationDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationObjectDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationObjectDTO.LearningObjectType; -import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationOverviewDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.NgxLearningPathDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyNameDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyProgressForLearningPathDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathCompetencyGraphDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathHealthDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathInformationDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationObjectDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationObjectDTO.LearningObjectType; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationOverviewDTO; +import de.tum.cit.aet.artemis.atlas.dto.NgxLearningPathDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/LtiResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/web/LtiResource.java index 71bf88ab1402..60a141081c77 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LtiResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/LtiResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.atlas.web; import java.text.ParseException; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/web/PrerequisiteResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/PrerequisiteResource.java index 2c65bddd8dea..14c6cabf5493 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/web/PrerequisiteResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/PrerequisiteResource.java @@ -43,8 +43,8 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportResponseDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; /** * REST controller for managing {@link Prerequisite Prerequisite} entities. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/web/StandardizedCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/StandardizedCompetencyResource.java index a60bc11b4f86..a24a357559a1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/web/StandardizedCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/StandardizedCompetencyResource.java @@ -22,8 +22,8 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaResultDTO; -import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.SourceDTO; +import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.KnowledgeAreaResultDTO; +import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.SourceDTO; /** * REST controller for managing {@link StandardizedCompetency} entities. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/web/science/ScienceResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/science/ScienceResource.java index 3f19b8e85f69..b4d018257499 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/web/science/ScienceResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/science/ScienceResource.java @@ -15,7 +15,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.web.rest.dto.science.ScienceEventDTO; +import de.tum.cit.aet.artemis.atlas.dto.science.ScienceEventDTO; /** * REST controller providing the science related endpoints. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/metis/ConversationWebsocketDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/dto/ConversationWebsocketDTO.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/metis/ConversationWebsocketDTO.java rename to src/main/java/de/tum/cit/aet/artemis/communication/dto/ConversationWebsocketDTO.java index 5bf11d77b108..05559eb80dce 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/metis/ConversationWebsocketDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/dto/ConversationWebsocketDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.websocket.dto.metis; +package de.tum.cit.aet.artemis.communication.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LinkPreviewDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/dto/LinkPreviewDTO.java similarity index 81% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LinkPreviewDTO.java rename to src/main/java/de/tum/cit/aet/artemis/communication/dto/LinkPreviewDTO.java index 5cd711b66949..6b9be680a63e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LinkPreviewDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/dto/LinkPreviewDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.communication.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/metis/MetisCrudAction.java b/src/main/java/de/tum/cit/aet/artemis/communication/dto/MetisCrudAction.java similarity index 81% rename from src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/metis/MetisCrudAction.java rename to src/main/java/de/tum/cit/aet/artemis/communication/dto/MetisCrudAction.java index 794868747b3b..67d24793f3d0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/metis/MetisCrudAction.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/dto/MetisCrudAction.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.websocket.dto.metis; +package de.tum.cit.aet.artemis.communication.dto; /** * Enum that is used in DTOs sent as payload in websocket messages, diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/PostContextFilterDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/dto/PostContextFilterDTO.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/PostContextFilterDTO.java rename to src/main/java/de/tum/cit/aet/artemis/communication/dto/PostContextFilterDTO.java index a45e030b7e64..1b1605065bf7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/PostContextFilterDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/dto/PostContextFilterDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.communication.dto; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/metis/PostDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/dto/PostDTO.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/metis/PostDTO.java rename to src/main/java/de/tum/cit/aet/artemis/communication/dto/PostDTO.java index ba17445c0414..2be7942abee1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/metis/PostDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/dto/PostDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.websocket.dto.metis; +package de.tum.cit.aet.artemis.communication.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java index 18de552f404d..f429bb1a75f0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java @@ -31,7 +31,7 @@ import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; -import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; +import de.tum.cit.aet.artemis.communication.dto.PostContextFilterDTO; /** * Spring Data repository for the Message (Post) entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java index f538f58a711e..df039a7bb3f5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java @@ -34,8 +34,8 @@ import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; -import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; +import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; +import de.tum.cit.aet.artemis.communication.dto.PostDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java index 3106df353ca2..67e43dfb881b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java @@ -59,9 +59,9 @@ import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; -import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; -import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; +import de.tum.cit.aet.artemis.communication.dto.PostContextFilterDTO; +import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; +import de.tum.cit.aet.artemis.communication.dto.PostDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/PostingService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/PostingService.java index bccce31e6e15..d1e86515e225 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/PostingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/PostingService.java @@ -39,8 +39,8 @@ import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.service.dto.UserRoleDTO; -import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; -import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; +import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; +import de.tum.cit.aet.artemis.communication.dto.PostDTO; public abstract class PostingService { diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/ReactionService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/ReactionService.java index 40f92969a1b8..758fe3b6debd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/ReactionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/ReactionService.java @@ -23,8 +23,8 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismAnswerPostService; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismPostService; -import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; -import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; +import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; +import de.tum.cit.aet.artemis.communication.dto.PostDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java index 988f763d150d..ba4901613eac 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java @@ -29,7 +29,7 @@ import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.lecture.domain.Lecture; -import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; +import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationService.java index fffff1497228..1f5293446b91 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationService.java @@ -42,8 +42,8 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.web.websocket.dto.metis.ConversationWebsocketDTO; -import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; +import de.tum.cit.aet.artemis.communication.dto.ConversationWebsocketDTO; +import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/linkpreview/LinkPreviewService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/linkpreview/LinkPreviewService.java index 00a6b1692d9d..b3f2f8129e6c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/linkpreview/LinkPreviewService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/linkpreview/LinkPreviewService.java @@ -11,7 +11,7 @@ import de.tum.cit.aet.artemis.communication.service.linkpreview.ogparser.OgParser; import de.tum.cit.aet.artemis.communication.service.linkpreview.ogparser.OpenGraph; import de.tum.cit.aet.artemis.communication.service.linkpreview.ogparser.htmlparser.OgMetaElementHtmlParser; -import de.tum.cit.aet.artemis.web.rest.dto.LinkPreviewDTO; +import de.tum.cit.aet.artemis.communication.dto.LinkPreviewDTO; /** * Service for retrieving meta information from a given url. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/ConversationMessageResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/ConversationMessageResource.java index f695e76bdcc6..db05eff51b6b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/ConversationMessageResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/ConversationMessageResource.java @@ -39,7 +39,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; -import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; +import de.tum.cit.aet.artemis.communication.dto.PostContextFilterDTO; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.PaginationUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/LinkPreviewResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/LinkPreviewResource.java index 0d70fff501f6..e6923afd718c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/LinkPreviewResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/LinkPreviewResource.java @@ -13,7 +13,7 @@ import de.tum.cit.aet.artemis.communication.service.linkpreview.LinkPreviewService; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.web.rest.dto.LinkPreviewDTO; +import de.tum.cit.aet.artemis.communication.dto.LinkPreviewDTO; /** * REST controller for Link Preview. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/NotificationResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationResource.java rename to src/main/java/de/tum/cit/aet/artemis/communication/web/NotificationResource.java index f9a87fa7ab41..3a714eb5cd33 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/NotificationResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.communication.web; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.MESSAGE_REPLY_IN_CONVERSATION_TITLE; import static de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants.NEW_MESSAGE_TITLE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/NotificationSettingsResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java rename to src/main/java/de/tum/cit/aet/artemis/communication/web/NotificationSettingsResource.java index ec59ce4a5857..e7696f54f0e1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/NotificationSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/NotificationSettingsResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.communication.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/SystemNotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/SystemNotificationResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/SystemNotificationResource.java rename to src/main/java/de/tum/cit/aet/artemis/communication/web/SystemNotificationResource.java index 51d76817ce2e..2fd24822e321 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/SystemNotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/SystemNotificationResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.communication.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/GroupChatResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/GroupChatResource.java index a10554818734..30cd7fbdfeb5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/GroupChatResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/GroupChatResource.java @@ -34,7 +34,7 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; +import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/core/aop/logging/LoggingAspect.java b/src/main/java/de/tum/cit/aet/artemis/core/aop/logging/LoggingAspect.java index bd6b1668ca0f..92c7508a5d64 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/aop/logging/LoggingAspect.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/aop/logging/LoggingAspect.java @@ -46,7 +46,8 @@ public void springBeanPointcut() { /** * Pointcut that matches all Spring beans in the application's main packages. */ - @Pointcut("within(de.tum.cit.aet.artemis.repository..*)" + " || within(de.tum.cit.aet.artemis.service..*)" + " || within(de.tum.cit.aet.artemis.web.rest..*)") + // ToDo: Verify that wildcards work as expected + @Pointcut("within(de.tum.cit.aet.artemis..*.repository..*)" + " || within(de.tum.cit.aet.artemis..*.service..*)" + " || within(de.tum.cit.aet.artemis..*.web..*)") public void applicationPackagePointcut() { // Method is empty as this is just a Pointcut, the implementations are in the advices. } diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java b/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java index bf7464a9d0dd..1b2e53560687 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java @@ -2,6 +2,7 @@ import java.util.regex.Pattern; +import de.tum.cit.aet.artemis.atlas.web.LtiResource; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; @@ -307,7 +308,7 @@ public final class Constants { public static final String PROFILE_AEOLUS = "aeolus"; /** - * The name of the Spring profile used for activating LTI in Artemis, see {@link de.tum.cit.aet.artemis.web.rest.LtiResource}. + * The name of the Spring profile used for activating LTI in Artemis, see {@link LtiResource}. */ public static final String PROFILE_LTI = "lti"; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/CustomMetricsExtensionConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/CustomMetricsExtensionConfiguration.java index a5ce111ac0b8..e584da7004ce 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/CustomMetricsExtensionConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/CustomMetricsExtensionConfiguration.java @@ -12,7 +12,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.messaging.simp.user.SimpUserRegistry; -import de.tum.cit.aet.artemis.web.rest.CustomMetricsExtension; +import de.tum.cit.aet.artemis.core.web.CustomMetricsExtension; import io.micrometer.core.annotation.Timed; import tech.jhipster.config.metric.JHipsterMetricsEndpoint; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java index a96aa5761728..9fec0f1248e5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java @@ -1,13 +1,13 @@ package de.tum.cit.aet.artemis.core.config.websocket; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService.getExerciseIdFromNonPersonalExerciseResultDestination; -import static de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService.isNonPersonalExerciseResultDestination; -import static de.tum.cit.aet.artemis.web.websocket.localci.LocalCIWebsocketMessagingService.isBuildAgentDestination; -import static de.tum.cit.aet.artemis.web.websocket.localci.LocalCIWebsocketMessagingService.isBuildQueueAdminDestination; -import static de.tum.cit.aet.artemis.web.websocket.localci.LocalCIWebsocketMessagingService.isBuildQueueCourseDestination; -import static de.tum.cit.aet.artemis.web.websocket.team.ParticipationTeamWebsocketService.getParticipationIdFromDestination; -import static de.tum.cit.aet.artemis.web.websocket.team.ParticipationTeamWebsocketService.isParticipationTeamDestination; +import static de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService.getExerciseIdFromNonPersonalExerciseResultDestination; +import static de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService.isNonPersonalExerciseResultDestination; +import static de.tum.cit.aet.artemis.programming.web.LocalCIWebsocketMessagingService.isBuildAgentDestination; +import static de.tum.cit.aet.artemis.programming.web.LocalCIWebsocketMessagingService.isBuildQueueAdminDestination; +import static de.tum.cit.aet.artemis.programming.web.LocalCIWebsocketMessagingService.isBuildQueueCourseDestination; +import static de.tum.cit.aet.artemis.exercise.web.ParticipationTeamWebsocketService.getParticipationIdFromDestination; +import static de.tum.cit.aet.artemis.exercise.web.ParticipationTeamWebsocketService.isParticipationTeamDestination; import java.net.InetSocketAddress; import java.security.Principal; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseCompetencyProgressDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseCompetencyProgressDTO.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseCompetencyProgressDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/CourseCompetencyProgressDTO.java index aa23362aa74c..c65f19cbc885 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseCompetencyProgressDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseCompetencyProgressDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.core.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseContentCount.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseContentCount.java similarity index 78% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseContentCount.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/CourseContentCount.java index 3d3d913801c0..b8fb57870aa3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseContentCount.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseContentCount.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.core.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseForDashboardDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseForDashboardDTO.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseForDashboardDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/CourseForDashboardDTO.java index b2efd3e2ebde..a4985405768f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseForDashboardDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseForDashboardDTO.java @@ -1,10 +1,11 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.core.dto; import java.util.Set; import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.exercise.dto.ParticipationResultDTO; /** * Returned by the for-dashboard resources. @@ -22,5 +23,5 @@ */ @JsonInclude(JsonInclude.Include.NON_EMPTY) public record CourseForDashboardDTO(Course course, CourseScoresDTO totalScores, CourseScoresDTO textScores, CourseScoresDTO programmingScores, CourseScoresDTO modelingScores, - CourseScoresDTO fileUploadScores, CourseScoresDTO quizScores, Set participationResults) { + CourseScoresDTO fileUploadScores, CourseScoresDTO quizScores, Set participationResults) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseForImportDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseForImportDTO.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseForImportDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/CourseForImportDTO.java index 96a39cfafd2c..e53396a18cb5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseForImportDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseForImportDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.core.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementDetailViewDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseManagementDetailViewDTO.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementDetailViewDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/CourseManagementDetailViewDTO.java index e9e40f05ef6f..253cbb648809 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementDetailViewDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseManagementDetailViewDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.core.dto; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementOverviewExerciseStatisticsDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseManagementOverviewExerciseStatisticsDTO.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementOverviewExerciseStatisticsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/CourseManagementOverviewExerciseStatisticsDTO.java index 08c8a8aa962b..31509ea2dcc9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementOverviewExerciseStatisticsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseManagementOverviewExerciseStatisticsDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.core.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementOverviewStatisticsDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseManagementOverviewStatisticsDTO.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementOverviewStatisticsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/CourseManagementOverviewStatisticsDTO.java index 8755e7a5f67e..9b92e0101191 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementOverviewStatisticsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseManagementOverviewStatisticsDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.core.dto; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementStatisticsDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseManagementStatisticsDTO.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementStatisticsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/CourseManagementStatisticsDTO.java index f20e50e57bb2..7f83ef6200d7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseManagementStatisticsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseManagementStatisticsDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.core.dto; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseScoresDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseScoresDTO.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseScoresDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/CourseScoresDTO.java index 41f7eeef23cc..2a477a9f309a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseScoresDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseScoresDTO.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.core.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.web.rest.dto.score.StudentScoresDTO; +import de.tum.cit.aet.artemis.assessment.dto.score.StudentScoresDTO; /** * Contains the scores that enable the client to show statistics for a calling student. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseWithIdDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseWithIdDTO.java similarity index 75% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseWithIdDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/CourseWithIdDTO.java index ea3f0cbd4c0a..88ebca7e3039 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CourseWithIdDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseWithIdDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.core.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CoursesForDashboardDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/CoursesForDashboardDTO.java similarity index 72% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CoursesForDashboardDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/CoursesForDashboardDTO.java index b1452a24c5c3..2f95bb5a5eca 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/CoursesForDashboardDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/CoursesForDashboardDTO.java @@ -1,9 +1,10 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.core.dto; import java.util.Set; import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO; import de.tum.cit.aet.artemis.exam.domain.Exam; @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/DataExportDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/DataExportDTO.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/DataExportDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/DataExportDTO.java index 05f54235ac98..57f74451ae68 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/DataExportDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/DataExportDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.core.dto; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/DueDateStat.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/DueDateStat.java similarity index 84% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/DueDateStat.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/DueDateStat.java index fe7e95d2d186..1702c6d3758b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/DueDateStat.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/DueDateStat.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.core.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ImageDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/ImageDTO.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ImageDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/ImageDTO.java index ea82f66a2665..074933268f8b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ImageDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/ImageDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.core.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ImprintDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/ImprintDTO.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ImprintDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/ImprintDTO.java index 8d01973978c7..0c4a1ce8af07 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ImprintDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/ImprintDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.core.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LegalDocument.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/LegalDocument.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LegalDocument.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/LegalDocument.java index 28f0ec8b338d..b3966b0b6525 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LegalDocument.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/LegalDocument.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.core.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/OnlineCourseDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/OnlineCourseDTO.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/OnlineCourseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/OnlineCourseDTO.java index fa086617e315..5851fd585d34 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/OnlineCourseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/OnlineCourseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.core.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/OnlineResourceDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/OnlineResourceDTO.java similarity index 80% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/OnlineResourceDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/OnlineResourceDTO.java index 330abea0f76b..10517a5ebf73 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/OnlineResourceDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/OnlineResourceDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.core.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/OrganizationCountDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/OrganizationCountDTO.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/OrganizationCountDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/OrganizationCountDTO.java index 46856aa6642f..be00cf25f0b4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/OrganizationCountDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/OrganizationCountDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.core.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/PrivacyStatementDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/PrivacyStatementDTO.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/PrivacyStatementDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/PrivacyStatementDTO.java index 6b28c9e317ca..19ba4e6f010f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/PrivacyStatementDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/PrivacyStatementDTO.java @@ -1,9 +1,10 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.core.dto; import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.domain.LegalDocumentType; +import de.tum.cit.aet.artemis.core.dto.LegalDocument; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PrivacyStatementDTO(LegalDocumentType type, String text, Language language) implements LegalDocument { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/RepositoryExportOptionsDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/RepositoryExportOptionsDTO.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/RepositoryExportOptionsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/RepositoryExportOptionsDTO.java index 283e3620f62d..5d9bb8eb0847 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/RepositoryExportOptionsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/RepositoryExportOptionsDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.core.dto; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/RequestDataExportDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/RequestDataExportDTO.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/RequestDataExportDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/RequestDataExportDTO.java index 37226dd2f184..3d99672e3d8b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/RequestDataExportDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/RequestDataExportDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.core.dto; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SearchResultPageDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/SearchResultPageDTO.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SearchResultPageDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/SearchResultPageDTO.java index 52b248aa36dc..8504c8ef6f1b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SearchResultPageDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/SearchResultPageDTO.java @@ -1,11 +1,11 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.core.dto; import java.util.ArrayList; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; /** * Wrapper for a search result which is paged
diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StatsForDashboardDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/StatsForDashboardDTO.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StatsForDashboardDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/StatsForDashboardDTO.java index ba22410fbab2..d76b7010ed03 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StatsForDashboardDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/StatsForDashboardDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.core.dto; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TutorLeaderboardDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/TutorLeaderboardDTO.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TutorLeaderboardDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/TutorLeaderboardDTO.java index f3f944150cae..47a59575142c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TutorLeaderboardDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/TutorLeaderboardDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.core.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/UserWithIdAndLoginDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/UserWithIdAndLoginDTO.java similarity index 78% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/UserWithIdAndLoginDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/UserWithIdAndLoginDTO.java index f326efeac272..21d1c7b927b3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/UserWithIdAndLoginDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/UserWithIdAndLoginDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.core.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/CompetencyPageableSearchDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/pageablesearch/CompetencyPageableSearchDTO.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/CompetencyPageableSearchDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/pageablesearch/CompetencyPageableSearchDTO.java index 905d5dd67161..378ab115155c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/CompetencyPageableSearchDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/pageablesearch/CompetencyPageableSearchDTO.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.web.rest.dto.pageablesearch; +package de.tum.cit.aet.artemis.core.dto.pageablesearch; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; /** * Search DTO for a list of competencies matching the given search terms. The result should be paged, diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/FinishedBuildJobPageableSearchDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/pageablesearch/FinishedBuildJobPageableSearchDTO.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/FinishedBuildJobPageableSearchDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/pageablesearch/FinishedBuildJobPageableSearchDTO.java index 0e27134b7b85..aeda44e70d8c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/FinishedBuildJobPageableSearchDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/pageablesearch/FinishedBuildJobPageableSearchDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.pageablesearch; +package de.tum.cit.aet.artemis.core.dto.pageablesearch; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/PageableSearchDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/pageablesearch/PageableSearchDTO.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/PageableSearchDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/pageablesearch/PageableSearchDTO.java index b4459b9b5d75..1ca057935967 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/PageableSearchDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/pageablesearch/PageableSearchDTO.java @@ -1,9 +1,9 @@ -package de.tum.cit.aet.artemis.web.rest.dto.pageablesearch; +package de.tum.cit.aet.artemis.core.dto.pageablesearch; import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.core.dto.SortingOrder; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; /** * Wrapper for a generic search for any list of entities. The result should be paged, diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/SearchTermPageableSearchDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/pageablesearch/SearchTermPageableSearchDTO.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/SearchTermPageableSearchDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/pageablesearch/SearchTermPageableSearchDTO.java index f1383d543656..27ab8b66fff7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/SearchTermPageableSearchDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/pageablesearch/SearchTermPageableSearchDTO.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.web.rest.dto.pageablesearch; +package de.tum.cit.aet.artemis.core.dto.pageablesearch; import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; /** * Wrapper for a generic search for any list of entities matching a given search term. The result should be paged, diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/UserPageableSearchDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/pageablesearch/UserPageableSearchDTO.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/UserPageableSearchDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/pageablesearch/UserPageableSearchDTO.java index 750bd8c5e5a9..ed451c392ad8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/pageablesearch/UserPageableSearchDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/pageablesearch/UserPageableSearchDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.pageablesearch; +package de.tum.cit.aet.artemis.core.dto.pageablesearch; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/exception/StudentsAlreadyAssignedException.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/StudentsAlreadyAssignedException.java index e5acc1262463..b4bcac2cb602 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/exception/StudentsAlreadyAssignedException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/StudentsAlreadyAssignedException.java @@ -9,7 +9,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.Team; -import de.tum.cit.aet.artemis.web.rest.TeamResource; +import de.tum.cit.aet.artemis.exercise.web.TeamResource; /** * Exception that will be thrown if the user tries to create a team that contains students who are already assigned to a different team for the exercise. The error response will diff --git a/src/main/java/de/tum/cit/aet/artemis/core/exception/StudentsAppearMultipleTimesException.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/StudentsAppearMultipleTimesException.java index 6750c6e6badb..1628499e7465 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/exception/StudentsAppearMultipleTimesException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/StudentsAppearMultipleTimesException.java @@ -8,7 +8,7 @@ import org.springframework.data.util.Pair; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.web.rest.TeamResource; +import de.tum.cit.aet.artemis.exercise.web.TeamResource; /** * Exception that will be thrown if the user tries to import teams that contain students who appear in another imported team. The error response will diff --git a/src/main/java/de/tum/cit/aet/artemis/core/exception/StudentsNotFoundException.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/StudentsNotFoundException.java index 9c7524d89fea..6df88a988a09 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/exception/StudentsNotFoundException.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/StudentsNotFoundException.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; -import de.tum.cit.aet.artemis.web.rest.TeamResource; +import de.tum.cit.aet.artemis.exercise.web.TeamResource; /** * Exception that will be thrown if the user tries to import teams that contain students whose login or registration number cannot be found. The error response will diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/WebsocketError.java b/src/main/java/de/tum/cit/aet/artemis/core/exception/WebsocketError.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/web/websocket/WebsocketError.java rename to src/main/java/de/tum/cit/aet/artemis/core/exception/WebsocketError.java index e3b32ce12664..726d27cfa64d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/WebsocketError.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/exception/WebsocketError.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.websocket; +package de.tum.cit.aet.artemis.core.exception; import java.io.Serializable; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java index 34d880add6d7..9069d21abee7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java @@ -50,7 +50,7 @@ import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.service.dto.UserRoleDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.UserPageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.UserPageableSearchDTO; /** * Spring Data JPA repository for the User entity.
diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/export/CourseExamExportService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/export/CourseExamExportService.java index a7eed36bceb7..3230b826ce8c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/export/CourseExamExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/export/CourseExamExportService.java @@ -49,7 +49,7 @@ import de.tum.cit.aet.artemis.service.ZipFileService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.service.TextExerciseWithSubmissionsExportService; -import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionExportOptionsDTO; /** * Service Implementation for exporting courses and exams. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExamCreationService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExamCreationService.java index b0448125a6eb..5824547064e6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExamCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExamCreationService.java @@ -27,7 +27,7 @@ import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exam.service.ExamService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.web.rest.dto.ExamScoresDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamScoresDTO; /** * A service to create the data export for exams the user has participated in. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExerciseCreationService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExerciseCreationService.java index c8d698ceabec..2d11f7ffa0d2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExerciseCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExerciseCreationService.java @@ -51,7 +51,7 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.text.domain.TextSubmission; -import de.tum.cit.aet.artemis.web.rest.dto.RepositoryExportOptionsDTO; +import de.tum.cit.aet.artemis.core.dto.RepositoryExportOptionsDTO; /** * A service to create the data export for exercise participations of the user. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportService.java index f6feb923e16d..1995fcd3c501 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportService.java @@ -27,8 +27,8 @@ import de.tum.cit.aet.artemis.core.repository.DataExportRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.web.rest.dto.DataExportDTO; -import de.tum.cit.aet.artemis.web.rest.dto.RequestDataExportDTO; +import de.tum.cit.aet.artemis.core.dto.DataExportDTO; +import de.tum.cit.aet.artemis.core.dto.RequestDataExportDTO; /** * Service Implementation for managing the data export in accordance with Art. 15 GDPR. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/util/PageUtil.java b/src/main/java/de/tum/cit/aet/artemis/core/util/PageUtil.java index b6867d9f0b16..40cbff0c217d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/util/PageUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/util/PageUtil.java @@ -8,7 +8,7 @@ import org.springframework.data.domain.Sort; import de.tum.cit.aet.artemis.core.dto.SortingOrder; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.PageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.PageableSearchDTO; public class PageUtil { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java index 3fd42aea8817..c0fcc1094cc6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/CourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.core.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static java.time.ZonedDateTime.now; @@ -107,16 +107,16 @@ import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.service.dto.UserPublicInfoDTO; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupsConfigurationService; -import de.tum.cit.aet.artemis.web.rest.dto.CourseForDashboardDTO; -import de.tum.cit.aet.artemis.web.rest.dto.CourseForImportDTO; -import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementDetailViewDTO; -import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementOverviewStatisticsDTO; -import de.tum.cit.aet.artemis.web.rest.dto.CoursesForDashboardDTO; -import de.tum.cit.aet.artemis.web.rest.dto.OnlineCourseDTO; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.dto.user.UserNameAndLoginDTO; +import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO; +import de.tum.cit.aet.artemis.core.dto.CourseForImportDTO; +import de.tum.cit.aet.artemis.core.dto.CourseManagementDetailViewDTO; +import de.tum.cit.aet.artemis.core.dto.CourseManagementOverviewStatisticsDTO; +import de.tum.cit.aet.artemis.core.dto.CoursesForDashboardDTO; +import de.tum.cit.aet.artemis.core.dto.OnlineCourseDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.assessment.dto.UserNameAndLoginDTO; import tech.jhipster.web.util.PaginationUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/CustomMetricsExtension.java b/src/main/java/de/tum/cit/aet/artemis/core/web/CustomMetricsExtension.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/CustomMetricsExtension.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/CustomMetricsExtension.java index b14351457a1e..ed42316de84c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/CustomMetricsExtension.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/CustomMetricsExtension.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.core.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/DataExportResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/DataExportResource.java index c995ff0656ad..b0b19f6481ab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/DataExportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/DataExportResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.core.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -31,8 +31,8 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.service.export.DataExportService; -import de.tum.cit.aet.artemis.web.rest.dto.DataExportDTO; -import de.tum.cit.aet.artemis.web.rest.dto.RequestDataExportDTO; +import de.tum.cit.aet.artemis.core.dto.DataExportDTO; +import de.tum.cit.aet.artemis.core.dto.RequestDataExportDTO; /** * REST controller for data exports. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/FileResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/FileResource.java index be7ca6c5eac2..e07aad61dd84 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/FileResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.core.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/GuidedTourSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/GuidedTourSettingsResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/GuidedTourSettingsResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/GuidedTourSettingsResource.java index 5ca35c110cc9..35772946b594 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/GuidedTourSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/GuidedTourSettingsResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.core.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/LectureResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/LectureResource.java index d6c7c9322d5a..818aaf948bd5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LectureResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/LectureResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.core.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -49,8 +49,8 @@ import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.service.LectureImportService; import de.tum.cit.aet.artemis.lecture.service.LectureService; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; /** * REST controller for managing Lecture. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/OrganizationResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/OrganizationResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/OrganizationResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/OrganizationResource.java index 9c7b36a3ec32..2e4a529747c6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/OrganizationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/OrganizationResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.core.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/PlantUmlResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/PlantUmlResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/PlantUmlResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/PlantUmlResource.java index e4def890e420..b855ec1fb984 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/PlantUmlResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/PlantUmlResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.core.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.util.TimeLogUtil.formatDurationFrom; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/StatisticsResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/StatisticsResource.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/StatisticsResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/StatisticsResource.java index 54ecf8f08ac8..f765fb307690 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/StatisticsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/StatisticsResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.core.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -22,8 +22,8 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.StatisticsService; -import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementStatisticsDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExerciseManagementStatisticsDTO; +import de.tum.cit.aet.artemis.core.dto.CourseManagementStatisticsDTO; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseManagementStatisticsDTO; /** * REST controller for managing statistics. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/TeamWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/core/web/TeamWebsocketService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/web/websocket/team/TeamWebsocketService.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/TeamWebsocketService.java index d579dac78f43..71055a46560c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/TeamWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/TeamWebsocketService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.websocket.team; +package de.tum.cit.aet.artemis.core.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -17,7 +17,7 @@ import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.web.websocket.dto.TeamAssignmentPayload; +import de.tum.cit.aet.artemis.exercise.dto.TeamAssignmentPayload; @Profile(PROFILE_CORE) @Controller diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/UserResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/UserResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/UserResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/UserResource.java index c9dccd0ad40e..7ec20b0d880a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/UserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/UserResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.core.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java index bcd672ce26c8..156ead184c88 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java @@ -29,7 +29,7 @@ import de.tum.cit.aet.artemis.service.dto.BuildJobResultCountDTO; import de.tum.cit.aet.artemis.service.dto.BuildJobsStatisticsDTO; import de.tum.cit.aet.artemis.service.dto.FinishedBuildJobDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.FinishedBuildJobPageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.FinishedBuildJobPageableSearchDTO; import tech.jhipster.web.util.PaginationUtil; @Profile(PROFILE_LOCALCI) diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminDataExportResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminDataExportResource.java index a710dda545d8..c494cbe512f6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminDataExportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminDataExportResource.java @@ -11,7 +11,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.core.service.export.DataExportService; -import de.tum.cit.aet.artemis.web.rest.dto.RequestDataExportDTO; +import de.tum.cit.aet.artemis.core.dto.RequestDataExportDTO; /** * REST controller for requesting data exports for another user as admin. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminImprintResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminImprintResource.java index ef6bc3f4b578..7af396570e77 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminImprintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminImprintResource.java @@ -16,7 +16,7 @@ import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.service.LegalDocumentService; -import de.tum.cit.aet.artemis.web.rest.dto.ImprintDTO; +import de.tum.cit.aet.artemis.core.dto.ImprintDTO; /** * REST controller for editing the imprint as an admin. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminOrganizationResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminOrganizationResource.java index 5b2c8df0e4ae..0afe380fe586 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminOrganizationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminOrganizationResource.java @@ -30,7 +30,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.service.OrganizationService; -import de.tum.cit.aet.artemis.web.rest.dto.OrganizationCountDTO; +import de.tum.cit.aet.artemis.core.dto.OrganizationCountDTO; /** * REST controller for administrating the Organization entities diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminPrivacyStatementResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminPrivacyStatementResource.java index 7743ecb4beb0..c385f699a091 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminPrivacyStatementResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminPrivacyStatementResource.java @@ -16,7 +16,7 @@ import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.service.LegalDocumentService; -import de.tum.cit.aet.artemis.web.rest.dto.PrivacyStatementDTO; +import de.tum.cit.aet.artemis.core.dto.PrivacyStatementDTO; /** * REST controller for editing the Privacy Statement as an admin. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStandardizedCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStandardizedCompetencyResource.java index ceb4e01f0ec4..41ac053c8de0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStandardizedCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStandardizedCompetencyResource.java @@ -28,11 +28,11 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaRequestDTO; -import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaResultDTO; -import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO; -import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyRequestDTO; -import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyResultDTO; +import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.KnowledgeAreaRequestDTO; +import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.KnowledgeAreaResultDTO; +import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO; +import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyRequestDTO; +import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyResultDTO; /** * Admin REST controller for managing {@link StandardizedCompetency} entities. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java index 50b2260cf191..059030f886b0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java @@ -44,7 +44,7 @@ import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.service.dto.UserDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.UserPageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.UserPageableSearchDTO; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.PaginationUtil; import tech.jhipster.web.util.ResponseUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicImprintResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicImprintResource.java index 5368cd6f51bc..9b71df4b361b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicImprintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicImprintResource.java @@ -14,7 +14,7 @@ import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.service.LegalDocumentService; -import de.tum.cit.aet.artemis.web.rest.dto.ImprintDTO; +import de.tum.cit.aet.artemis.core.dto.ImprintDTO; /** * REST controller for retrieving the imprint. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicPrivacyStatementResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicPrivacyStatementResource.java index eb053f213fa2..8bd134a708d8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicPrivacyStatementResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicPrivacyStatementResource.java @@ -14,7 +14,7 @@ import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.service.LegalDocumentService; -import de.tum.cit.aet.artemis.web.rest.dto.PrivacyStatementDTO; +import de.tum.cit.aet.artemis.core.dto.PrivacyStatementDTO; /** * REST controller for retrieving the Privacy Statement. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamAttendanceCheckEvent.java b/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamAttendanceCheckEvent.java index 952db3db9555..01a37bf34750 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamAttendanceCheckEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamAttendanceCheckEvent.java @@ -4,7 +4,7 @@ import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; -import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamAttendanceCheckEventDTO; +import de.tum.cit.aet.artemis.exam.dto.examevent.ExamAttendanceCheckEventDTO; /** * An event indicating an attendance check trigger during an exam. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamLiveEvent.java b/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamLiveEvent.java index d6ba3fd0f752..d1266fa24644 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamLiveEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamLiveEvent.java @@ -18,7 +18,7 @@ import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.exam.service.ExamLiveEventsService; -import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamLiveEventBaseDTO; +import de.tum.cit.aet.artemis.exam.dto.examevent.ExamLiveEventBaseDTO; /** * Base class for all exam live events. An exam live event indicates that an event or change has occurred during an exam. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamWideAnnouncementEvent.java b/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamWideAnnouncementEvent.java index 33cb9470cb96..259594321c68 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamWideAnnouncementEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamWideAnnouncementEvent.java @@ -4,7 +4,7 @@ import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; -import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamWideAnnouncementEventDTO; +import de.tum.cit.aet.artemis.exam.dto.examevent.ExamWideAnnouncementEventDTO; /** * An exam wide announcement event. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ProblemStatementUpdateEvent.java b/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ProblemStatementUpdateEvent.java index 424c947545ce..f5a0600ee5f0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ProblemStatementUpdateEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ProblemStatementUpdateEvent.java @@ -4,7 +4,7 @@ import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; -import de.tum.cit.aet.artemis.web.rest.dto.examevent.ProblemStatementUpdateEventDTO; +import de.tum.cit.aet.artemis.exam.dto.examevent.ProblemStatementUpdateEventDTO; /** * An event indicating an update of the problem statement of an exercise during an exam. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/WorkingTimeUpdateEvent.java b/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/WorkingTimeUpdateEvent.java index d25cb16b9d8a..8609533db8a7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/WorkingTimeUpdateEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/WorkingTimeUpdateEvent.java @@ -4,7 +4,7 @@ import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; -import de.tum.cit.aet.artemis.web.rest.dto.examevent.WorkingTimeUpdateEventDTO; +import de.tum.cit.aet.artemis.exam.dto.examevent.WorkingTimeUpdateEventDTO; /** * An event indicating an updated working time for a specific student exam. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamChecklistDTO.java b/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamChecklistDTO.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamChecklistDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamChecklistDTO.java index 51dfe2fb3973..297fe54905f8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamChecklistDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamChecklistDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.exam.dto; import jakarta.annotation.Nullable; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamInformationDTO.java b/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamInformationDTO.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamInformationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamInformationDTO.java index 2d04c49d480c..fb2e2e49fcbc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamInformationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamInformationDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.exam.dto; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamScoresDTO.java b/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamScoresDTO.java similarity index 74% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamScoresDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamScoresDTO.java index 637ec022eeae..b01ea969358e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamScoresDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamScoresDTO.java @@ -1,10 +1,11 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.exam.dto; import java.util.List; import java.util.Map; import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.assessment.dto.BonusResultDTO; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; @JsonInclude(JsonInclude.Include.NON_EMPTY) @@ -23,8 +24,8 @@ public record ExerciseInfo(Long exerciseId, String title, Double maxPoints, Long // Inner DTO @JsonInclude(JsonInclude.Include.NON_EMPTY) public record StudentResult(Long userId, String name, String email, String login, String registrationNumber, Boolean submitted, Double overallPointsAchieved, - Double overallScoreAchieved, String overallGrade, String overallGradeInFirstCorrection, Boolean hasPassed, Double overallPointsAchievedInFirstCorrection, - BonusResultDTO gradeWithBonus, Map exerciseGroupIdToExerciseResult, PlagiarismVerdict mostSeverePlagiarismVerdict) { + Double overallScoreAchieved, String overallGrade, String overallGradeInFirstCorrection, Boolean hasPassed, Double overallPointsAchievedInFirstCorrection, + BonusResultDTO gradeWithBonus, Map exerciseGroupIdToExerciseResult, PlagiarismVerdict mostSeverePlagiarismVerdict) { } // Inner DTO diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamSessionDTO.java b/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamSessionDTO.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamSessionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamSessionDTO.java index 8b43febbe5ee..8ede0c471be9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamSessionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamSessionDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.exam.dto; import java.time.Instant; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamUserAttendanceCheckDTO.java b/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamUserAttendanceCheckDTO.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamUserAttendanceCheckDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamUserAttendanceCheckDTO.java index 48474c9ef65d..81804d96e687 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamUserAttendanceCheckDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamUserAttendanceCheckDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.exam.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamUserDTO.java b/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamUserDTO.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamUserDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamUserDTO.java index 9387ff0e32de..d8c832245c16 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamUserDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamUserDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.exam.dto; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.Size; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamUsersNotFoundDTO.java b/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamUsersNotFoundDTO.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamUsersNotFoundDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamUsersNotFoundDTO.java index 02e20b4ca5f5..048d0d6c7bbc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamUsersNotFoundDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamUsersNotFoundDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.exam.dto; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamWithIdAndCourseDTO.java b/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamWithIdAndCourseDTO.java similarity index 64% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamWithIdAndCourseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamWithIdAndCourseDTO.java index a1c3ad1ecbd6..de3f85b768d6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExamWithIdAndCourseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamWithIdAndCourseDTO.java @@ -1,6 +1,7 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.exam.dto; import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.dto.CourseWithIdDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ExamWithIdAndCourseDTO(long id, CourseWithIdDTO course) { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StudentExamWithGradeDTO.java b/src/main/java/de/tum/cit/aet/artemis/exam/dto/StudentExamWithGradeDTO.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StudentExamWithGradeDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exam/dto/StudentExamWithGradeDTO.java index b956a791a56e..135b903cf51a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StudentExamWithGradeDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/dto/StudentExamWithGradeDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.exam.dto; import java.util.Map; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StudentExamWithIdAndExamAndUserDTO.java b/src/main/java/de/tum/cit/aet/artemis/exam/dto/StudentExamWithIdAndExamAndUserDTO.java similarity index 67% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StudentExamWithIdAndExamAndUserDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exam/dto/StudentExamWithIdAndExamAndUserDTO.java index a58023d8b131..84da7757de9f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/StudentExamWithIdAndExamAndUserDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/dto/StudentExamWithIdAndExamAndUserDTO.java @@ -1,6 +1,7 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.exam.dto; import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.dto.UserWithIdAndLoginDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record StudentExamWithIdAndExamAndUserDTO(long id, ExamWithIdAndCourseDTO exam, UserWithIdAndLoginDTO user) { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SuspiciousExamSessionsDTO.java b/src/main/java/de/tum/cit/aet/artemis/exam/dto/SuspiciousExamSessionsDTO.java similarity index 67% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SuspiciousExamSessionsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exam/dto/SuspiciousExamSessionsDTO.java index 7ea072f70120..ba93eb43d7a3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SuspiciousExamSessionsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/dto/SuspiciousExamSessionsDTO.java @@ -1,8 +1,9 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.exam.dto; import java.util.Set; import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.exam.dto.ExamSessionDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record SuspiciousExamSessionsDTO(Set examSessions) { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamAttendanceCheckEventDTO.java b/src/main/java/de/tum/cit/aet/artemis/exam/dto/examevent/ExamAttendanceCheckEventDTO.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamAttendanceCheckEventDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exam/dto/examevent/ExamAttendanceCheckEventDTO.java index 98d88a959450..4afc0447e32d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamAttendanceCheckEventDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/dto/examevent/ExamAttendanceCheckEventDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.examevent; +package de.tum.cit.aet.artemis.exam.dto.examevent; import java.time.Instant; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamLiveEventBaseDTO.java b/src/main/java/de/tum/cit/aet/artemis/exam/dto/examevent/ExamLiveEventBaseDTO.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamLiveEventBaseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exam/dto/examevent/ExamLiveEventBaseDTO.java index bd2b9430926a..6df43972b309 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamLiveEventBaseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/dto/examevent/ExamLiveEventBaseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.examevent; +package de.tum.cit.aet.artemis.exam.dto.examevent; import java.time.Instant; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamWideAnnouncementEventDTO.java b/src/main/java/de/tum/cit/aet/artemis/exam/dto/examevent/ExamWideAnnouncementEventDTO.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamWideAnnouncementEventDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exam/dto/examevent/ExamWideAnnouncementEventDTO.java index 7d7414094844..f46077c49fb6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ExamWideAnnouncementEventDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/dto/examevent/ExamWideAnnouncementEventDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.examevent; +package de.tum.cit.aet.artemis.exam.dto.examevent; import java.time.Instant; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ProblemStatementUpdateEventDTO.java b/src/main/java/de/tum/cit/aet/artemis/exam/dto/examevent/ProblemStatementUpdateEventDTO.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ProblemStatementUpdateEventDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exam/dto/examevent/ProblemStatementUpdateEventDTO.java index 510ee84c14b9..6312aa1fa7da 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/ProblemStatementUpdateEventDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/dto/examevent/ProblemStatementUpdateEventDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.examevent; +package de.tum.cit.aet.artemis.exam.dto.examevent; import java.time.Instant; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/WorkingTimeUpdateEventDTO.java b/src/main/java/de/tum/cit/aet/artemis/exam/dto/examevent/WorkingTimeUpdateEventDTO.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/WorkingTimeUpdateEventDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exam/dto/examevent/WorkingTimeUpdateEventDTO.java index a8efe37de0a8..dbb2a5b42af5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/examevent/WorkingTimeUpdateEventDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/dto/examevent/WorkingTimeUpdateEventDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.examevent; +package de.tum.cit.aet.artemis.exam.dto.examevent; import java.time.Instant; diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamRepository.java b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamRepository.java index 1940dd2c3a1d..94348a425783 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamRepository.java @@ -28,7 +28,7 @@ import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.web.rest.dto.CourseContentCount; +import de.tum.cit.aet.artemis.core.dto.CourseContentCount; /** * Spring Data JPA repository for the ExamRepository entity. @@ -82,7 +82,7 @@ Set findByCourseIdsForUser(@Param("courseIds") Set courseIds, @Param @Param("now") ZonedDateTime now); @Query(""" - SELECT new de.tum.cit.aet.artemis.web.rest.dto.CourseContentCount( + SELECT new de.tum.cit.aet.artemis.core.dto.CourseContentCount( COUNT(e.id), e.course.id ) diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamUserRepository.java b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamUserRepository.java index 3c98d36c6cef..ea2d6ed4b610 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamUserRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamUserRepository.java @@ -15,7 +15,7 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.exam.domain.ExamUser; -import de.tum.cit.aet.artemis.web.rest.dto.ExamUserAttendanceCheckDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamUserAttendanceCheckDTO; @Profile(PROFILE_CORE) @Repository @@ -35,7 +35,7 @@ public interface ExamUserRepository extends ArtemisJpaRepository List findAllByExamId(long examId); @Query(""" - SELECT new de.tum.cit.aet.artemis.web.rest.dto.ExamUserAttendanceCheckDTO( + SELECT new de.tum.cit.aet.artemis.exam.dto.ExamUserAttendanceCheckDTO( examUser.id, examUser.studentImagePath, examUser.user.login, diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamRegistrationService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamRegistrationService.java index 04c099de29e0..5c1e29eff5d0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamRegistrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamRegistrationService.java @@ -37,7 +37,7 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.web.rest.dto.ExamUserDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamUserDTO; /** * Service Implementation for registering students in the exam. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamService.java index 5dd16037f669..0fea2363308b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamService.java @@ -104,17 +104,17 @@ import de.tum.cit.aet.artemis.quiz.service.QuizResultService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; -import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; -import de.tum.cit.aet.artemis.web.rest.dto.BonusResultDTO; -import de.tum.cit.aet.artemis.web.rest.dto.BonusSourceResultDTO; -import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; -import de.tum.cit.aet.artemis.web.rest.dto.ExamChecklistDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExamScoresDTO; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; -import de.tum.cit.aet.artemis.web.rest.dto.StudentExamWithGradeDTO; -import de.tum.cit.aet.artemis.web.rest.dto.TutorLeaderboardDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.assessment.dto.BonusExampleDTO; +import de.tum.cit.aet.artemis.assessment.dto.BonusResultDTO; +import de.tum.cit.aet.artemis.assessment.dto.BonusSourceResultDTO; +import de.tum.cit.aet.artemis.core.dto.DueDateStat; +import de.tum.cit.aet.artemis.exam.dto.ExamChecklistDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamScoresDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; +import de.tum.cit.aet.artemis.exam.dto.StudentExamWithGradeDTO; +import de.tum.cit.aet.artemis.core.dto.TutorLeaderboardDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; /** * Service Implementation for managing exams. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSessionService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSessionService.java index 65d363b99beb..0a17280c3131 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSessionService.java @@ -25,12 +25,12 @@ import de.tum.cit.aet.artemis.exam.domain.SuspiciousSessionsAnalysisOptions; import de.tum.cit.aet.artemis.exam.repository.ExamSessionRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.web.rest.dto.CourseWithIdDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExamSessionDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExamWithIdAndCourseDTO; -import de.tum.cit.aet.artemis.web.rest.dto.StudentExamWithIdAndExamAndUserDTO; -import de.tum.cit.aet.artemis.web.rest.dto.SuspiciousExamSessionsDTO; -import de.tum.cit.aet.artemis.web.rest.dto.UserWithIdAndLoginDTO; +import de.tum.cit.aet.artemis.core.dto.CourseWithIdDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamSessionDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamWithIdAndCourseDTO; +import de.tum.cit.aet.artemis.exam.dto.StudentExamWithIdAndExamAndUserDTO; +import de.tum.cit.aet.artemis.exam.dto.SuspiciousExamSessionsDTO; +import de.tum.cit.aet.artemis.core.dto.UserWithIdAndLoginDTO; import inet.ipaddr.IPAddress; import inet.ipaddr.IPAddressString; diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamUserService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamUserService.java index 187a01b5628e..363969b86982 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamUserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamUserService.java @@ -31,8 +31,8 @@ import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.web.rest.dto.ExamUsersNotFoundDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ImageDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamUsersNotFoundDTO; +import de.tum.cit.aet.artemis.core.dto.ImageDTO; /** * Service Implementation for managing Exam Users. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ImageExtractor.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ImageExtractor.java index 5fbb35ed340f..b7544ca13551 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ImageExtractor.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ImageExtractor.java @@ -25,8 +25,9 @@ import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject; import org.apache.pdfbox.util.Matrix; +import de.tum.cit.aet.artemis.core.dto.ImageDTO; import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; -import de.tum.cit.aet.artemis.web.rest.dto.ImageDTO; +import de.tum.cit.aet.artemis.core.dto.ImageDTO; /** * Processor to extract images from a PDF and get information. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamLockResource.java b/src/main/java/de/tum/cit/aet/artemis/exam/web/ExamLockResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/ExamLockResource.java rename to src/main/java/de/tum/cit/aet/artemis/exam/web/ExamLockResource.java index 67aebbd1b301..d38637bb4d11 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamLockResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/web/ExamLockResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.exam.web; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java b/src/main/java/de/tum/cit/aet/artemis/exam/web/ExamResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java rename to src/main/java/de/tum/cit/aet/artemis/exam/web/ExamResource.java index 37b4e0488133..e1220bee3cf8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/web/ExamResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.exam.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.util.TimeLogUtil.formatDurationFrom; @@ -99,19 +99,19 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.service.dto.StudentDTO; -import de.tum.cit.aet.artemis.web.rest.dto.CourseWithIdDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExamChecklistDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExamInformationDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExamScoresDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExamUserDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExamWithIdAndCourseDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExerciseForPlagiarismCasesOverviewDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExerciseGroupWithIdAndExamDTO; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; -import de.tum.cit.aet.artemis.web.rest.dto.SuspiciousExamSessionsDTO; -import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamWideAnnouncementEventDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.CourseWithIdDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamChecklistDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamInformationDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamScoresDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamUserDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamWithIdAndCourseDTO; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseForPlagiarismCasesOverviewDTO; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseGroupWithIdAndExamDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; +import de.tum.cit.aet.artemis.exam.dto.SuspiciousExamSessionsDTO; +import de.tum.cit.aet.artemis.exam.dto.examevent.ExamWideAnnouncementEventDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.PaginationUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java b/src/main/java/de/tum/cit/aet/artemis/exam/web/ExamUserResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java rename to src/main/java/de/tum/cit/aet/artemis/exam/web/ExamUserResource.java index 40ec4ec5ca25..671d7c283644 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExamUserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/web/ExamUserResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.exam.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -30,9 +30,9 @@ import de.tum.cit.aet.artemis.exam.service.ExamUserService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.web.rest.dto.ExamUserAttendanceCheckDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExamUserDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExamUsersNotFoundDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamUserAttendanceCheckDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamUserDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamUsersNotFoundDTO; /** * REST controller for managing ExamUser. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/exam/web/ExampleSubmissionResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java rename to src/main/java/de/tum/cit/aet/artemis/exam/web/ExampleSubmissionResource.java index f52384d727fc..e8220cd98b5e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExampleSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/web/ExampleSubmissionResource.java @@ -1,5 +1,5 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.exam.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java b/src/main/java/de/tum/cit/aet/artemis/exam/web/ExerciseGroupResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java rename to src/main/java/de/tum/cit/aet/artemis/exam/web/ExerciseGroupResource.java index 31db34b67cf0..2593102ed063 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseGroupResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/web/ExerciseGroupResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.exam.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java b/src/main/java/de/tum/cit/aet/artemis/exam/web/StudentExamResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java rename to src/main/java/de/tum/cit/aet/artemis/exam/web/StudentExamResource.java index ff260a33bed7..73bcf60d09ef 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/StudentExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/web/StudentExamResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.exam.web; import static de.tum.cit.aet.artemis.core.config.Constants.EXAM_START_WAIT_TIME_MINUTES; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -72,9 +72,9 @@ import de.tum.cit.aet.artemis.programming.repository.SubmissionPolicyRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.web.rest.dto.StudentExamWithGradeDTO; -import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamAttendanceCheckEventDTO; -import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamLiveEventBaseDTO; +import de.tum.cit.aet.artemis.exam.dto.StudentExamWithGradeDTO; +import de.tum.cit.aet.artemis.exam.dto.examevent.ExamAttendanceCheckEventDTO; +import de.tum.cit.aet.artemis.exam.dto.examevent.ExamLiveEventBaseDTO; /** * REST controller for managing ExerciseGroup. diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java index 8d3bc00d2a23..ca4e4111dc81 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java @@ -74,7 +74,7 @@ import de.tum.cit.aet.artemis.quiz.config.QuizView; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.text.domain.TextExercise; -import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; +import de.tum.cit.aet.artemis.core.dto.DueDateStat; /** * An Exercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDTO.java b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseDTO.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseDTO.java index f4ca3f3444be..39a2f1294a20 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.exercise.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDetailsDTO.java b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseDetailsDTO.java similarity index 81% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDetailsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseDetailsDTO.java index 280a32c7cc14..a95bbd761bd4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseDetailsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseDetailsDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.exercise.dto; import java.util.Set; @@ -7,7 +7,7 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.iris.dto.IrisCombinedSettingsDTO; import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; -import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismCaseInfoDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ExerciseDetailsDTO(Exercise exercise, IrisCombinedSettingsDTO irisSettings, PlagiarismCaseInfoDTO plagiarismCaseInfo, Set availableExerciseHints, diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseForPlagiarismCasesOverviewDTO.java b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseForPlagiarismCasesOverviewDTO.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseForPlagiarismCasesOverviewDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseForPlagiarismCasesOverviewDTO.java index e9e9504041f0..99ce31c94bbf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseForPlagiarismCasesOverviewDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseForPlagiarismCasesOverviewDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.exercise.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseGroupWithIdAndExamDTO.java b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseGroupWithIdAndExamDTO.java similarity index 63% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseGroupWithIdAndExamDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseGroupWithIdAndExamDTO.java index 789d1f758945..69c94228ef63 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseGroupWithIdAndExamDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseGroupWithIdAndExamDTO.java @@ -1,6 +1,7 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.exercise.dto; import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.exam.dto.ExamWithIdAndCourseDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ExerciseGroupWithIdAndExamDTO(long id, ExamWithIdAndCourseDTO exam) { diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ExerciseInformationDTO.java b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseInformationDTO.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ExerciseInformationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseInformationDTO.java index 36fa2b019d10..557f3089088a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/metrics/ExerciseInformationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseInformationDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.metrics; +package de.tum.cit.aet.artemis.exercise.dto; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseManagementStatisticsDTO.java b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseManagementStatisticsDTO.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseManagementStatisticsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseManagementStatisticsDTO.java index 4e71b806979f..23f598c74cab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseManagementStatisticsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseManagementStatisticsDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.exercise.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseScoresAggregatedInformation.java b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseScoresAggregatedInformation.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseScoresAggregatedInformation.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseScoresAggregatedInformation.java index fe603ed9b056..5a1f9aa53e85 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseScoresAggregatedInformation.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseScoresAggregatedInformation.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.exercise.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseScoresDTO.java b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseScoresDTO.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseScoresDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseScoresDTO.java index cfd284cffb26..43f0ea4c36f1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ExerciseScoresDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseScoresDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.exercise.dto; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationDTO.java b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ParticipationDTO.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/dto/ParticipationDTO.java index 567a3475e2a5..514c558ab57c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ParticipationDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.exercise.dto; import java.io.Serializable; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationResultDTO.java b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ParticipationResultDTO.java similarity index 80% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationResultDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/dto/ParticipationResultDTO.java index eb9c066a1bd9..6ce2fa060aa0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationResultDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ParticipationResultDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.exercise.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationWithExerciseDTO.java b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ParticipationWithExerciseDTO.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationWithExerciseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/dto/ParticipationWithExerciseDTO.java index 656d81877d52..3e1e460dd033 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/ParticipationWithExerciseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ParticipationWithExerciseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.exercise.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionDTO.java b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionDTO.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionDTO.java index 5f1585ead642..96945613f0c6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.exercise.dto; import java.io.Serializable; import java.time.ZonedDateTime; @@ -15,7 +15,7 @@ */ @JsonInclude(JsonInclude.Include.NON_EMPTY) public record SubmissionDTO(Long id, Boolean submitted, SubmissionType type, Boolean exampleSubmission, ZonedDateTime submissionDate, String commitHash, Boolean buildFailed, - Boolean buildArtifact, ParticipationDTO participation, String submissionExerciseType) implements Serializable { + Boolean buildArtifact, ParticipationDTO participation, String submissionExerciseType) implements Serializable { /** * Converts a Submission into a SubmissionDTO. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionExportOptionsDTO.java b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionExportOptionsDTO.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionExportOptionsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionExportOptionsDTO.java index 388f7d999f43..11fae975c28a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionExportOptionsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionExportOptionsDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.exercise.dto; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/SubmissionPatch.java b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionPatch.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/SubmissionPatch.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionPatch.java index 563924eae593..8be86c19cd1d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/SubmissionPatch.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionPatch.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.websocket.dto; +package de.tum.cit.aet.artemis.exercise.dto; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.JsonNode; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/SubmissionPatchPayload.java b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionPatchPayload.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/SubmissionPatchPayload.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionPatchPayload.java index 054dc0ad2dea..6f4ec1e73079 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/SubmissionPatchPayload.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionPatchPayload.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.websocket.dto; +package de.tum.cit.aet.artemis.exercise.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/SubmissionSyncPayload.java b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionSyncPayload.java similarity index 84% rename from src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/SubmissionSyncPayload.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionSyncPayload.java index c0dc8a36e2f2..a8eac869adbf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/SubmissionSyncPayload.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionSyncPayload.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.websocket.dto; +package de.tum.cit.aet.artemis.exercise.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionVersionDTO.java b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionVersionDTO.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionVersionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionVersionDTO.java index d0e0620b3314..702643cb8ffe 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionVersionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionVersionDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.exercise.dto; import java.time.Instant; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionWithComplaintDTO.java b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionWithComplaintDTO.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionWithComplaintDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionWithComplaintDTO.java index 019817d21fda..e84284c392a6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionWithComplaintDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionWithComplaintDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.exercise.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionWithParticipationDTO.java b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionWithParticipationDTO.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionWithParticipationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionWithParticipationDTO.java index 688ed63ae9ce..29d7cd89a4a5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/SubmissionWithParticipationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionWithParticipationDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.exercise.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/TeamAssignmentPayload.java b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/TeamAssignmentPayload.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/TeamAssignmentPayload.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/dto/TeamAssignmentPayload.java index 2fb00179b093..cdecac141276 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/TeamAssignmentPayload.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/TeamAssignmentPayload.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.websocket.dto; +package de.tum.cit.aet.artemis.exercise.dto; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseMetricsRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseMetricsRepository.java index f9988dd63817..8aa1fd366c62 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseMetricsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseMetricsRepository.java @@ -13,10 +13,10 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.web.rest.dto.metrics.ExerciseInformationDTO; -import de.tum.cit.aet.artemis.web.rest.dto.metrics.MapEntryLongLong; -import de.tum.cit.aet.artemis.web.rest.dto.metrics.ResourceTimestampDTO; -import de.tum.cit.aet.artemis.web.rest.dto.metrics.ScoreDTO; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseInformationDTO; +import de.tum.cit.aet.artemis.atlas.dto.metrics.MapEntryLongLong; +import de.tum.cit.aet.artemis.atlas.dto.metrics.ResourceTimestampDTO; +import de.tum.cit.aet.artemis.atlas.dto.metrics.ScoreDTO; /** * Spring Data JPA repository to fetch exercise related metrics. @@ -32,7 +32,7 @@ public interface ExerciseMetricsRepository extends ArtemisJpaRepository= :minScore * @return MapEntryDTO with exercise id and team id */ @Query(""" - SELECT new de.tum.cit.aet.artemis.web.rest.dto.metrics.MapEntryLongLong(e.id, t.id) + SELECT new de.tum.cit.aet.artemis.atlas.dto.metrics.MapEntryLongLong(e.id, t.id) FROM Exercise e LEFT JOIN e.teams t LEFT JOIN t.students u diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java index e72cc563b504..dc6895c030e6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java @@ -10,6 +10,7 @@ import java.util.Optional; import java.util.Set; +import de.tum.cit.aet.artemis.exam.web.ExamResource; import jakarta.validation.constraints.NotNull; import org.springframework.cache.annotation.Cacheable; @@ -603,7 +604,7 @@ void revokeAccessToRestrictedFeedbackSuggestionModulesByCourseId(@Param("courseI @Param("restrictedFeedbackSuggestionModule") Collection restrictedFeedbackSuggestionModule); /** - * For an explanation, see {@link de.tum.cit.aet.artemis.web.rest.ExamResource#getAllExercisesWithPotentialPlagiarismForExam(long, long)} + * For an explanation, see {@link ExamResource#getAllExercisesWithPotentialPlagiarismForExam(long, long)} * * @param examId the id of the exam for which we want to get all exercises with potential plagiarism * @return a list of exercises with potential plagiarism diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java index 24e02ea48e34..439091c4bfb1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java @@ -40,7 +40,7 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.IdToPresentationScoreSum; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmittedAnswerCount; -import de.tum.cit.aet.artemis.web.rest.dto.feedback.FeedbackDetailDTO; +import de.tum.cit.aet.artemis.assessment.dto.FeedbackDetailDTO; /** * Spring Data JPA repository for the Participation entity. @@ -1242,7 +1242,7 @@ SELECT COALESCE(AVG(p.presentationScore), 0) * @return a list of {@link FeedbackDetailDTO} objects, with the relative count and task number set to 0. */ @Query(""" - SELECT new de.tum.cit.aet.artemis.web.rest.dto.feedback.FeedbackDetailDTO( + SELECT new de.tum.cit.aet.artemis.assessment.dto.FeedbackDetailDTO( COUNT(f.id), 0, f.detailText, diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java index d9b6f96973e1..2cd1092813bf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java @@ -33,7 +33,7 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; -import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; +import de.tum.cit.aet.artemis.core.dto.DueDateStat; /** * Spring Data repository for the Submission entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseScoresChartService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseScoresChartService.java index 144d386145ee..87ff35dbb8f5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseScoresChartService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseScoresChartService.java @@ -20,8 +20,8 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; -import de.tum.cit.aet.artemis.web.rest.dto.ExerciseScoresAggregatedInformation; -import de.tum.cit.aet.artemis.web.rest.dto.ExerciseScoresDTO; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseScoresAggregatedInformation; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseScoresDTO; /** * Service to efficiently calculate the statistics for the exercise-scores-chart.component.ts in the client diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseService.java index bccad3d8a998..620357e66bc0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseService.java @@ -68,10 +68,10 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.service.QuizBatchService; -import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementOverviewExerciseStatisticsDTO; -import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; -import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; -import de.tum.cit.aet.artemis.web.rest.dto.TutorLeaderboardDTO; +import de.tum.cit.aet.artemis.core.dto.CourseManagementOverviewExerciseStatisticsDTO; +import de.tum.cit.aet.artemis.core.dto.DueDateStat; +import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; +import de.tum.cit.aet.artemis.core.dto.TutorLeaderboardDTO; /** * Service Implementation for managing Exercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseSpecificationService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseSpecificationService.java index fd3872042db4..be192bffb113 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseSpecificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseSpecificationService.java @@ -26,7 +26,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseService; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseWithSubmissionsExportService.java index 07fc2a6af0c6..a51823f24d14 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseWithSubmissionsExportService.java @@ -27,7 +27,7 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionExportOptionsDTO; /** * Service for exporting Exercises with the student submissions. diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/LearningMetricsService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/LearningMetricsService.java index 43b9ec039fe6..78a2041f0b8d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/LearningMetricsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/LearningMetricsService.java @@ -21,18 +21,18 @@ import de.tum.cit.aet.artemis.atlas.repository.CompetencyMetricsRepository; import de.tum.cit.aet.artemis.exercise.repository.ExerciseMetricsRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitMetricsRepository; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO; -import de.tum.cit.aet.artemis.web.rest.dto.metrics.CompetencyInformationDTO; -import de.tum.cit.aet.artemis.web.rest.dto.metrics.CompetencyProgressDTO; -import de.tum.cit.aet.artemis.web.rest.dto.metrics.CompetencyStudentMetricsDTO; -import de.tum.cit.aet.artemis.web.rest.dto.metrics.ExerciseInformationDTO; -import de.tum.cit.aet.artemis.web.rest.dto.metrics.ExerciseStudentMetricsDTO; -import de.tum.cit.aet.artemis.web.rest.dto.metrics.LectureUnitInformationDTO; -import de.tum.cit.aet.artemis.web.rest.dto.metrics.LectureUnitStudentMetricsDTO; -import de.tum.cit.aet.artemis.web.rest.dto.metrics.MapEntryLongLong; -import de.tum.cit.aet.artemis.web.rest.dto.metrics.ResourceTimestampDTO; -import de.tum.cit.aet.artemis.web.rest.dto.metrics.ScoreDTO; -import de.tum.cit.aet.artemis.web.rest.dto.metrics.StudentMetricsDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyJolDTO; +import de.tum.cit.aet.artemis.atlas.dto.metrics.CompetencyInformationDTO; +import de.tum.cit.aet.artemis.atlas.dto.metrics.CompetencyProgressDTO; +import de.tum.cit.aet.artemis.atlas.dto.metrics.CompetencyStudentMetricsDTO; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseInformationDTO; +import de.tum.cit.aet.artemis.atlas.dto.metrics.ExerciseStudentMetricsDTO; +import de.tum.cit.aet.artemis.atlas.dto.metrics.LectureUnitInformationDTO; +import de.tum.cit.aet.artemis.atlas.dto.metrics.LectureUnitStudentMetricsDTO; +import de.tum.cit.aet.artemis.atlas.dto.metrics.MapEntryLongLong; +import de.tum.cit.aet.artemis.atlas.dto.metrics.ResourceTimestampDTO; +import de.tum.cit.aet.artemis.atlas.dto.metrics.ScoreDTO; +import de.tum.cit.aet.artemis.atlas.dto.metrics.StudentMetricsDTO; /** * Service class to access metrics regarding students' learning progress. diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionExportService.java index f1aeb5a5cd75..9ca97f58017d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionExportService.java @@ -34,7 +34,7 @@ import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ZipFileService; -import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionExportOptionsDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamService.java index 08cee3f54661..477180c2b241 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamService.java @@ -31,7 +31,7 @@ import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.dto.TeamSearchUserDTO; -import de.tum.cit.aet.artemis.web.rest.TeamResource; +import de.tum.cit.aet.artemis.exercise.web.TeamResource; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ConsistencyCheckResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ConsistencyCheckResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/ConsistencyCheckResource.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/web/ConsistencyCheckResource.java index 23d3880b7e6b..1449cbe7c774 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ConsistencyCheckResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ConsistencyCheckResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.exercise.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ExerciseResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/web/ExerciseResource.java index 0663cf07386f..bb44553db3c0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ExerciseResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.exercise.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -58,9 +58,9 @@ import de.tum.cit.aet.artemis.quiz.service.QuizBatchService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorParticipationStatus; -import de.tum.cit.aet.artemis.web.rest.dto.ExerciseDetailsDTO; -import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; -import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseDetailsDTO; +import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismCaseInfoDTO; /** * REST controller for managing Exercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseScoresChartResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ExerciseScoresChartResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseScoresChartResource.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/web/ExerciseScoresChartResource.java index 84889a183a01..bb8d6037316b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ExerciseScoresChartResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ExerciseScoresChartResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.exercise.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -25,7 +25,7 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.exercise.service.ExerciseScoresChartService; -import de.tum.cit.aet.artemis.web.rest.dto.ExerciseScoresDTO; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseScoresDTO; /** * Controller to provides endpoints to query the necessary data for the exercise-scores-chart.component.ts in the client diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipantScoreResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipantScoreResource.java index 00cfeca2806d..9213c3f409a6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipantScoreResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipantScoreResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.exercise.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -22,7 +22,7 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; -import de.tum.cit.aet.artemis.web.rest.dto.score.ScoreDTO; +import de.tum.cit.aet.artemis.assessment.dto.score.ScoreDTO; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java index db05960a1b42..aea708e1c992 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/ParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.exercise.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static java.time.ZonedDateTime.now; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/ParticipationTeamWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationTeamWebsocketService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/websocket/team/ParticipationTeamWebsocketService.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationTeamWebsocketService.java index 84f7030db173..243202422ef3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/team/ParticipationTeamWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationTeamWebsocketService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.websocket.team; +package de.tum.cit.aet.artemis.exercise.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -47,10 +47,10 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.service.TextSubmissionService; -import de.tum.cit.aet.artemis.web.websocket.dto.OnlineTeamStudentDTO; -import de.tum.cit.aet.artemis.web.websocket.dto.SubmissionPatch; -import de.tum.cit.aet.artemis.web.websocket.dto.SubmissionPatchPayload; -import de.tum.cit.aet.artemis.web.websocket.dto.SubmissionSyncPayload; +import de.tum.cit.aet.artemis.programming.dto.OnlineTeamStudentDTO; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionPatch; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionPatchPayload; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionSyncPayload; @Controller @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/SubmissionPolicyResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/web/SubmissionPolicyResource.java index 3fa9625c015f..b27e75ec1afc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionPolicyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/SubmissionPolicyResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.exercise.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/SubmissionResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/web/SubmissionResource.java index dc0fa61bacd5..b9e2a903cdde 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/SubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/SubmissionResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.exercise.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -41,10 +41,10 @@ import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.service.SubmissionService; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.web.rest.dto.SubmissionVersionDTO; -import de.tum.cit.aet.artemis.web.rest.dto.SubmissionWithComplaintDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionVersionDTO; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionWithComplaintDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; /** * REST controller for managing Submission. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/TeamResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/web/TeamResource.java index 0ded5a2ed8e5..4f524c27581f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/TeamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/TeamResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.exercise.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.config.Constants.SHORT_NAME_PATTERN; @@ -61,7 +61,7 @@ import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.service.dto.TeamSearchUserDTO; -import de.tum.cit.aet.artemis.web.websocket.team.TeamWebsocketService; +import de.tum.cit.aet.artemis.core.web.TeamWebsocketService; /** * REST controller for managing Teams. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/FileUploadAssessmentDTO.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/dto/FileUploadAssessmentDTO.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/FileUploadAssessmentDTO.java rename to src/main/java/de/tum/cit/aet/artemis/fileupload/dto/FileUploadAssessmentDTO.java index b58a97b218da..461eb620d62a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/FileUploadAssessmentDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/dto/FileUploadAssessmentDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.fileupload.dto; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseService.java index 79e534678d2d..29dbe04709e8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseService.java @@ -14,8 +14,8 @@ import de.tum.cit.aet.artemis.exercise.service.ExerciseSpecificationService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseWithSubmissionsExportService.java index 5c63b641cf4d..913dc381b091 100644 --- a/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseWithSubmissionsExportService.java @@ -13,7 +13,7 @@ import de.tum.cit.aet.artemis.exercise.service.ExerciseWithSubmissionsExportService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionExportOptionsDTO; /** * Service for exporting File Upload Exercises with the student submissions. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/web/FileUploadAssessmentResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java rename to src/main/java/de/tum/cit/aet/artemis/fileupload/web/FileUploadAssessmentResource.java index 92d616e214da..b26582077552 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/web/FileUploadAssessmentResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.fileupload.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -36,8 +36,8 @@ import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadSubmissionRepository; -import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; -import de.tum.cit.aet.artemis.web.rest.dto.FileUploadAssessmentDTO; +import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; +import de.tum.cit.aet.artemis.fileupload.dto.FileUploadAssessmentDTO; /** * REST controller for managing FileUploadAssessment. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/web/FileUploadExerciseResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java rename to src/main/java/de/tum/cit/aet/artemis/fileupload/web/FileUploadExerciseResource.java index 33d63acc8f23..78d36b269113 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/web/FileUploadExerciseResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.fileupload.web; import static de.tum.cit.aet.artemis.core.config.Constants.FILE_ENDING_PATTERN; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -58,9 +58,9 @@ import de.tum.cit.aet.artemis.fileupload.service.FileUploadExerciseService; import de.tum.cit.aet.artemis.fileupload.service.FileUploadSubmissionExportService; import de.tum.cit.aet.artemis.service.CourseService; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionExportOptionsDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; /** * REST controller for managing FileUploadExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/web/FileUploadSubmissionResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java rename to src/main/java/de/tum/cit/aet/artemis/fileupload/web/FileUploadSubmissionResource.java index 36cde9acfd88..0d7c4a23280f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/FileUploadSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/web/FileUploadSubmissionResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.fileupload.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisPipelineService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisPipelineService.java index 155e396d72b6..232c455c1b46 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisPipelineService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisPipelineService.java @@ -9,6 +9,7 @@ import java.util.function.Consumer; import java.util.function.Function; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyJolDTO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -35,7 +36,6 @@ import de.tum.cit.aet.artemis.iris.service.websocket.IrisChatWebsocketService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO; /** * Service responsible for executing the various Pyris pipelines in a type-safe manner. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java index 6198bfa632e1..5e5d450645fb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java @@ -4,15 +4,15 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyJolDTO; +import de.tum.cit.aet.artemis.atlas.dto.metrics.StudentMetricsDTO; import de.tum.cit.aet.artemis.iris.service.pyris.dto.PyrisPipelineExecutionSettingsDTO; import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisExtendedCourseDTO; import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisMessageDTO; import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisUserDTO; import de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolDTO; -import de.tum.cit.aet.artemis.web.rest.dto.metrics.StudentMetricsDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisCourseChatPipelineExecutionDTO(PyrisExtendedCourseDTO course, StudentMetricsDTO metrics, CompetencyJolDTO competencyJol, List chatHistory, - PyrisUserDTO user, PyrisPipelineExecutionSettingsDTO settings, List initialStages) { + PyrisUserDTO user, PyrisPipelineExecutionSettingsDTO settings, List initialStages) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/lectureunit/LectureUnitForLearningPathNodeDetailsDTO.java b/src/main/java/de/tum/cit/aet/artemis/lecture/dto/LectureUnitForLearningPathNodeDetailsDTO.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/lectureunit/LectureUnitForLearningPathNodeDetailsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/dto/LectureUnitForLearningPathNodeDetailsDTO.java index b4bf5f1c2e47..cc9bd99771a2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/lectureunit/LectureUnitForLearningPathNodeDetailsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/dto/LectureUnitForLearningPathNodeDetailsDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto.lectureunit; +package de.tum.cit.aet.artemis.lecture.dto; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LectureUnitInformationDTO.java b/src/main/java/de/tum/cit/aet/artemis/lecture/dto/LectureUnitInformationDTO.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LectureUnitInformationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/dto/LectureUnitInformationDTO.java index db5cb0a54253..a0e3876d35ad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LectureUnitInformationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/dto/LectureUnitInformationDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.lecture.dto; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LectureUnitSplitDTO.java b/src/main/java/de/tum/cit/aet/artemis/lecture/dto/LectureUnitSplitDTO.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LectureUnitSplitDTO.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/dto/LectureUnitSplitDTO.java index 0622d57295a2..bddfaabcf9fe 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/LectureUnitSplitDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/dto/LectureUnitSplitDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.lecture.dto; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureRepository.java index 58ec43d73445..ab6cd6c7b0f0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureRepository.java @@ -18,7 +18,7 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.lecture.domain.Lecture; -import de.tum.cit.aet.artemis.web.rest.dto.CourseContentCount; +import de.tum.cit.aet.artemis.core.dto.CourseContentCount; /** * Spring Data repository for the Lecture entity. @@ -157,7 +157,7 @@ default Lecture findByIdWithLectureUnitsAndSlidesAndAttachmentsElseThrow(long le } @Query(""" - SELECT new de.tum.cit.aet.artemis.web.rest.dto.CourseContentCount( + SELECT new de.tum.cit.aet.artemis.core.dto.CourseContentCount( COUNT(l.id), l.course.id ) diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitMetricsRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitMetricsRepository.java index b73fb254a4d8..cada75fd7448 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitMetricsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitMetricsRepository.java @@ -11,7 +11,7 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; -import de.tum.cit.aet.artemis.web.rest.dto.metrics.LectureUnitInformationDTO; +import de.tum.cit.aet.artemis.atlas.dto.metrics.LectureUnitInformationDTO; /** * Spring Data JPA repository to fetch lecture unit related metrics. @@ -27,7 +27,7 @@ public interface LectureUnitMetricsRepository extends ArtemisJpaRepository feedbacks, AssessmentType assessmentType, Boolean hasComplaint, Boolean exampleResult, Integer testCaseCount, Integer passedTestCaseCount, - Integer codeIssueCount) implements Serializable { + List feedbacks, AssessmentType assessmentType, Boolean hasComplaint, Boolean exampleResult, Integer testCaseCount, Integer passedTestCaseCount, + Integer codeIssueCount) implements Serializable { @JsonInclude(JsonInclude.Include.NON_EMPTY) public record FeedbackDTO(Long id, String text, String detailText, boolean hasLongFeedbackText, String reference, Double credits, Boolean positive, FeedbackType type, diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/programmingSubmission/BuildTriggerWebsocketError.java b/src/main/java/de/tum/cit/aet/artemis/programming/exceptions/BuildTriggerWebsocketError.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/web/websocket/programmingSubmission/BuildTriggerWebsocketError.java rename to src/main/java/de/tum/cit/aet/artemis/programming/exceptions/BuildTriggerWebsocketError.java index b696483c872e..e8b107518e16 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/programmingSubmission/BuildTriggerWebsocketError.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/exceptions/BuildTriggerWebsocketError.java @@ -1,6 +1,6 @@ -package de.tum.cit.aet.artemis.web.websocket.programmingSubmission; +package de.tum.cit.aet.artemis.programming.exceptions; -import de.tum.cit.aet.artemis.web.websocket.WebsocketError; +import de.tum.cit.aet.artemis.core.exception.WebsocketError; /** * A websocket dto for informing the client about a failed submission due to a communication error with the CI system. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java index 18ea0143b982..6ced332f4de2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java @@ -58,7 +58,7 @@ Page findIdsByFilterCriteria(@Param("buildStatus") BuildStatus buildStatus @Param("durationLower") Duration durationLower, @Param("durationUpper") Duration durationUpper, Pageable pageable); @Query(""" - SELECT new de.tum.cit.aet.artemis.core.service.connectors.localci.dto.DockerImageBuild( + SELECT new de.tum.cit.aet.artemis.programming.service.localci.dto.DockerImageBuild( b.dockerImage, MAX(b.buildStartDate) ) @@ -93,7 +93,7 @@ default Page findAllWithDataByCourseId(long courseId, Pageable pageabl } @Query(""" - SELECT new de.tum.cit.aet.artemis.core.service.connectors.localci.dto.ResultBuildJob( + SELECT new de.tum.cit.aet.artemis.programming.service.localci.dto.ResultBuildJob( b.result.id, b.buildJobId ) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogStatisticsEntryRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogStatisticsEntryRepository.java index e9a26fe0c3a1..6fcbe5bcb0bd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogStatisticsEntryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogStatisticsEntryRepository.java @@ -14,7 +14,7 @@ import de.tum.cit.aet.artemis.programming.domain.BuildLogStatisticsEntry; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.web.rest.dto.BuildLogStatisticsDTO; +import de.tum.cit.aet.artemis.programming.dto.BuildLogStatisticsDTO; /** * Spring Data JPA repository for the BuildLogStatisticsEntry entity. @@ -24,7 +24,7 @@ public interface BuildLogStatisticsEntryRepository extends ArtemisJpaRepository { @Query(""" - SELECT new de.tum.cit.aet.artemis.web.rest.dto.BuildLogStatisticsDTO( + SELECT new de.tum.cit.aet.artemis.programming.dto.BuildLogStatisticsDTO( COUNT(b.id), AVG(b.agentSetupDuration), AVG(b.testDuration), diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/CommitHistoryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/CommitHistoryService.java index 2c57e38a8ccc..097e0336b644 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/CommitHistoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/CommitHistoryService.java @@ -23,7 +23,7 @@ import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.web.rest.GitDiffReportParserService; +import de.tum.cit.aet.artemis.programming.web.GitDiffReportParserService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/GitService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/GitService.java index 25599ae7266a..2e4b7ff6bdaf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/GitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/GitService.java @@ -27,6 +27,7 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; +import de.tum.cit.aet.artemis.programming.dto.CommitInfoDTO; import jakarta.annotation.Nullable; import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; @@ -88,7 +89,6 @@ import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.service.ZipFileService; -import de.tum.cit.aet.artemis.web.rest.dto.CommitInfoDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingAssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingAssessmentService.java index b5ef07ff769f..56af3f50cc84 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingAssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingAssessmentService.java @@ -34,7 +34,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.service.SubmissionService; -import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; +import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseExportService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseExportService.java index 9a7ce6917e2b..39ed731cf804 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseExportService.java @@ -74,7 +74,7 @@ import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ZipFileService; -import de.tum.cit.aet.artemis.web.rest.dto.RepositoryExportOptionsDTO; +import de.tum.cit.aet.artemis.core.dto.RepositoryExportOptionsDTO; /** * Service for exporting programming exercises. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java index ad1ce7670300..f90ce3f28b55 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java @@ -71,7 +71,7 @@ import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseGradingStatisticsDTO; +import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseGradingStatisticsDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseParticipationService.java index 1107221cd1cc..181dabd88f3d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseParticipationService.java @@ -43,9 +43,10 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; +import de.tum.cit.aet.artemis.programming.dto.CommitInfoDTO; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlRepositoryPermission; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; -import de.tum.cit.aet.artemis.web.rest.dto.CommitInfoDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseRepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseRepositoryService.java index 6a77c7732d1e..99593d307132 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseRepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseRepositoryService.java @@ -38,7 +38,7 @@ import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ResourceLoaderService; -import de.tum.cit.aet.artemis.web.rest.SubmissionPolicyResource; +import de.tum.cit.aet.artemis.exercise.web.SubmissionPolicyResource; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java index 541bef1c641a..dee96e83968a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java @@ -90,8 +90,8 @@ import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseTestCaseService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseTestCaseService.java index 897c10f60561..fbb8c68d0524 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseTestCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseTestCaseService.java @@ -27,7 +27,7 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; -import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseTestCaseDTO; +import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseTestCaseDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingMessagingService.java index 20c46d4107d5..e12c563bc83f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingMessagingService.java @@ -28,9 +28,9 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.web.rest.dto.SubmissionDTO; -import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; -import de.tum.cit.aet.artemis.web.websocket.programmingSubmission.BuildTriggerWebsocketError; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionDTO; +import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService; +import de.tum.cit.aet.artemis.programming.exceptions.BuildTriggerWebsocketError; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingTriggerService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingTriggerService.java index 47db93d6d30d..179decf5d9c4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingTriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingTriggerService.java @@ -41,7 +41,7 @@ import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationTriggerService; import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.web.websocket.programmingSubmission.BuildTriggerWebsocketError; +import de.tum.cit.aet.artemis.programming.exceptions.BuildTriggerWebsocketError; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryService.java index 8d73cb6cfef7..185b93bbec5b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryService.java @@ -46,7 +46,7 @@ import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.web.rest.dto.FileMove; +import de.tum.cit.aet.artemis.programming.dto.FileMove; /** * Service that provides utilities for managing files in a git repository. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/SubmissionPolicyService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/SubmissionPolicyService.java index 5675a39c8522..56920bc7dffc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/SubmissionPolicyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/SubmissionPolicyService.java @@ -24,7 +24,7 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.repository.SubmissionPolicyRepository; -import de.tum.cit.aet.artemis.web.rest.SubmissionPolicyResource; +import de.tum.cit.aet.artemis.exercise.web.SubmissionPolicyResource; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/ContinuousIntegrationService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/ContinuousIntegrationService.java index a35b449286a7..f22c65b8b6d6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/ContinuousIntegrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/ContinuousIntegrationService.java @@ -17,7 +17,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; +import de.tum.cit.aet.artemis.programming.dto.CheckoutDirectoriesDTO; /** * Abstract service for managing entities related to continuous integration. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIService.java index 6e9c189f2c8c..ccc89b0641ad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIService.java @@ -8,6 +8,7 @@ import java.util.Map; import java.util.Optional; +import de.tum.cit.aet.artemis.programming.dto.CheckoutDirectoriesDTO; import org.gitlab4j.api.GitLabApi; import org.gitlab4j.api.GitLabApiException; import org.gitlab4j.api.ProjectApi; @@ -40,7 +41,6 @@ import de.tum.cit.aet.artemis.programming.service.ci.CIPermission; import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestResultsDTO; import de.tum.cit.aet.artemis.service.UriService; -import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseGitDiffReportService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseGitDiffReportService.java index 913a096ca8f8..23762a3809b0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseGitDiffReportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseGitDiffReportService.java @@ -38,7 +38,7 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseGitDiffReportRepository; import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.web.rest.GitDiffReportParserService; +import de.tum.cit.aet.artemis.programming.web.GitDiffReportParserService; /** * The service handling ProgrammingExerciseGitDiffReport and their ProgrammingExerciseGitDiffEntries. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsService.java index f0a6c4bdbb57..58fbc4b254b5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsService.java @@ -6,6 +6,7 @@ import java.util.Map; import java.util.Optional; +import de.tum.cit.aet.artemis.programming.dto.CheckoutDirectoriesDTO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Qualifier; @@ -37,7 +38,6 @@ import de.tum.cit.aet.artemis.programming.service.jenkins.build_plan.JenkinsBuildPlanService; import de.tum.cit.aet.artemis.programming.service.jenkins.jobs.JenkinsJobService; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; @Profile("jenkins") @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIQueueWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIQueueWebsocketService.java index e640d7b8d704..662ca006b73d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIQueueWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIQueueWebsocketService.java @@ -2,6 +2,7 @@ import java.util.List; +import de.tum.cit.aet.artemis.programming.web.LocalCIWebsocketMessagingService; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; @@ -21,7 +22,6 @@ import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildAgentInformation; import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.web.websocket.localci.LocalCIWebsocketMessagingService; /** * This service is responsible for sending build job queue information over websockets. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultProcessingService.java index b7a7fe5a4c77..0ad18f4f8816 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultProcessingService.java @@ -7,6 +7,8 @@ import java.util.UUID; import java.util.concurrent.CancellationException; +import de.tum.cit.aet.artemis.programming.dto.ResultDTO; +import de.tum.cit.aet.artemis.programming.exceptions.BuildTriggerWebsocketError; import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; @@ -43,8 +45,6 @@ import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildResult; import de.tum.cit.aet.artemis.programming.service.localci.dto.ResultQueueItem; import de.tum.cit.aet.artemis.service.BuildLogEntryService; -import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; -import de.tum.cit.aet.artemis.web.websocket.programmingSubmission.BuildTriggerWebsocketError; @Profile(PROFILE_LOCALCI) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIService.java index 618770248bdb..a6246c790800 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIService.java @@ -6,6 +6,8 @@ import java.util.Map; import java.util.Optional; +import de.tum.cit.aet.artemis.programming.dto.BuildPlanCheckoutDirectoriesDTO; +import de.tum.cit.aet.artemis.programming.dto.CheckoutDirectoriesDTO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Profile; @@ -30,8 +32,6 @@ import de.tum.cit.aet.artemis.programming.service.ci.AbstractContinuousIntegrationService; import de.tum.cit.aet.artemis.programming.service.ci.CIPermission; import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.web.rest.dto.BuildPlanCheckoutDirectoriesDTO; -import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; /** * Implementation of ContinuousIntegrationService for local CI. Contains methods for communication with the local CI system. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/SharedQueueManagementService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/SharedQueueManagementService.java index bf953cb344c3..4840e8c3169d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/SharedQueueManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/SharedQueueManagementService.java @@ -37,7 +37,7 @@ import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; import de.tum.cit.aet.artemis.programming.service.localci.dto.DockerImageBuild; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.FinishedBuildJobPageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.FinishedBuildJobPageableSearchDTO; /** * Includes methods for managing and retrieving the shared build job queue and build agent information. Also contains methods for cancelling build jobs. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildJobQueueItem.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildJobQueueItem.java index 28b79d40970c..991db6ae520c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildJobQueueItem.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildJobQueueItem.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.programming.domain.BuildStatus; -import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; +import de.tum.cit.aet.artemis.programming.dto.ResultDTO; @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/GitDiffReportParserService.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/GitDiffReportParserService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/GitDiffReportParserService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/GitDiffReportParserService.java index 2cc4e52e4fa1..a12dff5575d6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/GitDiffReportParserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/GitDiffReportParserService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.programming.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/IdeSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/IdeSettingsResource.java index 3a52e454e6ba..829c55569ef3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/IdeSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/IdeSettingsResource.java @@ -25,8 +25,8 @@ import de.tum.cit.aet.artemis.programming.domain.ide.UserIdeMapping; import de.tum.cit.aet.artemis.programming.repository.settings.IdeRepository; import de.tum.cit.aet.artemis.programming.repository.settings.UserIdeMappingRepository; -import de.tum.cit.aet.artemis.web.rest.dto.settings.ide.IdeDTO; -import de.tum.cit.aet.artemis.web.rest.dto.settings.ide.IdeMappingDTO; +import de.tum.cit.aet.artemis.programming.dto.IdeDTO; +import de.tum.cit.aet.artemis.programming.dto.IdeMappingDTO; /** * REST controller for managing Ide Settings (IdeSettings). diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/localci/LocalCIWebsocketMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/LocalCIWebsocketMessagingService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/websocket/localci/LocalCIWebsocketMessagingService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/LocalCIWebsocketMessagingService.java index d7aab6809ef9..aa02c478e551 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/localci/LocalCIWebsocketMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/LocalCIWebsocketMessagingService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.websocket.localci; +package de.tum.cit.aet.artemis.programming.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingAssessmentResource.java index 1f11412a07f1..931519dfd751 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingAssessmentResource.java @@ -41,7 +41,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingAssessmentService; -import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; +import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; /** * REST controller for managing ProgrammingAssessment. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseExportImportResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseExportImportResource.java index 4eeb25f8505c..e9ee580cfb9d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseExportImportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseExportImportResource.java @@ -80,7 +80,7 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeatureService; import de.tum.cit.aet.artemis.programming.service.SubmissionPolicyService; import de.tum.cit.aet.artemis.service.CourseService; -import de.tum.cit.aet.artemis.web.rest.dto.RepositoryExportOptionsDTO; +import de.tum.cit.aet.artemis.core.dto.RepositoryExportOptionsDTO; /** * REST controller for managing ProgrammingExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseGradingResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseGradingResource.java index 5b284126b2e9..b82260a009d7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseGradingResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseGradingResource.java @@ -26,7 +26,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseGradingService; -import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseGradingStatisticsDTO; +import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseGradingStatisticsDTO; /** * REST controller for managing ProgrammingExerciseTestCase. Test cases are created automatically from build run results which is why there are no endpoints available for POST, diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseParticipationResource.java index 41ea08d3c3de..518555b686c9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseParticipationResource.java @@ -48,7 +48,7 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingSubmissionService; import de.tum.cit.aet.artemis.programming.service.RepositoryService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; -import de.tum.cit.aet.artemis.web.rest.dto.CommitInfoDTO; +import de.tum.cit.aet.artemis.programming.dto.CommitInfoDTO; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExercisePlagiarismResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExercisePlagiarismResource.java index 2e71fa83d7a0..2bca8bebfb1f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExercisePlagiarismResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExercisePlagiarismResource.java @@ -34,7 +34,7 @@ import de.tum.cit.aet.artemis.plagiarism.service.ProgrammingLanguageNotSupportedForPlagiarismDetectionException; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismResultDTO; /** * REST controller for managing ProgrammingExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResource.java index e03521e3380c..3a97b247c98d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResource.java @@ -85,12 +85,12 @@ import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.service.CourseService; -import de.tum.cit.aet.artemis.web.rest.dto.BuildLogStatisticsDTO; -import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseResetOptionsDTO; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.web.websocket.dto.ProgrammingExerciseTestCaseStateDTO; +import de.tum.cit.aet.artemis.programming.dto.BuildLogStatisticsDTO; +import de.tum.cit.aet.artemis.programming.dto.CheckoutDirectoriesDTO; +import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseResetOptionsDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseTestCaseStateDTO; import io.jsonwebtoken.lang.Arrays; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseTestCaseResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseTestCaseResource.java index 76c3b22c3151..f31d5e00d6dd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseTestCaseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseTestCaseResource.java @@ -28,7 +28,7 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseTestCaseService; -import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseTestCaseDTO; +import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseTestCaseDTO; /** * REST controller for managing ProgrammingExerciseTestCase. Test cases are created automatically from build run results which is why there are no endpoints available for POST, diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/StaticCodeAnalysisResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/StaticCodeAnalysisResource.java index 01893c2c1d8c..a784917bcce7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/StaticCodeAnalysisResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/StaticCodeAnalysisResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.programming.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ProgrammingExerciseGitDiffReportResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ProgrammingExerciseGitDiffReportResource.java index fbed393589e6..b4be86d8458d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ProgrammingExerciseGitDiffReportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ProgrammingExerciseGitDiffReportResource.java @@ -33,7 +33,7 @@ import de.tum.cit.aet.artemis.programming.service.RepositoryService; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseGitDiffReportService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; -import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseGitDiffReportDTO; +import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseGitDiffReportDTO; /** * REST controller for managing ProgrammingExerciseGitDiffReports and its entries. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildJobQueueResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildJobQueueResource.java index c8a68ca1f948..78bae40e3b77 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildJobQueueResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildJobQueueResource.java @@ -33,7 +33,7 @@ import de.tum.cit.aet.artemis.service.dto.BuildJobResultCountDTO; import de.tum.cit.aet.artemis.service.dto.BuildJobsStatisticsDTO; import de.tum.cit.aet.artemis.service.dto.FinishedBuildJobDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.FinishedBuildJobPageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.FinishedBuildJobPageableSearchDTO; import tech.jhipster.web.util.PaginationUtil; @Profile(PROFILE_LOCALCI) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryProgrammingExerciseParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryProgrammingExerciseParticipationResource.java index d9e56824cf4b..6950ca4dc48a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryProgrammingExerciseParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryProgrammingExerciseParticipationResource.java @@ -62,8 +62,8 @@ import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.web.rest.dto.FileMove; -import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTO; +import de.tum.cit.aet.artemis.programming.dto.FileMove; +import de.tum.cit.aet.artemis.programming.dto.RepositoryStatusDTO; /** * Executes repository actions on repositories related to the participation id transmitted. Available to the owner of the participation, TAs/Instructors of the exercise and Admins. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryResource.java index a6ef7f4971fd..fdf718cdc575 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryResource.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.programming.web.repository; -import static de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTOType.CLEAN; -import static de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTOType.CONFLICT; -import static de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTOType.UNCOMMITTED_CHANGES; +import static de.tum.cit.aet.artemis.programming.dto.RepositoryStatusDTOType.CLEAN; +import static de.tum.cit.aet.artemis.programming.dto.RepositoryStatusDTOType.CONFLICT; +import static de.tum.cit.aet.artemis.programming.dto.RepositoryStatusDTOType.UNCOMMITTED_CHANGES; import java.io.ByteArrayInputStream; import java.io.FileNotFoundException; @@ -46,9 +46,9 @@ import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.programming.web.repository.util.RepositoryExecutor; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.web.rest.dto.FileMove; -import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTO; -import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTOType; +import de.tum.cit.aet.artemis.programming.dto.FileMove; +import de.tum.cit.aet.artemis.programming.dto.RepositoryStatusDTO; +import de.tum.cit.aet.artemis.programming.dto.RepositoryStatusDTOType; /** * Abstract class that can be extended to make repository endpoints available that retrieve the repository based on the implemented method getRepository. This way the retrieval of diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/TestRepositoryResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/TestRepositoryResource.java index 1f3ad147121d..8273c7f4eee8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/TestRepositoryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/TestRepositoryResource.java @@ -45,8 +45,8 @@ import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCServletService; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.web.rest.dto.FileMove; -import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTO; +import de.tum.cit.aet.artemis.programming.dto.FileMove; +import de.tum.cit.aet.artemis.programming.dto.RepositoryStatusDTO; /** * Executes requested actions on the test repository of a programming exercise. Only available to TAs, Instructors and Admins. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/QuizBatchJoinDTO.java b/src/main/java/de/tum/cit/aet/artemis/quiz/dto/QuizBatchJoinDTO.java similarity index 81% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/QuizBatchJoinDTO.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/dto/QuizBatchJoinDTO.java index aa04c90c6f0f..54689464e511 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/QuizBatchJoinDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/dto/QuizBatchJoinDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.quiz.dto; import jakarta.annotation.Nullable; diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseService.java index 4c1f124d8378..5115ba8bfda4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseService.java @@ -56,8 +56,8 @@ import de.tum.cit.aet.artemis.quiz.repository.ShortAnswerMappingRepository; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizExerciseResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizExerciseResource.java index 0ad904097716..7595915f4e8d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizExerciseResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.quiz.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -85,9 +85,9 @@ import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.web.rest.dto.QuizBatchJoinDTO; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.quiz.dto.QuizBatchJoinDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; /** * REST controller for managing QuizExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizParticipationResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizParticipationResource.java index b15a0fcd6969..f76daa5eb922 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizParticipationResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.quiz.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java b/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizPoolResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizPoolResource.java index 9a2c23794329..ad5ca368ea43 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizPoolResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizPoolResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.quiz.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizSubmissionResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java rename to src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizSubmissionResource.java index fdc6ebdc3d0e..a7be501f54fe 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/QuizSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizSubmissionResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.quiz.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -41,7 +41,7 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.service.QuizSubmissionService; import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; +import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService; /** * REST controller for managing QuizSubmission. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java b/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java index ceb4a3b91252..73ce4763fd8c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java @@ -101,13 +101,13 @@ import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupNotificationRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupChannelManagementService; -import de.tum.cit.aet.artemis.web.rest.dto.CourseContentCount; -import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementDetailViewDTO; -import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; -import de.tum.cit.aet.artemis.web.rest.dto.TutorLeaderboardDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.CourseContentCount; +import de.tum.cit.aet.artemis.core.dto.CourseManagementDetailViewDTO; +import de.tum.cit.aet.artemis.core.dto.DueDateStat; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; +import de.tum.cit.aet.artemis.core.dto.TutorLeaderboardDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; /** * Service Implementation for managing Course. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java b/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java index a8415c0d1faa..3518136f25c7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java @@ -22,7 +22,7 @@ import de.tum.cit.aet.artemis.lecture.domain.LectureUnitCompletion; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; -import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationObjectDTO.LearningObjectType; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationObjectDTO.LearningObjectType; /** * Service implementation for interactions with learning objects. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LegalDocumentService.java b/src/main/java/de/tum/cit/aet/artemis/service/LegalDocumentService.java index 44b8c73fd35a..7bc2aab22585 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LegalDocumentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/LegalDocumentService.java @@ -19,9 +19,9 @@ import de.tum.cit.aet.artemis.core.domain.LegalDocumentType; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; -import de.tum.cit.aet.artemis.web.rest.dto.ImprintDTO; -import de.tum.cit.aet.artemis.web.rest.dto.LegalDocument; -import de.tum.cit.aet.artemis.web.rest.dto.PrivacyStatementDTO; +import de.tum.cit.aet.artemis.core.dto.ImprintDTO; +import de.tum.cit.aet.artemis.core.dto.LegalDocument; +import de.tum.cit.aet.artemis.core.dto.PrivacyStatementDTO; /** * Service class responsible for providing and managing legal documents (privacy statment, imprint). diff --git a/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java b/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java index 1d8c37cf78e5..69c4adcfb9df 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java @@ -42,8 +42,8 @@ import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; -import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementStatisticsDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExerciseManagementStatisticsDTO; +import de.tum.cit.aet.artemis.core.dto.CourseManagementStatisticsDTO; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseManagementStatisticsDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java index ed075ce2297b..c3f5b5679cc8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java @@ -53,9 +53,9 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.text.domain.TextSubmission; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.web.rest.dto.SubmissionWithComplaintDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionWithComplaintDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/FinishedBuildJobDTO.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/FinishedBuildJobDTO.java index 7dedfd8cedf6..36b2a8d958f2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/FinishedBuildJobDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/service/dto/FinishedBuildJobDTO.java @@ -11,8 +11,8 @@ import de.tum.cit.aet.artemis.programming.domain.BuildJob; import de.tum.cit.aet.artemis.programming.domain.BuildStatus; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; -import de.tum.cit.aet.artemis.web.rest.dto.ParticipationDTO; -import de.tum.cit.aet.artemis.web.rest.dto.SubmissionDTO; +import de.tum.cit.aet.artemis.exercise.dto.ParticipationDTO; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionDTO; /** * A DTO representing a finished build job diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentDTO.java b/src/main/java/de/tum/cit/aet/artemis/text/dto/TextAssessmentDTO.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentDTO.java rename to src/main/java/de/tum/cit/aet/artemis/text/dto/TextAssessmentDTO.java index 2739c537c1e1..e4032b81da88 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/dto/TextAssessmentDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.text.dto; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentUpdateDTO.java b/src/main/java/de/tum/cit/aet/artemis/text/dto/TextAssessmentUpdateDTO.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentUpdateDTO.java rename to src/main/java/de/tum/cit/aet/artemis/text/dto/TextAssessmentUpdateDTO.java index f8da441d1d9d..eed111972a9c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TextAssessmentUpdateDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/dto/TextAssessmentUpdateDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.text.dto; import java.util.List; import java.util.Set; @@ -7,6 +7,7 @@ import de.tum.cit.aet.artemis.assessment.domain.ComplaintResponse; import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateBaseDTO; import de.tum.cit.aet.artemis.text.domain.TextBlock; @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/text/service/TextAssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextAssessmentService.java index eb011ad9ac3a..161093f7491d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/service/TextAssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextAssessmentService.java @@ -29,7 +29,7 @@ import de.tum.cit.aet.artemis.lti.service.LtiNewResultService; import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.text.domain.TextSubmission; -import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; +import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseFeedbackService.java index d888afcb17a7..5d980ec6a859 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseFeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseFeedbackService.java @@ -27,7 +27,7 @@ import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; -import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; +import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseService.java index 11aaab826cef..51a1140b95d4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseService.java @@ -15,8 +15,8 @@ import de.tum.cit.aet.artemis.exercise.service.ExerciseSpecificationService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseWithSubmissionsExportService.java index fa28171624e0..9d6f5285b75b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseWithSubmissionsExportService.java @@ -13,7 +13,7 @@ import de.tum.cit.aet.artemis.exercise.service.ExerciseWithSubmissionsExportService; import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.text.domain.TextExercise; -import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionExportOptionsDTO; /** * Service for exporting Text Exercises with the student submissions. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java b/src/main/java/de/tum/cit/aet/artemis/text/web/LongFeedbackTextResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java rename to src/main/java/de/tum/cit/aet/artemis/text/web/LongFeedbackTextResource.java index 2f256e1eb039..2abfbb63b20f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/LongFeedbackTextResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/web/LongFeedbackTextResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest; +package de.tum.cit.aet.artemis.text.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/text/web/TextAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/text/web/TextAssessmentResource.java index f92d64a0a3e3..58ccee17f7fc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/web/TextAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/web/TextAssessmentResource.java @@ -64,8 +64,8 @@ import de.tum.cit.aet.artemis.text.service.TextAssessmentService; import de.tum.cit.aet.artemis.text.service.TextBlockService; import de.tum.cit.aet.artemis.text.service.TextSubmissionService; -import de.tum.cit.aet.artemis.web.rest.dto.TextAssessmentDTO; -import de.tum.cit.aet.artemis.web.rest.dto.TextAssessmentUpdateDTO; +import de.tum.cit.aet.artemis.text.dto.TextAssessmentDTO; +import de.tum.cit.aet.artemis.text.dto.TextAssessmentUpdateDTO; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; diff --git a/src/main/java/de/tum/cit/aet/artemis/text/web/TextExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/text/web/TextExerciseResource.java index c48ccaba4c42..2456a704ca93 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/web/TextExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/web/TextExerciseResource.java @@ -84,10 +84,10 @@ import de.tum.cit.aet.artemis.text.service.TextExerciseImportService; import de.tum.cit.aet.artemis.text.service.TextExerciseService; import de.tum.cit.aet.artemis.text.service.TextSubmissionExportService; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionExportOptionsDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismResultDTO; /** * REST controller for managing TextExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TutorialGroupFreePeriodDTO.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/dto/TutorialGroupFreePeriodDTO.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TutorialGroupFreePeriodDTO.java rename to src/main/java/de/tum/cit/aet/artemis/tutorialgroup/dto/TutorialGroupFreePeriodDTO.java index 21b65769def5..25086f7b7154 100644 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/dto/TutorialGroupFreePeriodDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/dto/TutorialGroupFreePeriodDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.web.rest.dto; +package de.tum.cit.aet.artemis.tutorialgroup.dto; import java.time.LocalDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupFreePeriodResource.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupFreePeriodResource.java index fb53d4012815..e6444f58f6be 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupFreePeriodResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupFreePeriodResource.java @@ -34,7 +34,7 @@ import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupFreePeriodRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupsConfigurationRepository; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupFreePeriodService; -import de.tum.cit.aet.artemis.web.rest.dto.TutorialGroupFreePeriodDTO; +import de.tum.cit.aet.artemis.tutorialgroup.dto.TutorialGroupFreePeriodDTO; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/web/rest/package-info.java b/src/main/java/de/tum/cit/aet/artemis/web/rest/package-info.java deleted file mode 100644 index 61d227dffc4b..000000000000 --- a/src/main/java/de/tum/cit/aet/artemis/web/rest/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Spring MVC REST controllers. - */ -package de.tum.cit.aet.artemis.web.rest; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/package-info.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/package-info.java deleted file mode 100644 index 7c71c6173d61..000000000000 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/dto/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Data Access Objects used by WebSocket services. - */ -package de.tum.cit.aet.artemis.web.websocket.dto; diff --git a/src/main/java/de/tum/cit/aet/artemis/web/websocket/package-info.java b/src/main/java/de/tum/cit/aet/artemis/web/websocket/package-info.java deleted file mode 100644 index 6a655923cde0..000000000000 --- a/src/main/java/de/tum/cit/aet/artemis/web/websocket/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * WebSocket services, using Spring Websocket. - */ -package de.tum.cit.aet.artemis.web.websocket; diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java index dd07afb40424..2916e9e9bc2f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java @@ -47,7 +47,7 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingMessagingService; import de.tum.cit.aet.artemis.programming.service.gitlab.GitLabService; import de.tum.cit.aet.artemis.programming.service.jenkins.JenkinsService; -import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; +import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService; @ResourceLock("AbstractSpringIntegrationJenkinsGitlabTest") // NOTE: we use a common set of active profiles to reduce the number of application launches during testing. This significantly saves time and memory! diff --git a/src/test/java/de/tum/cit/aet/artemis/DatabaseQueryCountTest.java b/src/test/java/de/tum/cit/aet/artemis/DatabaseQueryCountTest.java index 691ef9ccfe34..ca974a35c362 100644 --- a/src/test/java/de/tum/cit/aet/artemis/DatabaseQueryCountTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/DatabaseQueryCountTest.java @@ -16,7 +16,7 @@ import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.lecture.LectureUtilService; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.web.rest.dto.CoursesForDashboardDTO; +import de.tum.cit.aet.artemis.core.dto.CoursesForDashboardDTO; class DatabaseQueryCountTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/FileIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/FileIntegrationTest.java index f4217433b0c7..ed8b7981f687 100644 --- a/src/test/java/de/tum/cit/aet/artemis/FileIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/FileIntegrationTest.java @@ -39,7 +39,7 @@ import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; -import de.tum.cit.aet.artemis.web.rest.dto.ExamUserDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamUserDTO; class FileIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/ImprintResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/ImprintResourceIntegrationTest.java index df192c1b5239..c9caddfc4947 100644 --- a/src/test/java/de/tum/cit/aet/artemis/ImprintResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/ImprintResourceIntegrationTest.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.core.domain.Language; -import de.tum.cit.aet.artemis.web.rest.dto.ImprintDTO; +import de.tum.cit.aet.artemis.core.dto.ImprintDTO; class ImprintResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/MetricsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/MetricsIntegrationTest.java index cba7b706df96..89c654ea6999 100644 --- a/src/test/java/de/tum/cit/aet/artemis/MetricsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/MetricsIntegrationTest.java @@ -28,9 +28,9 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseMetricsRepository; -import de.tum.cit.aet.artemis.web.rest.dto.metrics.ExerciseInformationDTO; -import de.tum.cit.aet.artemis.web.rest.dto.metrics.ResourceTimestampDTO; -import de.tum.cit.aet.artemis.web.rest.dto.metrics.StudentMetricsDTO; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseInformationDTO; +import de.tum.cit.aet.artemis.atlas.dto.metrics.ResourceTimestampDTO; +import de.tum.cit.aet.artemis.atlas.dto.metrics.StudentMetricsDTO; class MetricsIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/PrivacyStatementResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/PrivacyStatementResourceIntegrationTest.java index ee9b9ed4784d..66e6e818b559 100644 --- a/src/test/java/de/tum/cit/aet/artemis/PrivacyStatementResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/PrivacyStatementResourceIntegrationTest.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.core.domain.Language; -import de.tum.cit.aet.artemis.web.rest.dto.PrivacyStatementDTO; +import de.tum.cit.aet.artemis.core.dto.PrivacyStatementDTO; class PrivacyStatementResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/StatisticsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/StatisticsIntegrationTest.java index 862adb871c63..af6c74505216 100644 --- a/src/test/java/de/tum/cit/aet/artemis/StatisticsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/StatisticsIntegrationTest.java @@ -41,8 +41,8 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; -import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementStatisticsDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExerciseManagementStatisticsDTO; +import de.tum.cit.aet.artemis.core.dto.CourseManagementStatisticsDTO; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseManagementStatisticsDTO; class StatisticsIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/architecture/ServiceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/architecture/ServiceArchitectureTest.java index d59685d928aa..a03f8f3cae9a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/architecture/ServiceArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/architecture/ServiceArchitectureTest.java @@ -23,9 +23,9 @@ import de.tum.cit.aet.artemis.core.security.DomainUserDetailsService; import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; import de.tum.cit.aet.artemis.core.security.jwt.JWTCookieService; -import de.tum.cit.aet.artemis.web.rest.GitDiffReportParserService; -import de.tum.cit.aet.artemis.web.websocket.ResultWebsocketService; -import de.tum.cit.aet.artemis.web.websocket.localci.LocalCIWebsocketMessagingService; +import de.tum.cit.aet.artemis.programming.web.GitDiffReportParserService; +import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService; +import de.tum.cit.aet.artemis.programming.web.LocalCIWebsocketMessagingService; class ServiceArchitectureTest extends AbstractArchitectureTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentComplaintIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentComplaintIntegrationTest.java index 4262cfbdae48..af23a513bb37 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentComplaintIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentComplaintIntegrationTest.java @@ -51,8 +51,8 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.util.TestResourceUtils; -import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; -import de.tum.cit.aet.artemis.web.rest.dto.SubmissionWithComplaintDTO; +import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionWithComplaintDTO; class AssessmentComplaintIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java index 60d2d3942267..7363cadc9aa6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java @@ -38,7 +38,7 @@ import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; import de.tum.cit.aet.artemis.team.TeamUtilService; import de.tum.cit.aet.artemis.util.TestResourceUtils; -import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; +import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; class AssessmentTeamComplaintIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintUtilService.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintUtilService.java index 7a11bb3fa40f..ac1620eb6d3b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintUtilService.java @@ -16,7 +16,7 @@ import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; +import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; /** * Service responsible for initializing the database with specific testdata related to complaints for use in integration tests. diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ExampleSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ExampleSubmissionIntegrationTest.java index 4c6a9d524666..0e9b31de485f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ExampleSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ExampleSubmissionIntegrationTest.java @@ -43,7 +43,7 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.util.TestResourceUtils; -import de.tum.cit.aet.artemis.web.rest.dto.TextAssessmentDTO; +import de.tum.cit.aet.artemis.text.dto.TextAssessmentDTO; class ExampleSubmissionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java index c348fca88d52..9dd5ccd2db37 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java @@ -29,7 +29,7 @@ import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.team.TeamUtilService; import de.tum.cit.aet.artemis.text.domain.TextExercise; -import de.tum.cit.aet.artemis.web.rest.dto.ExerciseScoresDTO; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseScoresDTO; class ExerciseScoresChartIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/GradeStepIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/GradeStepIntegrationTest.java index 90365cfa3b11..b5bb7d61892d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/GradeStepIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/GradeStepIntegrationTest.java @@ -28,8 +28,8 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; -import de.tum.cit.aet.artemis.web.rest.dto.GradeDTO; -import de.tum.cit.aet.artemis.web.rest.dto.GradeStepsDTO; +import de.tum.cit.aet.artemis.assessment.dto.GradeDTO; +import de.tum.cit.aet.artemis.assessment.dto.GradeStepsDTO; class GradeStepIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java index 5be6122ff940..de99a986b029 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java @@ -40,7 +40,7 @@ import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.team.TeamUtilService; import de.tum.cit.aet.artemis.text.domain.TextExercise; -import de.tum.cit.aet.artemis.web.rest.dto.score.ScoreDTO; +import de.tum.cit.aet.artemis.assessment.dto.score.ScoreDTO; class ParticipantScoreIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java index dcaf22cb975f..b3e4465e0130 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java @@ -73,8 +73,8 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; -import de.tum.cit.aet.artemis.web.rest.dto.ResultWithPointsPerGradingCriterionDTO; -import de.tum.cit.aet.artemis.web.rest.dto.feedback.FeedbackDetailDTO; +import de.tum.cit.aet.artemis.assessment.dto.ResultWithPointsPerGradingCriterionDTO; +import de.tum.cit.aet.artemis.assessment.dto.FeedbackDetailDTO; class ResultServiceIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java index 7e7ff8e31735..c3fe342a01b2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java @@ -20,7 +20,7 @@ import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.web.rest.dto.TutorLeaderboardDTO; +import de.tum.cit.aet.artemis.core.dto.TutorLeaderboardDTO; class TutorLeaderboardServiceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/bonus/BonusIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/bonus/BonusIntegrationTest.java index 50b328fb273a..b26b50e1c779 100644 --- a/src/test/java/de/tum/cit/aet/artemis/bonus/BonusIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/bonus/BonusIntegrationTest.java @@ -33,7 +33,7 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; -import de.tum.cit.aet.artemis.web.rest.dto.BonusExampleDTO; +import de.tum.cit.aet.artemis.assessment.dto.BonusExampleDTO; class BonusIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/AbstractCompetencyPrerequisiteIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/AbstractCompetencyPrerequisiteIntegrationTest.java index 5cd7565d9bbd..fe140f60585b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/AbstractCompetencyPrerequisiteIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/AbstractCompetencyPrerequisiteIntegrationTest.java @@ -43,8 +43,8 @@ import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportResponseDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; abstract class AbstractCompetencyPrerequisiteIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyIntegrationTest.java index b278da4b3fac..84c4389780cd 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyIntegrationTest.java @@ -16,8 +16,8 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportResponseDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; class CompetencyIntegrationTest extends AbstractCompetencyPrerequisiteIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyJolIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyJolIntegrationTest.java index 4c49fd1c8bdd..32add750456c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyJolIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyJolIntegrationTest.java @@ -18,7 +18,7 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; import de.tum.cit.aet.artemis.atlas.repository.competency.CompetencyJolRepository; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyJolPairDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyJolPairDTO; class CompetencyJolIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/CourseCompetencyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/CourseCompetencyIntegrationTest.java index c48387dfc89e..017d73c0aba3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/CourseCompetencyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/CourseCompetencyIntegrationTest.java @@ -68,10 +68,10 @@ import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; -import de.tum.cit.aet.artemis.web.rest.dto.CourseCompetencyProgressDTO; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyRelationDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; +import de.tum.cit.aet.artemis.core.dto.CourseCompetencyProgressDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyRelationDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; class CourseCompetencyIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java index e3e4901a2c0d..64ba9ef941da 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java @@ -49,17 +49,17 @@ import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; -import de.tum.cit.aet.artemis.web.rest.LearningPathResource; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyGraphNodeDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyNameDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathCompetencyGraphDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathHealthDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathInformationDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationObjectDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathNavigationOverviewDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.NgxLearningPathDTO; +import de.tum.cit.aet.artemis.atlas.web.LearningPathResource; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyGraphNodeDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyNameDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathCompetencyGraphDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathHealthDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathInformationDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationObjectDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationOverviewDTO; +import de.tum.cit.aet.artemis.atlas.dto.NgxLearningPathDTO; class LearningPathIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteIntegrationTest.java index 888cdab1bc49..f92b4da2a86d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteIntegrationTest.java @@ -16,8 +16,8 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyImportResponseDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportResponseDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; class PrerequisiteIntegrationTest extends AbstractCompetencyPrerequisiteIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyIntegrationTest.java index 2c7b011380a6..156b1a3e15cf 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyIntegrationTest.java @@ -27,12 +27,12 @@ import de.tum.cit.aet.artemis.atlas.repository.SourceRepository; import de.tum.cit.aet.artemis.atlas.repository.competency.KnowledgeAreaRepository; import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; -import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaRequestDTO; -import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaResultDTO; -import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.SourceDTO; -import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO; -import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyRequestDTO; -import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyResultDTO; +import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.KnowledgeAreaRequestDTO; +import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.KnowledgeAreaResultDTO; +import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.SourceDTO; +import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO; +import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyRequestDTO; +import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyResultDTO; class StandardizedCompetencyIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyUtilService.java b/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyUtilService.java index 9dac1b1d223e..ec11421670d3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyUtilService.java @@ -15,8 +15,8 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.StandardizedCompetency; import de.tum.cit.aet.artemis.atlas.repository.competency.KnowledgeAreaRepository; import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; -import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaRequestDTO; -import de.tum.cit.aet.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyRequestDTO; +import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.KnowledgeAreaRequestDTO; +import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyRequestDTO; @Service public class StandardizedCompetencyUtilService { diff --git a/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java b/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java index 004adde1417c..09cadc5faa6e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java @@ -156,17 +156,17 @@ import de.tum.cit.aet.artemis.util.RequestUtilService; import de.tum.cit.aet.artemis.util.TestResourceUtils; import de.tum.cit.aet.artemis.util.ZipFileTestUtilService; -import de.tum.cit.aet.artemis.web.rest.dto.CourseForDashboardDTO; -import de.tum.cit.aet.artemis.web.rest.dto.CourseForImportDTO; -import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementDetailViewDTO; -import de.tum.cit.aet.artemis.web.rest.dto.CourseManagementOverviewStatisticsDTO; -import de.tum.cit.aet.artemis.web.rest.dto.CoursesForDashboardDTO; -import de.tum.cit.aet.artemis.web.rest.dto.OnlineCourseDTO; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; -import de.tum.cit.aet.artemis.web.rest.dto.TextAssessmentUpdateDTO; -import de.tum.cit.aet.artemis.web.rest.dto.TutorLeaderboardDTO; -import de.tum.cit.aet.artemis.web.rest.dto.user.UserNameAndLoginDTO; +import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO; +import de.tum.cit.aet.artemis.core.dto.CourseForImportDTO; +import de.tum.cit.aet.artemis.core.dto.CourseManagementDetailViewDTO; +import de.tum.cit.aet.artemis.core.dto.CourseManagementOverviewStatisticsDTO; +import de.tum.cit.aet.artemis.core.dto.CoursesForDashboardDTO; +import de.tum.cit.aet.artemis.core.dto.OnlineCourseDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; +import de.tum.cit.aet.artemis.text.dto.TextAssessmentUpdateDTO; +import de.tum.cit.aet.artemis.core.dto.TutorLeaderboardDTO; +import de.tum.cit.aet.artemis.assessment.dto.UserNameAndLoginDTO; @Service public class CourseTestService { diff --git a/src/test/java/de/tum/cit/aet/artemis/dataexport/DataExportResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/dataexport/DataExportResourceIntegrationTest.java index 4a865f4c539d..c7d2d0dc92a3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/dataexport/DataExportResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/dataexport/DataExportResourceIntegrationTest.java @@ -31,8 +31,8 @@ import de.tum.cit.aet.artemis.core.domain.DataExportState; import de.tum.cit.aet.artemis.core.repository.DataExportRepository; import de.tum.cit.aet.artemis.core.service.export.DataExportService; -import de.tum.cit.aet.artemis.web.rest.dto.DataExportDTO; -import de.tum.cit.aet.artemis.web.rest.dto.RequestDataExportDTO; +import de.tum.cit.aet.artemis.core.dto.DataExportDTO; +import de.tum.cit.aet.artemis.core.dto.RequestDataExportDTO; @ExtendWith(MockitoExtension.class) class DataExportResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamFactory.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamFactory.java index d665ca134eb9..6ae9c828ceee 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamFactory.java @@ -11,11 +11,11 @@ import de.tum.cit.aet.artemis.exam.domain.ExamSession; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.StudentExam; -import de.tum.cit.aet.artemis.web.rest.dto.CourseWithIdDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExamSessionDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExamWithIdAndCourseDTO; -import de.tum.cit.aet.artemis.web.rest.dto.StudentExamWithIdAndExamAndUserDTO; -import de.tum.cit.aet.artemis.web.rest.dto.UserWithIdAndLoginDTO; +import de.tum.cit.aet.artemis.core.dto.CourseWithIdDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamSessionDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamWithIdAndCourseDTO; +import de.tum.cit.aet.artemis.exam.dto.StudentExamWithIdAndExamAndUserDTO; +import de.tum.cit.aet.artemis.core.dto.UserWithIdAndLoginDTO; /** * Factory for creating Exams and related objects. diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java index 4404d4bb7a63..10a4233ecd95 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java @@ -85,16 +85,16 @@ import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; import de.tum.cit.aet.artemis.util.ZipFileTestUtilService; -import de.tum.cit.aet.artemis.web.rest.dto.CourseWithIdDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExamChecklistDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExamInformationDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExamScoresDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExamSessionDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExamWithIdAndCourseDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExerciseForPlagiarismCasesOverviewDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExerciseGroupWithIdAndExamDTO; -import de.tum.cit.aet.artemis.web.rest.dto.SuspiciousExamSessionsDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.CourseWithIdDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamChecklistDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamInformationDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamScoresDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamSessionDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamWithIdAndCourseDTO; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseForPlagiarismCasesOverviewDTO; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseGroupWithIdAndExamDTO; +import de.tum.cit.aet.artemis.exam.dto.SuspiciousExamSessionsDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; @TestInstance(TestInstance.Lifecycle.PER_CLASS) class ExamIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java index 1185ca7480a1..e4ec5b6da070 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java @@ -84,10 +84,10 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.util.ExamPrepareExercisesTestUtil; import de.tum.cit.aet.artemis.util.LocalRepository; -import de.tum.cit.aet.artemis.web.rest.dto.DueDateStat; -import de.tum.cit.aet.artemis.web.rest.dto.ExamChecklistDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExamScoresDTO; -import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; +import de.tum.cit.aet.artemis.core.dto.DueDateStat; +import de.tum.cit.aet.artemis.exam.dto.ExamChecklistDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamScoresDTO; +import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; class ExamParticipationIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamUserIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamUserIntegrationTest.java index a19f24625d1b..d42be55cdde3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamUserIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamUserIntegrationTest.java @@ -41,9 +41,9 @@ import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseTestService; import de.tum.cit.aet.artemis.util.LocalRepository; -import de.tum.cit.aet.artemis.web.rest.dto.ExamUserAttendanceCheckDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExamUserDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExamUsersNotFoundDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamUserAttendanceCheckDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamUserDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamUsersNotFoundDTO; class ExamUserIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java index d227d69d34bf..efbc0c4819b7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java @@ -128,11 +128,11 @@ import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.util.ExamPrepareExercisesTestUtil; import de.tum.cit.aet.artemis.util.LocalRepository; -import de.tum.cit.aet.artemis.web.rest.dto.StudentExamWithGradeDTO; -import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamAttendanceCheckEventDTO; -import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamLiveEventBaseDTO; -import de.tum.cit.aet.artemis.web.rest.dto.examevent.ExamWideAnnouncementEventDTO; -import de.tum.cit.aet.artemis.web.rest.dto.examevent.WorkingTimeUpdateEventDTO; +import de.tum.cit.aet.artemis.exam.dto.StudentExamWithGradeDTO; +import de.tum.cit.aet.artemis.exam.dto.examevent.ExamAttendanceCheckEventDTO; +import de.tum.cit.aet.artemis.exam.dto.examevent.ExamLiveEventBaseDTO; +import de.tum.cit.aet.artemis.exam.dto.examevent.ExamWideAnnouncementEventDTO; +import de.tum.cit.aet.artemis.exam.dto.examevent.WorkingTimeUpdateEventDTO; class StudentExamIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java index 054b2c4d7982..9e97ac518672 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java @@ -55,8 +55,8 @@ import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorParticipationStatus; import de.tum.cit.aet.artemis.util.TestResourceUtils; -import de.tum.cit.aet.artemis.web.rest.dto.ExerciseDetailsDTO; -import de.tum.cit.aet.artemis.web.rest.dto.StatsForDashboardDTO; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseDetailsDTO; +import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; class ExerciseIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java index 4280ab281ba5..577efcf716b9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java @@ -50,9 +50,9 @@ import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; -import de.tum.cit.aet.artemis.web.rest.dto.FileUploadAssessmentDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; +import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; +import de.tum.cit.aet.artemis.fileupload.dto.FileUploadAssessmentDTO; +import de.tum.cit.aet.artemis.programming.dto.ResultDTO; class FileUploadAssessmentIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java index 59632fafaefb..bad3f9dacbc3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java @@ -56,8 +56,8 @@ import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider; import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider.InvalidExamExerciseDateConfiguration; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; -import de.tum.cit.aet.artemis.web.rest.dto.CourseForDashboardDTO; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; class FileUploadExerciseIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java index 1c63da6ce0a4..b769feac4b24 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java @@ -68,10 +68,10 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus; import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingSubmissionElement; import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ModelingAssessmentDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; -import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; +import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; +import de.tum.cit.aet.artemis.modeling.dto.ModelingAssessmentDTO; +import de.tum.cit.aet.artemis.programming.dto.ResultDTO; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismResultDTO; class ModelingAssessmentIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java index b704af228164..dda82612e9e4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java @@ -69,8 +69,8 @@ import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider.InvalidExamExerciseDateConfiguration; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; import de.tum.cit.aet.artemis.util.TestResourceUtils; -import de.tum.cit.aet.artemis.web.rest.dto.CourseForDashboardDTO; -import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; +import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismResultDTO; class ModelingExerciseIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java index a4b6b63fdf23..aa4865850300 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java @@ -60,8 +60,8 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.util.TestResourceUtils; -import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; +import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; +import de.tum.cit.aet.artemis.programming.dto.ResultDTO; class ProgrammingAssessmentIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java index e2e8a60df620..8c7a21becf3f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java @@ -63,7 +63,7 @@ import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseGradingService; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseGradingStatisticsDTO; +import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseGradingStatisticsDTO; /** * Tests the {@link ProgrammingExerciseGradingService}. diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java index 8df1bdad0315..cdadf4c01d7c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java @@ -115,11 +115,11 @@ import de.tum.cit.aet.artemis.util.RequestUtilService; import de.tum.cit.aet.artemis.util.TestResourceUtils; import de.tum.cit.aet.artemis.util.ZipFileTestUtilService; -import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseResetOptionsDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseTestCaseDTO; -import de.tum.cit.aet.artemis.web.rest.dto.RepositoryExportOptionsDTO; -import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; -import de.tum.cit.aet.artemis.web.websocket.dto.ProgrammingExerciseTestCaseStateDTO; +import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseResetOptionsDTO; +import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseTestCaseDTO; +import de.tum.cit.aet.artemis.core.dto.RepositoryExportOptionsDTO; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismResultDTO; +import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseTestCaseStateDTO; /** * Note: this class should be independent of the actual VCS and CIS and contains common test logic for scenarios: diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java index cdd5340f1476..069b65f4e44e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java @@ -44,7 +44,7 @@ import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.util.LocalRepository; -import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; +import de.tum.cit.aet.artemis.programming.dto.CheckoutDirectoriesDTO; @TestInstance(TestInstance.Lifecycle.PER_CLASS) class ProgrammingExerciseLocalVCLocalCIIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java index 9161091d5968..e5212e4f0e32 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java @@ -42,7 +42,7 @@ import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.web.rest.dto.CommitInfoDTO; +import de.tum.cit.aet.artemis.programming.dto.CommitInfoDTO; class ProgrammingExerciseParticipationIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java index 176f684732c9..bef9c58c1609 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java @@ -68,7 +68,7 @@ import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.RequestUtilService; import de.tum.cit.aet.artemis.util.TestConstants; -import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; +import de.tum.cit.aet.artemis.programming.dto.ResultDTO; /** * Note: this class should be independent of the actual VCS and CIS and contains common test logic for both scenarios: diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java index 84747cdc22bd..d88dc1ff4281 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java @@ -35,7 +35,7 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseFeedbackCreationService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseTestCaseService; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.web.rest.dto.ProgrammingExerciseTestCaseDTO; +import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseTestCaseDTO; class ProgrammingExerciseTestCaseServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java index 6d80f316bb49..6f19a40eb806 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java @@ -153,8 +153,8 @@ import de.tum.cit.aet.artemis.util.RequestUtilService; import de.tum.cit.aet.artemis.util.TestConstants; import de.tum.cit.aet.artemis.util.ZipFileTestUtilService; -import de.tum.cit.aet.artemis.web.rest.dto.BuildLogStatisticsDTO; -import de.tum.cit.aet.artemis.web.rest.dto.CourseForDashboardDTO; +import de.tum.cit.aet.artemis.programming.dto.BuildLogStatisticsDTO; +import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO; /** * Note: this class should be independent of the actual VCS and CIS and contains common test logic for scenarios: diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java index 9c25ca166953..2e78521f1161 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java @@ -63,7 +63,7 @@ import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.util.TestConstants; import de.tum.cit.aet.artemis.util.TestResourceUtils; -import de.tum.cit.aet.artemis.web.rest.dto.SubmissionDTO; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionDTO; class ProgrammingSubmissionIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java index fa9b2e7894f9..9a45c78419c8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java @@ -90,8 +90,8 @@ import de.tum.cit.aet.artemis.util.GitUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; import de.tum.cit.aet.artemis.util.TestConstants; -import de.tum.cit.aet.artemis.web.rest.dto.FileMove; -import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTO; +import de.tum.cit.aet.artemis.programming.dto.FileMove; +import de.tum.cit.aet.artemis.programming.dto.RepositoryStatusDTO; class RepositoryIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java index d01c0542d6ca..42037f611d0f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java @@ -43,8 +43,8 @@ import de.tum.cit.aet.artemis.programming.web.repository.FileSubmission; import de.tum.cit.aet.artemis.util.GitUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; -import de.tum.cit.aet.artemis.web.rest.dto.FileMove; -import de.tum.cit.aet.artemis.web.rest.dto.RepositoryStatusDTO; +import de.tum.cit.aet.artemis.programming.dto.FileMove; +import de.tum.cit.aet.artemis.programming.dto.RepositoryStatusDTO; class TestRepositoryResourceIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java index f10797958d65..95d1c553ec8f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java @@ -84,8 +84,8 @@ import de.tum.cit.aet.artemis.quiz.service.QuizExerciseService; import de.tum.cit.aet.artemis.util.ExerciseIntegrationTestService; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; -import de.tum.cit.aet.artemis.web.rest.dto.QuizBatchJoinDTO; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.quiz.dto.QuizBatchJoinDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; class QuizExerciseIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java index 72e105e449ca..0f70cd9a44af 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java @@ -68,7 +68,7 @@ import de.tum.cit.aet.artemis.quiz.service.QuizBatchService; import de.tum.cit.aet.artemis.quiz.service.QuizExerciseService; import de.tum.cit.aet.artemis.quiz.service.QuizStatisticService; -import de.tum.cit.aet.artemis.web.rest.dto.QuizBatchJoinDTO; +import de.tum.cit.aet.artemis.quiz.dto.QuizBatchJoinDTO; class QuizSubmissionIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java index 39bc7d3ec678..b104349c199b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java @@ -34,8 +34,8 @@ import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.SlideRepository; import de.tum.cit.aet.artemis.lecture.service.LectureUnitProcessingService; -import de.tum.cit.aet.artemis.web.rest.dto.LectureUnitInformationDTO; -import de.tum.cit.aet.artemis.web.rest.dto.LectureUnitSplitDTO; +import de.tum.cit.aet.artemis.lecture.dto.LectureUnitInformationDTO; +import de.tum.cit.aet.artemis.lecture.dto.LectureUnitSplitDTO; class AttachmentUnitsIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitIntegrationTest.java index a94255d77a36..47e06fabc4a9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitIntegrationTest.java @@ -29,7 +29,7 @@ import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; -import de.tum.cit.aet.artemis.web.rest.dto.lectureunit.LectureUnitForLearningPathNodeDetailsDTO; +import de.tum.cit.aet.artemis.lecture.dto.LectureUnitForLearningPathNodeDetailsDTO; class LectureUnitIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/OnlineUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/OnlineUnitIntegrationTest.java index 605981f9b0f5..07811a7eef09 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/OnlineUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/OnlineUnitIntegrationTest.java @@ -36,7 +36,7 @@ import de.tum.cit.aet.artemis.lecture.domain.OnlineUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.OnlineUnitRepository; -import de.tum.cit.aet.artemis.web.rest.dto.OnlineResourceDTO; +import de.tum.cit.aet.artemis.core.dto.OnlineResourceDTO; class OnlineUnitIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResourceIntegrationTest.java index 27675a15878a..2fa9014eee99 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResourceIntegrationTest.java @@ -38,7 +38,7 @@ import de.tum.cit.aet.artemis.service.dto.BuildJobsStatisticsDTO; import de.tum.cit.aet.artemis.service.dto.FinishedBuildJobDTO; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.PageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.PageableSearchDTO; class LocalCIResourceIntegrationTest extends AbstractLocalCILocalVCIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIServiceTest.java index e0c2a0d4db4d..df7b48b1d29a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIServiceTest.java @@ -42,7 +42,7 @@ import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; import de.tum.cit.aet.artemis.programming.service.localci.dto.JobTimingInfo; import de.tum.cit.aet.artemis.programming.service.localci.dto.RepositoryInfo; -import de.tum.cit.aet.artemis.web.rest.dto.CheckoutDirectoriesDTO; +import de.tum.cit.aet.artemis.programming.dto.CheckoutDirectoriesDTO; class LocalCIServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java index df9f55446058..9d5ddb126d8d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java @@ -38,9 +38,9 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; -import de.tum.cit.aet.artemis.web.websocket.dto.metis.ConversationWebsocketDTO; -import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; +import de.tum.cit.aet.artemis.communication.dto.PostContextFilterDTO; +import de.tum.cit.aet.artemis.communication.dto.ConversationWebsocketDTO; +import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; /** * Contains useful methods for testing the conversations futures diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/AnswerMessageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/AnswerMessageIntegrationTest.java index bd6e1e634848..d163ae81dbc5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/AnswerMessageIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/AnswerMessageIntegrationTest.java @@ -41,7 +41,7 @@ import de.tum.cit.aet.artemis.lecture.LectureUtilService; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.post.ConversationUtilService; -import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; +import de.tum.cit.aet.artemis.communication.dto.PostDTO; class AnswerMessageIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java index d5f68fab1ff2..742a8e34032a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java @@ -36,7 +36,7 @@ import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupChannelManagementService; import de.tum.cit.aet.artemis.tutorialgroups.TutorialGroupUtilService; import de.tum.cit.aet.artemis.user.UserFactory; -import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; +import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; class ChannelIntegrationTest extends AbstractConversationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/GroupChatIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/GroupChatIntegrationTest.java index 13e785611768..1279a5ed466b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/GroupChatIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/GroupChatIntegrationTest.java @@ -19,8 +19,8 @@ import de.tum.cit.aet.artemis.communication.web.conversation.dtos.GroupChatDTO; import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.user.UserFactory; -import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; -import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; +import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; +import de.tum.cit.aet.artemis.communication.dto.PostDTO; class GroupChatIntegrationTest extends AbstractConversationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/MessageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/MessageIntegrationTest.java index f901bfda169f..388de5d7254a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/MessageIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/MessageIntegrationTest.java @@ -65,8 +65,8 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.post.ConversationUtilService; -import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; -import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; +import de.tum.cit.aet.artemis.communication.dto.PostContextFilterDTO; +import de.tum.cit.aet.artemis.communication.dto.PostDTO; class MessageIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/OneToOneChatIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/OneToOneChatIntegrationTest.java index f8eddd47335b..f3f8812566df 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/OneToOneChatIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/OneToOneChatIntegrationTest.java @@ -19,8 +19,8 @@ import de.tum.cit.aet.artemis.communication.web.conversation.dtos.OneToOneChatDTO; import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.user.UserFactory; -import de.tum.cit.aet.artemis.web.websocket.dto.metis.MetisCrudAction; -import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; +import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; +import de.tum.cit.aet.artemis.communication.dto.PostDTO; class OneToOneChatIntegrationTest extends AbstractConversationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/linkpreview/LinkPreviewIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/linkpreview/LinkPreviewIntegrationTest.java index e58b065418d0..c2bea7be643e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/linkpreview/LinkPreviewIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/linkpreview/LinkPreviewIntegrationTest.java @@ -22,7 +22,7 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.web.rest.dto.LinkPreviewDTO; +import de.tum.cit.aet.artemis.communication.dto.LinkPreviewDTO; class LinkPreviewIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationIntegrationTest.java index 3d2f15650aee..6003e1abd048 100644 --- a/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationIntegrationTest.java @@ -20,7 +20,7 @@ import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.OrganizationRepository; import de.tum.cit.aet.artemis.course.CourseFactory; -import de.tum.cit.aet.artemis.web.rest.dto.OrganizationCountDTO; +import de.tum.cit.aet.artemis.core.dto.OrganizationCountDTO; class OrganizationIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java index f8b1b9e0f7ea..31236148d5d5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java @@ -93,7 +93,7 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.util.LocalRepository; -import de.tum.cit.aet.artemis.web.rest.dto.QuizBatchJoinDTO; +import de.tum.cit.aet.artemis.quiz.dto.QuizBatchJoinDTO; class ParticipationIntegrationTest extends AbstractAthenaTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionExportIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionExportIntegrationTest.java index b66554a03fad..ad973ab7eae1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionExportIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionExportIntegrationTest.java @@ -33,7 +33,7 @@ import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; -import de.tum.cit.aet.artemis.web.rest.dto.SubmissionExportOptionsDTO; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionExportOptionsDTO; class SubmissionExportIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionIntegrationTest.java index a049ad6d8de0..78324531a711 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionIntegrationTest.java @@ -25,8 +25,8 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; -import de.tum.cit.aet.artemis.web.rest.dto.SubmissionVersionDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionVersionDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; class SubmissionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCaseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCaseIntegrationTest.java index bfb5fb62a83e..acd01b5f7cd4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCaseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCaseIntegrationTest.java @@ -33,8 +33,8 @@ import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; -import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO; -import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismVerdictDTO; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismCaseInfoDTO; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismVerdictDTO; class PlagiarismCaseIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCheckIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCheckIntegrationTest.java index 7a1803470d2d..b9348d703eb2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCheckIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCheckIntegrationTest.java @@ -13,7 +13,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.util.TestResourceUtils; -import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismResultDTO; class PlagiarismCheckIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismIntegrationTest.java index 5d5ebea1c23b..5556d215183d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismIntegrationTest.java @@ -30,7 +30,7 @@ import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; -import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismComparisonStatusDTO; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismComparisonStatusDTO; class PlagiarismIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismPostIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismPostIntegrationTest.java index 47a0d899452b..8ec8ae980477 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismPostIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismPostIntegrationTest.java @@ -38,8 +38,8 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.post.ConversationUtilService; -import de.tum.cit.aet.artemis.web.rest.dto.PostContextFilterDTO; -import de.tum.cit.aet.artemis.web.websocket.dto.metis.PostDTO; +import de.tum.cit.aet.artemis.communication.dto.PostContextFilterDTO; +import de.tum.cit.aet.artemis.communication.dto.PostDTO; class PlagiarismPostIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/science/ScienceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/science/ScienceIntegrationTest.java index d0457f37460d..78d5f1711ec2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/science/ScienceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/science/ScienceIntegrationTest.java @@ -16,7 +16,7 @@ import de.tum.cit.aet.artemis.atlas.repository.science.ScienceEventRepository; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggleService; -import de.tum.cit.aet.artemis.web.rest.dto.science.ScienceEventDTO; +import de.tum.cit.aet.artemis.atlas.dto.science.ScienceEventDTO; class ScienceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationServiceTest.java index a2f6f79eed4c..f4a3268a5a94 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationServiceTest.java @@ -37,10 +37,10 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.service.dto.MaxAndReachablePoints; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.web.rest.dto.BonusSourceResultDTO; -import de.tum.cit.aet.artemis.web.rest.dto.CourseForDashboardDTO; -import de.tum.cit.aet.artemis.web.rest.dto.CourseScoresDTO; -import de.tum.cit.aet.artemis.web.rest.dto.score.StudentScoresDTO; +import de.tum.cit.aet.artemis.assessment.dto.BonusSourceResultDTO; +import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO; +import de.tum.cit.aet.artemis.core.dto.CourseScoresDTO; +import de.tum.cit.aet.artemis.assessment.dto.score.StudentScoresDTO; class CourseScoreCalculationServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java index 8b4026dfcac6..2e3c52dd7a8f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java @@ -45,9 +45,9 @@ import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.web.rest.LearningPathResource; -import de.tum.cit.aet.artemis.web.rest.dto.competency.LearningPathHealthDTO; -import de.tum.cit.aet.artemis.web.rest.dto.competency.NgxLearningPathDTO; +import de.tum.cit.aet.artemis.atlas.web.LearningPathResource; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathHealthDTO; +import de.tum.cit.aet.artemis.atlas.dto.NgxLearningPathDTO; class LearningPathServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/LectureServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/LectureServiceTest.java index ee979e294a19..ff414ac7158b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/LectureServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/LectureServiceTest.java @@ -25,8 +25,8 @@ import de.tum.cit.aet.artemis.lecture.service.LectureService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; class LectureServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationTeamWebsocketServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationTeamWebsocketServiceTest.java index bbd7c67b8ff4..a654ae9f95df 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationTeamWebsocketServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationTeamWebsocketServiceTest.java @@ -32,8 +32,8 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.web.websocket.dto.SubmissionPatch; -import de.tum.cit.aet.artemis.web.websocket.team.ParticipationTeamWebsocketService; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionPatch; +import de.tum.cit.aet.artemis.exercise.web.ParticipationTeamWebsocketService; class ParticipationTeamWebsocketServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java index e8c362c17522..96028d08d9fd 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java @@ -46,7 +46,7 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.web.rest.dto.SubmissionWithComplaintDTO; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionWithComplaintDTO; class SubmissionServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/TeamWebsocketServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/TeamWebsocketServiceTest.java index f5da40367f6f..5bdbb8420a46 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/TeamWebsocketServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/TeamWebsocketServiceTest.java @@ -29,7 +29,7 @@ import de.tum.cit.aet.artemis.team.TeamUtilService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.web.websocket.dto.TeamAssignmentPayload; +import de.tum.cit.aet.artemis.exercise.dto.TeamAssignmentPayload; class TeamWebsocketServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java index eb84e85fe5d1..99c90985ed1a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java @@ -33,7 +33,7 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.web.rest.dto.ExamChecklistDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamChecklistDTO; class ExamServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/settings/ide/IdePreferencesIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/settings/ide/IdePreferencesIntegrationTest.java index 181ff1c5710d..e4a158a16a0d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/settings/ide/IdePreferencesIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/settings/ide/IdePreferencesIntegrationTest.java @@ -20,8 +20,8 @@ import de.tum.cit.aet.artemis.programming.domain.ide.UserIdeMapping; import de.tum.cit.aet.artemis.programming.repository.settings.IdeRepository; import de.tum.cit.aet.artemis.programming.repository.settings.UserIdeMappingRepository; -import de.tum.cit.aet.artemis.web.rest.dto.settings.ide.IdeDTO; -import de.tum.cit.aet.artemis.web.rest.dto.settings.ide.IdeMappingDTO; +import de.tum.cit.aet.artemis.programming.dto.IdeDTO; +import de.tum.cit.aet.artemis.programming.dto.IdeMappingDTO; class IdePreferencesIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/team/TeamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/team/TeamIntegrationTest.java index c1a914ee4eaf..07ab964eac34 100644 --- a/src/test/java/de/tum/cit/aet/artemis/team/TeamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/team/TeamIntegrationTest.java @@ -35,8 +35,8 @@ import de.tum.cit.aet.artemis.service.dto.TeamSearchUserDTO; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; -import de.tum.cit.aet.artemis.web.rest.dto.CoursesForDashboardDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ExerciseDetailsDTO; +import de.tum.cit.aet.artemis.core.dto.CoursesForDashboardDTO; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseDetailsDTO; class TeamIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java index a43b96b21d09..1ee51600e3c7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java @@ -76,10 +76,10 @@ import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.text.service.TextAssessmentService; -import de.tum.cit.aet.artemis.web.rest.dto.AssessmentUpdateDTO; -import de.tum.cit.aet.artemis.web.rest.dto.ResultDTO; -import de.tum.cit.aet.artemis.web.rest.dto.TextAssessmentDTO; -import de.tum.cit.aet.artemis.web.rest.dto.TextAssessmentUpdateDTO; +import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; +import de.tum.cit.aet.artemis.programming.dto.ResultDTO; +import de.tum.cit.aet.artemis.text.dto.TextAssessmentDTO; +import de.tum.cit.aet.artemis.text.dto.TextAssessmentUpdateDTO; class TextAssessmentIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/text/TextExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/TextExerciseIntegrationTest.java index b0edd3a24a04..cba8a64b1827 100644 --- a/src/test/java/de/tum/cit/aet/artemis/text/TextExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/TextExerciseIntegrationTest.java @@ -80,9 +80,9 @@ import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider; import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider.InvalidExamExerciseDateConfiguration; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; -import de.tum.cit.aet.artemis.web.rest.dto.CourseForDashboardDTO; -import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismComparisonStatusDTO; -import de.tum.cit.aet.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO; +import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismComparisonStatusDTO; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismResultDTO; class TextExerciseIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java index 248617d93fc6..8bb451ed03ce 100644 --- a/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java @@ -49,7 +49,7 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; -import de.tum.cit.aet.artemis.web.rest.dto.ExerciseDetailsDTO; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseDetailsDTO; class TextSubmissionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFreePeriodIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFreePeriodIntegrationTest.java index 8aa797a1512e..77b1c6eee30b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFreePeriodIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFreePeriodIntegrationTest.java @@ -21,7 +21,7 @@ import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupFreePeriod; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; import de.tum.cit.aet.artemis.user.UserFactory; -import de.tum.cit.aet.artemis.web.rest.dto.TutorialGroupFreePeriodDTO; +import de.tum.cit.aet.artemis.tutorialgroup.dto.TutorialGroupFreePeriodDTO; class TutorialGroupFreePeriodIntegrationTest extends AbstractTutorialGroupIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/util/PageableSearchUtilService.java b/src/test/java/de/tum/cit/aet/artemis/util/PageableSearchUtilService.java index e41f5a3adc32..4079cfceec33 100644 --- a/src/test/java/de/tum/cit/aet/artemis/util/PageableSearchUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/PageableSearchUtilService.java @@ -9,9 +9,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.core.dto.SortingOrder; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.CompetencyPageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.PageableSearchDTO; -import de.tum.cit.aet.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.CompetencyPageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.PageableSearchDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; /** * Service responsible for initializing the database with specific testdata related to searches for use in integration tests. diff --git a/src/test/java/de/tum/cit/aet/artemis/util/RequestUtilService.java b/src/test/java/de/tum/cit/aet/artemis/util/RequestUtilService.java index 4be757c8b41e..d6252a53e3d8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/util/RequestUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/RequestUtilService.java @@ -45,7 +45,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import de.tum.cit.aet.artemis.web.rest.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; @Service public class RequestUtilService { From 532a8617b4bfd91582ba7d4a7f2401ab39f20b1a Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Wed, 11 Sep 2024 18:50:22 +0200 Subject: [PATCH 18/43] Autowire UserTestRepository --- .../de/tum/cit/aet/artemis/repository/UserTestRepository.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/de/tum/cit/aet/artemis/repository/UserTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/repository/UserTestRepository.java index fb26235e6291..19eb4f5ec23e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repository/UserTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/repository/UserTestRepository.java @@ -4,7 +4,9 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; +import org.springframework.stereotype.Repository; +@Repository public interface UserTestRepository extends ArtemisJpaRepository { Set findAllByGroupsNotEmpty(); From 9634036e05ed649783eecbe93da4f6be46f50b55 Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Wed, 11 Sep 2024 18:55:21 +0200 Subject: [PATCH 19/43] Temporarily scan different package for repositories --- .../core/config/DatabaseConfiguration.java | 5 +- ...s:src:main:java:de:tum:in:www1:artemis.uml | 4633 +++++++++++++++++ 2 files changed, 4637 insertions(+), 1 deletion(-) create mode 100644 vester:Development:private:Artemis:src:main:java:de:tum:in:www1:artemis.uml diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/DatabaseConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/DatabaseConfiguration.java index a9edea6fbad1..215a0c694455 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/DatabaseConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/DatabaseConfiguration.java @@ -12,7 +12,10 @@ @Profile(PROFILE_CORE) @Configuration -@EnableJpaRepositories(basePackages = "de.tum.cit.aet.artemis.*.repository", repositoryBaseClass = RepositoryImpl.class) +@EnableJpaRepositories(basePackages = { + "de.tum.cit.aet.artemis.*.repository", + "de.tum.cit.aet.artemis.repository.**" // ToDo: Remove once test files have been moved +}, repositoryBaseClass = RepositoryImpl.class) @EnableJpaAuditing(auditorAwareRef = "springSecurityAuditorAware") @EnableTransactionManagement public class DatabaseConfiguration { diff --git a/vester:Development:private:Artemis:src:main:java:de:tum:in:www1:artemis.uml b/vester:Development:private:Artemis:src:main:java:de:tum:in:www1:artemis.uml new file mode 100644 index 000000000000..927416e16803 --- /dev/null +++ b/vester:Development:private:Artemis:src:main:java:de:tum:in:www1:artemis.uml @@ -0,0 +1,4633 @@ + + + JAVA + /Users/ole.vester/Development/private/Artemis/src/main/java/de/tum/in/www1/artemis + + de.tum.in.www1.artemis.domain.quiz.DragAndDropQuestionStatistic + de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLPackage + de.tum.in.www1.artemis.service.science.ScienceEventService + de.tum.in.www1.artemis.domain.iris.session.IrisHestiaSession + de.tum.in.www1.artemis.service.connectors.athena.AthenaSubmissionSelectionService + de.tum.in.www1.artemis.web.rest.dto.pageablesearch.CompetencyPageableSearchDTO + de.tum.in.www1.artemis.web.websocket.dto.OnlineTeamStudentDTO + de.tum.in.www1.artemis.domain.iris.settings.IrisHestiaSubSettings + de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyRequestDTO + de.tum.in.www1.artemis.repository.GroupNotificationRepository + de.tum.in.www1.artemis.service.dto.athena.ModelingFeedbackDTO + de.tum.in.www1.artemis.service.metis.AnswerMessageService + de.tum.in.www1.artemis.web.rest.dto.QuizBatchJoinDTO + de.tum.in.www1.artemis.service.linkpreview.ogparser.Content + de.tum.in.www1.artemis.web.rest.vm.KeyAndPasswordVM + de.tum.in.www1.artemis.config.migration.DatabaseMigration + de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationServerHealthIndicator + de.tum.in.www1.artemis.service.connectors.jenkins.build_plan.JenkinsBuildPlanService + de.tum.in.www1.artemis.web.rest.plagiarism.PlagiarismPostResource + de.tum.in.www1.artemis.service.linkpreview.ogparser.htmlparser.OgMetaElementHtmlParser + de.tum.in.www1.artemis.web.rest.open.PublicUserJwtResource + de.tum.in.www1.artemis.domain.metrics.ExerciseTypeMetricsEntry + de.tum.in.www1.artemis.web.rest.plagiarism.PlagiarismResultStats + de.tum.in.www1.artemis.service.competency.KnowledgeAreaService + de.tum.in.www1.artemis.repository.AttachmentRepository + de.tum.in.www1.artemis.domain.metis.conversation.ConversationSettings + de.tum.in.www1.artemis.repository.ApollonDiagramRepository + de.tum.in.www1.artemis.service.iris.session.IrisChatBasedFeatureInterface + de.tum.in.www1.artemis.service.programming.ProgrammingExerciseRepositoryService + de.tum.in.www1.artemis.service.quiz.QuizSubmissionService + de.tum.in.www1.artemis.service.ExerciseLifecycleService + de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsXmlConfigBuilder + de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.ParserStrategy + de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3.ActivityDiagramParser + de.tum.in.www1.artemis.config.SAML2Configuration + de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseGitDiffReportRepository + de.tum.in.www1.artemis.domain.quiz.QuizGroup + de.tum.in.www1.artemis.domain.statistics.BuildLogStatisticsEntry + de.tum.in.www1.artemis.web.rest.errors.HttpStatusException + de.tum.in.www1.artemis.web.rest.dto.CoursesForDashboardDTO + de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLAttribute + de.tum.in.www1.artemis.domain.enumeration.ComplaintType + de.tum.in.www1.artemis.web.rest.errors.StudentsNotFoundException + de.tum.in.www1.artemis.service.connectors.pyris.PyrisPipelineService + de.tum.in.www1.artemis.domain.assessment.dashboard.ExerciseRatingCount + de.tum.in.www1.artemis.domain.FileType + de.tum.in.www1.artemis.service.RatingService + de.tum.in.www1.artemis.repository.TextAssessmentEventRepository + de.tum.in.www1.artemis.domain.enumeration.SystemNotificationType + de.tum.in.www1.artemis.domain.iris.session.IrisSession + de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisExamDTO + de.tum.in.www1.artemis.domain.Submission + de.tum.in.www1.artemis.service.competency.CompetencyJolService + de.tum.in.www1.artemis.config.BuildAgentWithoutCoreCondition + de.tum.in.www1.artemis.web.rest.metis.conversation.ConversationResource + de.tum.in.www1.artemis.domain.competency.Competency + de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaResultDTO + de.tum.in.www1.artemis.service.plagiarism.PlagiarismWebsocketService + de.tum.in.www1.artemis.service.icl.ArtemisGitServletService + de.tum.in.www1.artemis.domain.quiz.QuizBatch + de.tum.in.www1.artemis.domain.BonusStrategy + de.tum.in.www1.artemis.service.compass.umlmodel.UMLContainerElement + de.tum.in.www1.artemis.domain.lecture.Slide + de.tum.in.www1.artemis.domain.enumeration.ExerciseMode + de.tum.in.www1.artemis.domain.push_notification.PushNotificationDeviceConfigurationId + de.tum.in.www1.artemis.web.websocket.localci.LocalCIWebsocketMessagingService + de.tum.in.www1.artemis.web.rest.dto.ExamSessionDTO + de.tum.in.www1.artemis.repository.StudentParticipationRepository + de.tum.in.www1.artemis.web.rest.programming.ProgrammingExerciseTestCaseResource + de.tum.in.www1.artemis.service.connectors.localci.scaparser.utils.ReportUtils + de.tum.in.www1.artemis.service.connectors.ci.CIPermission + de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralTestCaseService + de.tum.in.www1.artemis.exception.localvc.LocalVCInternalException + de.tum.in.www1.artemis.domain.hestia.TestwiseCoverageReportEntry + de.tum.in.www1.artemis.domain.participation.Participant + de.tum.in.www1.artemis.web.rest.open.PublicBuildPlanResource + de.tum.in.www1.artemis.web.rest.dto.examevent.ExamAttendanceCheckEventDTO + de.tum.in.www1.artemis.service.AuthorizationCheckService + de.tum.in.www1.artemis.web.rest.util.StringUtil + de.tum.in.www1.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeNonterminal + de.tum.in.www1.artemis.service.connectors.athena.AthenaFeedbackSendingService + de.tum.in.www1.artemis.repository.iris.IrisExerciseChatSessionRepository + de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisTextMessageContentDTO + de.tum.in.www1.artemis.config.DatabaseConfiguration + de.tum.in.www1.artemis.web.rest.ModelingExerciseResource + de.tum.in.www1.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType + de.tum.in.www1.artemis.service.connectors.gitlabci.GitLabCIService + de.tum.in.www1.artemis.domain.enumeration.ParticipationLifecycle + de.tum.in.www1.artemis.repository.base.FetchOptions + de.tum.in.www1.artemis.domain.leaderboard.tutor.TutorLeaderboardComplaints + de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.PyrisChatPipelineExecutionBaseDataDTO + de.tum.in.www1.artemis.service.user.AuthorityService + de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsInternalUrlService + de.tum.in.www1.artemis.domain.participation.Participation + de.tum.in.www1.artemis.service.compass.controller.ModelClusterFactory + de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO + de.tum.in.www1.artemis.service.connectors.localvc.LocalVCPrePushHook + de.tum.in.www1.artemis.service.ModelingExerciseImportService + de.tum.in.www1.artemis.web.rest.hestia.CoverageReportResource + de.tum.in.www1.artemis.web.rest.dto.SubmissionExportOptionsDTO + de.tum.in.www1.artemis.service.learningpath.LearningPathNgxService + de.tum.in.www1.artemis.domain.metis.conversation.UserConversationInfo + de.tum.in.www1.artemis.service.export.DataExportExamCreationService + de.tum.in.www1.artemis.service.connectors.jenkins.jobs.JenkinsJobService + de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestCaseDetailMessageDTO + de.tum.in.www1.artemis.domain.enumeration.DataExportState + de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository + de.tum.in.www1.artemis.domain.lecture.LectureUnitCompletion + de.tum.in.www1.artemis.service.connectors.gitlab.GitLabException + de.tum.in.www1.artemis.web.rest.GradeStepResource + de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException + de.tum.in.www1.artemis.service.FeedbackService + de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNDataStore + de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNStartEvent + de.tum.in.www1.artemis.domain.competency.CompetencyProgress + de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionService + de.tum.in.www1.artemis.web.rest.dto.ResultWithPointsPerGradingCriterionDTO + de.tum.in.www1.artemis.service.LegalDocumentService + de.tum.in.www1.artemis.service.notifications.ConversationNotificationService + de.tum.in.www1.artemis.service.SubmissionService + de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLControlFlow + de.tum.in.www1.artemis.web.rest.dto.science.ScienceEventDTO + de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObjectAttribute + de.tum.in.www1.artemis.repository.base.DynamicSpecificationRepository + de.tum.in.www1.artemis.web.rest.ExerciseResource + de.tum.in.www1.artemis.web.rest.dto.ModelingAssessmentDTO + de.tum.in.www1.artemis.service.FileService + de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse + de.tum.in.www1.artemis.web.rest.science.ScienceSettingsResource + de.tum.in.www1.artemis.service.connectors.BuildScriptProviderService + de.tum.in.www1.artemis.repository.specs.UserSpecs + de.tum.in.www1.artemis.config.icl.ssh.HashUtils + de.tum.in.www1.artemis.web.rest.dto.BonusResultDTO + de.tum.in.www1.artemis.domain.enumeration.QuizMode + de.tum.in.www1.artemis.service.feature.FeatureToggleService + de.tum.in.www1.artemis.service.hestia.structural.StructuralClass + de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationUpdateService + de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLRelationship + de.tum.in.www1.artemis.domain.Rating + de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyDragAndDropProportionalWithPenalty + de.tum.in.www1.artemis.domain.quiz.ShortAnswerMapping + de.tum.in.www1.artemis.web.rest.dto.metrics.LectureUnitInformationDTO + de.tum.in.www1.artemis.domain.quiz.MultipleChoiceQuestionStatistic + de.tum.in.www1.artemis.service.compass.umlmodel.deployment.UMLDeploymentDiagram + de.tum.in.www1.artemis.domain.iris.session.IrisCompetencyGenerationSession + de.tum.in.www1.artemis.service.hestia.structural.StructuralElement + de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.FileViolation + de.tum.in.www1.artemis.service.TextExerciseService + de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLClassDiagram + de.tum.in.www1.artemis.service.learningpath.LearningPathRecommendationService + de.tum.in.www1.artemis.web.websocket.dto.TeamAssignmentPayload + de.tum.in.www1.artemis.repository.SourceRepository + de.tum.in.www1.artemis.service.compass.umlmodel.usecase.UMLUseCase + de.tum.in.www1.artemis.domain.enumeration.StaticCodeAnalysisTool + de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO + de.tum.in.www1.artemis.service.scheduled.IExerciseScheduleService + de.tum.in.www1.artemis.service.TimeService + de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.SourceDTO + de.tum.in.www1.artemis.service.connectors.gitlab.dto.GitLabPersonalAccessTokenResponseDTO + de.tum.in.www1.artemis.web.rest.dto.CourseManagementStatisticsDTO + de.tum.in.www1.artemis.service.connectors.aeolus.Action + de.tum.in.www1.artemis.domain.Organization + de.tum.in.www1.artemis.repository.SubmissionVersionRepository + de.tum.in.www1.artemis.service.plagiarism.ContinuousPlagiarismControlPostContentProvider + de.tum.in.www1.artemis.service.notifications.push_notifications.ApplePushNotificationService + de.tum.in.www1.artemis.domain.lti.Claims + de.tum.in.www1.artemis.domain.lti.Lti13PlatformConfiguration + de.tum.in.www1.artemis.domain.Feedback + de.tum.in.www1.artemis.web.rest.dto.metrics.MapEntryLongLong + de.tum.in.www1.artemis.service.messaging.MainInstanceMessageSendService + de.tum.in.www1.artemis.domain.enumeration.CategoryState + de.tum.in.www1.artemis.domain.exam.event.ExamWideAnnouncementEvent + de.tum.in.www1.artemis.repository.metrics.ExerciseMetricsRepository + de.tum.in.www1.artemis.web.rest.QuizExerciseResource + de.tum.in.www1.artemis.service.icl.GitPublickeyAuthenticatorService + de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorAlertException + de.tum.in.www1.artemis.service.ExerciseImportService + de.tum.in.www1.artemis.web.rest.errors.ComplaintResponseLockedException + de.tum.in.www1.artemis.service.linkpreview.ogparser.htmlparser.OgMetaElement + de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO + de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3.ClassDiagramParser + de.tum.in.www1.artemis.domain.quiz.QuizStatisticCounter + de.tum.in.www1.artemis.service.dto.UserRoleDTO + de.tum.in.www1.artemis.service.connectors.localci.LocalCIBuildConfigurationService + de.tum.in.www1.artemis.web.rest.programming.ProgrammingExerciseResourceErrorKeys + de.tum.in.www1.artemis.domain.iris.settings.IrisSettingsType + de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyMultipleChoiceProportionalWithPenalty + de.tum.in.www1.artemis.web.websocket.programmingSubmission.BuildTriggerWebsocketError + de.tum.in.www1.artemis.service.iris.dto.IrisCombinedSubSettingsInterface + de.tum.in.www1.artemis.web.rest.dto.metrics.CompetencyStudentMetricsDTO + de.tum.in.www1.artemis.service.connectors.aeolus.AeolusRepository + de.tum.in.www1.artemis.repository.metrics.CompetencyMetricsRepository + de.tum.in.www1.artemis.service.connectors.localci.dto.BuildConfig + de.tum.in.www1.artemis.repository.RatingRepository + de.tum.in.www1.artemis.domain.PlagiarismCheckState + de.tum.in.www1.artemis.ApplicationWebXml + de.tum.in.www1.artemis.service.iris.websocket.IrisWebsocketDTO + de.tum.in.www1.artemis.service.connectors.pyris.PyrisHealthIndicator + de.tum.in.www1.artemis.domain.PersistentAuditEvent + de.tum.in.www1.artemis.repository.competency.StandardizedCompetencyRepository + de.tum.in.www1.artemis.repository.TextExerciseRepository + de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository + de.tum.in.www1.artemis.service.hestia.structural.StructuralTestCaseService + de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2.SyntaxTreeParser + de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentInterface + de.tum.in.www1.artemis.service.plagiarism.PlagiarismAnswerPostService + de.tum.in.www1.artemis.config.LoggingAspectConfiguration + de.tum.in.www1.artemis.domain.ConversationNotificationRecipientSummary + de.tum.in.www1.artemis.domain.quiz.DropLocation + de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3.UseCaseDiagramParser + de.tum.in.www1.artemis.security.annotations.AnnotationUtils + de.tum.in.www1.artemis.service.connectors.gitlabci.GitLabCIProgrammingLanguageFeatureService + de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyProgressDTO + de.tum.in.www1.artemis.repository.hestia.ExerciseHintRepository + de.tum.in.www1.artemis.config.DateTimeFormatConfiguration + de.tum.in.www1.artemis.domain.metis.conversation.Channel + de.tum.in.www1.artemis.web.rest.ExerciseGroupResource + de.tum.in.www1.artemis.repository.SingleUserNotificationRepository + de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.Violation + de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisBuildLogEntryDTO + de.tum.in.www1.artemis.repository.LectureUnitCompletionRepository + de.tum.in.www1.artemis.web.rest.dto.score.StudentScoreSum + de.tum.in.www1.artemis.domain.notification.SingleUserNotificationFactory + de.tum.in.www1.artemis.service.SlideSplitterService + de.tum.in.www1.artemis.repository.CourseRepository + de.tum.in.www1.artemis.service.connectors.aeolus.DockerConfig + de.tum.in.www1.artemis.service.exam.ImageExtractor + de.tum.in.www1.artemis.service.dto.athena.ModelingExerciseDTO + de.tum.in.www1.artemis.repository.StudentScoreRepository + de.tum.in.www1.artemis.service.user.UserCreationService + de.tum.in.www1.artemis.web.rest.programming.ProgrammingExerciseParticipationResource + de.tum.in.www1.artemis.repository.iris.IrisHestiaSessionRepository + de.tum.in.www1.artemis.service.connectors.jenkins.build_plan.JenkinsBuildPlanUtils + de.tum.in.www1.artemis.web.rest.hestia.ExerciseHintResource + de.tum.in.www1.artemis.web.rest.TutorParticipationResource + de.tum.in.www1.artemis.web.websocket.dto.ProgrammingExerciseTestCaseStateDTO + de.tum.in.www1.artemis.web.rest.ParticipantScoreResource + de.tum.in.www1.artemis.service.metis.ReactionService + de.tum.in.www1.artemis.domain.enumeration.DiagramType + de.tum.in.www1.artemis.web.rest.open.PublicImprintResource + de.tum.in.www1.artemis.service.plagiarism.ProgrammingLanguageNotSupportedForPlagiarismDetectionException + de.tum.in.www1.artemis.service.dto.TeamSearchUserDTO + de.tum.in.www1.artemis.service.connectors.aeolus.AeolusBuildScriptGenerationService + de.tum.in.www1.artemis.web.websocket.team.ParticipationTeamWebsocketService + de.tum.in.www1.artemis.service.compass.umlmodel.deployment.UMLDeploymentComponent + de.tum.in.www1.artemis.web.rest.dto.ProgrammingExerciseGitDiffEntryDTO + de.tum.in.www1.artemis.service.exam.ExamSessionService + de.tum.in.www1.artemis.service.iris.exception.IrisException + de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupSession + de.tum.in.www1.artemis.web.rest.dto.ImageDTO + de.tum.in.www1.artemis.service.compass.controller.FeedbackSelector + de.tum.in.www1.artemis.repository.ShortAnswerMappingRepository + de.tum.in.www1.artemis.web.rest.dto.SubmissionWithParticipationDTO + de.tum.in.www1.artemis.repository.ParticipationRepository + de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartDecision + de.tum.in.www1.artemis.service.iris.session.IrisCompetencyGenerationSessionService + de.tum.in.www1.artemis.domain.quiz.AnswerOption + de.tum.in.www1.artemis.service.iris.settings.IrisSettingsService + de.tum.in.www1.artemis.service.TeamService + de.tum.in.www1.artemis.web.rest.LearningPathResource + de.tum.in.www1.artemis.web.rest.dto.lectureunit.LectureUnitForLearningPathNodeDetailsDTO + de.tum.in.www1.artemis.domain.Result + de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO + de.tum.in.www1.artemis.service.ldap.LdapUserService + de.tum.in.www1.artemis.web.rest.dto.ProgrammingExerciseGradingStatisticsDTO + de.tum.in.www1.artemis.web.rest.BonusResource + de.tum.in.www1.artemis.domain.lti.Lti13AgsClaim + de.tum.in.www1.artemis.web.rest.dto.ExerciseManagementStatisticsDTO + de.tum.in.www1.artemis.web.rest.dto.ExamUserDTO + de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisCourseDTO + de.tum.in.www1.artemis.service.quiz.QuizService + de.tum.in.www1.artemis.domain.MigrationChangelog + de.tum.in.www1.artemis.web.rest.repository.FileSubmission + de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory + de.tum.in.www1.artemis.exception.LtiEmailAlreadyInUseException + de.tum.in.www1.artemis.domain.BuildRunState + de.tum.in.www1.artemis.web.rest.dto.StudentExamWithGradeDTO + de.tum.in.www1.artemis.config.migration.MigrationRegistry + de.tum.in.www1.artemis.config.lti.StateBasedOptimisticAuthorizationRequestRepository + de.tum.in.www1.artemis.security.lti.Lti13TokenRetriever + de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffReport + de.tum.in.www1.artemis.service.connectors.lti.LtiDeepLinkingService + de.tum.in.www1.artemis.repository.GradingScaleRepository + de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisSubmissionDTO + de.tum.in.www1.artemis.service.quiz.QuizBatchService + de.tum.in.www1.artemis.service.dto.GradingInstructionDTO + de.tum.in.www1.artemis.service.connectors.aeolus.ActionDeserializer + de.tum.in.www1.artemis.service.connectors.localci.LocalCIQueueWebsocketService + de.tum.in.www1.artemis.service.connectors.athena.AthenaConnector + de.tum.in.www1.artemis.web.rest.dto.DueDateStat + de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeatureService + de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObjectMethod + de.tum.in.www1.artemis.web.rest.GuidedTourSettingsResource + de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisExtendedCourseDTO + de.tum.in.www1.artemis.web.rest.admin.AdminPrivacyStatementResource + de.tum.in.www1.artemis.web.rest.ComplaintResponseResource + de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaRequestDTO + de.tum.in.www1.artemis.service.linkpreview.LinkPreviewService + de.tum.in.www1.artemis.web.rest.programming.ProgrammingSubmissionResource + de.tum.in.www1.artemis.web.rest.RatingResource + de.tum.in.www1.artemis.web.rest.errors.ExamConfigurationException + de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2.PetriNetParser + de.tum.in.www1.artemis.repository.LongFeedbackTextRepository + de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2.ObjectDiagramParser + de.tum.in.www1.artemis.domain.competency.LearningPath + de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisJsonMessageContentDTO + de.tum.in.www1.artemis.web.rest.dto.metrics.ExerciseInformationDTO + de.tum.in.www1.artemis.service.connectors.athena.AthenaModuleService + de.tum.in.www1.artemis.service.dto.ComplaintResponseUpdateDTO + de.tum.in.www1.artemis.service.connectors.gitlabci.GitLabCIBuildPlanService + de.tum.in.www1.artemis.repository.DragItemRepository + de.tum.in.www1.artemis.service.connectors.GitService + de.tum.in.www1.artemis.service.export.DataExportUtil + de.tum.in.www1.artemis.service.connectors.gitlab.dto.GitLabPersonalAccessTokenRequestDTO + de.tum.in.www1.artemis.service.compass.utils.SimilarityUtils + de.tum.in.www1.artemis.service.plagiarism.cache.PlagiarismCacheService + de.tum.in.www1.artemis.web.rest.admin.AdminStatisticsResource + de.tum.in.www1.artemis.config.StaticCodeAnalysisConfigurer + de.tum.in.www1.artemis.repository.PersistenceAuditEventRepository + de.tum.in.www1.artemis.service.TextExerciseImportService + de.tum.in.www1.artemis.domain.quiz.ShortAnswerSpot + de.tum.in.www1.artemis.web.rest.ModelingSubmissionResource + de.tum.in.www1.artemis.service.FileUploadSubmissionService + de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO + de.tum.in.www1.artemis.domain.enumeration.CourseInformationSharingConfiguration + de.tum.in.www1.artemis.service.connectors.localci.scaparser.exception.ParserException + de.tum.in.www1.artemis.repository.AttachmentUnitRepository + de.tum.in.www1.artemis.domain.statistics.tutor.effort.TutorEffort + de.tum.in.www1.artemis.service.connectors.vcs.VcsTokenManagementService + de.tum.in.www1.artemis.service.connectors.gitlabci.GitLabCIAuthorizationInterceptor + de.tum.in.www1.artemis.service.ProfileService + de.tum.in.www1.artemis.web.rest.push_notification.PushNotificationUnregisterRequest + de.tum.in.www1.artemis.domain.competency.CompetencyJol + de.tum.in.www1.artemis.service.programming.ProgrammingExerciseImportBasicService + de.tum.in.www1.artemis.domain.plagiarism.PlagiarismResult + de.tum.in.www1.artemis.web.rest.plagiarism.PlagiarismResource + de.tum.in.www1.artemis.domain.quiz.ShortAnswerSolution + de.tum.in.www1.artemis.web.rest.push_notification.PushNotificationRegisterDTO + de.tum.in.www1.artemis.web.websocket.dto.SubmissionSyncPayload + de.tum.in.www1.artemis.service.connectors.localci.dto.BuildResult + de.tum.in.www1.artemis.service.AssessmentService + de.tum.in.www1.artemis.service.dto.PasswordChangeDTO + de.tum.in.www1.artemis.domain.hestia.ExerciseHintActivation + de.tum.in.www1.artemis.domain.quiz.QuizQuestionStatistic + de.tum.in.www1.artemis.domain.iris.settings.IrisChatSubSettings + de.tum.in.www1.artemis.domain.exam.SuspiciousSessionsAnalysisOptions + de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2.ComponentDiagramParser + de.tum.in.www1.artemis.domain.IBonusStrategy + de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO + de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO + de.tum.in.www1.artemis.web.rest.dto.GradeDTO + de.tum.in.www1.artemis.service.compass.umlmodel.usecase.UMLActor + de.tum.in.www1.artemis.web.rest.dto.CourseForImportDTO + de.tum.in.www1.artemis.domain.competency.Source + de.tum.in.www1.artemis.config.connector.GitLabApiConfiguration + de.tum.in.www1.artemis.web.rest.metis.conversation.ChannelResource + de.tum.in.www1.artemis.service.connectors.ldap.LdapAuthenticationProvider + de.tum.in.www1.artemis.web.rest.dto.SubmissionVersionDTO + de.tum.in.www1.artemis.service.TextAssessmentService + de.tum.in.www1.artemis.web.rest.repository.util.RepositoryExecutor + de.tum.in.www1.artemis.web.rest.dto.FileMove + de.tum.in.www1.artemis.web.rest.tutorialgroups.TutorialGroupsConfigurationResource + de.tum.in.www1.artemis.service.iris.session.IrisSubFeatureInterface + de.tum.in.www1.artemis.domain.notification.TutorialGroupNotificationFactory + de.tum.in.www1.artemis.service.WebsocketMessagingService + de.tum.in.www1.artemis.service.exam.ExamUserService + de.tum.in.www1.artemis.domain.lecture.LectureUnit + de.tum.in.www1.artemis.domain.Attachment + de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartInputOutput + de.tum.in.www1.artemis.service.listeners.ResultListener + de.tum.in.www1.artemis.service.hestia.structural.StructuralSolutionEntryGenerationException + de.tum.in.www1.artemis.service.icl.SshGitCommandFactoryService + de.tum.in.www1.artemis.service.connectors.pyris.PyrisConnectorService + de.tum.in.www1.artemis.service.exam.ExamService + de.tum.in.www1.artemis.service.connectors.aeolus.dto.AeolusGenerationResponseDTO + de.tum.in.www1.artemis.service.connectors.aeolus.AeolusTemplateService + de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository + de.tum.in.www1.artemis.service.compass.utils.CompassConfiguration + de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.SpotbugsParser + de.tum.in.www1.artemis.service.dto.athena.SubmissionBaseDTO + de.tum.in.www1.artemis.domain.iris.settings.IrisCompetencyGenerationSubSettings + de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.GroupChatDTO + de.tum.in.www1.artemis.service.programming.DefaultTemplateUpgradeService + de.tum.in.www1.artemis.service.compass.umlmodel.deployment.UMLArtifact + de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNEndEvent + de.tum.in.www1.artemis.repository.plagiarism.PlagiarismComparisonRepository + de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityNode + de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.GroupGitDiffAndCoverageEntriesByFilePathAndTestCase + de.tum.in.www1.artemis.service.programming.ProgrammingExerciseImportFromFileService + de.tum.in.www1.artemis.domain.metis.PostSortCriterion + de.tum.in.www1.artemis.web.rest.admin.AdminCourseResource + de.tum.in.www1.artemis.domain.quiz.QuizStatistic + de.tum.in.www1.artemis.exception.ArtemisMailException + de.tum.in.www1.artemis.config.icl.BuildAgentConfiguration + de.tum.in.www1.artemis.service.dto.ResponsibleUserDTO + de.tum.in.www1.artemis.service.ExerciseService + de.tum.in.www1.artemis.service.notifications.GroupNotificationService + de.tum.in.www1.artemis.service.LectureService + de.tum.in.www1.artemis.web.rest.MetricsResource + de.tum.in.www1.artemis.domain.Lecture + de.tum.in.www1.artemis.service.iris.IrisDefaultTemplateService + de.tum.in.www1.artemis.web.rest.metis.conversation.OneToOneChatResource + de.tum.in.www1.artemis.service.plagiarism.PlagiarismPostService + de.tum.in.www1.artemis.web.rest.dto.SubmissionWithComplaintDTO + de.tum.in.www1.artemis.domain.GradeType + de.tum.in.www1.artemis.domain.exam.SuspiciousExamSessions + de.tum.in.www1.artemis.repository.QuizGroupRepository + de.tum.in.www1.artemis.web.rest.dto.UserWithIdAndLoginDTO + de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO + de.tum.in.www1.artemis.service.connectors.localci.buildagent.BuildJobExecutionService + de.tum.in.www1.artemis.domain.iris.settings.IrisSettings + de.tum.in.www1.artemis.web.rest.programming.ProgrammingExerciseLockResource + de.tum.in.www1.artemis.domain.DataExport + de.tum.in.www1.artemis.config.ConditionalMetricsExclusionConfiguration + de.tum.in.www1.artemis.domain.exam.event.ExamLiveEvent + de.tum.in.www1.artemis.service.exam.ExamAccessService + de.tum.in.www1.artemis.web.rest.util.PageUtil + de.tum.in.www1.artemis.service.export.ModelingExerciseWithSubmissionsExportService + de.tum.in.www1.artemis.domain.lecture.VideoUnit + de.tum.in.www1.artemis.repository.SlideRepository + de.tum.in.www1.artemis.domain.iris.message.IrisMessageSender + de.tum.in.www1.artemis.repository.metis.conversation.OneToOneChatRepository + de.tum.in.www1.artemis.repository.OnlineUnitRepository + de.tum.in.www1.artemis.service.programming.CommitHistoryService + de.tum.in.www1.artemis.service.ExerciseDateService + de.tum.in.www1.artemis.service.iris.IrisRateLimitService + de.tum.in.www1.artemis.repository.TextSubmissionRepository + de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupFreePeriod + de.tum.in.www1.artemis.repository.VideoUnitRepository + de.tum.in.www1.artemis.config.LoggingConfiguration + de.tum.in.www1.artemis.service.programming.TemplateUpgradePolicyService + de.tum.in.www1.artemis.web.rest.FileUploadExerciseResource + de.tum.in.www1.artemis.web.rest.AeolusTemplateResource + de.tum.in.www1.artemis.repository.BuildLogEntryRepository + de.tum.in.www1.artemis.service.compass.umlmodel.usecase.UMLUseCaseAssociation + de.tum.in.www1.artemis.domain.TempIdObject + de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestwiseCoverageReportDTO + de.tum.in.www1.artemis.service.quiz.QuizExerciseImportService + de.tum.in.www1.artemis.repository.iris.IrisSubSettingsRepository + de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.PMDCPDParser + de.tum.in.www1.artemis.web.filter.SpaWebFilter + de.tum.in.www1.artemis.service.hestia.structural.StructuralAttribute + de.tum.in.www1.artemis.web.rest.FileResource + de.tum.in.www1.artemis.service.connectors.pyris.job.CourseChatJob + de.tum.in.www1.artemis.web.rest.dto.DataExportDTO + de.tum.in.www1.artemis.config.CacheConfiguration + de.tum.in.www1.artemis.domain.plagiarism.PlagiarismMatch + de.tum.in.www1.artemis.management.SecurityMetersService + de.tum.in.www1.artemis.service.iris.session.IrisButtonBasedFeatureInterface + de.tum.in.www1.artemis.domain.GradeStep + de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsProgrammingLanguageFeatureService + de.tum.in.www1.artemis.domain.notification.GroupNotification + de.tum.in.www1.artemis.domain.competency.RelationType + de.tum.in.www1.artemis.web.rest.ExamResource + de.tum.in.www1.artemis.repository.NotificationRepository + de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupFreePeriodRepository + de.tum.in.www1.artemis.service.connectors.athena.AthenaFeedbackSuggestionsService + de.tum.in.www1.artemis.web.rest.tutorialgroups.errors.SessionOverlapsWithSessionException + de.tum.in.www1.artemis.service.tutorialgroups.TutorialGroupService + de.tum.in.www1.artemis.service.LectureImportService + de.tum.in.www1.artemis.domain.enumeration.NotificationType + de.tum.in.www1.artemis.service.util.structureoraclegenerator.JavaClassDiff + de.tum.in.www1.artemis.service.metrics.LearningMetricsService + de.tum.in.www1.artemis.service.programming.ProgrammingExerciseCodeReviewFeedbackService + de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3.BPMNDiagramParser + de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartFunctionCall + de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisUserDTO + de.tum.in.www1.artemis.web.rest.dto.CourseWithIdDTO + de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.Duplication + de.tum.in.www1.artemis.service.dto.StaticCodeAnalysisIssue + de.tum.in.www1.artemis.repository.metis.CustomPostRepository + de.tum.in.www1.artemis.domain.metis.conversation.GeneralConversationInfo + de.tum.in.www1.artemis.service.connectors.jenkins.jobs.JenkinsJobPermissionsUtils + de.tum.in.www1.artemis.config.icl.ssh.SshGitCommand + de.tum.in.www1.artemis.config.MetricsBean + de.tum.in.www1.artemis.security.DomainUserDetailsService + de.tum.in.www1.artemis.config.websocket.WebsocketBrokerHealthIndicator + de.tum.in.www1.artemis.service.connectors.gitlab.GitLabUserManagementService + de.tum.in.www1.artemis.service.connectors.localci.buildagent.BuildJobGitService + de.tum.in.www1.artemis.domain.enumeration.NotificationPriority + de.tum.in.www1.artemis.service.connectors.vcs.VcsUserManagementService + de.tum.in.www1.artemis.repository.TeamScoreRepository + de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObject + de.tum.in.www1.artemis.domain.competency.StandardizedCompetency + de.tum.in.www1.artemis.service.connectors.athena.AthenaSubmissionSendingService + de.tum.in.www1.artemis.service.programming.ProgrammingAssessmentService + de.tum.in.www1.artemis.domain.VcsRepositoryUri + de.tum.in.www1.artemis.service.compass.umlmodel.usecase.UMLSystemBoundary + de.tum.in.www1.artemis.service.exam.ExamSubmissionService + de.tum.in.www1.artemis.domain.enumeration.DisplayPriority + de.tum.in.www1.artemis.domain.Commit + de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.CheckstyleParser + de.tum.in.www1.artemis.web.rest.admin.AuditResource + de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsEndpoints + de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupSessionRepository + de.tum.in.www1.artemis.repository.UserRepository + de.tum.in.www1.artemis.service.programming.RepositoryParticipationService + de.tum.in.www1.artemis.service.iris.dto.IrisCombinedSettingsDTO + de.tum.in.www1.artemis.repository.metis.PostRepository + de.tum.in.www1.artemis.web.rest.ComplaintResource + de.tum.in.www1.artemis.service.user.UserService + de.tum.in.www1.artemis.web.rest.errors.FieldErrorVM + de.tum.in.www1.artemis.domain.enumeration.GroupNotificationType + de.tum.in.www1.artemis.domain.notification.SingleUserNotification + de.tum.in.www1.artemis.service.connectors.vcs.VersionControlRepositoryPermission + de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2.UMLModelV2Parser + de.tum.in.www1.artemis.service.InternalUrlService + de.tum.in.www1.artemis.service.connectors.aeolus.WindfileMetadata + de.tum.in.www1.artemis.web.rest.open.PublicAccountResource + de.tum.in.www1.artemis.service.connectors.jenkins.jobs.JenkinsJobPermission + de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict + de.tum.in.www1.artemis.config.icl.ssh.MultipleHostKeyProvider + de.tum.in.www1.artemis.service.plagiarism.ProgrammingPlagiarismDetectionService + de.tum.in.www1.artemis.web.rest.QuizSubmissionResource + de.tum.in.www1.artemis.service.FilePathService + de.tum.in.www1.artemis.service.dto.UserDTO + de.tum.in.www1.artemis.web.rest.SystemNotificationResource + de.tum.in.www1.artemis.web.rest.dto.examevent.ExamLiveEventBaseDTO + de.tum.in.www1.artemis.config.RestTemplateConfiguration + de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNGroup + de.tum.in.www1.artemis.domain.quiz.QuizPointStatistic + de.tum.in.www1.artemis.service.compass.umlmodel.communication.UMLCommunicationDiagram + de.tum.in.www1.artemis.service.connectors.localci.scaparser.utils.FileUtils + de.tum.in.www1.artemis.web.rest.ExamLockResource + de.tum.in.www1.artemis.config.auth.PyrisAuthorizationInterceptor + de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyShortAnswerAllOrNothing + de.tum.in.www1.artemis.web.rest.open.PublicTimeResource + de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor + de.tum.in.www1.artemis.service.quiz.QuizMessagingService + de.tum.in.www1.artemis.domain.quiz.DropLocationCounter + de.tum.in.www1.artemis.web.rest.dto.ExerciseScoresAggregatedInformation + de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupNotificationRepository + de.tum.in.www1.artemis.web.rest.dto.ExerciseScoresDTO + de.tum.in.www1.artemis.repository.ComplaintResponseRepository + de.tum.in.www1.artemis.service.connectors.pyris.PyrisStatusUpdateService + de.tum.in.www1.artemis.service.metis.conversation.OneToOneChatService + de.tum.in.www1.artemis.service.dto.athena.ProgrammingExerciseDTO + de.tum.in.www1.artemis.web.rest.ExampleSubmissionResource + de.tum.in.www1.artemis.service.notifications.NotificationSettingsCommunicationChannel + de.tum.in.www1.artemis.config.icl.JGitServletConfiguration + de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.BugInstance + de.tum.in.www1.artemis.web.rest.science.ScienceResource + de.tum.in.www1.artemis.service.quiz.QuizPoolService + de.tum.in.www1.artemis.config.icl.ssh.SshConstants + de.tum.in.www1.artemis.service.tutorialgroups.TutorialGroupFreePeriodService + de.tum.in.www1.artemis.web.rest.dto.metrics.LectureUnitStudentMetricsDTO + de.tum.in.www1.artemis.domain.leaderboard.tutor.TutorLeaderboardAnsweredMoreFeedbackRequests + de.tum.in.www1.artemis.config.migration.MigrationPath + de.tum.in.www1.artemis.service.programming.ProgrammingSubmissionService + de.tum.in.www1.artemis.service.util.RoundingUtil + de.tum.in.www1.artemis.web.rest.util.ResponseUtil + de.tum.in.www1.artemis.service.iris.session.IrisCourseChatSessionService + de.tum.in.www1.artemis.web.rest.push_notification.PushNotificationRegisterBody + de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupRepository + de.tum.in.www1.artemis.domain.iris.message.IrisMessageContent + de.tum.in.www1.artemis.service.AttachmentUnitService + de.tum.in.www1.artemis.service.ZipFileService + de.tum.in.www1.artemis.repository.FileUploadSubmissionRepository + de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2.ClassDiagramParser + de.tum.in.www1.artemis.repository.MigrationChangeRepository + de.tum.in.www1.artemis.web.rest.StaticCodeAnalysisResource + de.tum.in.www1.artemis.web.rest.StudentExamResource + de.tum.in.www1.artemis.domain.FileUploadExercise + de.tum.in.www1.artemis.service.util.Tuple + de.tum.in.www1.artemis.domain.analytics.TextAssessmentEvent + de.tum.in.www1.artemis.config.audit.AuditEventConverter + de.tum.in.www1.artemis.service.dto.ComplaintRequestDTO + de.tum.in.www1.artemis.domain.lecture.AttachmentUnit + de.tum.in.www1.artemis.service.programming.RepositoryAccessService + de.tum.in.www1.artemis.service.dto.athena.TextSubmissionDTO + de.tum.in.www1.artemis.domain.exam.event.WorkingTimeUpdateEvent + de.tum.in.www1.artemis.repository.plagiarism.PlagiarismResultRepository + de.tum.in.www1.artemis.domain.AuxiliaryRepository + de.tum.in.www1.artemis.service.ModelingExerciseService + de.tum.in.www1.artemis.service.connectors.localci.buildagent.BuildAgentDockerService + de.tum.in.www1.artemis.repository.QuizQuestionRepository + de.tum.in.www1.artemis.service.TitleCacheEvictionService + de.tum.in.www1.artemis.domain.notification.NotificationConstants + de.tum.in.www1.artemis.exception.JenkinsException + de.tum.in.www1.artemis.exception.localvc.LocalVCForbiddenException + de.tum.in.www1.artemis.config.JacksonConfiguration + de.tum.in.www1.artemis.repository.metis.AnswerPostRepository + de.tum.in.www1.artemis.config.lti.CustomLti13Configurer + de.tum.in.www1.artemis.repository.metis.conversation.GroupChatRepository + de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationTriggerService + de.tum.in.www1.artemis.service.export.FileUploadSubmissionExportService + de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2.CommunicationDiagramParser + de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralSolutionEntryGenerationException + de.tum.in.www1.artemis.validation.InetSocketAddressValidator + de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsTriggerService + de.tum.in.www1.artemis.domain.lecture.OnlineUnit + de.tum.in.www1.artemis.service.compass.umlmodel.petrinet.PetriNetArc + de.tum.in.www1.artemis.service.dto.athena.FeedbackBaseDTO + de.tum.in.www1.artemis.web.rest.programming.ProgrammingExerciseGradingResource + de.tum.in.www1.artemis.service.quiz.QuizExerciseService + de.tum.in.www1.artemis.domain.CourseExamExportErrorCause + de.tum.in.www1.artemis.web.rest.dto.CourseScoresDTO + de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyDragAndDropAllOrNothing + de.tum.in.www1.artemis.repository.DataExportRepository + de.tum.in.www1.artemis.domain.quiz.QuizQuestionStatisticComponent + de.tum.in.www1.artemis.repository.metis.CustomPostRepositoryImpl + de.tum.in.www1.artemis.domain.plagiarism.PlagiarismComparison + de.tum.in.www1.artemis.domain.exam.ExamSession + de.tum.in.www1.artemis.service.connectors.gitlab.AbstractGitLabAuthorizationInterceptor + de.tum.in.www1.artemis.repository.metis.ReactionRepository + de.tum.in.www1.artemis.service.messaging.InstanceMessageReceiveService + de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestCaseDTO + de.tum.in.www1.artemis.repository.BuildPlanRepository + de.tum.in.www1.artemis.web.rest.dto.score.StudentScoresDTO + de.tum.in.www1.artemis.service.connectors.localvc.LocalVCServletService + de.tum.in.www1.artemis.service.plagiarism.ModelingPlagiarismDetectionService + de.tum.in.www1.artemis.repository.science.ScienceSettingRepository + de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult + de.tum.in.www1.artemis.web.rest.metis.ReactionResource + de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedText + de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNAnnotation + de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException + de.tum.in.www1.artemis.service.exam.StudentExamService + de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralBlackboard + de.tum.in.www1.artemis.service.connectors.localci.LocalCITriggerService + de.tum.in.www1.artemis.service.competency.CompetencyService + de.tum.in.www1.artemis.web.rest.programming.ProgrammingAssessmentResource + de.tum.in.www1.artemis.web.rest.errors.ErrorConstants + de.tum.in.www1.artemis.web.rest.dto.ExamUsersNotFoundDTO + de.tum.in.www1.artemis.service.iris.websocket.IrisChatWebsocketService + de.tum.in.www1.artemis.service.dto.athena.ProgrammingFeedbackDTO + de.tum.in.www1.artemis.domain.quiz.DragAndDropMapping + de.tum.in.www1.artemis.service.feature.Feature + de.tum.in.www1.artemis.web.rest.dto.AssessmentUpdateDTO + de.tum.in.www1.artemis.service.connectors.lti.LtiNewResultService + de.tum.in.www1.artemis.web.rest.errors.ServiceUnavailableException + de.tum.in.www1.artemis.domain.Authority + de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisExerciseWithStudentSubmissionsDTO + de.tum.in.www1.artemis.repository.QuizExerciseRepository + de.tum.in.www1.artemis.repository.iris.IrisCompetencyGenerationSessionRepository + de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.CombineChangeBlocks + de.tum.in.www1.artemis.domain.metis.AnswerPost + de.tum.in.www1.artemis.service.connectors.localci.dto.ResultBuildJob + de.tum.in.www1.artemis.web.rest.admin.AdminDataExportResource + de.tum.in.www1.artemis.domain.iris.settings.IrisModelListConverter + de.tum.in.www1.artemis.service.ParticipationAuthorizationCheckService + de.tum.in.www1.artemis.service.scheduled.ParticipantScoreScheduleService + de.tum.in.www1.artemis.repository.metis.conversation.ConversationRepository + de.tum.in.www1.artemis.domain.push_notification.PushNotificationDeviceType + de.tum.in.www1.artemis.service.scheduled.ScheduleService + de.tum.in.www1.artemis.service.iris.session.IrisRateLimitedFeatureInterface + de.tum.in.www1.artemis.web.rest.dto.OnlineResourceDTO + de.tum.in.www1.artemis.web.rest.dto.TextAssessmentDTO + de.tum.in.www1.artemis.web.rest.dto.user.UserNameAndLoginDTO + de.tum.in.www1.artemis.domain.exam.SuspiciousSessionReason + de.tum.in.www1.artemis.service.programming.ProgrammingMessagingService + de.tum.in.www1.artemis.service.plagiarism.PlagiarismService + de.tum.in.www1.artemis.web.rest.AttachmentResource + de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2.DeploymentDiagramParser + de.tum.in.www1.artemis.service.export.TextSubmissionExportService + de.tum.in.www1.artemis.service.notifications.GeneralInstantNotificationService + de.tum.in.www1.artemis.service.dto.FinishedBuildJobDTO + de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisImageMessageContentDTO + de.tum.in.www1.artemis.domain.hestia.ExerciseHint + de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram + de.tum.in.www1.artemis.web.rest.metis.AnswerMessageResource + de.tum.in.www1.artemis.domain.enumeration.ProjectType + de.tum.in.www1.artemis.web.rest.tutorialgroups.TutorialGroupResource + de.tum.in.www1.artemis.service.connectors.HazelcastHealthIndicator + de.tum.in.www1.artemis.repository.ExerciseUnitRepository + de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisCompetencyDTO + de.tum.in.www1.artemis.web.rest.QuizPoolResource + de.tum.in.www1.artemis.web.rest.ApollonConversionResource + de.tum.in.www1.artemis.domain.SubmissionVersion + de.tum.in.www1.artemis.web.rest.ExerciseScoresChartResource + de.tum.in.www1.artemis.service.learningpath.LearningPathService + de.tum.in.www1.artemis.service.notifications.push_notifications.RelayNotificationRequest + de.tum.in.www1.artemis.service.export.ExerciseWithSubmissionsExportService + de.tum.in.www1.artemis.domain.plagiarism.PlagiarismStatus + de.tum.in.www1.artemis.web.rest.dto.metrics.ExerciseStudentMetricsDTO + de.tum.in.www1.artemis.service.metis.conversation.auth.ChannelAuthorizationService + de.tum.in.www1.artemis.service.util.HttpRequestUtils + de.tum.in.www1.artemis.domain.metis.CourseWideContext + de.tum.in.www1.artemis.repository.QuizPointStatisticRepository + de.tum.in.www1.artemis.config.CustomMetricsExtensionConfiguration + de.tum.in.www1.artemis.service.connectors.gitlabci.GitLabCIResultService + de.tum.in.www1.artemis.web.rest.ConsistencyCheckResource + de.tum.in.www1.artemis.domain.iris.settings.IrisSubSettingsType + de.tum.in.www1.artemis.web.rest.dto.LectureUnitSplitDTO + de.tum.in.www1.artemis.web.rest.dto.StatsForDashboardDTO + de.tum.in.www1.artemis.security.jwt.JWTCookieService + de.tum.in.www1.artemis.service.connectors.ci.AbstractBuildPlanCreator + de.tum.in.www1.artemis.domain.quiz.QuizExercise + de.tum.in.www1.artemis.service.export.QuizExerciseWithSubmissionsExportService + de.tum.in.www1.artemis.service.user.PasswordService + de.tum.in.www1.artemis.service.OnlineCourseConfigurationService + de.tum.in.www1.artemis.service.export.FileUploadExerciseWithSubmissionsExportService + de.tum.in.www1.artemis.service.compass.umlmodel.petrinet.PetriNet + de.tum.in.www1.artemis.web.rest.admin.AdminExerciseResource + de.tum.in.www1.artemis.repository.LectureUnitRepository + de.tum.in.www1.artemis.web.filter.Lti13LaunchFilter + de.tum.in.www1.artemis.repository.metis.conversation.ConversationNotificationRepository + de.tum.in.www1.artemis.service.dto.MaxAndReachablePoints + de.tum.in.www1.artemis.service.scheduled.PushNotificationDeviceConfigurationCleanupService + de.tum.in.www1.artemis.config.AsyncConfiguration + de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3.ObjectDiagramParser + de.tum.in.www1.artemis.service.connectors.apollon.dto.ApollonModelDTO + de.tum.in.www1.artemis.aop.logging.LoggingAspect + de.tum.in.www1.artemis.service.iris.session.IrisHestiaSessionService + de.tum.in.www1.artemis.web.rest.StatisticsResource + de.tum.in.www1.artemis.repository.science.ScienceEventRepository + de.tum.in.www1.artemis.service.scheduled.ProgrammingExerciseScheduleService + de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3.DeploymentDiagramParser + de.tum.in.www1.artemis.service.compass.umlmodel.communication.UMLCommunicationLink + de.tum.in.www1.artemis.web.rest.dto.ExerciseDTO + de.tum.in.www1.artemis.domain.modeling.ModelElement + de.tum.in.www1.artemis.service.connectors.localci.buildagent.BuildLogsMap + de.tum.in.www1.artemis.service.user.UserManagementInfoContributor + de.tum.in.www1.artemis.service.connectors.aeolus.Windfile + de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyJolDTO + de.tum.in.www1.artemis.domain.lti.LtiResourceLaunch + de.tum.in.www1.artemis.exception.FilePathParsingException + de.tum.in.www1.artemis.domain.quiz.QuizSubmission + de.tum.in.www1.artemis.domain.NotificationSetting + de.tum.in.www1.artemis.repository.ConductAgreementRepository + de.tum.in.www1.artemis.security.annotations.ManualConfig + de.tum.in.www1.artemis.service.export.CourseExamExportService + de.tum.in.www1.artemis.domain.enumeration.ScoringType + de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastInstructorInExercise + de.tum.in.www1.artemis.domain.notification.ConversationNotificationFactory + de.tum.in.www1.artemis.web.rest.dto.CourseManagementOverviewStatisticsDTO + de.tum.in.www1.artemis.service.feature.FeatureToggleInfoContributor + de.tum.in.www1.artemis.service.OrganizationService + de.tum.in.www1.artemis.web.rest.dto.examevent.ExamWideAnnouncementEventDTO + de.tum.in.www1.artemis.service.notifications.TutorialGroupNotificationService + de.tum.in.www1.artemis.web.rest.admin.LogResource + de.tum.in.www1.artemis.domain.leaderboard.tutor.TutorLeaderboardComplaintResponses + de.tum.in.www1.artemis.service.metis.PostingService + de.tum.in.www1.artemis.security.ArtemisAuthenticationProviderImpl + de.tum.in.www1.artemis.web.rest.open.PublicResultResource + de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.DropRemovedGitDiffEntries + de.tum.in.www1.artemis.repository.TeamRepository + de.tum.in.www1.artemis.service.TutorParticipationService + de.tum.in.www1.artemis.web.rest.dto.ExamInformationDTO + de.tum.in.www1.artemis.service.icl.SshGitLocationResolverService + de.tum.in.www1.artemis.service.programming.ProgrammingExerciseGradingService + de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse + de.tum.in.www1.artemis.domain.quiz.SubmittedAnswer + de.tum.in.www1.artemis.web.rest.dto.SubmissionDTO + de.tum.in.www1.artemis.service.ResultService + de.tum.in.www1.artemis.service.connectors.localvc.LocalVCRepositoryUri + de.tum.in.www1.artemis.web.rest.iris.IrisStatusDTO + de.tum.in.www1.artemis.service.dto.BuildJobDTOInterface + de.tum.in.www1.artemis.repository.ExampleSubmissionRepository + de.tum.in.www1.artemis.service.ldap.LdapUserDto + de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathInformationDTO + de.tum.in.www1.artemis.service.ComplaintService + de.tum.in.www1.artemis.service.competency.CompetencyRelationService + de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.CheckstyleFile + de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3.UMLModelV3Parser + de.tum.in.www1.artemis.config.EurekaClientRestTemplateConfiguration + de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceRoleInExerciseAspect + de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.AddUncoveredLinesAsPotentialCodeBlocks + de.tum.in.www1.artemis.domain.participation.AbstractBaseProgrammingExerciseParticipation + de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3.PetriNetParser + de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseTaskService + de.tum.in.www1.artemis.domain.enumeration.TeamImportStrategyType + de.tum.in.www1.artemis.service.scheduled.DataExportScheduleService + de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartFlowline + de.tum.in.www1.artemis.web.rest.dto.BuildPlanCheckoutDirectoriesDTO + de.tum.in.www1.artemis.web.rest.iris.IrisSettingsResource + de.tum.in.www1.artemis.service.compass.utils.JSONMapping + de.tum.in.www1.artemis.config.ApplicationConfiguration + de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.BehavioralKnowledgeSource + de.tum.in.www1.artemis.service.messaging.InstanceMessageSendService + de.tum.in.www1.artemis.domain.quiz.QuizSubmittedAnswerCount + de.tum.in.www1.artemis.service.connectors.localci.LocalCIResultProcessingService + de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisMessageContentBaseDTO + de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestResultsDTO + de.tum.in.www1.artemis.domain.metis.ConversationParticipantSettingsView + de.tum.in.www1.artemis.domain.enumeration.InitializationState + de.tum.in.www1.artemis.domain.ProgrammingExercise + de.tum.in.www1.artemis.service.messaging.MessageTopic + de.tum.in.www1.artemis.service.compass.CompassService + de.tum.in.www1.artemis.web.rest.dto.metrics.ScoreDTO + de.tum.in.www1.artemis.repository.CustomAuditEventRepository + de.tum.in.www1.artemis.repository.ModelClusterRepository + de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.ConversationUserDTO + de.tum.in.www1.artemis.web.rest.open.PublicOAuth2JWKSResource + de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase + de.tum.in.www1.artemis.repository.AuthorityRepository + de.tum.in.www1.artemis.service.quiz.QuizScheduleService + de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult + de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNIntermediateEvent + de.tum.in.www1.artemis.domain.plagiarism.text.TextSubmissionElement + de.tum.in.www1.artemis.domain.iris.settings.IrisGlobalSettings + de.tum.in.www1.artemis.domain.quiz.AbstractQuizSubmission + de.tum.in.www1.artemis.service.notifications.MailService + de.tum.in.www1.artemis.service.connectors.localci.scaparser.exception.UnsupportedToolException + de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNTask + de.tum.in.www1.artemis.repository.QuizPoolRepository + de.tum.in.www1.artemis.domain.notification.NotificationTarget + de.tum.in.www1.artemis.web.rest.admin.AdminLtiConfigurationResource + de.tum.in.www1.artemis.repository.TextBlockRepository + de.tum.in.www1.artemis.repository.plagiarism.PlagiarismSubmissionRepository + de.tum.in.www1.artemis.domain.modeling.SimilarElementCount + de.tum.in.www1.artemis.domain.BuildJob + de.tum.in.www1.artemis.service.export.ModelingSubmissionExportService + de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.CheckstyleError + de.tum.in.www1.artemis.service.metis.conversation.ConversationDTOService + de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.PMDParser + de.tum.in.www1.artemis.service.connectors.pyris.PyrisJobService + de.tum.in.www1.artemis.exception.LocalCIException + de.tum.in.www1.artemis.service.messaging.DistributedInstanceMessageSendService + de.tum.in.www1.artemis.config.connector.JenkinsServerConfiguration + de.tum.in.www1.artemis.domain.notification.Notification + de.tum.in.www1.artemis.web.rest.metis.conversation.ConversationManagementResource + de.tum.in.www1.artemis.service.export.DataExportService + de.tum.in.www1.artemis.service.connectors.localci.buildagent.BuildJobManagementService + de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3.SyntaxTreeParser + de.tum.in.www1.artemis.service.connectors.lti.Lti13Service + de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyShortAnswerProportionalWithPenalty + de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3.ComponentDiagramParser + de.tum.in.www1.artemis.web.rest.iris.IrisResource + de.tum.in.www1.artemis.config.StartupDelayConfig + de.tum.in.www1.artemis.domain.statistics.ScoreDistribution + de.tum.in.www1.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeTerminal + de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisHealthStatusDTO + de.tum.in.www1.artemis.domain.iris.message.IrisMessage + de.tum.in.www1.artemis.service.hestia.structural.StructuralConstructor + de.tum.in.www1.artemis.service.plagiarism.PlagiarismCaseService + de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse + de.tum.in.www1.artemis.web.rest.repository.FileSubmissionError + de.tum.in.www1.artemis.service.dto.athena.TextFeedbackDTO + de.tum.in.www1.artemis.repository.DragAndDropMappingRepository + de.tum.in.www1.artemis.web.rest.programming.ProgrammingExercisePlagiarismResource + de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseTaskRepository + de.tum.in.www1.artemis.domain.metis.ReactionConstraintValidator + de.tum.in.www1.artemis.web.rest.LtiResource + de.tum.in.www1.artemis.service.notifications.SingleUserNotificationService + de.tum.in.www1.artemis.service.connectors.lti.LtiDynamicRegistrationService + de.tum.in.www1.artemis.web.websocket.dto.metis.ConversationWebsocketDTO + de.tum.in.www1.artemis.service.scheduled.WeeklyEmailSummaryScheduleService + de.tum.in.www1.artemis.repository.CompetencyRepository + de.tum.in.www1.artemis.exception.UsernameAlreadyUsedException + de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenAlertException + de.tum.in.www1.artemis.web.rest.admin.FeatureToggleResource + de.tum.in.www1.artemis.service.connectors.gitlab.dto.GitLabPersonalAccessTokenListResponseDTO + de.tum.in.www1.artemis.domain.File + de.tum.in.www1.artemis.repository.ExamSessionRepository + de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationResultService + de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisLectureUnitDTO + de.tum.in.www1.artemis.service.BonusService + de.tum.in.www1.artemis.web.rest.dto.AssessmentUpdateBaseDTO + de.tum.in.www1.artemis.service.export.ProgrammingExerciseExportService + de.tum.in.www1.artemis.domain.enumeration.TutorParticipationStatus + de.tum.in.www1.artemis.service.connectors.jenkins.build_plan.JenkinsPipelineScriptCreator + de.tum.in.www1.artemis.security.SecurityUtils + de.tum.in.www1.artemis.repository.competency.CompetencyJolRepository + de.tum.in.www1.artemis.service.connectors.gitlab.GitLabPersonalAccessTokenManagementService + de.tum.in.www1.artemis.service.iris.dto.IrisCombinedCompetencyGenerationSubSettingsDTO + de.tum.in.www1.artemis.domain.quiz.PointCounter + de.tum.in.www1.artemis.domain.Course + de.tum.in.www1.artemis.web.rest.admin.iris.AdminIrisSettingsResource + de.tum.in.www1.artemis.repository.LdapUserRepository + de.tum.in.www1.artemis.web.rest.localci.BuildLogResource + de.tum.in.www1.artemis.repository.ModelElementRepository + de.tum.in.www1.artemis.service.util.ExamExerciseStartPreparationStatus + de.tum.in.www1.artemis.web.rest.dto.RepositoryExportOptionsDTO + de.tum.in.www1.artemis.service.iris.websocket.IrisWebsocketService + de.tum.in.www1.artemis.service.connectors.localvc.LocalVCPostPushHook + de.tum.in.www1.artemis.service.connectors.BuildScriptGenerationService + de.tum.in.www1.artemis.repository.SubmissionRepository + de.tum.in.www1.artemis.domain.lti.Lti13LaunchRequest + de.tum.in.www1.artemis.service.dto.athena.TextExerciseDTO + de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.CreateCommonChangeBlocks + de.tum.in.www1.artemis.service.exam.ExamDateService + de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage + de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObjectDiagram + de.tum.in.www1.artemis.web.rest.programming.ProgrammingExerciseResource + de.tum.in.www1.artemis.web.rest.dto.ExamWithIdAndCourseDTO + de.tum.in.www1.artemis.domain.enumeration.SortingOrder + de.tum.in.www1.artemis.web.rest.open.PublicLtiResource + de.tum.in.www1.artemis.domain.quiz.ShortAnswerSpotCounter + de.tum.in.www1.artemis.service.metis.ConversationMessagingService + de.tum.in.www1.artemis.web.rest.AthenaResource + de.tum.in.www1.artemis.service.export.DataExportExerciseCreationService + de.tum.in.www1.artemis.domain.quiz.DragAndDropSubmittedAnswer + de.tum.in.www1.artemis.web.rest.localci.BuildJobQueueResource + de.tum.in.www1.artemis.service.exam.ExamRegistrationService + de.tum.in.www1.artemis.web.rest.admin.AdminImprintResource + de.tum.in.www1.artemis.service.connectors.localci.dto.BuildAgentInformation + de.tum.in.www1.artemis.domain.participation.TutorParticipation + de.tum.in.www1.artemis.service.notifications.NotificationSettingsService + de.tum.in.www1.artemis.service.util.UrlUtils + de.tum.in.www1.artemis.config.SecurityConfiguration + de.tum.in.www1.artemis.service.hestia.behavioral.GroupedFile + de.tum.in.www1.artemis.domain.metis.Reaction + de.tum.in.www1.artemis.service.connectors.ci.AbstractContinuousIntegrationService + de.tum.in.www1.artemis.domain.enumeration.TutorialGroupSessionStatus + de.tum.in.www1.artemis.web.rest.TutorEffortResource + de.tum.in.www1.artemis.web.rest.dto.ExamChecklistDTO + de.tum.in.www1.artemis.service.scheduled.NotificationScheduleService + de.tum.in.www1.artemis.domain.enumeration.DefaultChannelType + de.tum.in.www1.artemis.exception.NetworkingException + de.tum.in.www1.artemis.repository.hestia.CoverageReportRepository + de.tum.in.www1.artemis.service.TextBlockService + de.tum.in.www1.artemis.web.rest.admin.AdminSystemNotificationResource + de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor + de.tum.in.www1.artemis.repository.FeedbackRepository + de.tum.in.www1.artemis.web.rest.admin.AdminTextAssessmentEventResource + de.tum.in.www1.artemis.domain.metis.conversation.ConversationSummary + de.tum.in.www1.artemis.repository.GradingCriterionRepository + de.tum.in.www1.artemis.web.rest.vm.ManagedUserVM + de.tum.in.www1.artemis.domain.lti.Lti13ClientRegistration + de.tum.in.www1.artemis.web.rest.AssessmentResource + de.tum.in.www1.artemis.repository.hestia.TestwiseCoverageReportEntryRepository + de.tum.in.www1.artemis.domain.quiz.QuizQuestion + de.tum.in.www1.artemis.web.rest.util.HeaderUtil + de.tum.in.www1.artemis.web.rest.dto.CourseContentCount + de.tum.in.www1.artemis.service.util.CommonsMultipartFile + de.tum.in.www1.artemis.service.FileUploadExerciseImportService + de.tum.in.www1.artemis.web.rest.lecture.VideoUnitResource + de.tum.in.www1.artemis.domain.hestia.CoverageReport + de.tum.in.www1.artemis.service.connectors.lti.LtiService + de.tum.in.www1.artemis.service.connectors.jenkins.jobs.JenkinsJobPermissionsService + de.tum.in.www1.artemis.security.Role + de.tum.in.www1.artemis.service.dto.UserInitializationDTO + de.tum.in.www1.artemis.repository.QuizBatchRepository + de.tum.in.www1.artemis.domain.submissionpolicy.SubmissionPenaltyPolicy + de.tum.in.www1.artemis.service.team.strategies.PurgeExistingStrategy + de.tum.in.www1.artemis.domain.enumeration.IExerciseLifecycle + de.tum.in.www1.artemis.domain.quiz.ShortAnswerQuestionStatistic + de.tum.in.www1.artemis.service.iris.session.IrisExerciseChatSessionService + de.tum.in.www1.artemis.service.connectors.apollon.ApollonHealthIndicator + de.tum.in.www1.artemis.exception.ContinuousIntegrationBuildPlanException + de.tum.in.www1.artemis.repository.OrganizationRepository + de.tum.in.www1.artemis.domain.metis.ConversationType + de.tum.in.www1.artemis.domain.metis.conversation.OneToOneChat + de.tum.in.www1.artemis.domain.GuidedTourSetting + de.tum.in.www1.artemis.domain.enumeration.SubmissionType + de.tum.in.www1.artemis.service.connectors.jenkins.build_plan.JenkinsBuildPlanLinkInfoContributor + de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise + de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmission + de.tum.in.www1.artemis.web.rest.ogparser.LinkPreviewResource + de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisStudentSubmissionDTO + de.tum.in.www1.artemis.service.BuildLogEntryService + de.tum.in.www1.artemis.service.dto.TestCaseBaseDTO + de.tum.in.www1.artemis.repository.TutorParticipationRepository + de.tum.in.www1.artemis.repository.AuxiliaryRepositoryRepository + de.tum.in.www1.artemis.domain.quiz.QuizQuestionComponent + de.tum.in.www1.artemis.domain.CourseExamExportState + de.tum.in.www1.artemis.web.rest.errors.ConflictException + de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupsConfigurationRepository + de.tum.in.www1.artemis.web.rest.FileUploadSubmissionResource + de.tum.in.www1.artemis.domain.TextBlock + de.tum.in.www1.artemis.domain.quiz.compare.SAMapping + de.tum.in.www1.artemis.domain.enumeration.AeolusTarget + de.tum.in.www1.artemis.service.ldap.LdapConfig + de.tum.in.www1.artemis.config.SentryConfiguration + de.tum.in.www1.artemis.web.rest.dto.BonusSourceResultDTO + de.tum.in.www1.artemis.domain.TextBlockType + de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceRoleInExercise + de.tum.in.www1.artemis.service.connectors.pyris.PyrisConnectorException + de.tum.in.www1.artemis.web.rest.tutorialgroups.errors.ScheduleOverlapsWithSessionException + de.tum.in.www1.artemis.web.rest.repository.RepositoryProgrammingExerciseParticipationResource + de.tum.in.www1.artemis.service.exam.ExamQuizService + de.tum.in.www1.artemis.service.connectors.GenericBuildScriptGenerationService + de.tum.in.www1.artemis.web.rest.vm.LoginVM + de.tum.in.www1.artemis.config.websocket.WebsocketConfiguration + de.tum.in.www1.artemis.service.ParticipationLifecycleService + de.tum.in.www1.artemis.web.websocket.dto.SubmissionPatch + de.tum.in.www1.artemis.service.iris.exception.IrisInternalPyrisErrorException + de.tum.in.www1.artemis.domain.submissionpolicy.LockRepositoryPolicy + de.tum.in.www1.artemis.web.rest.PlantUmlResource + de.tum.in.www1.artemis.service.iris.exception.IrisRateLimitExceededException + de.tum.in.www1.artemis.domain.iris.settings.IrisSubSettings + de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.ChannelIdAndNameDTO + de.tum.in.www1.artemis.service.archival.ArchivalReportEntry + de.tum.in.www1.artemis.web.rest.dto.metrics.CompetencyInformationDTO + de.tum.in.www1.artemis.web.rest.TextAssessmentEventResource + de.tum.in.www1.artemis.domain.metis.UserRole + de.tum.in.www1.artemis.domain.quiz.DragItem + de.tum.in.www1.artemis.service.ExerciseSpecificationService + de.tum.in.www1.artemis.service.connectors.localvc.LocalVCService + de.tum.in.www1.artemis.domain.exam.event.ProblemStatementUpdateEvent + de.tum.in.www1.artemis.exception.EmptyFileException + de.tum.in.www1.artemis.security.OAuth2JWKSService + de.tum.in.www1.artemis.repository.GradeStepRepository + de.tum.in.www1.artemis.domain.enumeration.AttachmentType + de.tum.in.www1.artemis.service.connectors.ci.CIUserManagementService + de.tum.in.www1.artemis.domain.LongFeedbackText + de.tum.in.www1.artemis.exception.ContinuousIntegrationException + de.tum.in.www1.artemis.service.exam.StudentExamAccessService + de.tum.in.www1.artemis.service.compass.umlmodel.petrinet.PetriNetPlace + de.tum.in.www1.artemis.config.TomcatConfiguration + de.tum.in.www1.artemis.service.EmailSummaryService + de.tum.in.www1.artemis.domain.notification.ConversationNotification + de.tum.in.www1.artemis.repository.NotificationSettingRepository + de.tum.in.www1.artemis.web.rest.LongFeedbackTextResource + de.tum.in.www1.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeLink + de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisMessageDTO + de.tum.in.www1.artemis.service.connectors.localvc.LocalVCPushFilter + de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException + de.tum.in.www1.artemis.web.rest.programming.ProgrammingExerciseExportImportResource + de.tum.in.www1.artemis.web.rest.dto.CourseManagementDetailViewDTO + de.tum.in.www1.artemis.repository.LectureRepository + de.tum.in.www1.artemis.domain.ProgrammingSubmission + de.tum.in.www1.artemis.domain.metis.conversation.Conversation + de.tum.in.www1.artemis.web.rest.dto.LectureUnitInformationDTO + de.tum.in.www1.artemis.service.hestia.CodeHintService + de.tum.in.www1.artemis.domain.enumeration.Visibility + de.tum.in.www1.artemis.web.websocket.WebsocketError + de.tum.in.www1.artemis.web.rest.metis.conversation.GroupChatResource + de.tum.in.www1.artemis.domain.LearningObject + de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisFeedbackDTO + de.tum.in.www1.artemis.service.feature.FeatureToggle + de.tum.in.www1.artemis.service.ExerciseDeletionService + de.tum.in.www1.artemis.web.rest.ParticipationResource + de.tum.in.www1.artemis.web.rest.admin.AdminModelingExerciseResource + de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyJolPairDTO + de.tum.in.www1.artemis.service.SubmissionVersionService + de.tum.in.www1.artemis.domain.GradingScale + de.tum.in.www1.artemis.domain.TextExercise + de.tum.in.www1.artemis.web.rest.ResultResource + de.tum.in.www1.artemis.service.StaticCodeAnalysisService + de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNSwimlane + de.tum.in.www1.artemis.web.rest.plagiarism.PlagiarismResultResponseBuilder + de.tum.in.www1.artemis.service.metis.conversation.auth.GroupChatAuthorizationService + de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathHealthDTO + de.tum.in.www1.artemis.service.PresentationPointsCalculationService + de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastTutorInCourse + de.tum.in.www1.artemis.service.AssessmentDashboardService + de.tum.in.www1.artemis.service.dto.athena.ProgrammingSubmissionDTO + de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException + de.tum.in.www1.artemis.service.AccountService + de.tum.in.www1.artemis.service.connectors.ci.AbstractContinuousIntegrationResultService + de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyRelationDTO + de.tum.in.www1.artemis.domain.metis.Posting + de.tum.in.www1.artemis.web.rest.CustomMetricsExtension + de.tum.in.www1.artemis.domain.hestia.CodeHint + de.tum.in.www1.artemis.service.scheduled.UserScheduleService + de.tum.in.www1.artemis.service.linkpreview.ogparser.OpenGraph + de.tum.in.www1.artemis.domain.FileUploadSubmission + de.tum.in.www1.artemis.domain.TextEmbedding + de.tum.in.www1.artemis.web.rest.AppleAppSiteAssociationResource + de.tum.in.www1.artemis.web.rest.dto.BonusExampleDTO + de.tum.in.www1.artemis.domain.scores.ParticipantScore + de.tum.in.www1.artemis.service.notifications.InstantNotificationService + de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceRoleInCourseAspect + de.tum.in.www1.artemis.web.rest.repository.TestRepositoryResource + de.tum.in.www1.artemis.service.feature.FeatureToggleAspect + de.tum.in.www1.artemis.web.rest.dto.ExamScoresDTO + de.tum.in.www1.artemis.domain.lecture.ExerciseUnit + de.tum.in.www1.artemis.service.ParticipantScoreService + de.tum.in.www1.artemis.web.rest.dto.ResultDTO + de.tum.in.www1.artemis.config.LiquibaseConfiguration + de.tum.in.www1.artemis.domain.quiz.QuizPool + de.tum.in.www1.artemis.service.connectors.AbstractGitService + de.tum.in.www1.artemis.repository.ExamLiveEventRepository + de.tum.in.www1.artemis.service.programming.TemplateUpgradeService + de.tum.in.www1.artemis.service.util.structureoraclegenerator.OracleGenerator + de.tum.in.www1.artemis.service.util.structureoraclegenerator.SerializerUtil + de.tum.in.www1.artemis.exception.AccountRegistrationBlockedException + de.tum.in.www1.artemis.web.rest.iris.IrisExerciseChatSessionResource + de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyMultipleChoiceProportionalWithoutPenalty + de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionConfigHelper + de.tum.in.www1.artemis.domain.modeling.ModelingExercise + de.tum.in.www1.artemis.security.jwt.JWTConfigurer + de.tum.in.www1.artemis.service.ModelingSubmissionService + de.tum.in.www1.artemis.web.rest.competency.StandardizedCompetencyResource + de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity + de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyDragAndDropProportionalWithoutPenalty + de.tum.in.www1.artemis.domain.enumeration.LegalDocumentType + de.tum.in.www1.artemis.service.exam.ExamDeletionService + de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation + de.tum.in.www1.artemis.domain.AbstractAuditingEntity + de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository + de.tum.in.www1.artemis.config.icl.ssh.SshConfiguration + de.tum.in.www1.artemis.security.SpringSecurityAuditorAware + de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismVerdictDTO + de.tum.in.www1.artemis.service.connectors.localci.LocalCIPriorityQueueComparator + de.tum.in.www1.artemis.web.rest.errors.StudentsAlreadyAssignedException + de.tum.in.www1.artemis.repository.BuildLogStatisticsEntryRepository + de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsService + de.tum.in.www1.artemis.web.rest.dto.ParticipationWithExerciseDTO + de.tum.in.www1.artemis.web.rest.dto.StudentExamWithIdAndExamAndUserDTO + de.tum.in.www1.artemis.service.tutorialgroups.TutorialGroupChannelManagementService + de.tum.in.www1.artemis.config.migration.MigrationService + de.tum.in.www1.artemis.service.dto.athena.ExerciseBaseDTO + de.tum.in.www1.artemis.service.TutorEffortService + de.tum.in.www1.artemis.domain.modeling.ApollonDiagram + de.tum.in.www1.artemis.service.ExerciseScoresChartService + de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.ExtractCoveredLines + de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroup + de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsUserManagementService + de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent + de.tum.in.www1.artemis.web.rest.UserResource + de.tum.in.www1.artemis.web.rest.AccountResource + de.tum.in.www1.artemis.service.dto.athena.ModelingSubmissionDTO + de.tum.in.www1.artemis.domain.leaderboard.tutor.TutorLeaderboardAssessments + de.tum.in.www1.artemis.domain.scores.TeamScore + de.tum.in.www1.artemis.domain.submissionpolicy.SubmissionPolicy + de.tum.in.www1.artemis.security.ArtemisAuthenticationProvider + de.tum.in.www1.artemis.service.connectors.localci.LocalCIProgrammingLanguageFeatureService + de.tum.in.www1.artemis.service.connectors.vcs.VersionControlService + de.tum.in.www1.artemis.domain.lti.LtiAuthenticationResponse + de.tum.in.www1.artemis.web.rest.hestia.ProgrammingExerciseGitDiffReportResource + de.tum.in.www1.artemis.domain.BaseExercise + de.tum.in.www1.artemis.service.connectors.apollon.ApollonConversionService + de.tum.in.www1.artemis.service.LectureUnitService + de.tum.in.www1.artemis.domain.exam.ExamUser + de.tum.in.www1.artemis.domain.enumeration.BuildPlanType + de.tum.in.www1.artemis.web.rest.dto.ExamUserAttendanceCheckDTO + de.tum.in.www1.artemis.service.connectors.aeolus.PlatformAction + de.tum.in.www1.artemis.service.hestia.structural.StructuralClassElements + de.tum.in.www1.artemis.domain.enumeration.FeedbackType + de.tum.in.www1.artemis.service.PlantUmlService + de.tum.in.www1.artemis.service.metis.conversation.auth.OneToOneChatAuthorizationService + de.tum.in.www1.artemis.service.dto.StaticCodeAnalysisReportDTO + de.tum.in.www1.artemis.service.metis.similarity.TitleJaccardSimilarityCompareStrategy + de.tum.in.www1.artemis.web.rest.dto.TutorialGroupFreePeriodDTO + de.tum.in.www1.artemis.domain.assessment.dashboard.ExerciseMapEntry + de.tum.in.www1.artemis.service.connectors.localci.scaparser.ReportParser + de.tum.in.www1.artemis.service.SystemNotificationService + de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.BugCollection + de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartProcess + de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNCallActivity + de.tum.in.www1.artemis.service.compass.umlmodel.deployment.UMLNode + de.tum.in.www1.artemis.security.jwt.JWTFilter + de.tum.in.www1.artemis.repository.metis.ConversationMessageRepository + de.tum.in.www1.artemis.domain.Team + de.tum.in.www1.artemis.service.metis.conversation.ConversationService + de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTestCaseType + de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupScheduleRepository + de.tum.in.www1.artemis.domain.science.ScienceEvent + de.tum.in.www1.artemis.domain.exam.ExerciseGroup + de.tum.in.www1.artemis.service.connectors.gitlab.GitLabAuthorizationInterceptor + de.tum.in.www1.artemis.repository.StatisticsRepository + de.tum.in.www1.artemis.service.ExampleSubmissionService + de.tum.in.www1.artemis.web.rest.dto.ProgrammingExerciseGitDiffReportDTO + de.tum.in.www1.artemis.security.annotations.EnforceNothing + de.tum.in.www1.artemis.domain.enumeration.TextAssessmentEventType + de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3.CommunicationDiagramParser + de.tum.in.www1.artemis.security.ArtemisInternalAuthenticationProvider + de.tum.in.www1.artemis.config.migration.MigrationEntry + de.tum.in.www1.artemis.service.iris.IrisMessageService + de.tum.in.www1.artemis.service.AbstractQuizSubmissionService + de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismComparisonStatusDTO + de.tum.in.www1.artemis.web.rest.dto.LegalDocument + de.tum.in.www1.artemis.service.programming.AuxiliaryRepositoryService + de.tum.in.www1.artemis.service.ConsistencyCheckService + de.tum.in.www1.artemis.web.websocket.dto.metis.MetisCrudAction + de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategy + de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivity + de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupsConfiguration + de.tum.in.www1.artemis.web.rest.dto.ParticipationResultDTO + de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.DuplicationFile + de.tum.in.www1.artemis.repository.CompetencyRelationRepository + de.tum.in.www1.artemis.repository.ExerciseGroupRepository + de.tum.in.www1.artemis.service.compass.umlmodel.petrinet.PetriNetTransition + de.tum.in.www1.artemis.web.rest.TeamResource + de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupRegistrationRepository + de.tum.in.www1.artemis.web.rest.dto.RepositoryStatusDTO + de.tum.in.www1.artemis.repository.ParticipantScoreRepository + de.tum.in.www1.artemis.web.rest.dto.competency.NgxLearningPathDTO + de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponent + de.tum.in.www1.artemis.domain.lecture.TextUnit + de.tum.in.www1.artemis.domain.assessment.dashboard.ResultCount + de.tum.in.www1.artemis.domain.competency.CompetencyRelation + de.tum.in.www1.artemis.service.connectors.athena.AthenaRepositoryExportService + de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor + de.tum.in.www1.artemis.domain.quiz.QuizConfiguration + de.tum.in.www1.artemis.service.competency.CompetencyProgressService + de.tum.in.www1.artemis.security.annotations.EnforceAdmin + de.tum.in.www1.artemis.web.rest.dto.GradeStepsDTO + de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupSchedule + de.tum.in.www1.artemis.service.TutorLeaderboardService + de.tum.in.www1.artemis.repository.iris.IrisCourseChatSessionRepository + de.tum.in.www1.artemis.web.rest.AbstractSubmissionResource + de.tum.in.www1.artemis.web.rest.dto.TextAssessmentUpdateDTO + de.tum.in.www1.artemis.domain.enumeration.AssessmentType + de.tum.in.www1.artemis.service.connectors.SAML2Service + de.tum.in.www1.artemis.domain.iris.message.IrisTextMessageContent + de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.CreateSolutionEntries + de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseSolutionEntry + de.tum.in.www1.artemis.web.rest.admin.AdminExamResource + de.tum.in.www1.artemis.web.websocket.dto.SubmissionPatchPayload + de.tum.in.www1.artemis.service.util.TimeLogUtil + de.tum.in.www1.artemis.domain.quiz.DragAndDropQuestion + de.tum.in.www1.artemis.domain.metis.ReactionConstraints + de.tum.in.www1.artemis.domain.enumeration.Language + de.tum.in.www1.artemis.web.rest.admin.AdminUserResource + de.tum.in.www1.artemis.web.rest.dto.OnlineCourseDTO + de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNSubprocess + de.tum.in.www1.artemis.domain.statistics.StatisticsEntry + de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingSubmissionElement + de.tum.in.www1.artemis.validation.constraints.TeamAssignmentConfigConstraints + de.tum.in.www1.artemis.web.rest.SubmissionResource + de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.course.PyrisCourseChatPipelineExecutionDTO + de.tum.in.www1.artemis.service.connectors.gitlab.dto.GitLabProjectDTO + de.tum.in.www1.artemis.service.connectors.localci.dto.JobTimingInfo + de.tum.in.www1.artemis.exception.QuizSubmissionException + de.tum.in.www1.artemis.web.rest.OrganizationResource + de.tum.in.www1.artemis.domain.DomainObject + de.tum.in.www1.artemis.domain.BuildLogEntry + de.tum.in.www1.artemis.domain.GradingInstruction + de.tum.in.www1.artemis.service.notifications.push_notifications.FirebasePushNotificationService + de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentDiagram + de.tum.in.www1.artemis.service.scheduled.AutomaticProgrammingExerciseCleanupService + de.tum.in.www1.artemis.exception.VersionControlException + de.tum.in.www1.artemis.web.rest.open.PublicPrivacyStatementResource + de.tum.in.www1.artemis.service.iris.dto.IrisCombinedChatSubSettingsDTO + de.tum.in.www1.artemis.repository.metis.ConversationParticipantRepository + de.tum.in.www1.artemis.service.metis.conversation.errors.ChannelNameDuplicateException + de.tum.in.www1.artemis.service.connectors.vcs.VcsTokenRenewalService + de.tum.in.www1.artemis.domain.statistics.CourseStatisticsAverageScore + de.tum.in.www1.artemis.service.StatisticsService + de.tum.in.www1.artemis.web.rest.dto.RepositoryStatusDTOType + de.tum.in.www1.artemis.web.rest.dto.SuspiciousExamSessionsDTO + de.tum.in.www1.artemis.repository.hestia.CoverageFileReportRepository + de.tum.in.www1.artemis.web.rest.dto.OrganizationCountDTO + de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisModelDTO + de.tum.in.www1.artemis.service.export.SubmissionExportService + de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestSuiteDTO + de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy + de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationService + de.tum.in.www1.artemis.repository.ResultRepository + de.tum.in.www1.artemis.config.SAML2Properties + de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisProgrammingExerciseDTO + de.tum.in.www1.artemis.service.connectors.jenkins.build_plan.JenkinsBuildPlanCreator + de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.exercise.PyrisExerciseChatPipelineExecutionDTO + de.tum.in.www1.artemis.repository.TemplateProgrammingExerciseParticipationRepository + de.tum.in.www1.artemis.service.dto.ComplaintAction + de.tum.in.www1.artemis.repository.QuizQuestionStatisticRepository + de.tum.in.www1.artemis.web.rest.iris.IrisModelsResource + de.tum.in.www1.artemis.service.plagiarism.ContinuousPlagiarismControlService + de.tum.in.www1.artemis.service.connectors.localci.dto.RepositoryInfo + de.tum.in.www1.artemis.web.rest.GradingScaleResource + de.tum.in.www1.artemis.service.connectors.gitlab.dto.GitLabRepositoryDTO + de.tum.in.www1.artemis.domain.notification.SystemNotification + de.tum.in.www1.artemis.service.metis.similarity.PostSimilarityComparisonStrategy + de.tum.in.www1.artemis.validation.TeamAssignmentConfigValidator + de.tum.in.www1.artemis.service.connectors.gitlab.GitlabInfoContributor + de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation + de.tum.in.www1.artemis.repository.ComplaintRepository + de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmissionElement + de.tum.in.www1.artemis.domain.notification.NotificationPlaceholderCreator + de.tum.in.www1.artemis.web.rest.SubmissionPolicyResource + de.tum.in.www1.artemis.web.rest.dto.CourseForDashboardDTO + de.tum.in.www1.artemis.web.rest.errors.LoginAlreadyUsedException + de.tum.in.www1.artemis.domain.participation.TemplateProgrammingExerciseParticipation + de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.InsertFileContents + de.tum.in.www1.artemis.service.connectors.localci.SharedQueueManagementService + de.tum.in.www1.artemis.domain.participation.ParticipationInterface + de.tum.in.www1.artemis.web.rest.CompetencyResource + de.tum.in.www1.artemis.service.scheduled.ModelingExerciseScheduleService + de.tum.in.www1.artemis.service.iris.settings.IrisSubSettingsService + de.tum.in.www1.artemis.domain.view.QuizView + de.tum.in.www1.artemis.web.rest.AndroidAppSiteAssociationResource + de.tum.in.www1.artemis.web.rest.ExamUserResource + de.tum.in.www1.artemis.web.rest.dto.LinkPreviewDTO + de.tum.in.www1.artemis.web.rest.dto.PrivacyStatementDTO + de.tum.in.www1.artemis.domain.iris.session.IrisCourseChatSession + de.tum.in.www1.artemis.web.websocket.team.TeamWebsocketService + de.tum.in.www1.artemis.repository.OnlineCourseConfigurationRepository + de.tum.in.www1.artemis.domain.iris.session.IrisExerciseChatSession + de.tum.in.www1.artemis.domain.exam.StudentExam + de.tum.in.www1.artemis.service.TextSubmissionService + de.tum.in.www1.artemis.web.rest.dto.CourseManagementOverviewExerciseStatisticsDTO + de.tum.in.www1.artemis.web.rest.dto.metrics.CompetencyProgressDTO + de.tum.in.www1.artemis.service.AuditEventService + de.tum.in.www1.artemis.service.dto.AbstractBuildResultNotificationDTO + de.tum.in.www1.artemis.web.rest.tutorialgroups.TutorialGroupSessionResource + de.tum.in.www1.artemis.exception.GitLabCIException + de.tum.in.www1.artemis.service.competency.StandardizedCompetencyService + de.tum.in.www1.artemis.domain.UserGroup + de.tum.in.www1.artemis.service.connectors.gitlabci.GitLabCIUserManagementService + de.tum.in.www1.artemis.domain.participation.StudentParticipation + de.tum.in.www1.artemis.web.rest.hestia.ProgrammingExerciseTaskResource + de.tum.in.www1.artemis.service.dto.AuditingEntityDTO + de.tum.in.www1.artemis.domain.StaticCodeAnalysisCategory + de.tum.in.www1.artemis.service.connectors.pyris.job.ExerciseChatJob + de.tum.in.www1.artemis.security.annotations.EnforceRoleInResourceAspect + de.tum.in.www1.artemis.service.connectors.gitlab.GitLabUserDoesNotExistException + de.tum.in.www1.artemis.domain.enumeration.ExerciseType + de.tum.in.www1.artemis.service.dto.GradingCriterionDTO + de.tum.in.www1.artemis.service.programming.ProgrammingExerciseService + de.tum.in.www1.artemis.repository.QuizSubmissionRepository + de.tum.in.www1.artemis.web.rest.repository.RepositoryActionType + de.tum.in.www1.artemis.web.rest.dto.score.TeamScoreSum + de.tum.in.www1.artemis.config.GuidedTourConfiguration + de.tum.in.www1.artemis.config.WebConfigurer + de.tum.in.www1.artemis.service.connectors.localci.buildagent.TestResultXmlParser + de.tum.in.www1.artemis.service.connectors.aeolus.ScriptAction + de.tum.in.www1.artemis.service.hestia.TestwiseCoverageService + de.tum.in.www1.artemis.web.rest.dto.score.ScoreDTO + de.tum.in.www1.artemis.service.util.ZonedDateTimeUtil + de.tum.in.www1.artemis.domain.TextSubmission + de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.ChannelDTO + de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityElement + de.tum.in.www1.artemis.domain.LtiPlatformConfiguration + de.tum.in.www1.artemis.config.Constants + de.tum.in.www1.artemis.service.compass.umlmodel.usecase.UMLUseCaseDiagram + de.tum.in.www1.artemis.domain.AssessmentNote + de.tum.in.www1.artemis.web.rest.iris.IrisCourseChatSessionResource + de.tum.in.www1.artemis.domain.enumeration.StatisticsView + de.tum.in.www1.artemis.domain.leaderboard.tutor.TutorLeaderboardMoreFeedbackRequests + de.tum.in.www1.artemis.web.rest.admin.AdminStandardizedCompetencyResource + de.tum.in.www1.artemis.web.rest.errors.StudentsAppearMultipleTimesException + de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3.FlowchartParser + de.tum.in.www1.artemis.domain.metis.ConversationParticipant + de.tum.in.www1.artemis.config.auth.AthenaAuthorizationInterceptor + de.tum.in.www1.artemis.security.jwt.TokenProvider + de.tum.in.www1.artemis.web.rest.dto.ImprintDTO + de.tum.in.www1.artemis.service.compass.umlmodel.communication.UMLMessage + de.tum.in.www1.artemis.domain.enumeration.ExerciseLifecycle + de.tum.in.www1.artemis.web.rest.NotificationResource + de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask + de.tum.in.www1.artemis.service.team.strategies.CreateOnlyStrategy + de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository + de.tum.in.www1.artemis.service.exam.ExamImportService + de.tum.in.www1.artemis.ArtemisApp + de.tum.in.www1.artemis.service.connectors.aeolus.AeolusResult + de.tum.in.www1.artemis.web.rest.tutorialgroups.TutorialGroupFreePeriodResource + de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObjectLink + de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.FindCommonLines + de.tum.in.www1.artemis.service.LearningObjectService + de.tum.in.www1.artemis.service.team.TeamImportStrategy + de.tum.in.www1.artemis.domain.BuildPlan + de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyShortAnswerUtil + de.tum.in.www1.artemis.exception.localvc.LocalVCAuthException + de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceRoleInCourse + de.tum.in.www1.artemis.service.export.DataExportCommunicationDataService + de.tum.in.www1.artemis.exception.localvc.LocalVCOperationException + de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisLectureDTO + de.tum.in.www1.artemis.web.rest.dto.ProgrammingExerciseTestCaseDTO + de.tum.in.www1.artemis.web.rest.errors.ExceptionTranslator + de.tum.in.www1.artemis.service.programming.ProgrammingTriggerService + de.tum.in.www1.artemis.repository.ExamUserRepository + de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisResultDTO + de.tum.in.www1.artemis.config.TaskSchedulingConfiguration + de.tum.in.www1.artemis.domain.GradingCriterion + de.tum.in.www1.artemis.service.connectors.localvc.LocalVCFetchFilter + de.tum.in.www1.artemis.web.rest.plagiarism.PlagiarismCaseResource + de.tum.in.www1.artemis.repository.hestia.CodeHintRepository + de.tum.in.www1.artemis.repository.GradingInstructionRepository + de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO + de.tum.in.www1.artemis.domain.quiz.AnswerCounter + de.tum.in.www1.artemis.service.programming.RepositoryService + de.tum.in.www1.artemis.web.websocket.dto.metis.PostDTO + de.tum.in.www1.artemis.service.linkpreview.ogparser.OgParser + de.tum.in.www1.artemis.service.ResourceLoaderService + de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLMethod + de.tum.in.www1.artemis.service.connectors.jenkins.dto.JenkinsUserDTO + de.tum.in.www1.artemis.web.rest.open.PublicProgrammingSubmissionResource + de.tum.in.www1.artemis.web.rest.TextAssessmentResource + de.tum.in.www1.artemis.web.rest.dto.examevent.ProblemStatementUpdateEventDTO + de.tum.in.www1.artemis.service.ComplaintResponseService + de.tum.in.www1.artemis.web.filter.CachingHttpHeadersFilter + de.tum.in.www1.artemis.service.compass.umlmodel.deployment.UMLDeploymentInterface + de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository + de.tum.in.www1.artemis.service.notifications.GroupNotificationScheduleService + de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement + de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyResultDTO + de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNFlow + de.tum.in.www1.artemis.web.rest.dto.metrics.ResourceTimestampDTO + de.tum.in.www1.artemis.service.ParticipationService + de.tum.in.www1.artemis.service.programming.ProgrammingExerciseImportService + de.tum.in.www1.artemis.service.plagiarism.TextPlagiarismDetectionService + de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNTransaction + de.tum.in.www1.artemis.service.connectors.localci.dto.ResultQueueItem + de.tum.in.www1.artemis.domain.exam.event.ExamAttendanceCheckEvent + de.tum.in.www1.artemis.repository.BuildJobRepository + de.tum.in.www1.artemis.repository.metrics.LectureUnitMetricsRepository + de.tum.in.www1.artemis.domain.Complaint + de.tum.in.www1.artemis.web.rest.dto.FileUploadAssessmentDTO + de.tum.in.www1.artemis.domain.science.ScienceEventType + de.tum.in.www1.artemis.domain.TeamAssignmentConfig + de.tum.in.www1.artemis.repository.ModelingExerciseRepository + de.tum.in.www1.artemis.web.rest.ModelingAssessmentResource + de.tum.in.www1.artemis.domain.ComplaintResponse + de.tum.in.www1.artemis.service.connectors.localci.LocalCIResultService + de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLClass + de.tum.in.www1.artemis.domain.metis.CreatedConversationMessage + de.tum.in.www1.artemis.repository.StaticCodeAnalysisCategoryRepository + de.tum.in.www1.artemis.web.rest.plagiarism.PlagiarismAnswerPostResource + de.tum.in.www1.artemis.web.rest.push_notification.PushNotificationResource + de.tum.in.www1.artemis.web.rest.metis.ConversationMessageResource + de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyProgressForLearningPathDTO + de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2.UseCaseDiagramParser + de.tum.in.www1.artemis.web.websocket.ResultWebsocketService + de.tum.in.www1.artemis.service.connectors.pyris.job.PyrisJob + de.tum.in.www1.artemis.web.rest.lecture.AttachmentUnitResource + de.tum.in.www1.artemis.web.rest.hestia.ProgrammingExerciseSolutionEntryResource + de.tum.in.www1.artemis.repository.CompetencyProgressRepository + de.tum.in.www1.artemis.web.rest.DataExportResource + de.tum.in.www1.artemis.web.rest.dto.ExerciseGroupWithIdAndExamDTO + de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisErrorResponseDTO + de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser + de.tum.in.www1.artemis.service.dto.StudentDTO + de.tum.in.www1.artemis.service.FileUploadExerciseService + de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartTerminal + de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsXmlFileUtils + de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.ExtractChangedLines + de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsInfoContributor + de.tum.in.www1.artemis.domain.exam.Exam + de.tum.in.www1.artemis.exception.GitException + de.tum.in.www1.artemis.domain.enumeration.SpanType + de.tum.in.www1.artemis.repository.GuidedTourSettingsRepository + de.tum.in.www1.artemis.web.rest.CourseResource + de.tum.in.www1.artemis.service.metis.conversation.GroupChatService + de.tum.in.www1.artemis.domain.modeling.ModelingSubmission + de.tum.in.www1.artemis.web.rest.lecture.ExerciseUnitResource + de.tum.in.www1.artemis.service.connectors.athena.AthenaDTOConverterService + de.tum.in.www1.artemis.service.HazelcastPathSerializer + de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase + de.tum.in.www1.artemis.repository.SystemNotificationRepository + de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.Flowchart + de.tum.in.www1.artemis.domain.User + de.tum.in.www1.artemis.web.rest.lecture.OnlineUnitResource + de.tum.in.www1.artemis.domain.hestia.CoverageFileReport + de.tum.in.www1.artemis.service.DragAndDropQuizAnswerConversionService + de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageState + de.tum.in.www1.artemis.domain.metis.conversation.ChannelSubType + de.tum.in.www1.artemis.service.LectureUnitProcessingService + de.tum.in.www1.artemis.web.rest.iris.IrisMessageResource + de.tum.in.www1.artemis.service.hestia.structural.StructuralMethod + de.tum.in.www1.artemis.service.dto.ConsistencyErrorDTO + de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry + de.tum.in.www1.artemis.web.rest.FileUploadAssessmentResource + de.tum.in.www1.artemis.domain.enumeration.GraphType + de.tum.in.www1.artemis.service.connectors.localci.LocalCIInfoContributor + de.tum.in.www1.artemis.domain.ExampleSubmission + de.tum.in.www1.artemis.repository.SubmissionPolicyRepository + de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNDiagram + de.tum.in.www1.artemis.web.rest.dto.TutorLeaderboardDTO + de.tum.in.www1.artemis.service.exam.ExamQuizQuestionsGenerator + de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseGitDiffReportService + de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyShortAnswerProportionalWithoutPenalty + de.tum.in.www1.artemis.repository.BonusRepository + de.tum.in.www1.artemis.domain.Repository + de.tum.in.www1.artemis.service.connectors.ci.notification.BuildLogParseUtils + de.tum.in.www1.artemis.service.connectors.ConnectorHealth + de.tum.in.www1.artemis.web.rest.dto.pageablesearch.UserPageableSearchDTO + de.tum.in.www1.artemis.service.metis.conversation.auth.ConversationAuthorizationService + de.tum.in.www1.artemis.service.iris.IrisSessionService + de.tum.in.www1.artemis.service.connectors.pyris.PyrisDTOService + de.tum.in.www1.artemis.web.rest.ApollonDiagramResource + de.tum.in.www1.artemis.domain.enumeration.RepositoryType + de.tum.in.www1.artemis.domain.modeling.ModelCluster + de.tum.in.www1.artemis.domain.iris.IrisTemplate + de.tum.in.www1.artemis.web.rest.LectureResource + de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation + de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.Project + de.tum.in.www1.artemis.web.rest.dto.metrics.StudentMetricsDTO + de.tum.in.www1.artemis.service.scheduled.AthenaScheduleService + de.tum.in.www1.artemis.domain.iris.session.IrisChatSession + de.tum.in.www1.artemis.config.websocket.WebsocketSecurityConfiguration + de.tum.in.www1.artemis.service.connectors.localci.buildagent.BuildJobContainerService + de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig + de.tum.in.www1.artemis.service.notifications.push_notifications.PushNotificationService + de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyImportResponseDTO + de.tum.in.www1.artemis.web.rest.dto.examevent.WorkingTimeUpdateEventDTO + de.tum.in.www1.artemis.service.export.DataExportQuizExerciseCreationService + de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityDiagram + de.tum.in.www1.artemis.service.connectors.localci.LocalCIService + de.tum.in.www1.artemis.service.quiz.QuizStatisticService + de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsResultService + de.tum.in.www1.artemis.service.connectors.localvc.LocalVCInfoContributor + de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedAnswer + de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.PmdCpc + de.tum.in.www1.artemis.web.rest.errors.EmailAlreadyUsedException + de.tum.in.www1.artemis.security.UserNotActivatedException + de.tum.in.www1.artemis.domain.ConductAgreementId + de.tum.in.www1.artemis.web.rest.localci.BuildPlanResource + de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.OneToOneChatDTO + de.tum.in.www1.artemis.service.metis.conversation.ChannelService + de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNPool + de.tum.in.www1.artemis.web.rest.open.PublicPyrisStatusUpdateResource + de.tum.in.www1.artemis.service.connectors.aeolus.AeolusBuildPlanService + de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore + de.tum.in.www1.artemis.service.export.DataExportCreationService + de.tum.in.www1.artemis.domain.metis.PostContextConstraintValidator + de.tum.in.www1.artemis.service.connectors.localci.dto.BuildJobQueueItem + de.tum.in.www1.artemis.web.rest.dto.CheckoutDirectoriesDTO + de.tum.in.www1.artemis.web.rest.hestia.CodeHintResource + de.tum.in.www1.artemis.web.rest.NotificationSettingsResource + de.tum.in.www1.artemis.service.connectors.vcs.AbstractVersionControlService + de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNGateway + de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.PMDReport + de.tum.in.www1.artemis.service.export.TextExerciseWithSubmissionsExportService + de.tum.in.www1.artemis.web.rest.admin.AdminOrganizationResource + de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise + de.tum.in.www1.artemis.web.rest.lecture.TextUnitResource + de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2.FlowchartParser + de.tum.in.www1.artemis.domain.metis.Post + de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsAuthorizationInterceptor + de.tum.in.www1.artemis.domain.quiz.MultipleChoiceSubmittedAnswer + de.tum.in.www1.artemis.repository.ExerciseRepository + de.tum.in.www1.artemis.web.rest.dto.BuildLogStatisticsDTO + de.tum.in.www1.artemis.web.rest.errors.PasswordViolatesRequirementsException + de.tum.in.www1.artemis.service.SubmissionPolicyService + de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.ParserPolicy + de.tum.in.www1.artemis.domain.metis.conversation.GroupChat + de.tum.in.www1.artemis.service.GradingScaleService + de.tum.in.www1.artemis.service.connectors.gitlabci.GitLabCITriggerService + de.tum.in.www1.artemis.service.tutorialgroups.TutorialGroupScheduleService + de.tum.in.www1.artemis.web.rest.open.PublicSystemNotificationResource + de.tum.in.www1.artemis.service.connectors.vcs.VersionControlServerHealthIndicator + de.tum.in.www1.artemis.domain.notification.GroupNotificationFactory + de.tum.in.www1.artemis.domain.enumeration.DifficultyLevel + de.tum.in.www1.artemis.web.rest.dto.ProgrammingExerciseResetOptionsDTO + de.tum.in.www1.artemis.service.connectors.gitlab.dto.GitLabCommitDTO + de.tum.in.www1.artemis.service.programming.JavaTemplateUpgradeService + de.tum.in.www1.artemis.repository.SubmittedAnswerRepository + de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository + de.tum.in.www1.artemis.repository.FileUploadExerciseRepository + de.tum.in.www1.artemis.domain.competency.BaseCompetency + de.tum.in.www1.artemis.repository.LtiPlatformConfigurationRepository + de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.ConversationDTO + de.tum.in.www1.artemis.service.tutorialgroups.TutorialGroupsConfigurationService + de.tum.in.www1.artemis.service.compass.umlmodel.syntaxtree.SyntaxTree + de.tum.in.www1.artemis.web.rest.vm.LoggerVM + de.tum.in.www1.artemis.config.ProgrammingLanguageConfiguration + de.tum.in.www1.artemis.domain.ConductAgreement + de.tum.in.www1.artemis.domain.quiz.compare.DnDMapping + de.tum.in.www1.artemis.web.rest.GitDiffReportParserService + de.tum.in.www1.artemis.config.migration.MigrationIntegrityException + de.tum.in.www1.artemis.domain.quiz.ShortAnswerQuestion + de.tum.in.www1.artemis.domain.enumeration.BuildStatus + de.tum.in.www1.artemis.repository.ModelingSubmissionRepository + de.tum.in.www1.artemis.service.connectors.gitlabci.GitLabCIInfoContributor + de.tum.in.www1.artemis.service.CourseService + de.tum.in.www1.artemis.repository.specs.MessageSpecs + de.tum.in.www1.artemis.service.programming.ProgrammingExerciseTestCaseService + de.tum.in.www1.artemis.domain.enumeration.QuizAction + de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyMultipleChoiceAllOrNothing + de.tum.in.www1.artemis.repository.Lti13ResourceLaunchRepository + de.tum.in.www1.artemis.service.connectors.gitlab.GitLabService + de.tum.in.www1.artemis.web.rest.dto.CourseCompetencyProgressDTO + de.tum.in.www1.artemis.domain.metis.PostConstraints + de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2.ActivityDiagramParser + de.tum.in.www1.artemis.domain.iris.settings.IrisCourseSettings + de.tum.in.www1.artemis.repository.ExamRepository + de.tum.in.www1.artemis.domain.lti.Scopes + de.tum.in.www1.artemis.domain.notification.TutorialGroupNotification + de.tum.in.www1.artemis.exception.QuizJoinException + de.tum.in.www1.artemis.domain.OnlineCourseConfiguration + de.tum.in.www1.artemis.domain.competency.KnowledgeArea + de.tum.in.www1.artemis.web.rest.dto.ParticipationDTO + de.tum.in.www1.artemis.service.hestia.ExerciseHintService + de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.SourceLine + de.tum.in.www1.artemis.web.rest.TextSubmissionResource + de.tum.in.www1.artemis.web.rest.TextExerciseResource + de.tum.in.www1.artemis.web.rest.admin.AdminBuildJobQueueResource + de.tum.in.www1.artemis.repository.competency.KnowledgeAreaRepository + de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathCompetencyGraphDTO + de.tum.in.www1.artemis.web.rest.dto.RequestDataExportDTO + de.tum.in.www1.artemis.domain.quiz.MultipleChoiceQuestion + de.tum.in.www1.artemis.service.compass.umlmodel.communication.Direction + de.tum.in.www1.artemis.web.rest.lecture.LectureUnitResource + de.tum.in.www1.artemis.service.UriService + de.tum.in.www1.artemis.service.dto.UserPublicInfoDTO + de.tum.in.www1.artemis.web.rest.errors.CaptchaRequiredException + de.tum.in.www1.artemis.web.rest.dto.CommitInfoDTO + de.tum.in.www1.artemis.service.compass.umlmodel.Similarity + de.tum.in.www1.artemis.service.connectors.localci.buildagent.SharedQueueProcessingService + de.tum.in.www1.artemis.domain.Exercise + de.tum.in.www1.artemis.web.rest.repository.RepositoryResource + de.tum.in.www1.artemis.service.iris.exception.IrisForbiddenException + de.tum.in.www1.artemis.service.ConductAgreementService + de.tum.in.www1.artemis.domain.iris.message.IrisJsonMessageContent + de.tum.in.www1.artemis.repository.iris.IrisSessionRepository + de.tum.in.www1.artemis.service.CourseScoreCalculationService + de.tum.in.www1.artemis.domain.push_notification.PushNotificationDeviceConfiguration + de.tum.in.www1.artemis.web.filter.ApiVersionFilter + de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNDataObject + de.tum.in.www1.artemis.repository.LearningPathRepository + de.tum.in.www1.artemis.service.connectors.gitlab.dto.GitLabPushNotificationDTO + de.tum.in.www1.artemis.repository.PushNotificationDeviceConfigurationRepository + de.tum.in.www1.artemis.service.compass.assessment.Context + de.tum.in.www1.artemis.repository.TextUnitRepository + de.tum.in.www1.artemis.domain.science.ScienceSetting + de.tum.in.www1.artemis.repository.StudentExamRepository + de.tum.in.www1.artemis.domain.scores.StudentScore + de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeature + de.tum.in.www1.artemis.service.programming.ProgrammingExerciseFeedbackCreationService + de.tum.in.www1.artemis.repository.ProgrammingSubmissionRepository + de.tum.in.www1.artemis.service.connectors.lti.ExternalPasswordResetInfoContributor + de.tum.in.www1.artemis.web.rest.dto.PostContextFilterDTO + de.tum.in.www1.artemis.repository.iris.IrisTemplateRepository + de.tum.in.www1.artemis.web.rest.util.DateUtil + de.tum.in.www1.artemis.web.rest.QuizParticipationResource + de.tum.in.www1.artemis.web.rest.dto.pageablesearch.PageableSearchDTO + de.tum.in.www1.artemis.config.PublicResourcesConfiguration + de.tum.in.www1.artemis.domain.Bonus + de.tum.in.www1.artemis.domain.enumeration.Weekday + de.tum.in.www1.artemis.service.programming.ProgrammingExerciseParticipationService + de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupRegistration + de.tum.in.www1.artemis.service.iris.dto.IrisCombinedHestiaSubSettingsDTO + de.tum.in.www1.artemis.service.util.structureoraclegenerator.JavaClassDiffSerializer + de.tum.in.www1.artemis.service.connectors.ci.notification.dto.CommitDTO + de.tum.in.www1.artemis.web.rest.dto.ExerciseForPlagiarismCasesOverviewDTO + de.tum.in.www1.artemis.domain.StaticCodeAnalysisDefaultCategory + de.tum.in.www1.artemis.repository.iris.IrisMessageRepository + de.tum.in.www1.artemis.repository.hestia.ExerciseHintActivationRepository + de.tum.in.www1.artemis.service.connectors.athena.AthenaHealthIndicator + de.tum.in.www1.artemis.service.connectors.localci.dto.DockerImageBuild + de.tum.in.www1.artemis.domain.lti.Lti13DeepLinkingResponse + de.tum.in.www1.artemis.domain.iris.settings.IrisExerciseSettings + de.tum.in.www1.artemis.service.exam.ExamLiveEventsService + de.tum.in.www1.artemis.service.notifications.push_notifications.FirebaseRelayNotificationRequests + de.tum.in.www1.artemis.repository.iris.IrisSettingsRepository + de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentRelationship + de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + All + private + + From d1ecab736fe6fe4d9ab31e6d1faa5567984d65a3 Mon Sep 17 00:00:00 2001 From: Ole Vester Date: Wed, 11 Sep 2024 18:56:25 +0200 Subject: [PATCH 20/43] Change exception path in test file --- .../test-data/static-code-analysis/expected/invalid_name.txt | 2 +- .../test-data/static-code-analysis/expected/invalid_xml.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/resources/test-data/static-code-analysis/expected/invalid_name.txt b/src/test/resources/test-data/static-code-analysis/expected/invalid_name.txt index 67ff374babdb..d3928a28becc 100644 --- a/src/test/resources/test-data/static-code-analysis/expected/invalid_name.txt +++ b/src/test/resources/test-data/static-code-analysis/expected/invalid_name.txt @@ -1 +1 @@ -{"issues":[{"filePath":"invalid_name.xml","startLine":1,"endLine":1,"startColumn":0,"endColumn":0,"rule":"ExceptionDuringParsing","category":"miscellaneous","message":"An exception occurred during parsing the report for file invalid_name.xml. Exception: de.tum.cit.aet.artemis.service.connectors.localci.scaparser.exception.UnsupportedToolException: Tool for identifying filePattern invalid_name.xml not found"}]} +{"issues":[{"filePath":"invalid_name.xml","startLine":1,"endLine":1,"startColumn":0,"endColumn":0,"rule":"ExceptionDuringParsing","category":"miscellaneous","message":"An exception occurred during parsing the report for file invalid_name.xml. Exception: de.tum.cit.aet.artemis.programming.service.localci.scaparser.exception.UnsupportedToolException: Tool for identifying filePattern invalid_name.xml not found"}]} diff --git a/src/test/resources/test-data/static-code-analysis/expected/invalid_xml.txt b/src/test/resources/test-data/static-code-analysis/expected/invalid_xml.txt index 927c4af06008..c2d5ac3284e9 100644 --- a/src/test/resources/test-data/static-code-analysis/expected/invalid_xml.txt +++ b/src/test/resources/test-data/static-code-analysis/expected/invalid_xml.txt @@ -1 +1 @@ -{"issues":[{"filePath":"invalid_xml.xml","startLine":1,"endLine":1,"startColumn":0,"endColumn":0,"rule":"ExceptionDuringParsing","category":"miscellaneous","message":"An exception occurred during parsing the report for file invalid_xml.xml. Exception: de.tum.cit.aet.artemis.service.connectors.localci.scaparser.exception.UnsupportedToolException: Tool for identifying filePattern invalid_xml.xml not found"}]} +{"issues":[{"filePath":"invalid_xml.xml","startLine":1,"endLine":1,"startColumn":0,"endColumn":0,"rule":"ExceptionDuringParsing","category":"miscellaneous","message":"An exception occurred during parsing the report for file invalid_xml.xml. Exception: de.tum.cit.aet.artemis.programming.service.localci.scaparser.exception.UnsupportedToolException: Tool for identifying filePattern invalid_xml.xml not found"}]} From 92f0e4609dafb361d3384238f991691336e39367 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Wed, 11 Sep 2024 21:04:35 +0200 Subject: [PATCH 21/43] move services into modules (part 3), also fix some web resource locations --- .../assessment/domain/BonusStrategy.java | 3 +- .../assessment/domain/IBonusStrategy.java | 2 +- .../aet/artemis/assessment/domain/Result.java | 2 +- .../dto/ComplaintAction.java | 2 +- .../dto/ComplaintRequestDTO.java | 2 +- .../dto/ComplaintResponseUpdateDTO.java | 2 +- .../dto/GradingCriterionDTO.java | 2 +- .../dto/GradingInstructionDTO.java | 2 +- .../dto/MaxAndReachablePoints.java | 2 +- .../ParticipantScoreRepository.java | 4 +- .../repository/ResultRepository.java | 4 +- .../repository/StudentScoreRepository.java | 2 +- .../repository/TeamScoreRepository.java | 2 +- .../service/AssessmentDashboardService.java | 2 +- .../assessment/service/AssessmentService.java | 6 +-- .../assessment/service/BonusService.java | 3 +- .../service/ComplaintResponseService.java | 2 +- .../assessment/service/ComplaintService.java | 2 +- .../CourseScoreCalculationService.java | 12 +++--- .../service/GradingScaleService.java | 4 +- .../service/ParticipantScoreService.java | 6 +-- .../assessment/service/ResultService.java | 10 ++--- .../service/TutorLeaderboardService.java | 2 +- .../web/AssessmentResource.java | 2 +- .../artemis/assessment/web/BonusResource.java | 2 +- .../assessment/web/ComplaintResource.java | 2 +- .../web/ComplaintResponseResource.java | 4 +- .../web/ExampleSubmissionResource.java | 2 +- .../assessment/web/GradeStepResource.java | 4 +- .../assessment/web/GradingScaleResource.java | 4 +- .../web/LongFeedbackTextResource.java | 4 +- .../web/ParticipantScoreResource.java | 4 +- .../assessment/web/ResultResource.java | 8 ++-- .../web/ResultWebsocketService.java | 2 +- .../athena/dto/ModelingExerciseDTO.java | 2 +- .../athena/dto/ProgrammingExerciseDTO.java | 2 +- .../artemis/athena/dto/TextExerciseDTO.java | 2 +- .../AthenaRepositoryExportService.java | 4 +- .../athena/service/AthenaScheduleService.java | 2 +- .../atlas/dto/LearningPathInformationDTO.java | 2 +- .../dto/{science => }/ScienceEventDTO.java | 2 +- .../metrics/ExerciseStudentMetricsDTO.java | 3 +- .../CompetencyJolRepository.java | 4 +- .../CompetencyMetricsRepository.java | 2 +- .../CourseCompetencyRepository.java | 2 +- .../KnowledgeAreaRepository.java | 2 +- .../{science => }/ScienceEventRepository.java | 2 +- .../ScienceSettingRepository.java | 2 +- .../StandardizedCompetencyRepository.java | 2 +- .../atlas/service/ScienceEventService.java | 4 +- .../competency/CompetencyJolService.java | 6 +-- .../competency/CompetencyProgressService.java | 4 +- .../service/competency/CompetencyService.java | 4 +- .../competency/CourseCompetencyService.java | 10 ++--- .../competency/KnowledgeAreaService.java | 2 +- .../competency/PrerequisiteService.java | 4 +- .../StandardizedCompetencyService.java | 10 ++--- .../LearningPathNavigationService.java | 6 +-- .../learningpath/LearningPathNgxService.java | 2 +- .../LearningPathRecommendationService.java | 2 +- .../learningpath/LearningPathService.java | 18 ++++----- .../AdminStandardizedCompetencyResource.java | 12 +++--- .../artemis/atlas/web/CompetencyResource.java | 4 +- .../atlas/web/CourseCompetencyResource.java | 12 +++--- .../atlas/web/LearningPathResource.java | 28 +++++++------- .../web/MetricsResource.java | 4 +- .../atlas/web/PrerequisiteResource.java | 4 +- .../web/{science => }/ScienceResource.java | 4 +- .../ScienceSettingsResource.java | 4 +- .../web/StandardizedCompetencyResource.java | 8 ++-- .../dto/BuildAgentInformation.java | 4 +- .../dto/BuildConfig.java | 4 +- .../dto/BuildJobQueueItem.java | 6 ++- .../dto/BuildJobResultCountDTO.java | 4 +- .../dto/BuildJobsStatisticsDTO.java | 4 +- .../dto/BuildResult.java | 15 +++++--- .../dto/DockerImageBuild.java | 2 +- .../dto/FinishedBuildJobDTO.java | 8 ++-- .../dto/JobTimingInfo.java | 4 +- .../dto/RepositoryInfo.java | 4 +- .../dto/ResultBuildJob.java | 2 +- .../buildagent/dto/ResultQueueItem.java | 15 ++++++++ .../service/BuildAgentDockerService.java | 2 +- .../service/BuildJobContainerService.java | 2 +- .../service/BuildJobExecutionService.java | 6 +-- .../service/BuildJobManagementService.java | 6 +-- .../buildagent/service/BuildLogsMap.java | 2 +- .../service/SharedQueueProcessingService.java | 14 +++---- .../service/TestResultXmlParser.java | 2 +- .../conversation/dtos => dto}/ChannelDTO.java | 2 +- .../dtos => dto}/ChannelIdAndNameDTO.java | 2 +- .../dtos => dto}/ConversationDTO.java | 2 +- .../dtos => dto}/ConversationUserDTO.java | 4 +- .../dto/ConversationWebsocketDTO.java | 2 - .../dtos => dto}/GroupChatDTO.java | 2 +- .../dtos => dto}/OneToOneChatDTO.java | 2 +- .../PushNotificationRegisterBody.java | 2 +- .../PushNotificationRegisterDTO.java | 2 +- .../PushNotificationUnregisterRequest.java | 2 +- .../dto/ResponsibleUserDTO.java | 2 +- .../ConversationMessageRepository.java | 2 +- .../service/AnswerMessageService.java | 5 +-- .../service/ConductAgreementService.java | 4 +- .../service/ConversationMessagingService.java | 7 ++-- .../service/EmailSummaryService.java | 3 +- .../service/NotificationScheduleService.java | 2 +- .../communication/service/PostingService.java | 7 ++-- .../service/ReactionService.java | 4 +- .../service/SystemNotificationService.java | 2 +- .../service/WebsocketMessagingService.java | 2 +- .../WeeklyEmailSummaryScheduleService.java | 3 +- .../service/conversation/ChannelService.java | 4 +- .../conversation/ConversationDTOService.java | 12 +++--- .../conversation/ConversationService.java | 8 ++-- .../conversation/GroupChatService.java | 2 +- .../linkpreview/LinkPreviewService.java | 2 +- .../GroupNotificationService.java | 2 +- .../service/notifications/MailService.java | 2 +- .../SingleUserNotificationService.java | 2 +- .../TutorialGroupNotificationService.java | 2 +- .../web}/AdminSystemNotificationResource.java | 4 +- .../AndroidAppSiteAssociationResource.java | 2 +- .../web/AppleAppSiteAssociationResource.java | 2 +- .../web/ConversationMessageResource.java | 2 +- .../web/LinkPreviewResource.java | 2 +- .../PushNotificationResource.java | 5 ++- .../web/conversation/ChannelResource.java | 4 +- .../conversation/ConversationResource.java | 10 ++--- .../web/conversation/GroupChatResource.java | 4 +- .../conversation/OneToOneChatResource.java | 2 +- .../core/config/CacheConfiguration.java | 4 +- .../aet/artemis/core/config/Constants.java | 2 +- .../core/config/DatabaseConfiguration.java | 4 +- .../config}/HazelcastPathSerializer.java | 2 +- .../logging => config}/LoggingAspect.java | 2 +- .../config/LoggingAspectConfiguration.java | 1 - .../aet/artemis/core/config/MetricsBean.java | 4 +- .../core/config/SecurityConfiguration.java | 4 +- .../TheiaInfoContributor.java | 4 +- .../artemis/core/config/WebConfigurer.java | 2 +- .../websocket/WebsocketConfiguration.java | 8 ++-- .../dto/AuditingEntityDTO.java | 2 +- .../core/dto/CourseForDashboardDTO.java | 2 +- .../dto/CourseManagementStatisticsDTO.java | 2 - .../core/dto/CoursesForDashboardDTO.java | 1 - .../dto/PasswordChangeDTO.java | 2 +- .../artemis/core/dto/PrivacyStatementDTO.java | 1 - .../{service => core}/dto/StudentDTO.java | 2 +- .../{service => core}/dto/UserDTO.java | 2 +- .../dto/UserInitializationDTO.java | 2 +- .../dto/UserPublicInfoDTO.java | 2 +- .../{service => core}/dto/UserRoleDTO.java | 2 +- .../FinishedBuildJobPageableSearchDTO.java | 2 +- .../dto/pageablesearch/PageableSearchDTO.java | 2 +- .../artemis/core/dto/vm/ManagedUserVM.java | 2 +- .../core/repository/UserRepository.java | 6 +-- .../core/security/OAuth2JWKSService.java | 2 +- .../filter/ApiVersionFilter.java | 2 +- .../filter/CachingHttpHeadersFilter.java | 2 +- .../filter/Lti13LaunchFilter.java | 2 +- .../filter/SpaWebFilter.java | 2 +- .../{ => core}/service/AuditEventService.java | 2 +- .../{ => core}/service/CourseService.java | 19 +++++----- .../service/DataExportScheduleService.java | 1 - .../{ => core}/service/FilePathService.java | 2 +- .../{ => core}/service/FileService.java | 2 +- .../service/LegalDocumentService.java | 6 +-- .../service/OrganizationService.java | 2 +- .../{ => core}/service/ProfileService.java | 2 +- .../service/ResourceLoaderService.java | 2 +- .../artemis/core/service/ScheduleService.java | 2 +- .../{ => core}/service/StatisticsService.java | 6 +-- .../core/service/TelemetryService.java | 2 - .../{ => core}/service/TimeService.java | 2 +- .../service/TitleCacheEvictionService.java | 2 +- .../{ => core}/service/ZipFileService.java | 2 +- .../export/CourseExamExportService.java | 8 ++-- .../export/DataExportCreationService.java | 6 +-- .../export/DataExportExamCreationService.java | 2 +- .../DataExportExerciseCreationService.java | 4 +- .../export/DataExportScienceEventService.java | 2 +- .../service/export/DataExportService.java | 6 +-- .../service/feature/FeatureToggleService.java | 2 +- .../core/service/user/UserService.java | 10 ++--- .../aet/artemis/core/web/AccountResource.java | 8 ++-- .../core/web/{admin => }/AuditResource.java | 4 +- .../aet/artemis/core/web/CourseResource.java | 38 +++++++++---------- .../artemis/core/web/DataExportResource.java | 4 +- .../{admin => }/FeatureToggleResource.java | 2 +- .../aet/artemis/core/web/FileResource.java | 6 +-- .../aet/artemis/core/web/LectureResource.java | 4 +- .../core/web/{admin => }/LogResource.java | 2 +- .../artemis/core/web/StatisticsResource.java | 6 +-- .../core/web/TeamWebsocketService.java | 2 +- .../aet/artemis/core/web/UserResource.java | 4 +- .../web/admin/AdminBuildJobQueueResource.java | 14 +++---- .../core/web/admin/AdminCourseResource.java | 8 ++-- .../web/admin/AdminDataExportResource.java | 2 +- .../core/web/admin/AdminImprintResource.java | 4 +- .../web/admin/AdminOrganizationResource.java | 4 +- .../admin/AdminPrivacyStatementResource.java | 4 +- .../web/admin/AdminStatisticsResource.java | 2 +- .../core/web/admin/AdminUserResource.java | 6 +-- .../core/web/open/PublicAccountResource.java | 2 +- .../core/web/open/PublicImprintResource.java | 4 +- .../open/PublicPrivacyStatementResource.java | 4 +- .../PublicSystemNotificationResource.java | 2 +- .../exam/domain/event/ExamLiveEvent.java | 2 +- .../aet/artemis/exam/dto/ExamScoresDTO.java | 4 +- .../exam/dto/ExamWithIdAndCourseDTO.java | 1 + .../StudentExamWithIdAndExamAndUserDTO.java | 1 + .../exam/dto/SuspiciousExamSessionsDTO.java | 1 - .../exam/repository/ExamRepository.java | 2 +- .../exam/service/ExamDeletionService.java | 2 +- .../exam/service/ExamLiveEventsService.java | 2 +- .../exam/service/ExamRegistrationService.java | 4 +- .../aet/artemis/exam/service/ExamService.java | 22 +++++------ .../exam/service/ExamSessionService.java | 8 ++-- .../exam/service/ExamSubmissionService.java | 2 +- .../artemis/exam/service/ExamUserService.java | 8 ++-- .../artemis/exam/service/ImageExtractor.java | 1 - .../exam/service/StudentExamService.java | 8 ++-- .../aet/artemis/exam/web/ExamResource.java | 30 +++++++-------- .../artemis/exam/web/ExamUserResource.java | 10 ++--- .../artemis/exam/web/StudentExamResource.java | 8 ++-- .../web/admin/AdminExamResource.java | 2 +- .../aet/artemis/exercise/domain/Exercise.java | 2 +- .../exercise/dto/ExerciseDetailsDTO.java | 2 +- .../dto/ExerciseGroupWithIdAndExamDTO.java | 1 + .../artemis/exercise/dto/SubmissionDTO.java | 2 +- .../dto/TeamSearchUserDTO.java | 2 +- .../repository/ExerciseMetricsRepository.java | 6 +-- .../repository/ExerciseRepository.java | 2 +- .../StudentParticipationRepository.java | 2 +- .../repository/SubmissionRepository.java | 2 +- .../service/ExerciseDeletionService.java | 1 - .../exercise/service/ExerciseService.java | 8 ++-- .../service/ExerciseSpecificationService.java | 2 +- .../ExerciseWithSubmissionsExportService.java | 4 +- .../service/LearningMetricsService.java | 8 ++-- ...articipationAuthorizationCheckService.java | 2 +- .../ParticipationLifecycleService.java | 3 +- .../service/ParticipationService.java | 8 ++-- .../service/SubmissionExportService.java | 6 +-- .../service/SubmissionService.java | 9 ++--- .../service/SubmissionVersionService.java | 2 +- .../service/team/PurgeExistingStrategy.java | 2 +- .../exercise/service/team/TeamService.java | 6 +-- .../web/AbstractSubmissionResource.java | 2 +- .../web}/AdminExerciseResource.java | 2 +- .../web/ConsistencyCheckResource.java | 2 +- .../exercise/web/ExerciseResource.java | 8 ++-- .../web/ExerciseScoresChartResource.java | 2 +- .../exercise/web/ParticipationResource.java | 4 +- .../ParticipationTeamWebsocketService.java | 10 ++--- .../exercise/web/SubmissionResource.java | 12 +++--- .../artemis/exercise/web/TeamResource.java | 8 ++-- .../domain/FileUploadSubmission.java | 4 +- .../service/FileUploadExerciseService.java | 4 +- ...dExerciseWithSubmissionsExportService.java | 4 +- .../FileUploadSubmissionExportService.java | 4 +- .../service/FileUploadSubmissionService.java | 8 ++-- .../web/FileUploadAssessmentResource.java | 6 +-- .../web/FileUploadExerciseResource.java | 8 ++-- .../iris/{web => dto}/IrisStatusDTO.java | 2 +- .../service/IrisDefaultTemplateService.java | 2 +- .../iris/service/pyris/PyrisDTOService.java | 2 +- .../service/pyris/PyrisPipelineService.java | 2 +- .../service/pyris/PyrisWebhookService.java | 2 +- .../PyrisCourseChatPipelineExecutionDTO.java | 2 +- .../websocket/IrisWebsocketService.java | 2 +- .../web}/AdminIrisSettingsResource.java | 2 +- .../aet/artemis/iris/web/IrisResource.java | 1 + .../lecture/repository/LectureRepository.java | 2 +- .../LectureUnitMetricsRepository.java | 2 +- .../service/AttachmentUnitService.java | 4 +- .../service/LearningObjectService.java | 4 +- .../lecture/service/LectureImportService.java | 5 +-- .../lecture/service/LectureService.java | 4 +- .../service/LectureUnitProcessingService.java | 8 ++-- .../lecture/service/LectureUnitService.java | 4 +- .../service/SlideSplitterService.java | 4 +- .../web/AttachmentResource.java | 8 ++-- .../lecture/web/AttachmentUnitResource.java | 8 ++-- .../lecture/web/LectureUnitResource.java | 2 +- .../lecture/web/OnlineUnitResource.java | 2 +- .../lti/config/CustomLti13Configurer.java | 4 +- .../aet/artemis/lti/service/Lti13Service.java | 1 - .../OnlineCourseConfigurationService.java | 2 +- .../web}/AdminLtiConfigurationResource.java | 2 +- .../{atlas => lti}/web/LtiResource.java | 2 +- .../service/ModelingExerciseService.java | 4 +- ...gExerciseWithSubmissionsExportService.java | 4 +- .../ModelingSubmissionExportService.java | 4 +- .../service/ModelingSubmissionService.java | 6 +-- .../web}/AdminModelingExerciseResource.java | 2 +- .../web/ApollonConversionResource.java | 2 +- .../web/ApollonDiagramResource.java | 2 +- .../web/ModelingAssessmentResource.java | 6 +-- .../web/ModelingExerciseResource.java | 10 ++--- .../plagiarism/dto/PlagiarismResultDTO.java | 1 - .../{web => dto}/PlagiarismResultStats.java | 2 +- .../service/PlagiarismAnswerPostService.java | 6 +-- .../service/PlagiarismCaseService.java | 4 +- .../service/PlagiarismPostService.java | 8 ++-- .../service/PlagiarismWebsocketService.java | 2 +- ...ProgrammingPlagiarismDetectionService.java | 4 +- .../web/PlagiarismCaseResource.java | 4 +- .../web/PlagiarismPostResource.java | 2 +- .../plagiarism/web/PlagiarismResource.java | 2 +- .../web/PlagiarismResultResponseBuilder.java | 1 + .../programming/domain/BuildRunState.java | 5 --- .../domain/ProgrammingExercise.java | 1 + .../domain/ProgrammingSubmission.java | 1 + .../domain/{ => build}/BuildJob.java | 5 ++- .../domain/{ => build}/BuildLogEntry.java | 3 +- .../{ => build}/BuildLogStatisticsEntry.java | 3 +- .../domain/{ => build}/BuildPlan.java | 3 +- .../domain/{ => build}/BuildPlanType.java | 2 +- .../domain/build/BuildRunState.java | 5 +++ .../domain/{ => build}/BuildStatus.java | 2 +- .../AbstractBuildResultNotificationDTO.java | 5 ++- .../dto/BuildJobDTOInterface.java | 2 +- .../dto/CheckoutDirectoriesDTO.java | 1 - .../dto/ConsistencyErrorDTO.java | 2 +- .../CoverageReportAndSubmissionDateDTO.java | 2 +- ...mmingSubmissionIdAndSubmissionDateDTO.java | 2 +- .../artemis/programming/dto/ResultDTO.java | 8 ++-- .../dto/StaticCodeAnalysisIssue.java | 2 +- .../dto/StaticCodeAnalysisReportDTO.java | 2 +- .../dto/TestCaseBaseDTO.java | 2 +- .../repository/BuildJobRepository.java | 10 ++--- .../repository/BuildLogEntryRepository.java | 2 +- .../BuildLogStatisticsEntryRepository.java | 4 +- .../repository/BuildPlanRepository.java | 2 +- .../ProgrammingSubmissionRepository.java | 2 +- .../hestia/CoverageReportRepository.java | 2 +- ...aticProgrammingExerciseCleanupService.java | 4 +- .../service/BuildLogEntryService.java | 5 ++- .../service/BuildScriptProviderService.java | 2 +- .../service/CommitHistoryService.java | 2 +- .../service/ConsistencyCheckService.java | 2 +- .../programming/service/GitService.java | 8 ++-- .../service/JavaTemplateUpgradeService.java | 4 +- .../programming/service/PlantUmlService.java | 2 +- .../service/ProgrammingAssessmentService.java | 4 +- ...mingExerciseCodeReviewFeedbackService.java | 2 +- .../ProgrammingExerciseExportService.java | 6 +-- ...ammingExerciseFeedbackCreationService.java | 8 ++-- .../ProgrammingExerciseGradingService.java | 5 +-- ...grammingExerciseImportFromFileService.java | 8 ++-- .../ProgrammingExerciseImportService.java | 5 +-- ...ogrammingExerciseParticipationService.java | 5 +-- .../ProgrammingExerciseRepositoryService.java | 6 +-- .../service/ProgrammingExerciseService.java | 12 +++--- .../ProgrammingExerciseTestCaseService.java | 2 +- .../service/ProgrammingMessagingService.java | 8 ++-- .../service/ProgrammingSubmissionService.java | 6 +-- .../service/ProgrammingTriggerService.java | 6 +-- .../service/RepositoryService.java | 4 +- .../service/SubmissionPolicyService.java | 2 +- .../{ => programming}/service/UriService.java | 2 +- .../AeolusBuildScriptGenerationService.java | 2 +- .../service/aeolus/AeolusTemplateService.java | 2 +- ...actContinuousIntegrationResultService.java | 6 +-- .../ContinuousIntegrationResultService.java | 4 +- .../ci/notification/BuildLogParseUtils.java | 2 +- .../ci/notification/dto/TestCaseDTO.java | 2 +- .../ci/notification/dto/TestResultsDTO.java | 8 ++-- .../ci/notification/dto/TestSuiteDTO.java | 4 +- .../service/gitlab/GitLabService.java | 2 +- .../gitlabci/GitLabCIBuildPlanService.java | 2 +- .../gitlabci/GitLabCIResultService.java | 8 ++-- .../service/gitlabci/GitLabCIService.java | 6 +-- .../gitlabci/GitLabCITriggerService.java | 2 +- ...ogrammingExerciseGitDiffReportService.java | 2 +- .../service/jenkins/JenkinsResultService.java | 8 ++-- .../service/jenkins/JenkinsService.java | 6 +-- .../build_plan/JenkinsBuildPlanCreator.java | 2 +- .../JenkinsPipelineScriptCreator.java | 2 +- .../LocalCIPriorityQueueComparator.java | 2 +- .../localci/LocalCIQueueWebsocketService.java | 5 +-- .../LocalCIResultProcessingService.java | 20 +++++----- .../service/localci/LocalCIResultService.java | 6 +-- .../service/localci/LocalCIService.java | 4 +- .../localci/LocalCITriggerService.java | 8 ++-- .../LocalCIWebsocketMessagingService.java | 8 ++-- .../localci/SharedQueueManagementService.java | 12 +++--- .../service/localci/dto/ResultQueueItem.java | 12 ------ .../localci/scaparser/ReportParser.java | 2 +- .../scaparser/strategy/CheckstyleParser.java | 4 +- .../scaparser/strategy/PMDCPDParser.java | 4 +- .../localci/scaparser/strategy/PMDParser.java | 4 +- .../scaparser/strategy/ParserStrategy.java | 2 +- .../scaparser/strategy/SpotbugsParser.java | 4 +- .../localci/scaparser/utils/ReportUtils.java | 4 +- .../GitPublickeyAuthenticatorService.java | 2 +- .../service/localvc/LocalVCService.java | 2 +- .../vcs/AbstractVersionControlService.java | 2 +- .../programming/web/IdeSettingsResource.java | 4 +- .../web/ProgrammingAssessmentResource.java | 4 +- ...ogrammingExerciseExportImportResource.java | 4 +- .../ProgrammingExerciseGradingResource.java | 2 +- ...grammingExerciseParticipationResource.java | 4 +- ...ProgrammingExercisePlagiarismResource.java | 2 +- .../web/ProgrammingExerciseResource.java | 14 +++---- .../ProgrammingExerciseTestCaseResource.java | 2 +- .../web/ProgrammingSubmissionResource.java | 2 +- .../web/SubmissionPolicyResource.java | 4 +- ...grammingExerciseGitDiffReportResource.java | 4 +- .../web/localci/BuildJobQueueResource.java | 12 +++--- .../web/localci/BuildLogResource.java | 2 +- .../web/localci/BuildPlanResource.java | 2 +- .../web/open/PublicBuildPlanResource.java | 2 +- ...grammingExerciseParticipationResource.java | 12 +++--- .../web/repository/RepositoryResource.java | 8 ++-- .../repository/TestRepositoryResource.java | 6 +-- .../quiz/domain/DragAndDropQuestion.java | 4 +- .../cit/aet/artemis/quiz/domain/DragItem.java | 4 +- .../AbstractQuizSubmissionService.java | 2 +- ...ragAndDropQuizAnswerConversionService.java | 2 +- .../quiz/service/QuizBatchService.java | 2 +- .../service/QuizExerciseImportService.java | 4 +- .../quiz/service/QuizExerciseService.java | 8 ++-- ...zExerciseWithSubmissionsExportService.java | 4 +- .../quiz/service/QuizMessagingService.java | 2 +- .../quiz/service/QuizScheduleService.java | 2 +- .../quiz/service/QuizStatisticService.java | 2 +- .../quiz/service/QuizSubmissionService.java | 6 +-- .../quiz/web/QuizExerciseResource.java | 12 +++--- .../quiz/web/QuizParticipationResource.java | 2 +- .../quiz/web/QuizSubmissionResource.java | 4 +- .../aet/artemis/service/dto/package-info.java | 4 -- .../cit/aet/artemis/service/package-info.java | 4 -- .../text/service/TextAssessmentService.java | 4 +- .../service/TextExerciseFeedbackService.java | 6 +-- .../text/service/TextExerciseService.java | 4 +- ...tExerciseWithSubmissionsExportService.java | 4 +- .../service/TextSubmissionExportService.java | 4 +- .../text/service/TextSubmissionService.java | 6 +-- .../AdminTextAssessmentEventResource.java | 2 +- .../text/web/TextAssessmentResource.java | 6 +-- .../text/web/TextExerciseResource.java | 10 ++--- .../tutorialgroup/domain/TutorialGroup.java | 2 +- .../service/TutorialGroupService.java | 2 +- .../web/TutorialGroupFreePeriodResource.java | 2 +- .../web/TutorialGroupResource.java | 2 +- .../AbstractArtemisIntegrationTest.java | 8 ++-- ...actSpringIntegrationJenkinsGitlabTest.java | 6 +-- ...ctSpringIntegrationLocalCILocalVCTest.java | 2 +- .../aet/artemis/BuildPlanIntegrationTest.java | 2 +- .../cit/aet/artemis/ClientForwardTest.java | 2 +- .../ContentVersionIntegrationTest.java | 2 +- .../aet/artemis/DatabaseQueryCountTest.java | 2 +- .../cit/aet/artemis/FileIntegrationTest.java | 2 +- .../aet/artemis/MetricsIntegrationTest.java | 6 +-- .../artemis/StatisticsIntegrationTest.java | 4 +- .../architecture/ArchitectureTest.java | 2 +- .../architecture/ServiceArchitectureTest.java | 4 +- .../AssessmentComplaintIntegrationTest.java | 10 ++--- ...ssessmentTeamComplaintIntegrationTest.java | 8 ++-- .../ComplaintResponseIntegrationTest.java | 6 +-- .../assessment/ComplaintUtilService.java | 2 +- .../ExampleSubmissionIntegrationTest.java | 2 +- .../ExerciseScoresChartIntegrationTest.java | 2 +- .../assessment/GradeStepIntegrationTest.java | 4 +- .../ParticipantScoreIntegrationTest.java | 2 +- .../ResultServiceIntegrationTest.java | 4 +- ...utorLeaderboardServiceIntegrationTest.java | 2 +- .../TutorParticipationIntegrationTest.java | 2 +- .../LdapAuthenticationIntegrationTest.java | 2 +- .../artemis/bonus/BonusIntegrationTest.java | 2 +- ...CompetencyPrerequisiteIntegrationTest.java | 4 +- .../competency/CompetencyIntegrationTest.java | 2 +- .../CompetencyJolIntegrationTest.java | 4 +- .../competency/CompetencyUtilService.java | 2 +- .../CourseCompetencyIntegrationTest.java | 10 ++--- .../LearningPathIntegrationTest.java | 22 +++++------ .../PrerequisiteIntegrationTest.java | 2 +- ...StandardizedCompetencyIntegrationTest.java | 8 ++-- .../StandardizedCompetencyUtilService.java | 4 +- .../connector/GitlabRequestMockProvider.java | 2 +- .../artemis/connectors/Lti13ServiceTest.java | 2 +- .../aet/artemis/course/CourseTestService.java | 34 ++++++++--------- .../aet/artemis/course/CourseUtilService.java | 2 +- .../DataExportResourceIntegrationTest.java | 4 +- .../tum/cit/aet/artemis/exam/ExamFactory.java | 4 +- .../aet/artemis/exam/ExamIntegrationTest.java | 22 +++++------ .../ExamParticipationIntegrationTest.java | 8 ++-- .../exam/ExamRegistrationIntegrationTest.java | 2 +- .../artemis/exam/ExamUserIntegrationTest.java | 6 +-- .../exam/StudentExamIntegrationTest.java | 12 +++--- .../exercise/ExerciseIntegrationTest.java | 4 +- .../FileUploadAssessmentIntegrationTest.java | 4 +- .../FileUploadExerciseIntegrationTest.java | 4 +- .../FileUploadSubmissionIntegrationTest.java | 2 +- .../ModelingAssessmentIntegrationTest.java | 8 ++-- .../ModelingExerciseIntegrationTest.java | 4 +- .../ProgrammingAssessmentIntegrationTest.java | 4 +- .../ProgrammingExerciseFactory.java | 4 +- ...ProgrammingExerciseGradingServiceTest.java | 2 +- ...gExerciseIntegrationJenkinsGitlabTest.java | 4 +- ...rammingExerciseIntegrationTestService.java | 18 ++++----- ...ExerciseLocalVCLocalCIIntegrationTest.java | 2 +- ...gExerciseParticipationIntegrationTest.java | 2 +- .../ProgrammingExerciseResultTestService.java | 6 +-- ...rogrammingExerciseTestCaseServiceTest.java | 2 +- .../ProgrammingExerciseTestService.java | 12 +++--- .../ProgrammingExerciseUtilService.java | 2 +- ...AndResultGitlabJenkinsIntegrationTest.java | 2 +- .../ProgrammingSubmissionIntegrationTest.java | 2 +- .../RepositoryIntegrationTest.java | 8 ++-- ...seParticipationJenkinsIntegrationTest.java | 2 +- .../StaticCodeAnalysisIntegrationTest.java | 2 +- ...TestRepositoryResourceIntegrationTest.java | 4 +- .../exercise/quiz/QuizExerciseFactory.java | 2 +- .../quiz/QuizExerciseIntegrationTest.java | 4 +- .../quiz/QuizExerciseUtilService.java | 2 +- .../quiz/QuizSubmissionIntegrationTest.java | 2 +- .../artemis/iris/IrisChatWebsocketTest.java | 2 +- ...risExerciseChatSessionIntegrationTest.java | 2 +- .../AttachmentUnitsIntegrationTest.java | 4 +- .../aet/artemis/lecture/LectureFactory.java | 2 +- .../lecture/LectureUnitIntegrationTest.java | 2 +- .../artemis/lecture/LectureUtilService.java | 2 +- .../lecture/OnlineUnitIntegrationTest.java | 2 +- .../BuildAgentDockerServiceTest.java | 8 ++-- ...AgentSshAuthenticationIntegrationTest.java | 2 +- .../artemis/localvcci/BuildResultTest.java | 2 +- .../localvcci/LocalCIIntegrationTest.java | 8 ++-- .../LocalCIResourceIntegrationTest.java | 24 ++++++------ .../artemis/localvcci/LocalCIServiceTest.java | 14 +++---- .../LocalVCLocalCIIntegrationTest.java | 2 +- .../SharedQueueManagementServiceTest.java | 2 +- .../metis/AbstractConversationTest.java | 10 ++--- .../metis/AnswerMessageIntegrationTest.java | 2 +- .../artemis/metis/ChannelIntegrationTest.java | 6 +-- .../metis/ConversationIntegrationTest.java | 12 +++--- .../metis/GroupChatIntegrationTest.java | 6 +-- .../artemis/metis/MessageIntegrationTest.java | 4 +- .../metis/OneToOneChatIntegrationTest.java | 6 +-- .../PushNotificationResourceTest.java | 6 +-- .../OrganizationIntegrationTest.java | 2 +- .../ParticipationIntegrationTest.java | 4 +- .../ParticipationUtilService.java | 4 +- .../SubmissionExportIntegrationTest.java | 2 +- .../SubmissionIntegrationTest.java | 4 +- .../PlagiarismCaseIntegrationTest.java | 4 +- .../PlagiarismCheckIntegrationTest.java | 2 +- .../plagiarism/PlagiarismIntegrationTest.java | 2 +- .../PlagiarismPostIntegrationTest.java | 4 +- .../repository/UserTestRepository.java | 3 +- .../science/ScienceIntegrationTest.java | 4 +- .../ScienceSettingsIntegrationTest.java | 2 +- .../artemis/science/ScienceUtilService.java | 2 +- .../security/Lti13LaunchFilterTest.java | 2 +- .../security/OAuth2JWKSServiceTest.java | 2 +- .../service/BuildLogEntryServiceTest.java | 3 +- .../service/ConductAgreementServiceTest.java | 1 + .../service/ConsistencyCheckTestService.java | 2 +- .../CourseScoreCalculationServiceTest.java | 10 ++--- .../artemis/service/CourseServiceTest.java | 3 +- .../service/EmailSummaryServiceTest.java | 1 + .../artemis/service/FilePathServiceTest.java | 2 + .../aet/artemis/service/FileServiceTest.java | 3 ++ .../artemis/service/GitlabCIServiceTest.java | 2 +- .../artemis/service/JenkinsServiceTest.java | 6 +-- .../service/LearningObjectServiceTest.java | 1 + .../service/LearningPathServiceTest.java | 6 +-- .../artemis/service/LectureServiceTest.java | 4 +- .../OnlineCourseConfigurationServiceTest.java | 1 + ...cipationAuthorizationCheckServiceTest.java | 1 + .../ParticipationLifecycleServiceTest.java | 1 + .../service/ParticipationServiceTest.java | 4 +- ...ParticipationTeamWebsocketServiceTest.java | 4 +- .../service/ResourceLoaderServiceTest.java | 1 + .../service/SubmissionServiceTest.java | 3 +- .../service/TeamWebsocketServiceTest.java | 2 +- .../TitleCacheEvictionServiceTest.java | 1 + ...WeeklyEmailSummaryScheduleServiceTest.java | 2 + .../artemis/service/ZipFileServiceTest.java | 1 + .../JenkinsPipelineScriptCreatorTest.java | 2 +- .../buildagent/TestResultXmlParserTest.java | 2 +- .../artemis/service/exam/ExamServiceTest.java | 2 +- .../notifications/MailServiceTest.java | 2 +- ...ngExerciseFeedbackCreationServiceTest.java | 6 +-- .../ide/IdePreferencesIntegrationTest.java | 4 +- .../aet/artemis/team/TeamIntegrationTest.java | 6 +-- .../text/TextAssessmentIntegrationTest.java | 8 ++-- .../text/TextExerciseIntegrationTest.java | 6 +-- .../text/TextSubmissionIntegrationTest.java | 2 +- .../theia/TheiaInfoContributorTest.java | 2 +- ...utorialGroupFreePeriodIntegrationTest.java | 2 +- .../TutorialGroupIntegrationTest.java | 2 +- .../user/AccountResourceIntegrationTest.java | 4 +- .../tum/cit/aet/artemis/user/UserFactory.java | 2 +- .../cit/aet/artemis/user/UserTestService.java | 6 +-- ...AndroidAppSiteAssociationResourceTest.java | 2 +- .../AppleAppSiteAssociationResourceTest.java | 2 +- 599 files changed, 1287 insertions(+), 1269 deletions(-) rename src/main/java/de/tum/cit/aet/artemis/{service => assessment}/dto/ComplaintAction.java (59%) rename src/main/java/de/tum/cit/aet/artemis/{service => assessment}/dto/ComplaintRequestDTO.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{service => assessment}/dto/ComplaintResponseUpdateDTO.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{service => assessment}/dto/GradingCriterionDTO.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{service => assessment}/dto/GradingInstructionDTO.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{service => assessment}/dto/MaxAndReachablePoints.java (82%) rename src/main/java/de/tum/cit/aet/artemis/{exercise => assessment}/web/AssessmentResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{exam => assessment}/web/ExampleSubmissionResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{text => assessment}/web/LongFeedbackTextResource.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{exercise => assessment}/web/ParticipantScoreResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/atlas/dto/{science => }/ScienceEventDTO.java (82%) rename src/main/java/de/tum/cit/aet/artemis/atlas/repository/{competency => }/CompetencyJolRepository.java (98%) rename src/main/java/de/tum/cit/aet/artemis/atlas/repository/{competency => }/KnowledgeAreaRepository.java (97%) rename src/main/java/de/tum/cit/aet/artemis/atlas/repository/{science => }/ScienceEventRepository.java (95%) rename src/main/java/de/tum/cit/aet/artemis/atlas/repository/{science => }/ScienceSettingRepository.java (91%) rename src/main/java/de/tum/cit/aet/artemis/atlas/repository/{competency => }/StandardizedCompetencyRepository.java (90%) rename src/main/java/de/tum/cit/aet/artemis/{core/web/admin => atlas/web}/AdminStandardizedCompetencyResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{assessment => atlas}/web/MetricsResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/atlas/web/{science => }/ScienceResource.java (93%) rename src/main/java/de/tum/cit/aet/artemis/atlas/web/{science => }/ScienceSettingsResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{programming/service/localci => buildagent}/dto/BuildAgentInformation.java (77%) rename src/main/java/de/tum/cit/aet/artemis/{programming/service/localci => buildagent}/dto/BuildConfig.java (72%) rename src/main/java/de/tum/cit/aet/artemis/{programming/service/localci => buildagent}/dto/BuildJobQueueItem.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{service => buildagent}/dto/BuildJobResultCountDTO.java (60%) rename src/main/java/de/tum/cit/aet/artemis/{service => buildagent}/dto/BuildJobsStatisticsDTO.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{programming/service/localci => buildagent}/dto/BuildResult.java (89%) rename src/main/java/de/tum/cit/aet/artemis/{programming/service/localci => buildagent}/dto/DockerImageBuild.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{service => buildagent}/dto/FinishedBuildJobDTO.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{programming/service/localci => buildagent}/dto/JobTimingInfo.java (54%) rename src/main/java/de/tum/cit/aet/artemis/{programming/service/localci => buildagent}/dto/RepositoryInfo.java (64%) rename src/main/java/de/tum/cit/aet/artemis/{programming/service/localci => buildagent}/dto/ResultBuildJob.java (80%) create mode 100644 src/main/java/de/tum/cit/aet/artemis/buildagent/dto/ResultQueueItem.java rename src/main/java/de/tum/cit/aet/artemis/communication/{web/conversation/dtos => dto}/ChannelDTO.java (98%) rename src/main/java/de/tum/cit/aet/artemis/communication/{web/conversation/dtos => dto}/ChannelIdAndNameDTO.java (81%) rename src/main/java/de/tum/cit/aet/artemis/communication/{web/conversation/dtos => dto}/ConversationDTO.java (98%) rename src/main/java/de/tum/cit/aet/artemis/communication/{web/conversation/dtos => dto}/ConversationUserDTO.java (88%) rename src/main/java/de/tum/cit/aet/artemis/communication/{web/conversation/dtos => dto}/GroupChatDTO.java (93%) rename src/main/java/de/tum/cit/aet/artemis/communication/{web/conversation/dtos => dto}/OneToOneChatDTO.java (92%) rename src/main/java/de/tum/cit/aet/artemis/communication/{web/push_notification => dto}/PushNotificationRegisterBody.java (74%) rename src/main/java/de/tum/cit/aet/artemis/communication/{web/push_notification => dto}/PushNotificationRegisterDTO.java (72%) rename src/main/java/de/tum/cit/aet/artemis/communication/{web/push_notification => dto}/PushNotificationUnregisterRequest.java (75%) rename src/main/java/de/tum/cit/aet/artemis/{service => communication}/dto/ResponsibleUserDTO.java (83%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/service/ConductAgreementService.java (93%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/service/EmailSummaryService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/service/SystemNotificationService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => communication}/service/WebsocketMessagingService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/web/admin => communication/web}/AdminSystemNotificationResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{core => communication}/web/AndroidAppSiteAssociationResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core => communication}/web/AppleAppSiteAssociationResource.java (98%) rename src/main/java/de/tum/cit/aet/artemis/communication/web/{push_notification => }/PushNotificationResource.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{service => core/config}/HazelcastPathSerializer.java (95%) rename src/main/java/de/tum/cit/aet/artemis/core/{aop/logging => config}/LoggingAspect.java (98%) rename src/main/java/de/tum/cit/aet/artemis/core/{component => config}/TheiaInfoContributor.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{service => core}/dto/AuditingEntityDTO.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{service => core}/dto/PasswordChangeDTO.java (85%) rename src/main/java/de/tum/cit/aet/artemis/{service => core}/dto/StudentDTO.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{service => core}/dto/UserDTO.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{service => core}/dto/UserInitializationDTO.java (84%) rename src/main/java/de/tum/cit/aet/artemis/{service => core}/dto/UserPublicInfoDTO.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{service => core}/dto/UserRoleDTO.java (96%) rename src/main/java/de/tum/cit/aet/artemis/core/{web => security}/filter/ApiVersionFilter.java (97%) rename src/main/java/de/tum/cit/aet/artemis/core/{web => security}/filter/CachingHttpHeadersFilter.java (98%) rename src/main/java/de/tum/cit/aet/artemis/core/{web => security}/filter/Lti13LaunchFilter.java (99%) rename src/main/java/de/tum/cit/aet/artemis/core/{web => security}/filter/SpaWebFilter.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/AuditEventService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/CourseService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/FilePathService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/FileService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/LegalDocumentService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/OrganizationService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/ProfileService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/ResourceLoaderService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/StatisticsService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/TimeService.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/TitleCacheEvictionService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => core}/service/ZipFileService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/core/web/{admin => }/AuditResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/core/web/{admin => }/FeatureToggleResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/core/web/{admin => }/LogResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{core => exam}/web/admin/AdminExamResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{service => exercise}/dto/TeamSearchUserDTO.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/service/ParticipationAuthorizationCheckService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/service/ParticipationLifecycleService.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/service/ParticipationService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/service/SubmissionService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => exercise}/service/SubmissionVersionService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/web/admin => exercise/web}/AdminExerciseResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/iris/{web => dto}/IrisStatusDTO.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{core/web/admin/iris => iris/web}/AdminIrisSettingsResource.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{ => lecture}/service/AttachmentUnitService.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{ => lecture}/service/LearningObjectService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => lecture}/service/SlideSplitterService.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{core => lecture}/web/AttachmentResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{ => lti}/service/OnlineCourseConfigurationService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{core/web/admin => lti/web}/AdminLtiConfigurationResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{atlas => lti}/web/LtiResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{core/web/admin => modeling/web}/AdminModelingExerciseResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{text => modeling}/web/ApollonConversionResource.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{text => modeling}/web/ApollonDiagramResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/plagiarism/{web => dto}/PlagiarismResultStats.java (91%) delete mode 100644 src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildRunState.java rename src/main/java/de/tum/cit/aet/artemis/programming/domain/{ => build}/BuildJob.java (97%) rename src/main/java/de/tum/cit/aet/artemis/programming/domain/{ => build}/BuildLogEntry.java (94%) rename src/main/java/de/tum/cit/aet/artemis/programming/domain/{ => build}/BuildLogStatisticsEntry.java (96%) rename src/main/java/de/tum/cit/aet/artemis/programming/domain/{ => build}/BuildPlan.java (93%) rename src/main/java/de/tum/cit/aet/artemis/programming/domain/{ => build}/BuildPlanType.java (80%) create mode 100644 src/main/java/de/tum/cit/aet/artemis/programming/domain/build/BuildRunState.java rename src/main/java/de/tum/cit/aet/artemis/programming/domain/{ => build}/BuildStatus.java (79%) rename src/main/java/de/tum/cit/aet/artemis/{service => programming}/dto/AbstractBuildResultNotificationDTO.java (94%) rename src/main/java/de/tum/cit/aet/artemis/{service => programming}/dto/BuildJobDTOInterface.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{service => programming}/dto/ConsistencyErrorDTO.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{service => programming}/dto/CoverageReportAndSubmissionDateDTO.java (86%) rename src/main/java/de/tum/cit/aet/artemis/{service => programming}/dto/ProgrammingSubmissionIdAndSubmissionDateDTO.java (84%) rename src/main/java/de/tum/cit/aet/artemis/{service => programming}/dto/StaticCodeAnalysisIssue.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{service => programming}/dto/StaticCodeAnalysisReportDTO.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{service => programming}/dto/TestCaseBaseDTO.java (92%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/BuildLogEntryService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{ => programming}/service/UriService.java (99%) rename src/main/java/de/tum/cit/aet/artemis/programming/{web => service/localci}/LocalCIWebsocketMessagingService.java (95%) delete mode 100644 src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/ResultQueueItem.java rename src/main/java/de/tum/cit/aet/artemis/{exercise => programming}/web/SubmissionPolicyResource.java (99%) delete mode 100644 src/main/java/de/tum/cit/aet/artemis/service/dto/package-info.java delete mode 100644 src/main/java/de/tum/cit/aet/artemis/service/package-info.java rename src/main/java/de/tum/cit/aet/artemis/{core/web/admin => text/web}/AdminTextAssessmentEventResource.java (97%) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/BonusStrategy.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/BonusStrategy.java index fad7e7f73de2..d346d9cf1c27 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/BonusStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/BonusStrategy.java @@ -5,10 +5,9 @@ import org.apache.commons.lang3.NotImplementedException; -import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.assessment.dto.BonusExampleDTO; +import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.assessment.dto.BonusExampleDTO; public enum BonusStrategy implements IBonusStrategy { diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/IBonusStrategy.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/IBonusStrategy.java index 51d43f2e83ee..0af2187c9ce1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/IBonusStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/IBonusStrategy.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.assessment.domain; -import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.assessment.dto.BonusExampleDTO; +import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; public interface IBonusStrategy { diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java index cbfcff34ecab..759d36e2dc7f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java @@ -54,10 +54,10 @@ import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageFileReport; +import de.tum.cit.aet.artemis.programming.dto.ResultDTO; import de.tum.cit.aet.artemis.quiz.config.QuizView; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; -import de.tum.cit.aet.artemis.programming.dto.ResultDTO; /** * A Result. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/ComplaintAction.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/ComplaintAction.java similarity index 59% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/ComplaintAction.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/ComplaintAction.java index 3c6fcf7c9fe8..dff262621528 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/ComplaintAction.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/ComplaintAction.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto; +package de.tum.cit.aet.artemis.assessment.dto; public enum ComplaintAction { REFRESH_LOCK, RESOLVE_COMPLAINT diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/ComplaintRequestDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/ComplaintRequestDTO.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/ComplaintRequestDTO.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/ComplaintRequestDTO.java index a56106b2c505..ba4184d39cd4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/ComplaintRequestDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/ComplaintRequestDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto; +package de.tum.cit.aet.artemis.assessment.dto; import java.util.Optional; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/ComplaintResponseUpdateDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/ComplaintResponseUpdateDTO.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/ComplaintResponseUpdateDTO.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/ComplaintResponseUpdateDTO.java index 422904278f13..2e8f51d54439 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/ComplaintResponseUpdateDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/ComplaintResponseUpdateDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto; +package de.tum.cit.aet.artemis.assessment.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/GradingCriterionDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/GradingCriterionDTO.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/GradingCriterionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/GradingCriterionDTO.java index 4c93c2a65b7e..ebfc35775657 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/GradingCriterionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/GradingCriterionDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto; +package de.tum.cit.aet.artemis.assessment.dto; import java.util.Set; import java.util.stream.Collectors; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/GradingInstructionDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/GradingInstructionDTO.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/GradingInstructionDTO.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/GradingInstructionDTO.java index ea071e935540..e2cd30af9cf2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/GradingInstructionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/GradingInstructionDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto; +package de.tum.cit.aet.artemis.assessment.dto; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/MaxAndReachablePoints.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/MaxAndReachablePoints.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/MaxAndReachablePoints.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/dto/MaxAndReachablePoints.java index 735272aa45f1..7bf75dd61332 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/MaxAndReachablePoints.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/MaxAndReachablePoints.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto; +package de.tum.cit.aet.artemis.assessment.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java index 8731d9effc7c..9ebc559d8387 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java @@ -23,11 +23,11 @@ import de.tum.cit.aet.artemis.assessment.domain.ParticipantScore; import de.tum.cit.aet.artemis.assessment.dto.ScoreDistribution; import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; +import de.tum.cit.aet.artemis.core.dto.CourseManagementOverviewExerciseStatisticsDTO; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; -import de.tum.cit.aet.artemis.core.dto.CourseManagementOverviewExerciseStatisticsDTO; import de.tum.cit.aet.artemis.exercise.dto.ExerciseScoresAggregatedInformation; +import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java index 698f04c36d02..b33bc781d504 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java @@ -26,18 +26,18 @@ import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.ResultWithPointsPerGradingCriterionDTO; import de.tum.cit.aet.artemis.assessment.dto.dashboard.ResultCount; import de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardAssessments; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.DueDateStat; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.core.util.RoundingUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.core.dto.DueDateStat; -import de.tum.cit.aet.artemis.assessment.dto.ResultWithPointsPerGradingCriterionDTO; /** * Spring Data JPA repository for the Result entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/StudentScoreRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/StudentScoreRepository.java index 63aae8a54263..7515acd4f459 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/StudentScoreRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/StudentScoreRepository.java @@ -16,10 +16,10 @@ import org.springframework.transaction.annotation.Transactional; import de.tum.cit.aet.artemis.assessment.domain.StudentScore; +import de.tum.cit.aet.artemis.assessment.dto.score.StudentScoreSum; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.assessment.dto.score.StudentScoreSum; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TeamScoreRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TeamScoreRepository.java index 4f101894a652..042dada814e0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TeamScoreRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/TeamScoreRepository.java @@ -16,11 +16,11 @@ import org.springframework.transaction.annotation.Transactional; import de.tum.cit.aet.artemis.assessment.domain.TeamScore; +import de.tum.cit.aet.artemis.assessment.dto.score.TeamScoreSum; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Team; -import de.tum.cit.aet.artemis.assessment.dto.score.TeamScoreSum; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentDashboardService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentDashboardService.java index e223fc8d0aa6..93302aac4e9f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentDashboardService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentDashboardService.java @@ -18,13 +18,13 @@ import de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntry; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.core.dto.DueDateStat; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorParticipationStatus; -import de.tum.cit.aet.artemis.core.dto.DueDateStat; /** * Service Implementation for managing Tutor-Assessment-Dashboard. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentService.java index 1cd4999b1868..1a451ad49aff 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/AssessmentService.java @@ -14,9 +14,11 @@ import de.tum.cit.aet.artemis.assessment.domain.ComplaintResponse; import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateBaseDTO; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService; import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @@ -30,12 +32,10 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; +import de.tum.cit.aet.artemis.exercise.service.SubmissionService; import de.tum.cit.aet.artemis.lti.service.LtiNewResultService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.service.ProgrammingAssessmentService; -import de.tum.cit.aet.artemis.service.SubmissionService; -import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateBaseDTO; -import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/BonusService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/BonusService.java index 43575b726868..c982db81f448 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/BonusService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/BonusService.java @@ -10,11 +10,10 @@ import de.tum.cit.aet.artemis.assessment.domain.GradeType; import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.domain.IBonusStrategy; +import de.tum.cit.aet.artemis.assessment.dto.BonusExampleDTO; import de.tum.cit.aet.artemis.assessment.repository.BonusRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; -import de.tum.cit.aet.artemis.assessment.dto.BonusExampleDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.assessment.dto.BonusExampleDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintResponseService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintResponseService.java index 1f631b9efadc..07b716e8f387 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintResponseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintResponseService.java @@ -13,6 +13,7 @@ import de.tum.cit.aet.artemis.assessment.domain.ComplaintResponse; import de.tum.cit.aet.artemis.assessment.domain.ComplaintType; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.ComplaintResponseUpdateDTO; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; import de.tum.cit.aet.artemis.core.domain.Course; @@ -24,7 +25,6 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; /** * Service for managing complaint responses. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintService.java index acd8dd0597f3..90433cf4a50f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ComplaintService.java @@ -19,6 +19,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Complaint; import de.tum.cit.aet.artemis.assessment.domain.ComplaintType; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.ComplaintRequestDTO; import de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntry; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; @@ -36,7 +37,6 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; -import de.tum.cit.aet.artemis.service.dto.ComplaintRequestDTO; /** * Service for managing complaints. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/CourseScoreCalculationService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/CourseScoreCalculationService.java index 13b88cf0c7f1..d51d71f250a0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/CourseScoreCalculationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/CourseScoreCalculationService.java @@ -26,13 +26,19 @@ import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.BonusSourceResultDTO; +import de.tum.cit.aet.artemis.assessment.dto.MaxAndReachablePoints; +import de.tum.cit.aet.artemis.assessment.dto.score.StudentScoresDTO; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO; +import de.tum.cit.aet.artemis.core.dto.CourseScoresDTO; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.dto.ParticipationResultDTO; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; @@ -41,12 +47,6 @@ import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismCaseService.PlagiarismMapping; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.service.dto.MaxAndReachablePoints; -import de.tum.cit.aet.artemis.assessment.dto.BonusSourceResultDTO; -import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO; -import de.tum.cit.aet.artemis.core.dto.CourseScoresDTO; -import de.tum.cit.aet.artemis.exercise.dto.ParticipationResultDTO; -import de.tum.cit.aet.artemis.assessment.dto.score.StudentScoresDTO; /** * Service Implementation for calculating course scores. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/GradingScaleService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/GradingScaleService.java index b2eddbed3dd6..f7e7a4b76f88 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/GradingScaleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/GradingScaleService.java @@ -16,11 +16,11 @@ import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.util.PageUtil; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreService.java index 408d3297075e..689734a21812 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreService.java @@ -20,6 +20,9 @@ import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.domain.ParticipantScore; +import de.tum.cit.aet.artemis.assessment.dto.score.ScoreDTO; +import de.tum.cit.aet.artemis.assessment.dto.score.StudentScoreSum; +import de.tum.cit.aet.artemis.assessment.dto.score.TeamScoreSum; import de.tum.cit.aet.artemis.assessment.listener.ResultListener; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; @@ -34,9 +37,6 @@ import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; -import de.tum.cit.aet.artemis.assessment.dto.score.ScoreDTO; -import de.tum.cit.aet.artemis.assessment.dto.score.StudentScoreSum; -import de.tum.cit.aet.artemis.assessment.dto.score.TeamScoreSum; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java index 35b7072c4980..66a042ffea0e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java @@ -28,6 +28,7 @@ import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; import de.tum.cit.aet.artemis.assessment.domain.LongFeedbackText; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.FeedbackDetailDTO; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; @@ -35,6 +36,8 @@ import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.RatingRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService; +import de.tum.cit.aet.artemis.buildagent.dto.ResultBuildJob; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @@ -50,20 +53,17 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.lti.service.LtiNewResultService; -import de.tum.cit.aet.artemis.programming.domain.BuildPlanType; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; +import de.tum.cit.aet.artemis.programming.domain.build.BuildPlanType; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; +import de.tum.cit.aet.artemis.programming.service.BuildLogEntryService; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; -import de.tum.cit.aet.artemis.programming.service.localci.dto.ResultBuildJob; -import de.tum.cit.aet.artemis.service.BuildLogEntryService; -import de.tum.cit.aet.artemis.assessment.dto.FeedbackDetailDTO; -import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/TutorLeaderboardService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/TutorLeaderboardService.java index 802b3d665cfc..8ce8a0e8dc92 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/TutorLeaderboardService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/TutorLeaderboardService.java @@ -21,10 +21,10 @@ import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.TutorLeaderboardDTO; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.core.dto.TutorLeaderboardDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/web/AssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/AssessmentResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/exercise/web/AssessmentResource.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/web/AssessmentResource.java index 08b8b4438671..7335d7ad85f2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/web/AssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/AssessmentResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.exercise.web; +package de.tum.cit.aet.artemis.assessment.web; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/BonusResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/BonusResource.java index 891f974d781e..8318cd961687 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/BonusResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/BonusResource.java @@ -24,6 +24,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Bonus; import de.tum.cit.aet.artemis.assessment.domain.BonusStrategy; import de.tum.cit.aet.artemis.assessment.domain.GradingScale; +import de.tum.cit.aet.artemis.assessment.dto.BonusExampleDTO; import de.tum.cit.aet.artemis.assessment.repository.BonusRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.assessment.service.BonusService; @@ -41,7 +42,6 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.exam.service.ExamAccessService; -import de.tum.cit.aet.artemis.assessment.dto.BonusExampleDTO; /** * REST controller for managing bonus diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ComplaintResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ComplaintResource.java index bdcb26195a79..678476645c96 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ComplaintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ComplaintResource.java @@ -24,6 +24,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Complaint; import de.tum.cit.aet.artemis.assessment.domain.ComplaintType; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.ComplaintRequestDTO; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.service.ComplaintService; @@ -50,7 +51,6 @@ import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.service.dto.ComplaintRequestDTO; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ComplaintResponseResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ComplaintResponseResource.java index 131b6d338ee0..fcc2a7d73785 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ComplaintResponseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ComplaintResponseResource.java @@ -19,6 +19,8 @@ import de.tum.cit.aet.artemis.assessment.domain.Complaint; import de.tum.cit.aet.artemis.assessment.domain.ComplaintResponse; +import de.tum.cit.aet.artemis.assessment.dto.ComplaintAction; +import de.tum.cit.aet.artemis.assessment.dto.ComplaintResponseUpdateDTO; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.service.ComplaintResponseService; import de.tum.cit.aet.artemis.core.domain.User; @@ -26,8 +28,6 @@ import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.service.dto.ComplaintAction; -import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; /** * REST controller for managing complaints. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/web/ExampleSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ExampleSubmissionResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/exam/web/ExampleSubmissionResource.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/web/ExampleSubmissionResource.java index e8220cd98b5e..358d50b21c24 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/web/ExampleSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ExampleSubmissionResource.java @@ -1,5 +1,5 @@ -package de.tum.cit.aet.artemis.exam.web; +package de.tum.cit.aet.artemis.assessment.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradeStepResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradeStepResource.java index 49898c247bd2..0f18cedc19d9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradeStepResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradeStepResource.java @@ -17,6 +17,8 @@ import de.tum.cit.aet.artemis.assessment.domain.GradeStep; import de.tum.cit.aet.artemis.assessment.domain.GradingScale; +import de.tum.cit.aet.artemis.assessment.dto.GradeDTO; +import de.tum.cit.aet.artemis.assessment.dto.GradeStepsDTO; import de.tum.cit.aet.artemis.assessment.repository.GradeStepRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.core.domain.Course; @@ -33,8 +35,6 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; -import de.tum.cit.aet.artemis.assessment.dto.GradeDTO; -import de.tum.cit.aet.artemis.assessment.dto.GradeStepsDTO; /** * REST controller for managing grade steps of a grading scale diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradingScaleResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradingScaleResource.java index 824d007644da..aae951b2e9a7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradingScaleResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/GradingScaleResource.java @@ -27,6 +27,8 @@ import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.assessment.service.GradingScaleService; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -36,8 +38,6 @@ import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; /** * REST controller for managing grading scale diff --git a/src/main/java/de/tum/cit/aet/artemis/text/web/LongFeedbackTextResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/LongFeedbackTextResource.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/text/web/LongFeedbackTextResource.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/web/LongFeedbackTextResource.java index 2abfbb63b20f..c1675b845267 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/web/LongFeedbackTextResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/LongFeedbackTextResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.text.web; +package de.tum.cit.aet.artemis.assessment.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -18,7 +18,7 @@ import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; -import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; +import de.tum.cit.aet.artemis.exercise.service.ParticipationAuthorizationCheckService; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipantScoreResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ParticipantScoreResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipantScoreResource.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/web/ParticipantScoreResource.java index 9213c3f409a6..6b5a38ba0574 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipantScoreResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ParticipantScoreResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.exercise.web; +package de.tum.cit.aet.artemis.assessment.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.dto.score.ScoreDTO; import de.tum.cit.aet.artemis.assessment.listener.ResultListener; import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreService; import de.tum.cit.aet.artemis.core.domain.Course; @@ -22,7 +23,6 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; -import de.tum.cit.aet.artemis.assessment.dto.score.ScoreDTO; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java index e468f980d438..ea8f2fcaa290 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java @@ -27,6 +27,8 @@ import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.FeedbackDetailDTO; +import de.tum.cit.aet.artemis.assessment.dto.ResultWithPointsPerGradingCriterionDTO; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.core.domain.Course; @@ -50,11 +52,9 @@ import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.ParticipationAuthorizationCheckService; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; -import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.assessment.dto.ResultWithPointsPerGradingCriterionDTO; -import de.tum.cit.aet.artemis.assessment.dto.FeedbackDetailDTO; /** * REST controller for managing Result. diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultWebsocketService.java index a4a6258babdc..927cf64f7999 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultWebsocketService.java @@ -15,6 +15,7 @@ import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; @@ -23,7 +24,6 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.programming.dto.ResultDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/athena/dto/ModelingExerciseDTO.java b/src/main/java/de/tum/cit/aet/artemis/athena/dto/ModelingExerciseDTO.java index 97b5725fe289..55d309a2c85e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/athena/dto/ModelingExerciseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/dto/ModelingExerciseDTO.java @@ -6,8 +6,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.assessment.dto.GradingCriterionDTO; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; -import de.tum.cit.aet.artemis.service.dto.GradingCriterionDTO; /** * A DTO representing a ModelingExercise, for transferring data to Athena diff --git a/src/main/java/de/tum/cit/aet/artemis/athena/dto/ProgrammingExerciseDTO.java b/src/main/java/de/tum/cit/aet/artemis/athena/dto/ProgrammingExerciseDTO.java index 77416182b631..c2d00833ac9d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/athena/dto/ProgrammingExerciseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/dto/ProgrammingExerciseDTO.java @@ -8,8 +8,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.assessment.dto.GradingCriterionDTO; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.service.dto.GradingCriterionDTO; /** * A DTO representing a ProgrammingExercise, for transferring data to Athena diff --git a/src/main/java/de/tum/cit/aet/artemis/athena/dto/TextExerciseDTO.java b/src/main/java/de/tum/cit/aet/artemis/athena/dto/TextExerciseDTO.java index beb92b701927..7cd94e1dfcc8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/athena/dto/TextExerciseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/dto/TextExerciseDTO.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.service.dto.GradingCriterionDTO; +import de.tum.cit.aet.artemis.assessment.dto.GradingCriterionDTO; import de.tum.cit.aet.artemis.text.domain.TextExercise; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaRepositoryExportService.java b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaRepositoryExportService.java index 6730f5043163..da034293eb7c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaRepositoryExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaRepositoryExportService.java @@ -12,8 +12,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.dto.RepositoryExportOptionsDTO; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.exception.ServiceUnavailableException; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; @@ -21,8 +23,6 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseExportService; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.core.dto.RepositoryExportOptionsDTO; /** * Service for exporting programming exercise repositories for Athena. diff --git a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaScheduleService.java index 0e4f80c3a5f0..bd29ce314e7f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaScheduleService.java @@ -21,11 +21,11 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.ProfileService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseLifecycle; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseLifecycleService; -import de.tum.cit.aet.artemis.service.ProfileService; @Service @Profile("athena & scheduling") diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/dto/LearningPathInformationDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/LearningPathInformationDTO.java index b9f0e96082ec..9ad36906d0e6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/dto/LearningPathInformationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/LearningPathInformationDTO.java @@ -2,8 +2,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; import de.tum.cit.aet.artemis.assessment.dto.UserNameAndLoginDTO; +import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record LearningPathInformationDTO(long id, UserNameAndLoginDTO user, int progress) { diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/dto/science/ScienceEventDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/ScienceEventDTO.java similarity index 82% rename from src/main/java/de/tum/cit/aet/artemis/atlas/dto/science/ScienceEventDTO.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/dto/ScienceEventDTO.java index bd89b4045ed1..86f7f48241ea 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/dto/science/ScienceEventDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/ScienceEventDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.atlas.dto.science; +package de.tum.cit.aet.artemis.atlas.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/ExerciseStudentMetricsDTO.java b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/ExerciseStudentMetricsDTO.java index 4646af13d16b..8020a5aae0d0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/ExerciseStudentMetricsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/dto/metrics/ExerciseStudentMetricsDTO.java @@ -4,6 +4,7 @@ import java.util.Set; import com.fasterxml.jackson.annotation.JsonInclude; + import de.tum.cit.aet.artemis.exercise.dto.ExerciseInformationDTO; /** @@ -22,5 +23,5 @@ */ @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ExerciseStudentMetricsDTO(Map exerciseInformation, Map> categories, Map averageScore, - Map score, Map averageLatestSubmission, Map latestSubmission, Set completed, Map teamId) { + Map score, Map averageLatestSubmission, Map latestSubmission, Set completed, Map teamId) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/CompetencyJolRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyJolRepository.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/CompetencyJolRepository.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyJolRepository.java index cc70a3835407..be715d7b4627 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/CompetencyJolRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyJolRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.atlas.repository.competency; +package de.tum.cit.aet.artemis.atlas.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -11,8 +11,8 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyJol; -import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.atlas.dto.CompetencyJolDTO; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository for the {@link CompetencyJol} entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyMetricsRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyMetricsRepository.java index b439697f7f9b..362064d79ec5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyMetricsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyMetricsRepository.java @@ -10,11 +10,11 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; -import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.atlas.dto.CompetencyJolDTO; import de.tum.cit.aet.artemis.atlas.dto.metrics.CompetencyInformationDTO; import de.tum.cit.aet.artemis.atlas.dto.metrics.CompetencyProgressDTO; import de.tum.cit.aet.artemis.atlas.dto.metrics.MapEntryLongLong; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; /** * Spring Data JPA repository to fetch competency related metrics. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CourseCompetencyRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CourseCompetencyRepository.java index cea392b62c31..9a164343bc0e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CourseCompetencyRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CourseCompetencyRepository.java @@ -12,11 +12,11 @@ import de.tum.cit.aet.artemis.atlas.domain.LearningObject; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.dto.metrics.CompetencyExerciseMasteryCalculationDTO; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; -import de.tum.cit.aet.artemis.atlas.dto.metrics.CompetencyExerciseMasteryCalculationDTO; /** * Spring Data JPA repository for the {@link CourseCompetency} entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/KnowledgeAreaRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/KnowledgeAreaRepository.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/KnowledgeAreaRepository.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/repository/KnowledgeAreaRepository.java index ca6935f33dee..fff734efe111 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/KnowledgeAreaRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/KnowledgeAreaRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.atlas.repository.competency; +package de.tum.cit.aet.artemis.atlas.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/science/ScienceEventRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/ScienceEventRepository.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/atlas/repository/science/ScienceEventRepository.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/repository/ScienceEventRepository.java index 94a30b92eb23..f93db6988e1b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/science/ScienceEventRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/ScienceEventRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.atlas.repository.science; +package de.tum.cit.aet.artemis.atlas.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/science/ScienceSettingRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/ScienceSettingRepository.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/atlas/repository/science/ScienceSettingRepository.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/repository/ScienceSettingRepository.java index c5e1bd252096..398c03f4e4dd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/science/ScienceSettingRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/ScienceSettingRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.atlas.repository.science; +package de.tum.cit.aet.artemis.atlas.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/StandardizedCompetencyRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/StandardizedCompetencyRepository.java similarity index 90% rename from src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/StandardizedCompetencyRepository.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/repository/StandardizedCompetencyRepository.java index ca63f429122d..e0d968ccbba1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/competency/StandardizedCompetencyRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/StandardizedCompetencyRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.atlas.repository.competency; +package de.tum.cit.aet.artemis.atlas.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/ScienceEventService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/ScienceEventService.java index 3bd3acd5ee1f..7e7c80491131 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/ScienceEventService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/ScienceEventService.java @@ -10,8 +10,8 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.atlas.domain.science.ScienceEvent; -import de.tum.cit.aet.artemis.atlas.repository.science.ScienceEventRepository; -import de.tum.cit.aet.artemis.atlas.dto.science.ScienceEventDTO; +import de.tum.cit.aet.artemis.atlas.dto.ScienceEventDTO; +import de.tum.cit.aet.artemis.atlas.repository.ScienceEventRepository; /** * Service class for {@link ScienceEvent}. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyJolService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyJolService.java index aff710da3bc5..8deffa786626 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyJolService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyJolService.java @@ -16,14 +16,14 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyJol; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyJolDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyJolPairDTO; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyJolRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; -import de.tum.cit.aet.artemis.atlas.repository.competency.CompetencyJolRepository; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.iris.service.session.IrisCourseChatSessionService; -import de.tum.cit.aet.artemis.atlas.dto.CompetencyJolDTO; -import de.tum.cit.aet.artemis.atlas.dto.CompetencyJolPairDTO; /** * Service Implementation for managing CompetencyJol. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyProgressService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyProgressService.java index 81c3b9bdc141..bd6ff4b3148d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyProgressService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyProgressService.java @@ -24,11 +24,13 @@ import de.tum.cit.aet.artemis.atlas.domain.LearningObject; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.dto.metrics.CompetencyExerciseMasteryCalculationDTO; import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.CourseCompetencyProgressDTO; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.util.RoundingUtil; @@ -38,8 +40,6 @@ import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; -import de.tum.cit.aet.artemis.core.dto.CourseCompetencyProgressDTO; -import de.tum.cit.aet.artemis.atlas.dto.metrics.CompetencyExerciseMasteryCalculationDTO; /** * Service for calculating the progress of a student in a competency. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java index 84630b322c49..9217aa5196ad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java @@ -13,18 +13,18 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; -import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; +import de.tum.cit.aet.artemis.atlas.repository.StandardizedCompetencyRepository; import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.service.ExerciseService; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; -import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; /** * Service for managing competencies. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java index a516afb07b97..05b4f0bca77e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java @@ -24,13 +24,17 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; import de.tum.cit.aet.artemis.atlas.domain.competency.StandardizedCompetency; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyRelationDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; -import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; +import de.tum.cit.aet.artemis.atlas.repository.StandardizedCompetencyRepository; import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.CompetencyPageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; @@ -39,10 +43,6 @@ import de.tum.cit.aet.artemis.exercise.service.ExerciseService; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.atlas.dto.CompetencyRelationDTO; -import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.CompetencyPageableSearchDTO; /** * Service for managing competencies. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/KnowledgeAreaService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/KnowledgeAreaService.java index 0430b940ff57..5f41a381aa3d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/KnowledgeAreaService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/KnowledgeAreaService.java @@ -8,8 +8,8 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.atlas.domain.competency.KnowledgeArea; -import de.tum.cit.aet.artemis.atlas.repository.competency.KnowledgeAreaRepository; import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.KnowledgeAreaRequestDTO; +import de.tum.cit.aet.artemis.atlas.repository.KnowledgeAreaRepository; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java index be31a21e501b..aff6e8927bd7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java @@ -13,18 +13,18 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; -import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; +import de.tum.cit.aet.artemis.atlas.repository.StandardizedCompetencyRepository; import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.service.ExerciseService; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; -import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; /** * Service for managing prerequisites. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/StandardizedCompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/StandardizedCompetencyService.java index 3b3bcd4912a4..47a4bd801e8e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/StandardizedCompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/StandardizedCompetencyService.java @@ -23,16 +23,16 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.KnowledgeArea; import de.tum.cit.aet.artemis.atlas.domain.competency.Source; import de.tum.cit.aet.artemis.atlas.domain.competency.StandardizedCompetency; -import de.tum.cit.aet.artemis.atlas.repository.SourceRepository; -import de.tum.cit.aet.artemis.atlas.repository.competency.KnowledgeAreaRepository; -import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; -import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.SourceDTO; import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO; import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO.KnowledgeAreaForCatalogDTO; import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO.StandardizedCompetencyForCatalogDTO; import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyRequestDTO; +import de.tum.cit.aet.artemis.atlas.repository.KnowledgeAreaRepository; +import de.tum.cit.aet.artemis.atlas.repository.SourceRepository; +import de.tum.cit.aet.artemis.atlas.repository.StandardizedCompetencyRepository; +import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; /** * Service for managing {@link StandardizedCompetency} entities. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathNavigationService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathNavigationService.java index 564355f5ba60..f4d9bc336544 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathNavigationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathNavigationService.java @@ -12,13 +12,13 @@ import de.tum.cit.aet.artemis.atlas.domain.LearningObject; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; -import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathRecommendationService.RecommendationState; -import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.service.LearningObjectService; import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationDTO; import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationObjectDTO; import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationObjectDTO.LearningObjectType; import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationOverviewDTO; +import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathRecommendationService.RecommendationState; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.lecture.service.LearningObjectService; /** * Service for navigating through a learning path. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathNgxService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathNgxService.java index 7420a8cfc115..4bad211efcc5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathNgxService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathNgxService.java @@ -22,11 +22,11 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; import de.tum.cit.aet.artemis.atlas.domain.competency.RelationType; +import de.tum.cit.aet.artemis.atlas.dto.NgxLearningPathDTO; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; -import de.tum.cit.aet.artemis.atlas.dto.NgxLearningPathDTO; /** * Service Implementation for the generation of ngx representations of learning paths. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathRecommendationService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathRecommendationService.java index 40c1fec1b84f..5fe455ec8ce7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathRecommendationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathRecommendationService.java @@ -38,7 +38,7 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; -import de.tum.cit.aet.artemis.service.LearningObjectService; +import de.tum.cit.aet.artemis.lecture.service.LearningObjectService; /** * Service Implementation for the recommendation of competencies and learning objects in learning paths. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathService.java index 13a459258f63..937123a30fe1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/learningpath/LearningPathService.java @@ -22,6 +22,13 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyRelation; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyGraphEdgeDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyGraphNodeDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathCompetencyGraphDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathHealthDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathInformationDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationOverviewDTO; +import de.tum.cit.aet.artemis.atlas.dto.NgxLearningPathDTO; import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; @@ -29,6 +36,8 @@ import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -40,15 +49,6 @@ import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.domain.LectureUnitCompletion; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.atlas.dto.CompetencyGraphEdgeDTO; -import de.tum.cit.aet.artemis.atlas.dto.CompetencyGraphNodeDTO; -import de.tum.cit.aet.artemis.atlas.dto.LearningPathCompetencyGraphDTO; -import de.tum.cit.aet.artemis.atlas.dto.LearningPathHealthDTO; -import de.tum.cit.aet.artemis.atlas.dto.LearningPathInformationDTO; -import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationOverviewDTO; -import de.tum.cit.aet.artemis.atlas.dto.NgxLearningPathDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; /** * Service Implementation for managing Learning Paths. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStandardizedCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/AdminStandardizedCompetencyResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStandardizedCompetencyResource.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/web/AdminStandardizedCompetencyResource.java index 41ac053c8de0..aa7889ec35b0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStandardizedCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/AdminStandardizedCompetencyResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.web.admin; +package de.tum.cit.aet.artemis.atlas.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -23,16 +23,16 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.atlas.domain.competency.StandardizedCompetency; -import de.tum.cit.aet.artemis.atlas.service.competency.KnowledgeAreaService; -import de.tum.cit.aet.artemis.atlas.service.competency.StandardizedCompetencyService; -import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.core.service.feature.Feature; -import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.KnowledgeAreaRequestDTO; import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.KnowledgeAreaResultDTO; import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO; import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyRequestDTO; import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyResultDTO; +import de.tum.cit.aet.artemis.atlas.service.competency.KnowledgeAreaService; +import de.tum.cit.aet.artemis.atlas.service.competency.StandardizedCompetencyService; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.core.service.feature.Feature; +import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; /** * Admin REST controller for managing {@link StandardizedCompetency} entities. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/web/CompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/CompetencyResource.java index f3cb0dce1357..aa240c5f9a42 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/web/CompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/CompetencyResource.java @@ -27,6 +27,8 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportResponseDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyService; @@ -43,8 +45,6 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; -import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportResponseDTO; -import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/web/CourseCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/CourseCompetencyResource.java index 9b2cf71aeb34..d335c9285f59 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/web/CourseCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/CourseCompetencyResource.java @@ -28,6 +28,9 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyJolPairDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyRelationDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; @@ -37,6 +40,9 @@ import de.tum.cit.aet.artemis.atlas.service.competency.CourseCompetencyService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.CourseCompetencyProgressDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.CompetencyPageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -51,12 +57,6 @@ import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.iris.service.IrisCompetencyGenerationService; import de.tum.cit.aet.artemis.iris.service.pyris.dto.competency.PyrisCompetencyExtractionInputDTO; -import de.tum.cit.aet.artemis.core.dto.CourseCompetencyProgressDTO; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.atlas.dto.CompetencyJolPairDTO; -import de.tum.cit.aet.artemis.atlas.dto.CompetencyRelationDTO; -import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.CompetencyPageableSearchDTO; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/web/LearningPathResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/LearningPathResource.java index 58349267dbd9..709ac913cdf9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/web/LearningPathResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/LearningPathResource.java @@ -25,6 +25,16 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyNameDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyProgressForLearningPathDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathCompetencyGraphDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathHealthDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathInformationDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationObjectDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationObjectDTO.LearningObjectType; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationOverviewDTO; +import de.tum.cit.aet.artemis.atlas.dto.NgxLearningPathDTO; import de.tum.cit.aet.artemis.atlas.repository.LearningPathRepository; import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathNavigationService; @@ -32,6 +42,8 @@ import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -39,22 +51,10 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.CourseService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.service.CourseService; -import de.tum.cit.aet.artemis.service.LearningObjectService; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.atlas.dto.CompetencyNameDTO; -import de.tum.cit.aet.artemis.atlas.dto.CompetencyProgressForLearningPathDTO; -import de.tum.cit.aet.artemis.atlas.dto.LearningPathCompetencyGraphDTO; -import de.tum.cit.aet.artemis.atlas.dto.LearningPathHealthDTO; -import de.tum.cit.aet.artemis.atlas.dto.LearningPathInformationDTO; -import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationDTO; -import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationObjectDTO; -import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationObjectDTO.LearningObjectType; -import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationOverviewDTO; -import de.tum.cit.aet.artemis.atlas.dto.NgxLearningPathDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.lecture.service.LearningObjectService; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/MetricsResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/MetricsResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/assessment/web/MetricsResource.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/web/MetricsResource.java index c96a3d8beb68..ca2fa2f30251 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/MetricsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/MetricsResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.assessment.web; +package de.tum.cit.aet.artemis.atlas.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -11,10 +11,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.atlas.dto.metrics.StudentMetricsDTO; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; import de.tum.cit.aet.artemis.exercise.service.LearningMetricsService; -import de.tum.cit.aet.artemis.atlas.dto.metrics.StudentMetricsDTO; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/web/PrerequisiteResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/PrerequisiteResource.java index 14c6cabf5493..7cd32bdd957a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/web/PrerequisiteResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/PrerequisiteResource.java @@ -27,6 +27,8 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportResponseDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; import de.tum.cit.aet.artemis.atlas.service.competency.CourseCompetencyService; @@ -43,8 +45,6 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; -import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportResponseDTO; -import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; /** * REST controller for managing {@link Prerequisite Prerequisite} entities. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/web/science/ScienceResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/ScienceResource.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/atlas/web/science/ScienceResource.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/web/ScienceResource.java index b4d018257499..7312cc824997 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/web/science/ScienceResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/ScienceResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.atlas.web.science; +package de.tum.cit.aet.artemis.atlas.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -11,11 +11,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.atlas.dto.ScienceEventDTO; import de.tum.cit.aet.artemis.atlas.service.ScienceEventService; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.atlas.dto.science.ScienceEventDTO; /** * REST controller providing the science related endpoints. diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/web/science/ScienceSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/ScienceSettingsResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/atlas/web/science/ScienceSettingsResource.java rename to src/main/java/de/tum/cit/aet/artemis/atlas/web/ScienceSettingsResource.java index 11d93c5a686f..d5fce76d6195 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/web/science/ScienceSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/ScienceSettingsResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.atlas.web.science; +package de.tum.cit.aet.artemis.atlas.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.atlas.domain.science.ScienceSetting; -import de.tum.cit.aet.artemis.atlas.repository.science.ScienceSettingRepository; +import de.tum.cit.aet.artemis.atlas.repository.ScienceSettingRepository; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.UserRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/web/StandardizedCompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/StandardizedCompetencyResource.java index a24a357559a1..8b6316fcc51c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/web/StandardizedCompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/StandardizedCompetencyResource.java @@ -15,15 +15,15 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.KnowledgeArea; import de.tum.cit.aet.artemis.atlas.domain.competency.StandardizedCompetency; +import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.KnowledgeAreaResultDTO; +import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.SourceDTO; +import de.tum.cit.aet.artemis.atlas.repository.KnowledgeAreaRepository; import de.tum.cit.aet.artemis.atlas.repository.SourceRepository; -import de.tum.cit.aet.artemis.atlas.repository.competency.KnowledgeAreaRepository; -import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; +import de.tum.cit.aet.artemis.atlas.repository.StandardizedCompetencyRepository; import de.tum.cit.aet.artemis.atlas.service.competency.StandardizedCompetencyService; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.KnowledgeAreaResultDTO; -import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.SourceDTO; /** * REST controller for managing {@link StandardizedCompetency} entities. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildAgentInformation.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildAgentInformation.java similarity index 77% rename from src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildAgentInformation.java rename to src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildAgentInformation.java index fe462388162f..35625765d858 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildAgentInformation.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildAgentInformation.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.service.localci.dto; +package de.tum.cit.aet.artemis.buildagent.dto; import java.io.Serial; import java.io.Serializable; @@ -7,6 +7,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +// NOTE: this data structure is used in shared code between core and build agent nodes. Changing it requires that the shared data structures in Hazelcast (or potentially Redis) +// in the future are migrated or cleared. Changes should be communicated in release notes as potentially breaking changes. @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) public record BuildAgentInformation(String name, int maxNumberOfConcurrentBuildJobs, int numberOfCurrentBuildJobs, List runningBuildJobs, boolean status, diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildConfig.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildConfig.java similarity index 72% rename from src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildConfig.java rename to src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildConfig.java index da47f94703b4..bce9a9b20e65 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildConfig.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildConfig.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.service.localci.dto; +package de.tum.cit.aet.artemis.buildagent.dto; import java.io.Serializable; import java.util.List; @@ -9,6 +9,8 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProjectType; +// NOTE: this data structure is used in shared code between core and build agent nodes. Changing it requires that the shared data structures in Hazelcast (or potentially Redis) +// in the future are migrated or cleared. Changes should be communicated in release notes as potentially breaking changes. @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) public record BuildConfig(String buildScript, String dockerImage, String commitHashToBuild, String assignmentCommitHash, String testCommitHash, String branch, diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildJobQueueItem.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildJobQueueItem.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildJobQueueItem.java rename to src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildJobQueueItem.java index 991db6ae520c..d9bfff039c2e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildJobQueueItem.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildJobQueueItem.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.service.localci.dto; +package de.tum.cit.aet.artemis.buildagent.dto; import java.io.Serial; import java.io.Serializable; @@ -7,9 +7,11 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.programming.domain.BuildStatus; +import de.tum.cit.aet.artemis.programming.domain.build.BuildStatus; import de.tum.cit.aet.artemis.programming.dto.ResultDTO; +// NOTE: this data structure is used in shared code between core and build agent nodes. Changing it requires that the shared data structures in Hazelcast (or potentially Redis) +// in the future are migrated or cleared. Changes should be communicated in release notes as potentially breaking changes. @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) public record BuildJobQueueItem(String id, String name, String buildAgentAddress, long participationId, long courseId, long exerciseId, int retryCount, int priority, diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/BuildJobResultCountDTO.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildJobResultCountDTO.java similarity index 60% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/BuildJobResultCountDTO.java rename to src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildJobResultCountDTO.java index a161fdb3da17..784f7a299326 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/BuildJobResultCountDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildJobResultCountDTO.java @@ -1,8 +1,8 @@ -package de.tum.cit.aet.artemis.service.dto; +package de.tum.cit.aet.artemis.buildagent.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.programming.domain.BuildStatus; +import de.tum.cit.aet.artemis.programming.domain.build.BuildStatus; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record BuildJobResultCountDTO(BuildStatus status, long count) { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/BuildJobsStatisticsDTO.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildJobsStatisticsDTO.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/BuildJobsStatisticsDTO.java rename to src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildJobsStatisticsDTO.java index 7293002eebbc..db1aecdc0759 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/BuildJobsStatisticsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildJobsStatisticsDTO.java @@ -1,10 +1,10 @@ -package de.tum.cit.aet.artemis.service.dto; +package de.tum.cit.aet.artemis.buildagent.dto; import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.programming.domain.BuildStatus; +import de.tum.cit.aet.artemis.programming.domain.build.BuildStatus; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record BuildJobsStatisticsDTO(long totalBuilds, long successfulBuilds, long failedBuilds, long cancelledBuilds) { diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildResult.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildResult.java similarity index 89% rename from src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildResult.java rename to src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildResult.java index 1169b42083b5..fbb9bbbdbee1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/BuildResult.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/BuildResult.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.service.localci.dto; +package de.tum.cit.aet.artemis.buildagent.dto; import java.io.Serializable; import java.time.ZonedDateTime; @@ -11,17 +11,20 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.dto.AbstractBuildResultNotificationDTO; +import de.tum.cit.aet.artemis.programming.dto.BuildJobDTOInterface; +import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisReportDTO; +import de.tum.cit.aet.artemis.programming.dto.TestCaseBaseDTO; import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestwiseCoverageReportDTO; -import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; -import de.tum.cit.aet.artemis.service.dto.BuildJobDTOInterface; -import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; -import de.tum.cit.aet.artemis.service.dto.TestCaseBaseDTO; /** * Represents all the information returned by the local CI system about a build. * Note: due to limitations with inheritance, we cannot declare this as a record, but we can use it in a similar way with final fields. */ + +// NOTE: this data structure is used in shared code between core and build agent nodes. Changing it requires that the shared data structures in Hazelcast (or potentially Redis) +// in the future are migrated or cleared. Changes should be communicated in release notes as potentially breaking changes. @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) public class BuildResult extends AbstractBuildResultNotificationDTO implements Serializable { diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/DockerImageBuild.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/DockerImageBuild.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/DockerImageBuild.java rename to src/main/java/de/tum/cit/aet/artemis/buildagent/dto/DockerImageBuild.java index a44779f477b4..89b96ce92a12 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/DockerImageBuild.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/DockerImageBuild.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.service.localci.dto; +package de.tum.cit.aet.artemis.buildagent.dto; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/FinishedBuildJobDTO.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/FinishedBuildJobDTO.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/FinishedBuildJobDTO.java rename to src/main/java/de/tum/cit/aet/artemis/buildagent/dto/FinishedBuildJobDTO.java index 36b2a8d958f2..c655693646df 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/FinishedBuildJobDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/FinishedBuildJobDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto; +package de.tum.cit.aet.artemis.buildagent.dto; import java.time.ZonedDateTime; @@ -8,11 +8,11 @@ import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.assessment.domain.Result; -import de.tum.cit.aet.artemis.programming.domain.BuildJob; -import de.tum.cit.aet.artemis.programming.domain.BuildStatus; -import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.exercise.dto.ParticipationDTO; import de.tum.cit.aet.artemis.exercise.dto.SubmissionDTO; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.build.BuildJob; +import de.tum.cit.aet.artemis.programming.domain.build.BuildStatus; /** * A DTO representing a finished build job diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/JobTimingInfo.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/JobTimingInfo.java similarity index 54% rename from src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/JobTimingInfo.java rename to src/main/java/de/tum/cit/aet/artemis/buildagent/dto/JobTimingInfo.java index 33ea1df85916..8de38115f6b6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/JobTimingInfo.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/JobTimingInfo.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.service.localci.dto; +package de.tum.cit.aet.artemis.buildagent.dto; import java.io.Serializable; import java.time.ZonedDateTime; @@ -6,6 +6,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +// NOTE: this data structure is used in shared code between core and build agent nodes. Changing it requires that the shared data structures in Hazelcast (or potentially Redis) +// in the future are migrated or cleared. Changes should be communicated in release notes as potentially breaking changes. @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) public record JobTimingInfo(ZonedDateTime submissionDate, ZonedDateTime buildStartDate, ZonedDateTime buildCompletionDate) implements Serializable { diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/RepositoryInfo.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/RepositoryInfo.java similarity index 64% rename from src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/RepositoryInfo.java rename to src/main/java/de/tum/cit/aet/artemis/buildagent/dto/RepositoryInfo.java index 3b72b0dd0f1f..069d23758978 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/RepositoryInfo.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/RepositoryInfo.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.service.localci.dto; +package de.tum.cit.aet.artemis.buildagent.dto; import java.io.Serializable; @@ -7,6 +7,8 @@ import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +// NOTE: this data structure is used in shared code between core and build agent nodes. Changing it requires that the shared data structures in Hazelcast (or potentially Redis) +// in the future are migrated or cleared. Changes should be communicated in release notes as potentially breaking changes. @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) public record RepositoryInfo(String repositoryName, RepositoryType repositoryType, RepositoryType triggeredByPushTo, String assignmentRepositoryUri, String testRepositoryUri, diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/ResultBuildJob.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/ResultBuildJob.java similarity index 80% rename from src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/ResultBuildJob.java rename to src/main/java/de/tum/cit/aet/artemis/buildagent/dto/ResultBuildJob.java index ad5435048a50..f4b13a85cdb8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/ResultBuildJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/ResultBuildJob.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.service.localci.dto; +package de.tum.cit.aet.artemis.buildagent.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/ResultQueueItem.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/ResultQueueItem.java new file mode 100644 index 000000000000..9ed86f7306f7 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/ResultQueueItem.java @@ -0,0 +1,15 @@ +package de.tum.cit.aet.artemis.buildagent.dto; + +import java.io.Serializable; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonInclude; + +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; + +// NOTE: this data structure is used in shared code between core and build agent nodes. Changing it requires that the shared data structures in Hazelcast (or potentially Redis) +// in the future are migrated or cleared. Changes should be communicated in release notes as potentially breaking changes. +@JsonInclude(JsonInclude.Include.NON_EMPTY) +// TODO: this data structure should not use BuildLogEntry because it's an entity class (and not a DTO) +public record ResultQueueItem(BuildResult buildResult, BuildJobQueueItem buildJobQueueItem, List buildLogs, Throwable exception) implements Serializable { +} diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildAgentDockerService.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildAgentDockerService.java index b26eec61a897..378bd12ed247 100644 --- a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildAgentDockerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildAgentDockerService.java @@ -38,9 +38,9 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.map.IMap; +import de.tum.cit.aet.artemis.buildagent.dto.BuildJobQueueItem; import de.tum.cit.aet.artemis.core.exception.LocalCIException; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; /** * Service for Docker related operations in local CI diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobContainerService.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobContainerService.java index ddd2f9e05ebc..8df60f45026f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobContainerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobContainerService.java @@ -43,8 +43,8 @@ import com.github.dockerjava.api.model.HostConfig; import de.tum.cit.aet.artemis.core.exception.LocalCIException; -import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService.RepositoryCheckoutPath; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobExecutionService.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobExecutionService.java index 962216ae245e..f25d5b6f749d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobExecutionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobExecutionService.java @@ -33,6 +33,8 @@ import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.exception.NotFoundException; +import de.tum.cit.aet.artemis.buildagent.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.buildagent.dto.BuildResult; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.exception.GitException; import de.tum.cit.aet.artemis.core.exception.LocalCIException; @@ -41,12 +43,10 @@ import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildResult; +import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisReportDTO; import de.tum.cit.aet.artemis.programming.service.localci.scaparser.ReportParser; import de.tum.cit.aet.artemis.programming.service.localci.scaparser.exception.UnsupportedToolException; import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCRepositoryUri; -import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; /** * This service contains the logic to execute a build job for a programming exercise participation in the local CI system. diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobManagementService.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobManagementService.java index 3219e291eb49..f514d59496cd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobManagementService.java @@ -31,10 +31,10 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.topic.ITopic; +import de.tum.cit.aet.artemis.buildagent.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.buildagent.dto.BuildResult; import de.tum.cit.aet.artemis.core.exception.LocalCIException; -import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildResult; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; /** * This service is responsible for adding build jobs to the Integrated Code Lifecycle executor service. diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildLogsMap.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildLogsMap.java index 6172bc3fe294..5ea22f2911ec 100644 --- a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildLogsMap.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildLogsMap.java @@ -11,7 +11,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; @Profile(PROFILE_BUILDAGENT) @Component diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/SharedQueueProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/SharedQueueProcessingService.java index 80bf86586fb4..f82f7aa7a36f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/SharedQueueProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/SharedQueueProcessingService.java @@ -34,14 +34,14 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.map.IMap; +import de.tum.cit.aet.artemis.buildagent.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.buildagent.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.buildagent.dto.BuildResult; +import de.tum.cit.aet.artemis.buildagent.dto.JobTimingInfo; +import de.tum.cit.aet.artemis.buildagent.dto.ResultQueueItem; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.programming.domain.BuildStatus; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildAgentInformation; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildResult; -import de.tum.cit.aet.artemis.programming.service.localci.dto.JobTimingInfo; -import de.tum.cit.aet.artemis.programming.service.localci.dto.ResultQueueItem; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.build.BuildStatus; /** * Includes functionality for processing build jobs from the shared build job queue. diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/TestResultXmlParser.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/TestResultXmlParser.java index 68426c31d002..5e2672e4b426 100644 --- a/src/main/java/de/tum/cit/aet/artemis/buildagent/service/TestResultXmlParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/service/TestResultXmlParser.java @@ -11,7 +11,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildResult; +import de.tum.cit.aet.artemis.buildagent.dto.BuildResult; public class TestResultXmlParser { diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/ChannelDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/dto/ChannelDTO.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/ChannelDTO.java rename to src/main/java/de/tum/cit/aet/artemis/communication/dto/ChannelDTO.java index fbc679cfcfee..338a29b2b421 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/ChannelDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/dto/ChannelDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.communication.web.conversation.dtos; +package de.tum.cit.aet.artemis.communication.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/ChannelIdAndNameDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/dto/ChannelIdAndNameDTO.java similarity index 81% rename from src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/ChannelIdAndNameDTO.java rename to src/main/java/de/tum/cit/aet/artemis/communication/dto/ChannelIdAndNameDTO.java index 9676f806b705..392e50bcb793 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/ChannelIdAndNameDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/dto/ChannelIdAndNameDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.communication.web.conversation.dtos; +package de.tum.cit.aet.artemis.communication.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/ConversationDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/dto/ConversationDTO.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/ConversationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/communication/dto/ConversationDTO.java index 529a24ed65fb..8ea2d6450ce9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/ConversationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/dto/ConversationDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.communication.web.conversation.dtos; +package de.tum.cit.aet.artemis.communication.dto; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/ConversationUserDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/dto/ConversationUserDTO.java similarity index 88% rename from src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/ConversationUserDTO.java rename to src/main/java/de/tum/cit/aet/artemis/communication/dto/ConversationUserDTO.java index bbd8ca1337b6..9e5c508d07ec 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/ConversationUserDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/dto/ConversationUserDTO.java @@ -1,9 +1,9 @@ -package de.tum.cit.aet.artemis.communication.web.conversation.dtos; +package de.tum.cit.aet.artemis.communication.dto; import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.service.dto.UserPublicInfoDTO; +import de.tum.cit.aet.artemis.core.dto.UserPublicInfoDTO; /** * Extension of the UserPublicInfoDTO with special flags for the conversation context diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/dto/ConversationWebsocketDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/dto/ConversationWebsocketDTO.java index 05559eb80dce..1b6de465ecb5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/dto/ConversationWebsocketDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/dto/ConversationWebsocketDTO.java @@ -2,8 +2,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationDTO; - /** * DTO that is included as payload for conversation related websocket messages */ diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/GroupChatDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/dto/GroupChatDTO.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/GroupChatDTO.java rename to src/main/java/de/tum/cit/aet/artemis/communication/dto/GroupChatDTO.java index ffffddb30ce6..ba431fdaf210 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/GroupChatDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/dto/GroupChatDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.communication.web.conversation.dtos; +package de.tum.cit.aet.artemis.communication.dto; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/OneToOneChatDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/dto/OneToOneChatDTO.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/OneToOneChatDTO.java rename to src/main/java/de/tum/cit/aet/artemis/communication/dto/OneToOneChatDTO.java index cb0b9dc0c1dd..631373e2ac9c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/dtos/OneToOneChatDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/dto/OneToOneChatDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.communication.web.conversation.dtos; +package de.tum.cit.aet.artemis.communication.dto; import java.util.Set; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/push_notification/PushNotificationRegisterBody.java b/src/main/java/de/tum/cit/aet/artemis/communication/dto/PushNotificationRegisterBody.java similarity index 74% rename from src/main/java/de/tum/cit/aet/artemis/communication/web/push_notification/PushNotificationRegisterBody.java rename to src/main/java/de/tum/cit/aet/artemis/communication/dto/PushNotificationRegisterBody.java index d8d4637b921c..985039d9fba8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/push_notification/PushNotificationRegisterBody.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/dto/PushNotificationRegisterBody.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.communication.web.push_notification; +package de.tum.cit.aet.artemis.communication.dto; import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceType; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/push_notification/PushNotificationRegisterDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/dto/PushNotificationRegisterDTO.java similarity index 72% rename from src/main/java/de/tum/cit/aet/artemis/communication/web/push_notification/PushNotificationRegisterDTO.java rename to src/main/java/de/tum/cit/aet/artemis/communication/dto/PushNotificationRegisterDTO.java index 661dff1ed66b..0fc6db1b5176 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/push_notification/PushNotificationRegisterDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/dto/PushNotificationRegisterDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.communication.web.push_notification; +package de.tum.cit.aet.artemis.communication.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/push_notification/PushNotificationUnregisterRequest.java b/src/main/java/de/tum/cit/aet/artemis/communication/dto/PushNotificationUnregisterRequest.java similarity index 75% rename from src/main/java/de/tum/cit/aet/artemis/communication/web/push_notification/PushNotificationUnregisterRequest.java rename to src/main/java/de/tum/cit/aet/artemis/communication/dto/PushNotificationUnregisterRequest.java index ac753d8ffc0a..87dbfdc2f4e6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/push_notification/PushNotificationUnregisterRequest.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/dto/PushNotificationUnregisterRequest.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.communication.web.push_notification; +package de.tum.cit.aet.artemis.communication.dto; import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceType; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/ResponsibleUserDTO.java b/src/main/java/de/tum/cit/aet/artemis/communication/dto/ResponsibleUserDTO.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/ResponsibleUserDTO.java rename to src/main/java/de/tum/cit/aet/artemis/communication/dto/ResponsibleUserDTO.java index a084e54550b7..af828b645a23 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/ResponsibleUserDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/dto/ResponsibleUserDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto; +package de.tum.cit.aet.artemis.communication.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java index f429bb1a75f0..21b3dfac0b81 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java @@ -27,11 +27,11 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.dto.PostContextFilterDTO; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; -import de.tum.cit.aet.artemis.communication.dto.PostContextFilterDTO; /** * Spring Data repository for the Message (Post) entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java index df039a7bb3f5..fa370edc0737 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java @@ -15,6 +15,8 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotification; +import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; +import de.tum.cit.aet.artemis.communication.dto.PostDTO; import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; @@ -33,9 +35,6 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; -import de.tum.cit.aet.artemis.communication.dto.PostDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ConductAgreementService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/ConductAgreementService.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/service/ConductAgreementService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/ConductAgreementService.java index f9662f9f44ce..fb9ae1673c66 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ConductAgreementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/ConductAgreementService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.communication.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -19,7 +19,7 @@ public class ConductAgreementService { private final ConductAgreementRepository conductAgreementRepository; - ConductAgreementService(ConductAgreementRepository conductAgreementRepository) { + public ConductAgreementService(ConductAgreementRepository conductAgreementRepository) { this.conductAgreementRepository = conductAgreementRepository; } diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java index 67e43dfb881b..0020deca7faf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java @@ -39,6 +39,9 @@ import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotification; import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotificationFactory; +import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; +import de.tum.cit.aet.artemis.communication.dto.PostContextFilterDTO; +import de.tum.cit.aet.artemis.communication.dto.PostDTO; import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.SingleUserNotificationRepository; @@ -58,10 +61,6 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.communication.dto.PostContextFilterDTO; -import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; -import de.tum.cit.aet.artemis.communication.dto.PostDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/EmailSummaryService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/EmailSummaryService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/EmailSummaryService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/EmailSummaryService.java index 0e016dad1989..6cdb1f29df6a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/EmailSummaryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/EmailSummaryService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.communication.service; import static de.tum.cit.aet.artemis.communication.service.notifications.NotificationSettingsService.NOTIFICATION__WEEKLY_SUMMARY__BASIC_WEEKLY_SUMMARY; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -17,6 +17,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.CourseService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/NotificationScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/NotificationScheduleService.java index b189e231e2be..fbd312a44bdd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/NotificationScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/NotificationScheduleService.java @@ -19,12 +19,12 @@ import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.ProfileService; import de.tum.cit.aet.artemis.core.service.ScheduleService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseLifecycle; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; -import de.tum.cit.aet.artemis.service.ProfileService; @Service @Profile(PROFILE_SCHEDULING) diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/PostingService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/PostingService.java index d1e86515e225..f3a01dab6ba6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/PostingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/PostingService.java @@ -26,10 +26,13 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; import de.tum.cit.aet.artemis.communication.domain.notification.ConversationNotification; import de.tum.cit.aet.artemis.communication.domain.notification.Notification; +import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; +import de.tum.cit.aet.artemis.communication.dto.PostDTO; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.UserRoleDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -37,10 +40,6 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.service.dto.UserRoleDTO; -import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; -import de.tum.cit.aet.artemis.communication.dto.PostDTO; public abstract class PostingService { diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/ReactionService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/ReactionService.java index 758fe3b6debd..a1b9b2b71ec8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/ReactionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/ReactionService.java @@ -11,6 +11,8 @@ import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.Posting; import de.tum.cit.aet.artemis.communication.domain.Reaction; +import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; +import de.tum.cit.aet.artemis.communication.dto.PostDTO; import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.communication.repository.ReactionRepository; @@ -23,8 +25,6 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismAnswerPostService; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismPostService; -import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; -import de.tum.cit.aet.artemis.communication.dto.PostDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SystemNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/SystemNotificationService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/SystemNotificationService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/SystemNotificationService.java index 56c26166a692..5e1c81e2c0bf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SystemNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/SystemNotificationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.communication.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/WebsocketMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/WebsocketMessagingService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/WebsocketMessagingService.java rename to src/main/java/de/tum/cit/aet/artemis/communication/service/WebsocketMessagingService.java index b2cdc29d4974..b28b70cfe6e8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/WebsocketMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/WebsocketMessagingService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.communication.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/WeeklyEmailSummaryScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/WeeklyEmailSummaryScheduleService.java index 22672b6568b6..a1b24069bc1a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/WeeklyEmailSummaryScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/WeeklyEmailSummaryScheduleService.java @@ -20,8 +20,7 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.service.EmailSummaryService; -import de.tum.cit.aet.artemis.service.ProfileService; +import de.tum.cit.aet.artemis.core.service.ProfileService; @Service @Profile(PROFILE_SCHEDULING) diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java index ba4901613eac..c78f44893d8e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ChannelService.java @@ -18,10 +18,11 @@ import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.dto.ChannelDTO; +import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.communication.service.conversation.errors.ChannelNameDuplicateException; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @@ -29,7 +30,6 @@ import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.lecture.domain.Lecture; -import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationDTOService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationDTOService.java index 1665711ac299..6dd78aa23098 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationDTOService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationDTOService.java @@ -18,19 +18,19 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; import de.tum.cit.aet.artemis.communication.domain.conversation.GroupChat; import de.tum.cit.aet.artemis.communication.domain.conversation.OneToOneChat; +import de.tum.cit.aet.artemis.communication.dto.ChannelDTO; +import de.tum.cit.aet.artemis.communication.dto.ConversationDTO; import de.tum.cit.aet.artemis.communication.dto.ConversationSummary; +import de.tum.cit.aet.artemis.communication.dto.ConversationUserDTO; +import de.tum.cit.aet.artemis.communication.dto.GroupChatDTO; +import de.tum.cit.aet.artemis.communication.dto.OneToOneChatDTO; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.service.conversation.auth.ChannelAuthorizationService; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationDTO; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationUserDTO; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.GroupChatDTO; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.OneToOneChatDTO; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.UserPublicInfoDTO; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.service.dto.UserPublicInfoDTO; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationService.java index 1f5293446b91..c2a1761b6b46 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/ConversationService.java @@ -24,8 +24,11 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; import de.tum.cit.aet.artemis.communication.domain.conversation.GroupChat; +import de.tum.cit.aet.artemis.communication.dto.ConversationDTO; import de.tum.cit.aet.artemis.communication.dto.ConversationSummary; +import de.tum.cit.aet.artemis.communication.dto.ConversationWebsocketDTO; import de.tum.cit.aet.artemis.communication.dto.GeneralConversationInfo; +import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; import de.tum.cit.aet.artemis.communication.dto.UserConversationInfo; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; @@ -33,7 +36,7 @@ import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.GroupChatRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.OneToOneChatRepository; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationDTO; +import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; @@ -41,9 +44,6 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.communication.dto.ConversationWebsocketDTO; -import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/GroupChatService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/GroupChatService.java index 2dddbede2c05..30af11786b0b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/GroupChatService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/conversation/GroupChatService.java @@ -11,9 +11,9 @@ import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; import de.tum.cit.aet.artemis.communication.domain.conversation.GroupChat; +import de.tum.cit.aet.artemis.communication.dto.GroupChatDTO; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.GroupChatRepository; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.GroupChatDTO; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/linkpreview/LinkPreviewService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/linkpreview/LinkPreviewService.java index b3f2f8129e6c..dd5c0f81f452 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/linkpreview/LinkPreviewService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/linkpreview/LinkPreviewService.java @@ -7,11 +7,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.dto.LinkPreviewDTO; import de.tum.cit.aet.artemis.communication.service.linkpreview.ogparser.Content; import de.tum.cit.aet.artemis.communication.service.linkpreview.ogparser.OgParser; import de.tum.cit.aet.artemis.communication.service.linkpreview.ogparser.OpenGraph; import de.tum.cit.aet.artemis.communication.service.linkpreview.ogparser.htmlparser.OgMetaElementHtmlParser; -import de.tum.cit.aet.artemis.communication.dto.LinkPreviewDTO; /** * Service for retrieving meta information from a given url. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/GroupNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/GroupNotificationService.java index e6b2d350fdfb..6e48ec307044 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/GroupNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/GroupNotificationService.java @@ -38,6 +38,7 @@ import de.tum.cit.aet.artemis.communication.domain.notification.NotificationConstants; import de.tum.cit.aet.artemis.communication.domain.notification.NotificationTarget; import de.tum.cit.aet.artemis.communication.repository.GroupNotificationRepository; +import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -46,7 +47,6 @@ import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MailService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MailService.java index 536d42d27dd0..fddce3b9e6cd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MailService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/MailService.java @@ -25,10 +25,10 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.DataExport; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.TimeService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; -import de.tum.cit.aet.artemis.service.TimeService; /** * Service for preparing and sending emails. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/SingleUserNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/SingleUserNotificationService.java index 7925b0347fb5..4e242f93e0fb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/SingleUserNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/SingleUserNotificationService.java @@ -57,6 +57,7 @@ import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotification; import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; import de.tum.cit.aet.artemis.communication.repository.SingleUserNotificationRepository; +import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.communication.service.conversation.ConversationService; import de.tum.cit.aet.artemis.core.domain.DataExport; import de.tum.cit.aet.artemis.core.domain.User; @@ -70,7 +71,6 @@ import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/TutorialGroupNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/TutorialGroupNotificationService.java index 48e227585072..7e82b1bd1a1a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/TutorialGroupNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/TutorialGroupNotificationService.java @@ -14,8 +14,8 @@ import org.springframework.util.StringUtils; import de.tum.cit.aet.artemis.communication.domain.notification.TutorialGroupNotification; +import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistrationType; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminSystemNotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/AdminSystemNotificationResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminSystemNotificationResource.java rename to src/main/java/de/tum/cit/aet/artemis/communication/web/AdminSystemNotificationResource.java index 24a15f1b5f97..adee7ca161eb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminSystemNotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/AdminSystemNotificationResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.web.admin; +package de.tum.cit.aet.artemis.communication.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -21,10 +21,10 @@ import de.tum.cit.aet.artemis.communication.domain.notification.Notification; import de.tum.cit.aet.artemis.communication.domain.notification.SystemNotification; import de.tum.cit.aet.artemis.communication.repository.SystemNotificationRepository; +import de.tum.cit.aet.artemis.communication.service.SystemNotificationService; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.core.util.HeaderUtil; -import de.tum.cit.aet.artemis.service.SystemNotificationService; /** * REST controller for administrating system notifications. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/AndroidAppSiteAssociationResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/AndroidAppSiteAssociationResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/web/AndroidAppSiteAssociationResource.java rename to src/main/java/de/tum/cit/aet/artemis/communication/web/AndroidAppSiteAssociationResource.java index 0f25af42296d..9f7d2e60b6d4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/AndroidAppSiteAssociationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/AndroidAppSiteAssociationResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.web; +package de.tum.cit.aet.artemis.communication.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/AppleAppSiteAssociationResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/AppleAppSiteAssociationResource.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/web/AppleAppSiteAssociationResource.java rename to src/main/java/de/tum/cit/aet/artemis/communication/web/AppleAppSiteAssociationResource.java index 9d45bb57bf59..4ddffa796402 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/AppleAppSiteAssociationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/AppleAppSiteAssociationResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.web; +package de.tum.cit.aet.artemis.communication.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/ConversationMessageResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/ConversationMessageResource.java index db05eff51b6b..77cedf02539a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/ConversationMessageResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/ConversationMessageResource.java @@ -31,6 +31,7 @@ import de.tum.cit.aet.artemis.communication.domain.CreatedConversationMessage; import de.tum.cit.aet.artemis.communication.domain.DisplayPriority; import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.dto.PostContextFilterDTO; import de.tum.cit.aet.artemis.communication.service.ConversationMessagingService; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -39,7 +40,6 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; -import de.tum.cit.aet.artemis.communication.dto.PostContextFilterDTO; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.PaginationUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/LinkPreviewResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/LinkPreviewResource.java index e6923afd718c..3c0a59795284 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/LinkPreviewResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/LinkPreviewResource.java @@ -11,9 +11,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.communication.dto.LinkPreviewDTO; import de.tum.cit.aet.artemis.communication.service.linkpreview.LinkPreviewService; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.communication.dto.LinkPreviewDTO; /** * REST controller for Link Preview. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/push_notification/PushNotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/PushNotificationResource.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/communication/web/push_notification/PushNotificationResource.java rename to src/main/java/de/tum/cit/aet/artemis/communication/web/PushNotificationResource.java index 048cedd0154f..f8ccde45eeb6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/push_notification/PushNotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/PushNotificationResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.communication.web.push_notification; +package de.tum.cit.aet.artemis.communication.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -26,6 +26,9 @@ import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfiguration; import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfigurationId; +import de.tum.cit.aet.artemis.communication.dto.PushNotificationRegisterBody; +import de.tum.cit.aet.artemis.communication.dto.PushNotificationRegisterDTO; +import de.tum.cit.aet.artemis.communication.dto.PushNotificationUnregisterRequest; import de.tum.cit.aet.artemis.communication.repository.PushNotificationDeviceConfigurationRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.User; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java index b9f33bcb15d3..03c7445e02e0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ChannelResource.java @@ -33,6 +33,8 @@ import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.dto.ChannelDTO; +import de.tum.cit.aet.artemis.communication.dto.ChannelIdAndNameDTO; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; @@ -40,8 +42,6 @@ import de.tum.cit.aet.artemis.communication.service.conversation.ConversationService; import de.tum.cit.aet.artemis.communication.service.conversation.auth.ChannelAuthorizationService; import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelIdAndNameDTO; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenAlertException; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ConversationResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ConversationResource.java index ef9d891241d2..8ea63e4ce3f6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ConversationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/ConversationResource.java @@ -27,12 +27,15 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; +import de.tum.cit.aet.artemis.communication.dto.ConversationDTO; +import de.tum.cit.aet.artemis.communication.dto.ConversationUserDTO; +import de.tum.cit.aet.artemis.communication.dto.ResponsibleUserDTO; +import de.tum.cit.aet.artemis.communication.service.ConductAgreementService; import de.tum.cit.aet.artemis.communication.service.conversation.ConversationService; import de.tum.cit.aet.artemis.communication.service.conversation.ConversationService.ConversationMemberSearchFilters; import de.tum.cit.aet.artemis.communication.service.conversation.auth.ChannelAuthorizationService; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationDTO; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationUserDTO; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.dto.UserPublicInfoDTO; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -40,9 +43,6 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ConductAgreementService; -import de.tum.cit.aet.artemis.service.dto.ResponsibleUserDTO; -import de.tum.cit.aet.artemis.service.dto.UserPublicInfoDTO; import tech.jhipster.web.util.PaginationUtil; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/GroupChatResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/GroupChatResource.java index 30cd7fbdfeb5..247f5cd38bfd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/GroupChatResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/GroupChatResource.java @@ -23,18 +23,18 @@ import de.tum.cit.aet.artemis.communication.domain.NotificationType; import de.tum.cit.aet.artemis.communication.domain.conversation.GroupChat; +import de.tum.cit.aet.artemis.communication.dto.GroupChatDTO; +import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; import de.tum.cit.aet.artemis.communication.repository.conversation.GroupChatRepository; import de.tum.cit.aet.artemis.communication.service.conversation.ConversationDTOService; import de.tum.cit.aet.artemis.communication.service.conversation.ConversationService; import de.tum.cit.aet.artemis.communication.service.conversation.GroupChatService; import de.tum.cit.aet.artemis.communication.service.conversation.auth.GroupChatAuthorizationService; import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.GroupChatDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; -import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/OneToOneChatResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/OneToOneChatResource.java index 7533a91ccb39..a5fe0e2c7356 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/OneToOneChatResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/conversation/OneToOneChatResource.java @@ -19,12 +19,12 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.communication.domain.NotificationType; +import de.tum.cit.aet.artemis.communication.dto.OneToOneChatDTO; import de.tum.cit.aet.artemis.communication.service.conversation.ConversationDTOService; import de.tum.cit.aet.artemis.communication.service.conversation.ConversationService; import de.tum.cit.aet.artemis.communication.service.conversation.OneToOneChatService; import de.tum.cit.aet.artemis.communication.service.conversation.auth.OneToOneChatAuthorizationService; import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.OneToOneChatDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/CacheConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/CacheConfiguration.java index 086d214d90b1..73cb7773ed50 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/CacheConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/CacheConfiguration.java @@ -50,8 +50,8 @@ import com.hazelcast.spring.cache.HazelcastCacheManager; import com.hazelcast.spring.context.SpringManagedContext; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.programming.service.localci.LocalCIPriorityQueueComparator; -import de.tum.cit.aet.artemis.service.HazelcastPathSerializer; import tech.jhipster.config.JHipsterProperties; import tech.jhipster.config.cache.PrefixedKeyGenerator; @@ -293,7 +293,7 @@ private void hazelcastBindOnlyOnInterface(String hazelcastInterface, Config conf } /** - * Note: this is configured to be able to cache files in the Hazelcast cluster, see {@link de.tum.cit.aet.artemis.service.FileService#getFileForPath} + * Note: this is configured to be able to cache files in the Hazelcast cluster, see {@link FileService#getFileForPath} * * @return the serializer config for files based on paths */ diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java b/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java index 1b2e53560687..ef5ce5cc92e5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java @@ -2,8 +2,8 @@ import java.util.regex.Pattern; -import de.tum.cit.aet.artemis.atlas.web.LtiResource; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.lti.web.LtiResource; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.service.ProgrammingSubmissionService; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/DatabaseConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/DatabaseConfiguration.java index 215a0c694455..72ba6f2332d6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/DatabaseConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/DatabaseConfiguration.java @@ -12,9 +12,7 @@ @Profile(PROFILE_CORE) @Configuration -@EnableJpaRepositories(basePackages = { - "de.tum.cit.aet.artemis.*.repository", - "de.tum.cit.aet.artemis.repository.**" // ToDo: Remove once test files have been moved +@EnableJpaRepositories(basePackages = { "de.tum.cit.aet.artemis.*.repository", "de.tum.cit.aet.artemis.repository.**" // ToDo: Remove once test files have been moved }, repositoryBaseClass = RepositoryImpl.class) @EnableJpaAuditing(auditorAwareRef = "springSecurityAuditorAware") @EnableTransactionManagement diff --git a/src/main/java/de/tum/cit/aet/artemis/service/HazelcastPathSerializer.java b/src/main/java/de/tum/cit/aet/artemis/core/config/HazelcastPathSerializer.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/HazelcastPathSerializer.java rename to src/main/java/de/tum/cit/aet/artemis/core/config/HazelcastPathSerializer.java index 62d9a1454410..47db00a02903 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/HazelcastPathSerializer.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/HazelcastPathSerializer.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.core.config; import static de.tum.cit.aet.artemis.core.config.Constants.HAZELCAST_PATH_SERIALIZER_ID; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/aop/logging/LoggingAspect.java b/src/main/java/de/tum/cit/aet/artemis/core/config/LoggingAspect.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/aop/logging/LoggingAspect.java rename to src/main/java/de/tum/cit/aet/artemis/core/config/LoggingAspect.java index 92c7508a5d64..a916500b1bcc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/aop/logging/LoggingAspect.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/LoggingAspect.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.aop.logging; +package de.tum.cit.aet.artemis.core.config; import java.util.Arrays; import java.util.Objects; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/LoggingAspectConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/LoggingAspectConfiguration.java index 35d534a96f59..42db7dcc7fae 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/LoggingAspectConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/LoggingAspectConfiguration.java @@ -8,7 +8,6 @@ import org.springframework.context.annotation.Profile; import org.springframework.core.env.Environment; -import de.tum.cit.aet.artemis.core.aop.logging.LoggingAspect; import tech.jhipster.config.JHipsterConstants; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java b/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java index fb18f7707792..6d2bff114552 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/MetricsBean.java @@ -34,11 +34,13 @@ import com.zaxxer.hikari.HikariDataSource; +import de.tum.cit.aet.artemis.buildagent.dto.BuildAgentInformation; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.StatisticsRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.ProfileService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; @@ -46,8 +48,6 @@ import de.tum.cit.aet.artemis.exercise.dto.ExerciseTypeMetricsEntry; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.programming.service.localci.SharedQueueManagementService; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildAgentInformation; -import de.tum.cit.aet.artemis.service.ProfileService; import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.MultiGauge; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/SecurityConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/SecurityConfiguration.java index d534dc86bc52..baacbfd73966 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/SecurityConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/SecurityConfiguration.java @@ -35,12 +35,12 @@ import de.tum.cit.aet.artemis.core.security.DomainUserDetailsService; import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.security.filter.SpaWebFilter; import de.tum.cit.aet.artemis.core.security.jwt.JWTConfigurer; import de.tum.cit.aet.artemis.core.security.jwt.TokenProvider; +import de.tum.cit.aet.artemis.core.service.ProfileService; import de.tum.cit.aet.artemis.core.service.user.PasswordService; -import de.tum.cit.aet.artemis.core.web.filter.SpaWebFilter; import de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer; -import de.tum.cit.aet.artemis.service.ProfileService; @Configuration @EnableWebSecurity diff --git a/src/main/java/de/tum/cit/aet/artemis/core/component/TheiaInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/core/config/TheiaInfoContributor.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/core/component/TheiaInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/core/config/TheiaInfoContributor.java index 2310b0ca2882..4664cfe457d0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/component/TheiaInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/TheiaInfoContributor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.component; +package de.tum.cit.aet.artemis.core.config; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_THEIA; @@ -10,8 +10,6 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import de.tum.cit.aet.artemis.core.config.Constants; - @Profile(PROFILE_THEIA) @Component public class TheiaInfoContributor implements InfoContributor { diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/WebConfigurer.java b/src/main/java/de/tum/cit/aet/artemis/core/config/WebConfigurer.java index 6c235be0e596..646fa942e7e0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/WebConfigurer.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/WebConfigurer.java @@ -28,7 +28,7 @@ import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.filter.CorsFilter; -import de.tum.cit.aet.artemis.core.web.filter.CachingHttpHeadersFilter; +import de.tum.cit.aet.artemis.core.security.filter.CachingHttpHeadersFilter; import tech.jhipster.config.JHipsterProperties; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java index 9fec0f1248e5..6f3f02131a7c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java @@ -1,13 +1,13 @@ package de.tum.cit.aet.artemis.core.config.websocket; -import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService.getExerciseIdFromNonPersonalExerciseResultDestination; import static de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService.isNonPersonalExerciseResultDestination; -import static de.tum.cit.aet.artemis.programming.web.LocalCIWebsocketMessagingService.isBuildAgentDestination; -import static de.tum.cit.aet.artemis.programming.web.LocalCIWebsocketMessagingService.isBuildQueueAdminDestination; -import static de.tum.cit.aet.artemis.programming.web.LocalCIWebsocketMessagingService.isBuildQueueCourseDestination; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.exercise.web.ParticipationTeamWebsocketService.getParticipationIdFromDestination; import static de.tum.cit.aet.artemis.exercise.web.ParticipationTeamWebsocketService.isParticipationTeamDestination; +import static de.tum.cit.aet.artemis.programming.service.localci.LocalCIWebsocketMessagingService.isBuildAgentDestination; +import static de.tum.cit.aet.artemis.programming.service.localci.LocalCIWebsocketMessagingService.isBuildQueueAdminDestination; +import static de.tum.cit.aet.artemis.programming.service.localci.LocalCIWebsocketMessagingService.isBuildQueueCourseDestination; import java.net.InetSocketAddress; import java.security.Principal; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/AuditingEntityDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/AuditingEntityDTO.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/AuditingEntityDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/AuditingEntityDTO.java index 34a97fce7e6e..71c5316f60a1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/AuditingEntityDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/AuditingEntityDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto; +package de.tum.cit.aet.artemis.core.dto; import java.time.Instant; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseForDashboardDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseForDashboardDTO.java index a4985405768f..99039b8ddca2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseForDashboardDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseForDashboardDTO.java @@ -23,5 +23,5 @@ */ @JsonInclude(JsonInclude.Include.NON_EMPTY) public record CourseForDashboardDTO(Course course, CourseScoresDTO totalScores, CourseScoresDTO textScores, CourseScoresDTO programmingScores, CourseScoresDTO modelingScores, - CourseScoresDTO fileUploadScores, CourseScoresDTO quizScores, Set participationResults) { + CourseScoresDTO fileUploadScores, CourseScoresDTO quizScores, Set participationResults) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseManagementStatisticsDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseManagementStatisticsDTO.java index 7f83ef6200d7..699e7070e0c6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseManagementStatisticsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseManagementStatisticsDTO.java @@ -4,8 +4,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.core.dto.CourseStatisticsAverageScore; - @JsonInclude(JsonInclude.Include.NON_EMPTY) public record CourseManagementStatisticsDTO(Double averageScoreOfCourse, List averageScoresOfExercises) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/core/dto/CoursesForDashboardDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/CoursesForDashboardDTO.java index 2f95bb5a5eca..8feb77c01903 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/dto/CoursesForDashboardDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/CoursesForDashboardDTO.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO; import de.tum.cit.aet.artemis.exam.domain.Exam; @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/PasswordChangeDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/PasswordChangeDTO.java similarity index 85% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/PasswordChangeDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/PasswordChangeDTO.java index ac53b48240e8..296a9cab975f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/PasswordChangeDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/PasswordChangeDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto; +package de.tum.cit.aet.artemis.core.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/dto/PrivacyStatementDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/PrivacyStatementDTO.java index 19ba4e6f010f..2430c35f9c86 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/dto/PrivacyStatementDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/PrivacyStatementDTO.java @@ -4,7 +4,6 @@ import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.domain.LegalDocumentType; -import de.tum.cit.aet.artemis.core.dto.LegalDocument; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PrivacyStatementDTO(LegalDocumentType type, String text, Language language) implements LegalDocument { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/StudentDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/StudentDTO.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/StudentDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/StudentDTO.java index 947c2c7a495f..4230b2a0460c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/StudentDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/StudentDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto; +package de.tum.cit.aet.artemis.core.dto; import java.util.Objects; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/UserDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/UserDTO.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/UserDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/UserDTO.java index 05f8567bf955..1ac72940f919 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/UserDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/UserDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto; +package de.tum.cit.aet.artemis.core.dto; import static de.tum.cit.aet.artemis.core.config.Constants.USERNAME_MAX_LENGTH; import static de.tum.cit.aet.artemis.core.config.Constants.USERNAME_MIN_LENGTH; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/UserInitializationDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/UserInitializationDTO.java similarity index 84% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/UserInitializationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/UserInitializationDTO.java index 0fe621829a34..ff4fe78ad658 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/UserInitializationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/UserInitializationDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto; +package de.tum.cit.aet.artemis.core.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/UserPublicInfoDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/UserPublicInfoDTO.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/UserPublicInfoDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/UserPublicInfoDTO.java index d53522c3d347..a6da8966dfc5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/UserPublicInfoDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/UserPublicInfoDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto; +package de.tum.cit.aet.artemis.core.dto; import java.util.Objects; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/UserRoleDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/UserRoleDTO.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/UserRoleDTO.java rename to src/main/java/de/tum/cit/aet/artemis/core/dto/UserRoleDTO.java index 724a1ec02dbd..455a348d2ffa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/UserRoleDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/UserRoleDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto; +package de.tum.cit.aet.artemis.core.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/dto/pageablesearch/FinishedBuildJobPageableSearchDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/pageablesearch/FinishedBuildJobPageableSearchDTO.java index aeda44e70d8c..a3a7f24374a5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/dto/pageablesearch/FinishedBuildJobPageableSearchDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/pageablesearch/FinishedBuildJobPageableSearchDTO.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.programming.domain.BuildStatus; +import de.tum.cit.aet.artemis.programming.domain.build.BuildStatus; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record FinishedBuildJobPageableSearchDTO(BuildStatus buildStatus, String buildAgentAddress, ZonedDateTime startDate, ZonedDateTime endDate, Integer buildDurationLower, diff --git a/src/main/java/de/tum/cit/aet/artemis/core/dto/pageablesearch/PageableSearchDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/pageablesearch/PageableSearchDTO.java index 1ca057935967..483df90e727c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/dto/pageablesearch/PageableSearchDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/pageablesearch/PageableSearchDTO.java @@ -2,8 +2,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.core.dto.SortingOrder; import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.SortingOrder; /** * Wrapper for a generic search for any list of entities. The result should be paged, diff --git a/src/main/java/de/tum/cit/aet/artemis/core/dto/vm/ManagedUserVM.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/vm/ManagedUserVM.java index 6d7bd4f4ede2..039ed4a7e30f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/dto/vm/ManagedUserVM.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/vm/ManagedUserVM.java @@ -6,7 +6,7 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.service.dto.UserDTO; +import de.tum.cit.aet.artemis.core.dto.UserDTO; /** * View Model extending the UserDTO, which is meant to be used in the user management UI. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java index 9069d21abee7..e01f172f0ca2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java @@ -44,13 +44,13 @@ import de.tum.cit.aet.artemis.core.domain.Organization; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.dto.SortingOrder; +import de.tum.cit.aet.artemis.core.dto.UserDTO; +import de.tum.cit.aet.artemis.core.dto.UserRoleDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.UserPageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.service.dto.UserDTO; -import de.tum.cit.aet.artemis.service.dto.UserRoleDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.UserPageableSearchDTO; /** * Spring Data JPA repository for the User entity.
diff --git a/src/main/java/de/tum/cit/aet/artemis/core/security/OAuth2JWKSService.java b/src/main/java/de/tum/cit/aet/artemis/core/security/OAuth2JWKSService.java index 4c0090273721..d8c80fd75385 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/security/OAuth2JWKSService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/security/OAuth2JWKSService.java @@ -25,7 +25,7 @@ import com.nimbusds.jose.jwk.KeyUse; import com.nimbusds.jose.jwk.RSAKey; -import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; +import de.tum.cit.aet.artemis.lti.service.OnlineCourseConfigurationService; /** * This Service is responsible to manage JWKs for all OAuth2 ClientRegistrations. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/filter/ApiVersionFilter.java b/src/main/java/de/tum/cit/aet/artemis/core/security/filter/ApiVersionFilter.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/web/filter/ApiVersionFilter.java rename to src/main/java/de/tum/cit/aet/artemis/core/security/filter/ApiVersionFilter.java index ba45e0c804e1..230267950218 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/filter/ApiVersionFilter.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/security/filter/ApiVersionFilter.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.web.filter; +package de.tum.cit.aet.artemis.core.security.filter; import static tech.jhipster.config.JHipsterConstants.SPRING_PROFILE_PRODUCTION; import static tech.jhipster.config.JHipsterConstants.SPRING_PROFILE_TEST; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/filter/CachingHttpHeadersFilter.java b/src/main/java/de/tum/cit/aet/artemis/core/security/filter/CachingHttpHeadersFilter.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/web/filter/CachingHttpHeadersFilter.java rename to src/main/java/de/tum/cit/aet/artemis/core/security/filter/CachingHttpHeadersFilter.java index 1134d13114e4..ec1cf9578db5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/filter/CachingHttpHeadersFilter.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/security/filter/CachingHttpHeadersFilter.java @@ -5,7 +5,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -package de.tum.cit.aet.artemis.core.web.filter; +package de.tum.cit.aet.artemis.core.security.filter; import java.io.IOException; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/filter/Lti13LaunchFilter.java b/src/main/java/de/tum/cit/aet/artemis/core/security/filter/Lti13LaunchFilter.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/core/web/filter/Lti13LaunchFilter.java rename to src/main/java/de/tum/cit/aet/artemis/core/security/filter/Lti13LaunchFilter.java index 1f353be7e19d..55eb9c385fcc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/filter/Lti13LaunchFilter.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/security/filter/Lti13LaunchFilter.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.web.filter; +package de.tum.cit.aet.artemis.core.security.filter; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/filter/SpaWebFilter.java b/src/main/java/de/tum/cit/aet/artemis/core/security/filter/SpaWebFilter.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/core/web/filter/SpaWebFilter.java rename to src/main/java/de/tum/cit/aet/artemis/core/security/filter/SpaWebFilter.java index c507e6b00b7c..37fba39cc2ad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/filter/SpaWebFilter.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/security/filter/SpaWebFilter.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.web.filter; +package de.tum.cit.aet.artemis.core.security.filter; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AuditEventService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/AuditEventService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/AuditEventService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/AuditEventService.java index edb312e3ffad..f1a37c066971 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AuditEventService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/AuditEventService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.core.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/CourseService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/CourseService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/CourseService.java index 73ce4763fd8c..9e3b69f269cc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/CourseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/CourseService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.core.service; import static de.tum.cit.aet.artemis.assessment.domain.ComplaintType.COMPLAINT; import static de.tum.cit.aet.artemis.assessment.domain.ComplaintType.MORE_FEEDBACK; @@ -66,13 +66,20 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.CourseContentCount; +import de.tum.cit.aet.artemis.core.dto.CourseManagementDetailViewDTO; +import de.tum.cit.aet.artemis.core.dto.DueDateStat; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.core.dto.StatisticsEntry; +import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; +import de.tum.cit.aet.artemis.core.dto.StudentDTO; +import de.tum.cit.aet.artemis.core.dto.TutorLeaderboardDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.StatisticsRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.export.CourseExamExportService; import de.tum.cit.aet.artemis.core.service.user.UserService; import de.tum.cit.aet.artemis.core.util.PageUtil; @@ -97,17 +104,9 @@ import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupNotificationRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupRepository; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupChannelManagementService; -import de.tum.cit.aet.artemis.core.dto.CourseContentCount; -import de.tum.cit.aet.artemis.core.dto.CourseManagementDetailViewDTO; -import de.tum.cit.aet.artemis.core.dto.DueDateStat; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; -import de.tum.cit.aet.artemis.core.dto.TutorLeaderboardDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; /** * Service Implementation for managing Course. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/DataExportScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/DataExportScheduleService.java index 8bc915518edd..f9089d6e5cb8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/DataExportScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/DataExportScheduleService.java @@ -24,7 +24,6 @@ import de.tum.cit.aet.artemis.core.service.export.DataExportCreationService; import de.tum.cit.aet.artemis.core.service.export.DataExportService; import de.tum.cit.aet.artemis.core.service.user.UserService; -import de.tum.cit.aet.artemis.service.ProfileService; /** * Service responsible for scheduling data exports. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/FilePathService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/FilePathService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/FilePathService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/FilePathService.java index b129614bfa84..efb8bdc4b1b6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/FilePathService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/FilePathService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.core.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/FileService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/FileService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/FileService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/FileService.java index 23a5fee39d7c..20aa37c7bacc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/FileService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/FileService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.core.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LegalDocumentService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/LegalDocumentService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/LegalDocumentService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/LegalDocumentService.java index 7bc2aab22585..457adf4e509f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LegalDocumentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/LegalDocumentService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.core.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -17,11 +17,11 @@ import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.domain.LegalDocumentType; -import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import de.tum.cit.aet.artemis.core.dto.ImprintDTO; import de.tum.cit.aet.artemis.core.dto.LegalDocument; import de.tum.cit.aet.artemis.core.dto.PrivacyStatementDTO; +import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; /** * Service class responsible for providing and managing legal documents (privacy statment, imprint). diff --git a/src/main/java/de/tum/cit/aet/artemis/service/OrganizationService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/OrganizationService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/OrganizationService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/OrganizationService.java index 259190287069..a8f9705461f1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/OrganizationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/OrganizationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.core.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ProfileService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/ProfileService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/ProfileService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/ProfileService.java index 64bd29be6ad8..e142d9f82026 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ProfileService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/ProfileService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.core.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ResourceLoaderService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/ResourceLoaderService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/ResourceLoaderService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/ResourceLoaderService.java index fb4bcdc57bd0..726f573a7e97 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ResourceLoaderService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/ResourceLoaderService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.core.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/ScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/ScheduleService.java index 61a1e7117ec0..69ad1cfd5181 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/ScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/ScheduleService.java @@ -21,10 +21,10 @@ import de.tum.cit.aet.artemis.exercise.domain.ExerciseLifecycle; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.service.ExerciseLifecycleService; +import de.tum.cit.aet.artemis.exercise.service.ParticipationLifecycleService; import de.tum.cit.aet.artemis.programming.domain.ParticipationLifecycle; import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; -import de.tum.cit.aet.artemis.service.ParticipationLifecycleService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/StatisticsService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/StatisticsService.java index 69c4adcfb9df..31f35f7e89d8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/StatisticsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/StatisticsService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.core.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.util.RoundingUtil.roundScoreSpecifiedByCourseSettings; @@ -31,6 +31,7 @@ import de.tum.cit.aet.artemis.core.domain.GraphType; import de.tum.cit.aet.artemis.core.domain.SpanType; import de.tum.cit.aet.artemis.core.domain.StatisticsView; +import de.tum.cit.aet.artemis.core.dto.CourseManagementStatisticsDTO; import de.tum.cit.aet.artemis.core.dto.CourseStatisticsAverageScore; import de.tum.cit.aet.artemis.core.dto.StatisticsEntry; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @@ -39,11 +40,10 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseManagementStatisticsDTO; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; -import de.tum.cit.aet.artemis.core.dto.CourseManagementStatisticsDTO; -import de.tum.cit.aet.artemis.exercise.dto.ExerciseManagementStatisticsDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/TelemetryService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/TelemetryService.java index a92471563f82..1b50d15131e3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/TelemetryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/TelemetryService.java @@ -23,8 +23,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; -import de.tum.cit.aet.artemis.service.ProfileService; - @Service @Profile(PROFILE_SCHEDULING) public class TelemetryService { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TimeService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/TimeService.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/service/TimeService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/TimeService.java index 8a989265e92a..6fc0f8b030a7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TimeService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/TimeService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.core.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/TitleCacheEvictionService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/TitleCacheEvictionService.java index ac16cf17b660..0ee7cceac695 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/TitleCacheEvictionService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.core.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ZipFileService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/ZipFileService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/ZipFileService.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/ZipFileService.java index bfa34547deff..4d40473c4eb9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ZipFileService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/ZipFileService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.core.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/export/CourseExamExportService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/export/CourseExamExportService.java index 3230b826ce8c..ad14a6097a26 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/export/CourseExamExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/export/CourseExamExportService.java @@ -28,14 +28,18 @@ import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.CourseExamExportErrorCause; import de.tum.cit.aet.artemis.core.domain.CourseExamExportState; import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.service.ArchivalReportEntry; +import de.tum.cit.aet.artemis.core.service.FileService; +import de.tum.cit.aet.artemis.core.service.ZipFileService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionExportOptionsDTO; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.service.FileUploadExerciseWithSubmissionsExportService; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; @@ -44,12 +48,8 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseExportService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.service.QuizExerciseWithSubmissionsExportService; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.service.ZipFileService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.service.TextExerciseWithSubmissionsExportService; -import de.tum.cit.aet.artemis.exercise.dto.SubmissionExportOptionsDTO; /** * Service Implementation for exporting courses and exams. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportCreationService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportCreationService.java index e4079b166d3e..cbeed27c44ea 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportCreationService.java @@ -26,10 +26,10 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ArtemisMailException; import de.tum.cit.aet.artemis.core.repository.DataExportRepository; +import de.tum.cit.aet.artemis.core.service.FileService; +import de.tum.cit.aet.artemis.core.service.ResourceLoaderService; +import de.tum.cit.aet.artemis.core.service.ZipFileService; import de.tum.cit.aet.artemis.core.service.user.UserService; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.ResourceLoaderService; -import de.tum.cit.aet.artemis.service.ZipFileService; /** * A service to create data exports for users diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExamCreationService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExamCreationService.java index 5824547064e6..964515037ee1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExamCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExamCreationService.java @@ -24,10 +24,10 @@ import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exam.domain.StudentExam; +import de.tum.cit.aet.artemis.exam.dto.ExamScoresDTO; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exam.service.ExamService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.exam.dto.ExamScoresDTO; /** * A service to create the data export for exams the user has participated in. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExerciseCreationService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExerciseCreationService.java index 2d11f7ffa0d2..83921300956c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExerciseCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExerciseCreationService.java @@ -33,7 +33,9 @@ import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.communication.domain.AnswerPost; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.RepositoryExportOptionsDTO; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; @@ -49,9 +51,7 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseExportService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; -import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.text.domain.TextSubmission; -import de.tum.cit.aet.artemis.core.dto.RepositoryExportOptionsDTO; /** * A service to create the data export for exercise participations of the user. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportScienceEventService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportScienceEventService.java index 2a6f7b9a8b65..50f05295e92e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportScienceEventService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportScienceEventService.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.atlas.domain.science.ScienceEvent; -import de.tum.cit.aet.artemis.atlas.repository.science.ScienceEventRepository; +import de.tum.cit.aet.artemis.atlas.repository.ScienceEventRepository; /** * A Service to create the science event export data for users. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportService.java index 1995fcd3c501..c3d6f8f918e5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportService.java @@ -21,14 +21,14 @@ import de.tum.cit.aet.artemis.core.domain.DataExport; import de.tum.cit.aet.artemis.core.domain.DataExportState; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.DataExportDTO; +import de.tum.cit.aet.artemis.core.dto.RequestDataExportDTO; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import de.tum.cit.aet.artemis.core.repository.DataExportRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.core.dto.DataExportDTO; -import de.tum.cit.aet.artemis.core.dto.RequestDataExportDTO; +import de.tum.cit.aet.artemis.core.service.FileService; /** * Service Implementation for managing the data export in accordance with Art. 15 GDPR. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/feature/FeatureToggleService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/feature/FeatureToggleService.java index 0bd1cb22c239..83438c369cfd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/feature/FeatureToggleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/feature/FeatureToggleService.java @@ -14,7 +14,7 @@ import com.hazelcast.core.HazelcastInstance; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java index 4dbd9669e99e..c883f774dcad 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java @@ -38,10 +38,12 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import de.tum.cit.aet.artemis.atlas.repository.science.ScienceEventRepository; +import de.tum.cit.aet.artemis.atlas.repository.ScienceEventRepository; import de.tum.cit.aet.artemis.core.domain.Authority; import de.tum.cit.aet.artemis.core.domain.GuidedTourSetting; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.StudentDTO; +import de.tum.cit.aet.artemis.core.dto.UserDTO; import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.exception.AccountRegistrationBlockedException; @@ -53,6 +55,8 @@ import de.tum.cit.aet.artemis.core.repository.GuidedTourSettingsRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.FilePathService; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.core.service.connectors.ldap.LdapAuthenticationProvider; import de.tum.cit.aet.artemis.core.service.ldap.LdapUserDto; import de.tum.cit.aet.artemis.core.service.ldap.LdapUserService; @@ -61,10 +65,6 @@ import de.tum.cit.aet.artemis.programming.service.ParticipationVcsAccessTokenService; import de.tum.cit.aet.artemis.programming.service.ci.CIUserManagementService; import de.tum.cit.aet.artemis.programming.service.vcs.VcsUserManagementService; -import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.dto.StudentDTO; -import de.tum.cit.aet.artemis.service.dto.UserDTO; import tech.jhipster.security.RandomUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/AccountResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/AccountResource.java index b39e43f95aa1..2a441e4cd035 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/AccountResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/AccountResource.java @@ -32,6 +32,8 @@ import org.springframework.web.multipart.MultipartFile; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.PasswordChangeDTO; +import de.tum.cit.aet.artemis.core.dto.UserDTO; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.EmailAlreadyUsedException; @@ -39,14 +41,12 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.service.AccountService; +import de.tum.cit.aet.artemis.core.service.FilePathService; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.core.service.user.UserCreationService; import de.tum.cit.aet.artemis.core.service.user.UserService; import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCPersonalAccessTokenManagementService; import de.tum.cit.aet.artemis.programming.service.localvc.ssh.HashUtils; -import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.dto.PasswordChangeDTO; -import de.tum.cit.aet.artemis.service.dto.UserDTO; /** * REST controller for managing the current user's account. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AuditResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/AuditResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/web/admin/AuditResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/AuditResource.java index cf9c625b9822..03be23e493f2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AuditResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/AuditResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.web.admin; +package de.tum.cit.aet.artemis.core.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static tech.jhipster.web.util.PaginationUtil.generatePaginationHttpHeaders; @@ -23,7 +23,7 @@ import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.service.AuditEventService; +import de.tum.cit.aet.artemis.core.service.AuditEventService; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.ResponseUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java index c0fcc1094cc6..ac9bbc03d02f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java @@ -58,6 +58,7 @@ import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; +import de.tum.cit.aet.artemis.assessment.dto.UserNameAndLoginDTO; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.assessment.service.AssessmentDashboardService; @@ -66,9 +67,22 @@ import de.tum.cit.aet.artemis.assessment.service.GradingScaleService; import de.tum.cit.aet.artemis.athena.service.AthenaModuleService; import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; +import de.tum.cit.aet.artemis.communication.service.ConductAgreementService; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO; +import de.tum.cit.aet.artemis.core.dto.CourseForImportDTO; +import de.tum.cit.aet.artemis.core.dto.CourseManagementDetailViewDTO; +import de.tum.cit.aet.artemis.core.dto.CourseManagementOverviewStatisticsDTO; +import de.tum.cit.aet.artemis.core.dto.CoursesForDashboardDTO; +import de.tum.cit.aet.artemis.core.dto.OnlineCourseDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; +import de.tum.cit.aet.artemis.core.dto.StudentDTO; +import de.tum.cit.aet.artemis.core.dto.UserDTO; +import de.tum.cit.aet.artemis.core.dto.UserPublicInfoDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenAlertException; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @@ -82,6 +96,9 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.CourseService; +import de.tum.cit.aet.artemis.core.service.FilePathService; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; @@ -94,29 +111,12 @@ import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseService; +import de.tum.cit.aet.artemis.exercise.service.SubmissionService; import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; +import de.tum.cit.aet.artemis.lti.service.OnlineCourseConfigurationService; import de.tum.cit.aet.artemis.programming.service.ci.CIUserManagementService; import de.tum.cit.aet.artemis.programming.service.vcs.VcsUserManagementService; -import de.tum.cit.aet.artemis.service.ConductAgreementService; -import de.tum.cit.aet.artemis.service.CourseService; -import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; -import de.tum.cit.aet.artemis.service.SubmissionService; -import de.tum.cit.aet.artemis.service.dto.StudentDTO; -import de.tum.cit.aet.artemis.service.dto.UserDTO; -import de.tum.cit.aet.artemis.service.dto.UserPublicInfoDTO; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupsConfigurationService; -import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO; -import de.tum.cit.aet.artemis.core.dto.CourseForImportDTO; -import de.tum.cit.aet.artemis.core.dto.CourseManagementDetailViewDTO; -import de.tum.cit.aet.artemis.core.dto.CourseManagementOverviewStatisticsDTO; -import de.tum.cit.aet.artemis.core.dto.CoursesForDashboardDTO; -import de.tum.cit.aet.artemis.core.dto.OnlineCourseDTO; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.assessment.dto.UserNameAndLoginDTO; import tech.jhipster.web.util.PaginationUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/DataExportResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/DataExportResource.java index b0b19f6481ab..c754fcdeb9ae 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/DataExportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/DataExportResource.java @@ -25,14 +25,14 @@ import de.tum.cit.aet.artemis.core.domain.DataExport; import de.tum.cit.aet.artemis.core.domain.DataExportState; +import de.tum.cit.aet.artemis.core.dto.DataExportDTO; +import de.tum.cit.aet.artemis.core.dto.RequestDataExportDTO; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.DataExportRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.service.export.DataExportService; -import de.tum.cit.aet.artemis.core.dto.DataExportDTO; -import de.tum.cit.aet.artemis.core.dto.RequestDataExportDTO; /** * REST controller for data exports. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/FeatureToggleResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/FeatureToggleResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/web/admin/FeatureToggleResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/FeatureToggleResource.java index 84a58f7918aa..6634a39ba454 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/FeatureToggleResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/FeatureToggleResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.web.admin; +package de.tum.cit.aet.artemis.core.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/FileResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/FileResource.java index e07aad61dd84..4413ec2f6a8d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/FileResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/FileResource.java @@ -52,6 +52,9 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.FilePathService; +import de.tum.cit.aet.artemis.core.service.FileService; +import de.tum.cit.aet.artemis.core.service.ResourceLoaderService; import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -74,9 +77,6 @@ import de.tum.cit.aet.artemis.quiz.domain.DragItem; import de.tum.cit.aet.artemis.quiz.repository.DragItemRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizQuestionRepository; -import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.ResourceLoaderService; /** * REST controller for managing Files. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/LectureResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/LectureResource.java index 818aaf948bd5..c08141d61697 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/LectureResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/LectureResource.java @@ -31,6 +31,8 @@ import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -49,8 +51,6 @@ import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.service.LectureImportService; import de.tum.cit.aet.artemis.lecture.service.LectureService; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; /** * REST controller for managing Lecture. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/LogResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/LogResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/web/admin/LogResource.java rename to src/main/java/de/tum/cit/aet/artemis/core/web/LogResource.java index 375deea352f6..88cca685fd55 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/LogResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/LogResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.web.admin; +package de.tum.cit.aet.artemis.core.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/StatisticsResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/StatisticsResource.java index f765fb307690..9b9ac9f366e8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/StatisticsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/StatisticsResource.java @@ -15,15 +15,15 @@ import de.tum.cit.aet.artemis.core.domain.GraphType; import de.tum.cit.aet.artemis.core.domain.SpanType; import de.tum.cit.aet.artemis.core.domain.StatisticsView; +import de.tum.cit.aet.artemis.core.dto.CourseManagementStatisticsDTO; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.StatisticsService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.service.StatisticsService; -import de.tum.cit.aet.artemis.core.dto.CourseManagementStatisticsDTO; import de.tum.cit.aet.artemis.exercise.dto.ExerciseManagementStatisticsDTO; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; /** * REST controller for managing statistics. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/TeamWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/core/web/TeamWebsocketService.java index 71055a46560c..db2f0fee2aa2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/TeamWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/TeamWebsocketService.java @@ -12,11 +12,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Controller; +import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.exercise.dto.TeamAssignmentPayload; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/UserResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/UserResource.java index 7ec20b0d880a..7e8adfbd022c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/UserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/UserResource.java @@ -24,14 +24,14 @@ import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.UserDTO; +import de.tum.cit.aet.artemis.core.dto.UserInitializationDTO; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.service.user.UserCreationService; import de.tum.cit.aet.artemis.core.service.user.UserService; import de.tum.cit.aet.artemis.lti.service.LtiService; -import de.tum.cit.aet.artemis.service.dto.UserDTO; -import de.tum.cit.aet.artemis.service.dto.UserInitializationDTO; import tech.jhipster.web.util.PaginationUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java index 156ead184c88..bd1bcc4dea1b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminBuildJobQueueResource.java @@ -20,16 +20,16 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import de.tum.cit.aet.artemis.buildagent.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.buildagent.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.buildagent.dto.BuildJobResultCountDTO; +import de.tum.cit.aet.artemis.buildagent.dto.BuildJobsStatisticsDTO; +import de.tum.cit.aet.artemis.buildagent.dto.FinishedBuildJobDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.FinishedBuildJobPageableSearchDTO; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.programming.domain.BuildJob; +import de.tum.cit.aet.artemis.programming.domain.build.BuildJob; import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; import de.tum.cit.aet.artemis.programming.service.localci.SharedQueueManagementService; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildAgentInformation; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.service.dto.BuildJobResultCountDTO; -import de.tum.cit.aet.artemis.service.dto.BuildJobsStatisticsDTO; -import de.tum.cit.aet.artemis.service.dto.FinishedBuildJobDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.FinishedBuildJobPageableSearchDTO; import tech.jhipster.web.util.PaginationUtil; @Profile(PROFILE_LOCALCI) diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java index d52b8d567150..a75b2e2d4a0a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java @@ -38,11 +38,11 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.core.service.CourseService; +import de.tum.cit.aet.artemis.core.service.FilePathService; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.core.util.HeaderUtil; -import de.tum.cit.aet.artemis.service.CourseService; -import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; +import de.tum.cit.aet.artemis.lti.service.OnlineCourseConfigurationService; /** * REST controller for managing Course. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminDataExportResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminDataExportResource.java index c494cbe512f6..0e1f17de42c1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminDataExportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminDataExportResource.java @@ -9,9 +9,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.core.dto.RequestDataExportDTO; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.core.service.export.DataExportService; -import de.tum.cit.aet.artemis.core.dto.RequestDataExportDTO; /** * REST controller for requesting data exports for another user as admin. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminImprintResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminImprintResource.java index 7af396570e77..1e705926232c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminImprintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminImprintResource.java @@ -14,9 +14,9 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.domain.Language; -import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.service.LegalDocumentService; import de.tum.cit.aet.artemis.core.dto.ImprintDTO; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.core.service.LegalDocumentService; /** * REST controller for editing the imprint as an admin. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminOrganizationResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminOrganizationResource.java index 0afe380fe586..75d3719b9c6e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminOrganizationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminOrganizationResource.java @@ -23,14 +23,14 @@ import de.tum.cit.aet.artemis.core.domain.Organization; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.OrganizationCountDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.OrganizationRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.core.service.OrganizationService; import de.tum.cit.aet.artemis.core.util.HeaderUtil; -import de.tum.cit.aet.artemis.service.OrganizationService; -import de.tum.cit.aet.artemis.core.dto.OrganizationCountDTO; /** * REST controller for administrating the Organization entities diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminPrivacyStatementResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminPrivacyStatementResource.java index c385f699a091..af48dc8f3565 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminPrivacyStatementResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminPrivacyStatementResource.java @@ -14,9 +14,9 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.domain.Language; -import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.service.LegalDocumentService; import de.tum.cit.aet.artemis.core.dto.PrivacyStatementDTO; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.core.service.LegalDocumentService; /** * REST controller for editing the Privacy Statement as an admin. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStatisticsResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStatisticsResource.java index a4c46b7594b5..9c6db4cc7616 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStatisticsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminStatisticsResource.java @@ -17,7 +17,7 @@ import de.tum.cit.aet.artemis.core.domain.SpanType; import de.tum.cit.aet.artemis.core.domain.StatisticsView; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; -import de.tum.cit.aet.artemis.service.StatisticsService; +import de.tum.cit.aet.artemis.core.service.StatisticsService; /** * REST controller for administrating statistics. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java index 059030f886b0..6b403e5602e0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminUserResource.java @@ -31,6 +31,9 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.StudentDTO; +import de.tum.cit.aet.artemis.core.dto.UserDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.UserPageableSearchDTO; import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.EmailAlreadyUsedException; @@ -42,9 +45,6 @@ import de.tum.cit.aet.artemis.core.service.user.UserCreationService; import de.tum.cit.aet.artemis.core.service.user.UserService; import de.tum.cit.aet.artemis.core.util.HeaderUtil; -import de.tum.cit.aet.artemis.service.dto.StudentDTO; -import de.tum.cit.aet.artemis.service.dto.UserDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.UserPageableSearchDTO; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.PaginationUtil; import tech.jhipster.web.util.ResponseUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicAccountResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicAccountResource.java index edf8c4ff2d92..992b340359a1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicAccountResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicAccountResource.java @@ -27,6 +27,7 @@ import de.tum.cit.aet.artemis.communication.service.notifications.MailService; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.UserDTO; import de.tum.cit.aet.artemis.core.dto.vm.KeyAndPasswordVM; import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; @@ -41,7 +42,6 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.core.service.AccountService; import de.tum.cit.aet.artemis.core.service.user.UserService; -import de.tum.cit.aet.artemis.service.dto.UserDTO; /** * REST controller for public endpoints regarding the current user's account. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicImprintResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicImprintResource.java index 9b71df4b361b..070f1e31a48e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicImprintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicImprintResource.java @@ -12,9 +12,9 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.domain.Language; -import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; -import de.tum.cit.aet.artemis.service.LegalDocumentService; import de.tum.cit.aet.artemis.core.dto.ImprintDTO; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.core.service.LegalDocumentService; /** * REST controller for retrieving the imprint. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicPrivacyStatementResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicPrivacyStatementResource.java index 8bd134a708d8..e984a3f42b88 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicPrivacyStatementResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicPrivacyStatementResource.java @@ -12,9 +12,9 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.domain.Language; -import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; -import de.tum.cit.aet.artemis.service.LegalDocumentService; import de.tum.cit.aet.artemis.core.dto.PrivacyStatementDTO; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; +import de.tum.cit.aet.artemis.core.service.LegalDocumentService; /** * REST controller for retrieving the Privacy Statement. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicSystemNotificationResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicSystemNotificationResource.java index 8547320e0c14..027707747dc3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicSystemNotificationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/open/PublicSystemNotificationResource.java @@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.communication.domain.notification.SystemNotification; +import de.tum.cit.aet.artemis.communication.service.SystemNotificationService; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; -import de.tum.cit.aet.artemis.service.SystemNotificationService; /** * REST controller for public system notifications. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamLiveEvent.java b/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamLiveEvent.java index d1266fa24644..0237a1bcd69a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamLiveEvent.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/domain/event/ExamLiveEvent.java @@ -17,8 +17,8 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener; import de.tum.cit.aet.artemis.core.domain.DomainObject; -import de.tum.cit.aet.artemis.exam.service.ExamLiveEventsService; import de.tum.cit.aet.artemis.exam.dto.examevent.ExamLiveEventBaseDTO; +import de.tum.cit.aet.artemis.exam.service.ExamLiveEventsService; /** * Base class for all exam live events. An exam live event indicates that an event or change has occurred during an exam. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamScoresDTO.java b/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamScoresDTO.java index b01ea969358e..c86f520c774a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamScoresDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamScoresDTO.java @@ -24,8 +24,8 @@ public record ExerciseInfo(Long exerciseId, String title, Double maxPoints, Long // Inner DTO @JsonInclude(JsonInclude.Include.NON_EMPTY) public record StudentResult(Long userId, String name, String email, String login, String registrationNumber, Boolean submitted, Double overallPointsAchieved, - Double overallScoreAchieved, String overallGrade, String overallGradeInFirstCorrection, Boolean hasPassed, Double overallPointsAchievedInFirstCorrection, - BonusResultDTO gradeWithBonus, Map exerciseGroupIdToExerciseResult, PlagiarismVerdict mostSeverePlagiarismVerdict) { + Double overallScoreAchieved, String overallGrade, String overallGradeInFirstCorrection, Boolean hasPassed, Double overallPointsAchievedInFirstCorrection, + BonusResultDTO gradeWithBonus, Map exerciseGroupIdToExerciseResult, PlagiarismVerdict mostSeverePlagiarismVerdict) { } // Inner DTO diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamWithIdAndCourseDTO.java b/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamWithIdAndCourseDTO.java index de3f85b768d6..f7737becfd73 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamWithIdAndCourseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/dto/ExamWithIdAndCourseDTO.java @@ -1,6 +1,7 @@ package de.tum.cit.aet.artemis.exam.dto; import com.fasterxml.jackson.annotation.JsonInclude; + import de.tum.cit.aet.artemis.core.dto.CourseWithIdDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/dto/StudentExamWithIdAndExamAndUserDTO.java b/src/main/java/de/tum/cit/aet/artemis/exam/dto/StudentExamWithIdAndExamAndUserDTO.java index 84da7757de9f..d2a8a3070dc8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/dto/StudentExamWithIdAndExamAndUserDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/dto/StudentExamWithIdAndExamAndUserDTO.java @@ -1,6 +1,7 @@ package de.tum.cit.aet.artemis.exam.dto; import com.fasterxml.jackson.annotation.JsonInclude; + import de.tum.cit.aet.artemis.core.dto.UserWithIdAndLoginDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/dto/SuspiciousExamSessionsDTO.java b/src/main/java/de/tum/cit/aet/artemis/exam/dto/SuspiciousExamSessionsDTO.java index ba93eb43d7a3..b9c01b424d8f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/dto/SuspiciousExamSessionsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/dto/SuspiciousExamSessionsDTO.java @@ -3,7 +3,6 @@ import java.util.Set; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.exam.dto.ExamSessionDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record SuspiciousExamSessionsDTO(Set examSessions) { diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamRepository.java b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamRepository.java index 94348a425783..429ce9b91e39 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamRepository.java @@ -23,12 +23,12 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.dto.CourseContentCount; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.core.dto.CourseContentCount; /** * Spring Data JPA repository for the ExamRepository entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDeletionService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDeletionService.java index e0c094a24d40..a8fd46512528 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDeletionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamDeletionService.java @@ -35,9 +35,9 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDeletionService; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; import de.tum.cit.aet.artemis.quiz.domain.QuizPool; import de.tum.cit.aet.artemis.quiz.repository.QuizPoolRepository; -import de.tum.cit.aet.artemis.service.ParticipationService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamLiveEventsService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamLiveEventsService.java index 2d65b0624698..fa48e0c1a09c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamLiveEventsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamLiveEventsService.java @@ -6,6 +6,7 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.exam.domain.Exam; @@ -18,7 +19,6 @@ import de.tum.cit.aet.artemis.exam.repository.ExamLiveEventRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; /** * This service handles outgoing events during exams, so we can inform the client about a change or something that happened. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamRegistrationService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamRegistrationService.java index 5c1e29eff5d0..2f747de288ff 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamRegistrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamRegistrationService.java @@ -31,13 +31,13 @@ import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.domain.StudentExam; +import de.tum.cit.aet.artemis.exam.dto.ExamUserDTO; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; -import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.exam.dto.ExamUserDTO; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; /** * Service Implementation for registering students in the exam. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamService.java index 0fea2363308b..40184805ade5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamService.java @@ -45,6 +45,9 @@ import de.tum.cit.aet.artemis.assessment.domain.GradeStep; import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.BonusExampleDTO; +import de.tum.cit.aet.artemis.assessment.dto.BonusResultDTO; +import de.tum.cit.aet.artemis.assessment.dto.BonusSourceResultDTO; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; @@ -57,6 +60,11 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.DueDateStat; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; +import de.tum.cit.aet.artemis.core.dto.TutorLeaderboardDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @@ -71,6 +79,9 @@ import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.StudentExam; +import de.tum.cit.aet.artemis.exam.dto.ExamChecklistDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamScoresDTO; +import de.tum.cit.aet.artemis.exam.dto.StudentExamWithGradeDTO; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; @@ -104,17 +115,6 @@ import de.tum.cit.aet.artemis.quiz.service.QuizResultService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; -import de.tum.cit.aet.artemis.assessment.dto.BonusExampleDTO; -import de.tum.cit.aet.artemis.assessment.dto.BonusResultDTO; -import de.tum.cit.aet.artemis.assessment.dto.BonusSourceResultDTO; -import de.tum.cit.aet.artemis.core.dto.DueDateStat; -import de.tum.cit.aet.artemis.exam.dto.ExamChecklistDTO; -import de.tum.cit.aet.artemis.exam.dto.ExamScoresDTO; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; -import de.tum.cit.aet.artemis.exam.dto.StudentExamWithGradeDTO; -import de.tum.cit.aet.artemis.core.dto.TutorLeaderboardDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; /** * Service Implementation for managing exams. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSessionService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSessionService.java index 0a17280c3131..0c83ebf31f0b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSessionService.java @@ -18,19 +18,19 @@ import org.springframework.security.web.util.matcher.IpAddressMatcher; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.dto.CourseWithIdDTO; +import de.tum.cit.aet.artemis.core.dto.UserWithIdAndLoginDTO; import de.tum.cit.aet.artemis.exam.domain.ExamSession; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.domain.SuspiciousExamSessions; import de.tum.cit.aet.artemis.exam.domain.SuspiciousSessionReason; import de.tum.cit.aet.artemis.exam.domain.SuspiciousSessionsAnalysisOptions; -import de.tum.cit.aet.artemis.exam.repository.ExamSessionRepository; -import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; -import de.tum.cit.aet.artemis.core.dto.CourseWithIdDTO; import de.tum.cit.aet.artemis.exam.dto.ExamSessionDTO; import de.tum.cit.aet.artemis.exam.dto.ExamWithIdAndCourseDTO; import de.tum.cit.aet.artemis.exam.dto.StudentExamWithIdAndExamAndUserDTO; import de.tum.cit.aet.artemis.exam.dto.SuspiciousExamSessionsDTO; -import de.tum.cit.aet.artemis.core.dto.UserWithIdAndLoginDTO; +import de.tum.cit.aet.artemis.exam.repository.ExamSessionRepository; +import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import inet.ipaddr.IPAddress; import inet.ipaddr.IPAddressString; diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSubmissionService.java index ed6d7e1123d5..7637b53787c6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamSubmissionService.java @@ -22,9 +22,9 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; -import de.tum.cit.aet.artemis.service.ParticipationService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamUserService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamUserService.java index 363969b86982..3d65c678871c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamUserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamUserService.java @@ -25,14 +25,14 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.ImageDTO; import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.FilePathService; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.exam.domain.ExamUser; -import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; -import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.exam.dto.ExamUsersNotFoundDTO; -import de.tum.cit.aet.artemis.core.dto.ImageDTO; +import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; /** * Service Implementation for managing Exam Users. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ImageExtractor.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ImageExtractor.java index b7544ca13551..d1469a476259 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ImageExtractor.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ImageExtractor.java @@ -27,7 +27,6 @@ import de.tum.cit.aet.artemis.core.dto.ImageDTO; import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; -import de.tum.cit.aet.artemis.core.dto.ImageDTO; /** * Processor to extract images from a PDF and get information. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamService.java index 23e2e8c05dcf..73e0ffaa8d8b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamService.java @@ -33,6 +33,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @@ -48,6 +49,9 @@ import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; +import de.tum.cit.aet.artemis.exercise.service.SubmissionService; +import de.tum.cit.aet.artemis.exercise.service.SubmissionVersionService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; @@ -69,10 +73,6 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.quiz.service.QuizPoolService; -import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.SubmissionService; -import de.tum.cit.aet.artemis.service.SubmissionVersionService; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/web/ExamResource.java b/src/main/java/de/tum/cit/aet/artemis/exam/web/ExamResource.java index e1220bee3cf8..6f035a7695bb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/web/ExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/web/ExamResource.java @@ -59,6 +59,11 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.CourseWithIdDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; +import de.tum.cit.aet.artemis.core.dto.StudentDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenAlertException; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @@ -82,6 +87,13 @@ import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.domain.SuspiciousSessionsAnalysisOptions; +import de.tum.cit.aet.artemis.exam.dto.ExamChecklistDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamInformationDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamScoresDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamUserDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamWithIdAndCourseDTO; +import de.tum.cit.aet.artemis.exam.dto.SuspiciousExamSessionsDTO; +import de.tum.cit.aet.artemis.exam.dto.examevent.ExamWideAnnouncementEventDTO; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.service.ExamAccessService; import de.tum.cit.aet.artemis.exam.service.ExamDateService; @@ -95,23 +107,11 @@ import de.tum.cit.aet.artemis.exam.service.StudentExamService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.service.SubmissionService; -import de.tum.cit.aet.artemis.service.dto.StudentDTO; -import de.tum.cit.aet.artemis.core.dto.CourseWithIdDTO; -import de.tum.cit.aet.artemis.exam.dto.ExamChecklistDTO; -import de.tum.cit.aet.artemis.exam.dto.ExamInformationDTO; -import de.tum.cit.aet.artemis.exam.dto.ExamScoresDTO; -import de.tum.cit.aet.artemis.exam.dto.ExamUserDTO; -import de.tum.cit.aet.artemis.exam.dto.ExamWithIdAndCourseDTO; import de.tum.cit.aet.artemis.exercise.dto.ExerciseForPlagiarismCasesOverviewDTO; import de.tum.cit.aet.artemis.exercise.dto.ExerciseGroupWithIdAndExamDTO; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; -import de.tum.cit.aet.artemis.exam.dto.SuspiciousExamSessionsDTO; -import de.tum.cit.aet.artemis.exam.dto.examevent.ExamWideAnnouncementEventDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.exercise.service.SubmissionService; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import io.swagger.annotations.ApiParam; import tech.jhipster.web.util.PaginationUtil; diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/web/ExamUserResource.java b/src/main/java/de/tum/cit/aet/artemis/exam/web/ExamUserResource.java index 671d7c283644..3f481c43c2f0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/web/ExamUserResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/web/ExamUserResource.java @@ -24,15 +24,15 @@ import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.core.service.FilePathService; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.exam.domain.ExamUser; -import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; -import de.tum.cit.aet.artemis.exam.service.ExamAccessService; -import de.tum.cit.aet.artemis.exam.service.ExamUserService; -import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.exam.dto.ExamUserAttendanceCheckDTO; import de.tum.cit.aet.artemis.exam.dto.ExamUserDTO; import de.tum.cit.aet.artemis.exam.dto.ExamUsersNotFoundDTO; +import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; +import de.tum.cit.aet.artemis.exam.service.ExamAccessService; +import de.tum.cit.aet.artemis.exam.service.ExamUserService; /** * REST controller for managing ExamUser. diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/web/StudentExamResource.java b/src/main/java/de/tum/cit/aet/artemis/exam/web/StudentExamResource.java index 73bcf60d09ef..181b6b8205b1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/web/StudentExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/web/StudentExamResource.java @@ -35,6 +35,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.domain.User; @@ -54,6 +55,9 @@ import de.tum.cit.aet.artemis.exam.domain.ExamSession; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.domain.event.ExamLiveEvent; +import de.tum.cit.aet.artemis.exam.dto.StudentExamWithGradeDTO; +import de.tum.cit.aet.artemis.exam.dto.examevent.ExamAttendanceCheckEventDTO; +import de.tum.cit.aet.artemis.exam.dto.examevent.ExamLiveEventBaseDTO; import de.tum.cit.aet.artemis.exam.repository.ExamLiveEventRepository; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; @@ -71,10 +75,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.SubmissionPolicyRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.exam.dto.StudentExamWithGradeDTO; -import de.tum.cit.aet.artemis.exam.dto.examevent.ExamAttendanceCheckEventDTO; -import de.tum.cit.aet.artemis.exam.dto.examevent.ExamLiveEventBaseDTO; /** * REST controller for managing ExerciseGroup. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminExamResource.java b/src/main/java/de/tum/cit/aet/artemis/exam/web/admin/AdminExamResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminExamResource.java rename to src/main/java/de/tum/cit/aet/artemis/exam/web/admin/AdminExamResource.java index 463bb2d184b9..add9135f8c54 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminExamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/web/admin/AdminExamResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.web.admin; +package de.tum.cit.aet.artemis.exam.web.admin; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java index ca4e4111dc81..2c7ae1b53009 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/Exercise.java @@ -59,6 +59,7 @@ import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.DueDateStat; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; @@ -74,7 +75,6 @@ import de.tum.cit.aet.artemis.quiz.config.QuizView; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.text.domain.TextExercise; -import de.tum.cit.aet.artemis.core.dto.DueDateStat; /** * An Exercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseDetailsDTO.java b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseDetailsDTO.java index a95bbd761bd4..eaa46988ebda 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseDetailsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseDetailsDTO.java @@ -6,8 +6,8 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.iris.dto.IrisCombinedSettingsDTO; -import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismCaseInfoDTO; +import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ExerciseDetailsDTO(Exercise exercise, IrisCombinedSettingsDTO irisSettings, PlagiarismCaseInfoDTO plagiarismCaseInfo, Set availableExerciseHints, diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseGroupWithIdAndExamDTO.java b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseGroupWithIdAndExamDTO.java index 69c94228ef63..6a2685c36db0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseGroupWithIdAndExamDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/ExerciseGroupWithIdAndExamDTO.java @@ -1,6 +1,7 @@ package de.tum.cit.aet.artemis.exercise.dto; import com.fasterxml.jackson.annotation.JsonInclude; + import de.tum.cit.aet.artemis.exam.dto.ExamWithIdAndCourseDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionDTO.java b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionDTO.java index 96945613f0c6..8abb58b3bd3a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/SubmissionDTO.java @@ -15,7 +15,7 @@ */ @JsonInclude(JsonInclude.Include.NON_EMPTY) public record SubmissionDTO(Long id, Boolean submitted, SubmissionType type, Boolean exampleSubmission, ZonedDateTime submissionDate, String commitHash, Boolean buildFailed, - Boolean buildArtifact, ParticipationDTO participation, String submissionExerciseType) implements Serializable { + Boolean buildArtifact, ParticipationDTO participation, String submissionExerciseType) implements Serializable { /** * Converts a Submission into a SubmissionDTO. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/TeamSearchUserDTO.java b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/TeamSearchUserDTO.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/TeamSearchUserDTO.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/dto/TeamSearchUserDTO.java index 79ce195e5f17..788f2cc43266 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/TeamSearchUserDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/dto/TeamSearchUserDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto; +package de.tum.cit.aet.artemis.exercise.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseMetricsRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseMetricsRepository.java index 8aa1fd366c62..5e006cb23889 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseMetricsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseMetricsRepository.java @@ -10,13 +10,13 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.atlas.dto.metrics.MapEntryLongLong; +import de.tum.cit.aet.artemis.atlas.dto.metrics.ResourceTimestampDTO; +import de.tum.cit.aet.artemis.atlas.dto.metrics.ScoreDTO; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.dto.ExerciseInformationDTO; -import de.tum.cit.aet.artemis.atlas.dto.metrics.MapEntryLongLong; -import de.tum.cit.aet.artemis.atlas.dto.metrics.ResourceTimestampDTO; -import de.tum.cit.aet.artemis.atlas.dto.metrics.ScoreDTO; /** * Spring Data JPA repository to fetch exercise related metrics. diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java index dc6895c030e6..ff509559e132 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/ExerciseRepository.java @@ -10,7 +10,6 @@ import java.util.Optional; import java.util.Set; -import de.tum.cit.aet.artemis.exam.web.ExamResource; import jakarta.validation.constraints.NotNull; import org.springframework.cache.annotation.Cacheable; @@ -24,6 +23,7 @@ import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.exam.web.ExamResource; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.dto.ExerciseTypeMetricsEntry; diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java index 439091c4bfb1..d88e3bd7bae0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java @@ -29,6 +29,7 @@ import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.FeedbackDetailDTO; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; @@ -40,7 +41,6 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.IdToPresentationScoreSum; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmittedAnswerCount; -import de.tum.cit.aet.artemis.assessment.dto.FeedbackDetailDTO; /** * Spring Data JPA repository for the Participation entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java index 2cd1092813bf..da35f7aac190 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/SubmissionRepository.java @@ -17,6 +17,7 @@ import de.tum.cit.aet.artemis.assessment.dto.dashboard.ExerciseMapEntry; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.DueDateStat; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; @@ -33,7 +34,6 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; -import de.tum.cit.aet.artemis.core.dto.DueDateStat; /** * Spring Data repository for the Submission entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseDeletionService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseDeletionService.java index 5bc8312e9b9d..73f31c2b73a5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseDeletionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseDeletionService.java @@ -36,7 +36,6 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.service.QuizExerciseService; -import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.service.TextExerciseService; diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseService.java index 620357e66bc0..63ee9a79e159 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseService.java @@ -48,6 +48,10 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.CourseManagementOverviewExerciseStatisticsDTO; +import de.tum.cit.aet.artemis.core.dto.DueDateStat; +import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; +import de.tum.cit.aet.artemis.core.dto.TutorLeaderboardDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -68,10 +72,6 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.service.QuizBatchService; -import de.tum.cit.aet.artemis.core.dto.CourseManagementOverviewExerciseStatisticsDTO; -import de.tum.cit.aet.artemis.core.dto.DueDateStat; -import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; -import de.tum.cit.aet.artemis.core.dto.TutorLeaderboardDTO; /** * Service Implementation for managing Exercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseSpecificationService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseSpecificationService.java index be192bffb113..6fcd571f02b4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseSpecificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseSpecificationService.java @@ -14,6 +14,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.Course_; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.Exam_; @@ -26,7 +27,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseService; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseWithSubmissionsExportService.java index a51823f24d14..1ccd03d928fc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseWithSubmissionsExportService.java @@ -24,9 +24,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.core.service.ArchivalReportEntry; +import de.tum.cit.aet.artemis.core.service.FilePathService; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; -import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.exercise.dto.SubmissionExportOptionsDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/LearningMetricsService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/LearningMetricsService.java index 78a2041f0b8d..c939f59367b5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/LearningMetricsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/LearningMetricsService.java @@ -18,14 +18,10 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.atlas.repository.CompetencyMetricsRepository; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseMetricsRepository; -import de.tum.cit.aet.artemis.lecture.repository.LectureUnitMetricsRepository; import de.tum.cit.aet.artemis.atlas.dto.CompetencyJolDTO; import de.tum.cit.aet.artemis.atlas.dto.metrics.CompetencyInformationDTO; import de.tum.cit.aet.artemis.atlas.dto.metrics.CompetencyProgressDTO; import de.tum.cit.aet.artemis.atlas.dto.metrics.CompetencyStudentMetricsDTO; -import de.tum.cit.aet.artemis.exercise.dto.ExerciseInformationDTO; import de.tum.cit.aet.artemis.atlas.dto.metrics.ExerciseStudentMetricsDTO; import de.tum.cit.aet.artemis.atlas.dto.metrics.LectureUnitInformationDTO; import de.tum.cit.aet.artemis.atlas.dto.metrics.LectureUnitStudentMetricsDTO; @@ -33,6 +29,10 @@ import de.tum.cit.aet.artemis.atlas.dto.metrics.ResourceTimestampDTO; import de.tum.cit.aet.artemis.atlas.dto.metrics.ScoreDTO; import de.tum.cit.aet.artemis.atlas.dto.metrics.StudentMetricsDTO; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyMetricsRepository; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseInformationDTO; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseMetricsRepository; +import de.tum.cit.aet.artemis.lecture.repository.LectureUnitMetricsRepository; /** * Service class to access metrics regarding students' learning progress. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ParticipationAuthorizationCheckService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/service/ParticipationAuthorizationCheckService.java index 3acaf4c87e4b..548314637cf4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ParticipationAuthorizationCheckService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.exercise.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ParticipationLifecycleService.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleService.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/service/ParticipationLifecycleService.java index d4c7b8c81f05..7be05c72b66c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ParticipationLifecycleService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.exercise.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -14,7 +14,6 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; -import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.programming.domain.ParticipationLifecycle; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ParticipationService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/service/ParticipationService.java index 0e13ea05feaf..5590e5c810f4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/ParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ParticipationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.exercise.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -29,6 +29,7 @@ import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.exception.VersionControlException; +import de.tum.cit.aet.artemis.core.service.ProfileService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.Submission; @@ -41,18 +42,19 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; -import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; -import de.tum.cit.aet.artemis.programming.domain.BuildPlanType; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.domain.build.BuildPlanType; import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageReportRepository; +import de.tum.cit.aet.artemis.programming.service.BuildLogEntryService; import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.ParticipationVcsAccessTokenService; +import de.tum.cit.aet.artemis.programming.service.UriService; import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.programming.service.localci.SharedQueueManagementService; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionExportService.java index 9ca97f58017d..5c7557b88071 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionExportService.java @@ -28,13 +28,13 @@ import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.service.ArchivalReportEntry; +import de.tum.cit.aet.artemis.core.service.FileService; +import de.tum.cit.aet.artemis.core.service.ZipFileService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.ZipFileService; import de.tum.cit.aet.artemis.exercise.dto.SubmissionExportOptionsDTO; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionService.java index c3f5b5679cc8..fc72035f5f70 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.exercise.service; import static de.tum.cit.aet.artemis.core.config.Constants.MAX_NUMBER_OF_LOCKED_SUBMISSIONS_PER_TUTOR; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -33,6 +33,8 @@ import de.tum.cit.aet.artemis.assessment.service.FeedbackService; import de.tum.cit.aet.artemis.athena.service.AthenaSubmissionSelectionService; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -46,16 +48,13 @@ import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionWithComplaintDTO; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.text.domain.TextSubmission; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.exercise.dto.SubmissionWithComplaintDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionVersionService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionVersionService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/SubmissionVersionService.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionVersionService.java index 98a9d19a60b1..9159b1e2a5e4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SubmissionVersionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionVersionService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.exercise.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/PurgeExistingStrategy.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/PurgeExistingStrategy.java index 1ee4564b1f41..0c782d45e205 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/PurgeExistingStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/PurgeExistingStrategy.java @@ -5,7 +5,7 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; -import de.tum.cit.aet.artemis.service.ParticipationService; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; public class PurgeExistingStrategy extends TeamImportStrategy { diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamService.java index 477180c2b241..027ae3ead69c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/team/TeamService.java @@ -25,13 +25,13 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.dto.TeamImportStrategyType; +import de.tum.cit.aet.artemis.exercise.dto.TeamSearchUserDTO; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; +import de.tum.cit.aet.artemis.exercise.web.TeamResource; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlRepositoryPermission; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; -import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.dto.TeamSearchUserDTO; -import de.tum.cit.aet.artemis.exercise.web.TeamResource; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/web/AbstractSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/AbstractSubmissionResource.java index 2d4a62214d66..337f58213e7b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/web/AbstractSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/AbstractSubmissionResource.java @@ -13,7 +13,7 @@ import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.service.SubmissionService; +import de.tum.cit.aet.artemis.exercise.service.SubmissionService; /** * Abstract class that allows reuse diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/AdminExerciseResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminExerciseResource.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/web/AdminExerciseResource.java index 44f6b853fee5..cc824e67405d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/AdminExerciseResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.web.admin; +package de.tum.cit.aet.artemis.exercise.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ConsistencyCheckResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ConsistencyCheckResource.java index 1449cbe7c774..41aa91486fbf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ConsistencyCheckResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ConsistencyCheckResource.java @@ -18,8 +18,8 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.programming.dto.ConsistencyErrorDTO; import de.tum.cit.aet.artemis.programming.service.ConsistencyCheckService; -import de.tum.cit.aet.artemis.service.dto.ConsistencyErrorDTO; /** * REST controller for consistency checks diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ExerciseResource.java index bb44553db3c0..765d8c5fa385 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ExerciseResource.java @@ -30,6 +30,7 @@ import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.service.TutorParticipationService; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -43,12 +44,15 @@ import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseDetailsDTO; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDeletionService; import de.tum.cit.aet.artemis.exercise.service.ExerciseService; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; import de.tum.cit.aet.artemis.iris.dto.IrisCombinedSettingsDTO; import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismCaseInfoDTO; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismCaseService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; @@ -56,11 +60,7 @@ import de.tum.cit.aet.artemis.programming.service.hestia.ExerciseHintService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.service.QuizBatchService; -import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorParticipationStatus; -import de.tum.cit.aet.artemis.exercise.dto.ExerciseDetailsDTO; -import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; -import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismCaseInfoDTO; /** * REST controller for managing Exercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ExerciseScoresChartResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ExerciseScoresChartResource.java index bb8d6037316b..d58b045d7933 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ExerciseScoresChartResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ExerciseScoresChartResource.java @@ -23,9 +23,9 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseScoresDTO; import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.exercise.service.ExerciseScoresChartService; -import de.tum.cit.aet.artemis.exercise.dto.ExerciseScoresDTO; /** * Controller to provides endpoints to query the necessary data for the exercise-scores-chart.component.ts in the client diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java index aea708e1c992..a9f3d94ae2d2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationResource.java @@ -79,6 +79,8 @@ import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; +import de.tum.cit.aet.artemis.exercise.service.ParticipationAuthorizationCheckService; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; @@ -95,8 +97,6 @@ import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.quiz.service.QuizBatchService; import de.tum.cit.aet.artemis.quiz.service.QuizSubmissionService; -import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.service.TextExerciseFeedbackService; diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationTeamWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationTeamWebsocketService.java index 243202422ef3..ccf10fb60273 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationTeamWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/ParticipationTeamWebsocketService.java @@ -32,25 +32,25 @@ import com.hazelcast.core.HazelcastInstance; +import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionPatch; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionPatchPayload; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionSyncPayload; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.service.ModelingSubmissionService; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.programming.dto.OnlineTeamStudentDTO; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.service.TextSubmissionService; -import de.tum.cit.aet.artemis.programming.dto.OnlineTeamStudentDTO; -import de.tum.cit.aet.artemis.exercise.dto.SubmissionPatch; -import de.tum.cit.aet.artemis.exercise.dto.SubmissionPatchPayload; -import de.tum.cit.aet.artemis.exercise.dto.SubmissionSyncPayload; @Controller @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/web/SubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/SubmissionResource.java index b9e2a903cdde..f29b696fb401 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/web/SubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/SubmissionResource.java @@ -21,6 +21,8 @@ import de.tum.cit.aet.artemis.assessment.service.ResultService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -33,18 +35,16 @@ import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.SubmissionVersion; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionVersionDTO; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionWithComplaintDTO; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionVersionRepository; +import de.tum.cit.aet.artemis.exercise.service.SubmissionService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; -import de.tum.cit.aet.artemis.service.BuildLogEntryService; -import de.tum.cit.aet.artemis.service.SubmissionService; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.exercise.dto.SubmissionVersionDTO; -import de.tum.cit.aet.artemis.exercise.dto.SubmissionWithComplaintDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; +import de.tum.cit.aet.artemis.programming.service.BuildLogEntryService; /** * REST controller for managing Submission. diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/web/TeamResource.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/TeamResource.java index 4f524c27581f..cb748e552a76 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/web/TeamResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/TeamResource.java @@ -49,19 +49,19 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.util.HeaderUtil; +import de.tum.cit.aet.artemis.core.web.TeamWebsocketService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.dto.TeamImportStrategyType; +import de.tum.cit.aet.artemis.exercise.dto.TeamSearchUserDTO; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; +import de.tum.cit.aet.artemis.exercise.service.SubmissionService; import de.tum.cit.aet.artemis.exercise.service.team.TeamService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.SubmissionService; -import de.tum.cit.aet.artemis.service.dto.TeamSearchUserDTO; -import de.tum.cit.aet.artemis.core.web.TeamWebsocketService; /** * REST controller for managing Teams. diff --git a/src/main/java/de/tum/cit/aet/artemis/fileupload/domain/FileUploadSubmission.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/domain/FileUploadSubmission.java index 2c37a5ecbeb1..1cbf69f2d73c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/fileupload/domain/FileUploadSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/domain/FileUploadSubmission.java @@ -11,9 +11,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.cit.aet.artemis.core.service.FilePathService; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.exercise.domain.Submission; -import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.service.FileService; /** * A FileUploadSubmission. diff --git a/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseService.java index 29dbe04709e8..07b81cf57bc8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseService.java @@ -10,12 +10,12 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.core.util.PageUtil; import de.tum.cit.aet.artemis.exercise.service.ExerciseSpecificationService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseWithSubmissionsExportService.java index 913dc381b091..4e28f8fdba35 100644 --- a/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadExerciseWithSubmissionsExportService.java @@ -10,10 +10,10 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.service.ArchivalReportEntry; +import de.tum.cit.aet.artemis.core.service.FileService; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionExportOptionsDTO; import de.tum.cit.aet.artemis.exercise.service.ExerciseWithSubmissionsExportService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.exercise.dto.SubmissionExportOptionsDTO; /** * Service for exporting File Upload Exercises with the student submissions. diff --git a/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionExportService.java index 9cd7611d291e..ca9e3b7501be 100644 --- a/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionExportService.java @@ -14,13 +14,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.service.FileService; +import de.tum.cit.aet.artemis.core.service.ZipFileService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.service.SubmissionExportService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.ZipFileService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionService.java index 2a8337344771..ce3cc4b157d6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionService.java @@ -31,6 +31,8 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.FilePathService; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.Submission; @@ -40,13 +42,11 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; +import de.tum.cit.aet.artemis.exercise.service.SubmissionService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadSubmissionRepository; -import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.SubmissionService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/fileupload/web/FileUploadAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/web/FileUploadAssessmentResource.java index b26582077552..08c8751cb5da 100644 --- a/src/main/java/de/tum/cit/aet/artemis/fileupload/web/FileUploadAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/web/FileUploadAssessmentResource.java @@ -18,9 +18,11 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.service.AssessmentService; +import de.tum.cit.aet.artemis.assessment.web.AssessmentResource; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; @@ -31,13 +33,11 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.exercise.web.AssessmentResource; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.fileupload.dto.FileUploadAssessmentDTO; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadSubmissionRepository; -import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; -import de.tum.cit.aet.artemis.fileupload.dto.FileUploadAssessmentDTO; /** * REST controller for managing FileUploadAssessment. diff --git a/src/main/java/de/tum/cit/aet/artemis/fileupload/web/FileUploadExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/web/FileUploadExerciseResource.java index 78d36b269113..84e361d2b4fe 100644 --- a/src/main/java/de/tum/cit/aet/artemis/fileupload/web/FileUploadExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/web/FileUploadExerciseResource.java @@ -35,6 +35,8 @@ import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -44,11 +46,13 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.CourseService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.core.util.ResponseUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionExportOptionsDTO; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDeletionService; import de.tum.cit.aet.artemis.exercise.service.ExerciseService; @@ -57,10 +61,6 @@ import de.tum.cit.aet.artemis.fileupload.service.FileUploadExerciseImportService; import de.tum.cit.aet.artemis.fileupload.service.FileUploadExerciseService; import de.tum.cit.aet.artemis.fileupload.service.FileUploadSubmissionExportService; -import de.tum.cit.aet.artemis.service.CourseService; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.exercise.dto.SubmissionExportOptionsDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; /** * REST controller for managing FileUploadExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisStatusDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisStatusDTO.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/iris/web/IrisStatusDTO.java rename to src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisStatusDTO.java index 459536fb1b12..056e166d67cf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisStatusDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/dto/IrisStatusDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.iris.web; +package de.tum.cit.aet.artemis.iris.dto; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisDefaultTemplateService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisDefaultTemplateService.java index 489e3dae1fe4..1f55d964a794 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisDefaultTemplateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisDefaultTemplateService.java @@ -14,8 +14,8 @@ import org.springframework.core.io.Resource; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.service.ResourceLoaderService; import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; -import de.tum.cit.aet.artemis.service.ResourceLoaderService; /** * Service that loads default Iris templates from the resources/templates/iris folder. diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisDTOService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisDTOService.java index 0f07d9625b40..931f7c311757 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisDTOService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisDTOService.java @@ -15,6 +15,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.service.ProfileService; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisBuildLogEntryDTO; import de.tum.cit.aet.artemis.iris.service.pyris.dto.data.PyrisFeedbackDTO; @@ -28,7 +29,6 @@ import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.RepositoryService; -import de.tum.cit.aet.artemis.service.ProfileService; @Service @Profile("iris") diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisPipelineService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisPipelineService.java index 232c455c1b46..f25479058f61 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisPipelineService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisPipelineService.java @@ -9,7 +9,6 @@ import java.util.function.Consumer; import java.util.function.Function; -import de.tum.cit.aet.artemis.atlas.dto.CompetencyJolDTO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -17,6 +16,7 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyJol; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyJolDTO; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisWebhookService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisWebhookService.java index 31018290664d..1c5c9fe6bcca 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisWebhookService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisWebhookService.java @@ -15,6 +15,7 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.service.FilePathService; import de.tum.cit.aet.artemis.iris.domain.settings.IrisCourseSettings; import de.tum.cit.aet.artemis.iris.exception.IrisInternalPyrisErrorException; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; @@ -24,7 +25,6 @@ import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; import de.tum.cit.aet.artemis.lecture.domain.AttachmentType; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; -import de.tum.cit.aet.artemis.service.FilePathService; @Service @Profile("iris") diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java index 5e5d450645fb..a27dba39442c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/dto/chat/course/PyrisCourseChatPipelineExecutionDTO.java @@ -14,5 +14,5 @@ @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisCourseChatPipelineExecutionDTO(PyrisExtendedCourseDTO course, StudentMetricsDTO metrics, CompetencyJolDTO competencyJol, List chatHistory, - PyrisUserDTO user, PyrisPipelineExecutionSettingsDTO settings, List initialStages) { + PyrisUserDTO user, PyrisPipelineExecutionSettingsDTO settings, List initialStages) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/websocket/IrisWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/websocket/IrisWebsocketService.java index 16af32c5d504..6c401c1eb8a3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/websocket/IrisWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/websocket/IrisWebsocketService.java @@ -7,7 +7,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; /** * A service to send a message over the websocket to a specific user diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/iris/AdminIrisSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/AdminIrisSettingsResource.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/core/web/admin/iris/AdminIrisSettingsResource.java rename to src/main/java/de/tum/cit/aet/artemis/iris/web/AdminIrisSettingsResource.java index 312d3215d11f..e688774349c6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/iris/AdminIrisSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/AdminIrisSettingsResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.web.admin.iris; +package de.tum.cit.aet.artemis.iris.web; import org.springframework.context.annotation.Profile; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisResource.java index e5c4a1d2769a..17df925c4b1c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisResource.java @@ -9,6 +9,7 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.iris.dto.IrisStatusDTO; import de.tum.cit.aet.artemis.iris.service.IrisRateLimitService; import de.tum.cit.aet.artemis.iris.service.pyris.PyrisHealthIndicator; diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureRepository.java index ab6cd6c7b0f0..7ab7df9d479d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureRepository.java @@ -16,9 +16,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.core.dto.CourseContentCount; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.lecture.domain.Lecture; -import de.tum.cit.aet.artemis.core.dto.CourseContentCount; /** * Spring Data repository for the Lecture entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitMetricsRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitMetricsRepository.java index cada75fd7448..d6394154376c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitMetricsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitMetricsRepository.java @@ -9,9 +9,9 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import de.tum.cit.aet.artemis.atlas.dto.metrics.LectureUnitInformationDTO; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; -import de.tum.cit.aet.artemis.atlas.dto.metrics.LectureUnitInformationDTO; /** * Spring Data JPA repository to fetch lecture unit related metrics. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java b/src/main/java/de/tum/cit/aet/artemis/lecture/service/AttachmentUnitService.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/service/AttachmentUnitService.java index ef9072f281c5..44a5811c6020 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/AttachmentUnitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/service/AttachmentUnitService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.lecture.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -18,6 +18,8 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.service.FilePathService; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; import de.tum.cit.aet.artemis.iris.service.pyris.PyrisWebhookService; import de.tum.cit.aet.artemis.lecture.domain.Attachment; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LearningObjectService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/service/LearningObjectService.java index 3518136f25c7..f8df30522158 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/LearningObjectService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LearningObjectService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.lecture.service; import static de.tum.cit.aet.artemis.core.config.Constants.MIN_SCORE_GREEN; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -14,6 +14,7 @@ import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreService; import de.tum.cit.aet.artemis.atlas.domain.LearningObject; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationObjectDTO.LearningObjectType; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; @@ -22,7 +23,6 @@ import de.tum.cit.aet.artemis.lecture.domain.LectureUnitCompletion; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; -import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationObjectDTO.LearningObjectType; /** * Service implementation for interactions with learning objects. diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureImportService.java b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureImportService.java index 2412bdceb441..5eca29ad0bc1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureImportService.java @@ -17,6 +17,8 @@ import org.springframework.transaction.annotation.Transactional; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.service.FilePathService; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; import de.tum.cit.aet.artemis.iris.service.pyris.PyrisWebhookService; import de.tum.cit.aet.artemis.lecture.domain.Attachment; @@ -30,9 +32,6 @@ import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; -import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.SlideSplitterService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureService.java b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureService.java index 320f57bfbba7..e310bb6c4e5b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureService.java @@ -19,6 +19,8 @@ import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.util.PageUtil; import de.tum.cit.aet.artemis.iris.service.pyris.PyrisWebhookService; @@ -28,8 +30,6 @@ import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitProcessingService.java index 2a36c33d09d2..0cca1005ce23 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitProcessingService.java @@ -29,17 +29,15 @@ import org.springframework.web.multipart.MultipartFile; import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; +import de.tum.cit.aet.artemis.core.service.FilePathService; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.lecture.domain.AttachmentType; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.Lecture; -import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; -import de.tum.cit.aet.artemis.service.AttachmentUnitService; -import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.SlideSplitterService; import de.tum.cit.aet.artemis.lecture.dto.LectureUnitInformationDTO; import de.tum.cit.aet.artemis.lecture.dto.LectureUnitSplitDTO; +import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitService.java b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitService.java index 648519862e5d..fd371f07c9e4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitService.java @@ -25,6 +25,8 @@ import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.FilePathService; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.iris.service.pyris.PyrisWebhookService; @@ -38,8 +40,6 @@ import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.SlideRepository; -import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.service.FileService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/SlideSplitterService.java b/src/main/java/de/tum/cit/aet/artemis/lecture/service/SlideSplitterService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/SlideSplitterService.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/service/SlideSplitterService.java index a96a46658af4..2801cab5c02f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/SlideSplitterService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/service/SlideSplitterService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.lecture.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -24,6 +24,8 @@ import org.springframework.web.multipart.MultipartFile; import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; +import de.tum.cit.aet.artemis.core.service.FilePathService; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.Slide; import de.tum.cit.aet.artemis.lecture.repository.SlideRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/AttachmentResource.java b/src/main/java/de/tum/cit/aet/artemis/lecture/web/AttachmentResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/web/AttachmentResource.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/web/AttachmentResource.java index 7b017d468f75..3b5e44b6ac2f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/AttachmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/web/AttachmentResource.java @@ -1,7 +1,7 @@ -package de.tum.cit.aet.artemis.core.web; +package de.tum.cit.aet.artemis.lecture.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.service.FilePathService.actualPathForPublicPath; +import static de.tum.cit.aet.artemis.core.service.FilePathService.actualPathForPublicPath; import java.net.URI; import java.net.URISyntaxException; @@ -35,12 +35,12 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.FilePathService; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.lecture.domain.AttachmentType; import de.tum.cit.aet.artemis.lecture.repository.AttachmentRepository; -import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.service.FileService; import tech.jhipster.web.util.ResponseUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/web/AttachmentUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/lecture/web/AttachmentUnitResource.java index c64a6f9441db..7bb80fbab4be 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/web/AttachmentUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/web/AttachmentUnitResource.java @@ -37,16 +37,16 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.Lecture; +import de.tum.cit.aet.artemis.lecture.dto.LectureUnitInformationDTO; import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; +import de.tum.cit.aet.artemis.lecture.service.AttachmentUnitService; import de.tum.cit.aet.artemis.lecture.service.LectureUnitProcessingService; -import de.tum.cit.aet.artemis.service.AttachmentUnitService; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.SlideSplitterService; -import de.tum.cit.aet.artemis.lecture.dto.LectureUnitInformationDTO; +import de.tum.cit.aet.artemis.lecture.service.SlideSplitterService; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/web/LectureUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/lecture/web/LectureUnitResource.java index 455fd0bbe396..b14667346674 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/web/LectureUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/web/LectureUnitResource.java @@ -36,10 +36,10 @@ import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; +import de.tum.cit.aet.artemis.lecture.dto.LectureUnitForLearningPathNodeDetailsDTO; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; -import de.tum.cit.aet.artemis.lecture.dto.LectureUnitForLearningPathNodeDetailsDTO; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/web/OnlineUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/lecture/web/OnlineUnitResource.java index 1744f3343d2e..473d0201c294 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/web/OnlineUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/web/OnlineUnitResource.java @@ -29,6 +29,7 @@ import com.google.common.net.InternetDomainName; import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.core.dto.OnlineResourceDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import de.tum.cit.aet.artemis.core.security.Role; @@ -39,7 +40,6 @@ import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.OnlineUnitRepository; import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; -import de.tum.cit.aet.artemis.core.dto.OnlineResourceDTO; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/config/CustomLti13Configurer.java b/src/main/java/de/tum/cit/aet/artemis/lti/config/CustomLti13Configurer.java index 8b10bf04750c..30456f545dd7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/config/CustomLti13Configurer.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/config/CustomLti13Configurer.java @@ -7,10 +7,10 @@ import org.springframework.security.web.authentication.logout.LogoutFilter; import org.springframework.stereotype.Component; +import de.tum.cit.aet.artemis.core.security.filter.Lti13LaunchFilter; import de.tum.cit.aet.artemis.core.security.jwt.JWTFilter; -import de.tum.cit.aet.artemis.core.web.filter.Lti13LaunchFilter; import de.tum.cit.aet.artemis.lti.service.Lti13Service; -import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; +import de.tum.cit.aet.artemis.lti.service.OnlineCourseConfigurationService; import uk.ac.ox.ctl.lti13.Lti13Configurer; import uk.ac.ox.ctl.lti13.security.oauth2.client.lti.authentication.OidcLaunchFlowAuthenticationProvider; import uk.ac.ox.ctl.lti13.security.oauth2.client.lti.web.HttpSessionOAuth2AuthorizationRequestRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/service/Lti13Service.java b/src/main/java/de/tum/cit/aet/artemis/lti/service/Lti13Service.java index db6b6bf3991f..7d3c06dee2db 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/service/Lti13Service.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/service/Lti13Service.java @@ -53,7 +53,6 @@ import de.tum.cit.aet.artemis.lti.dto.Scopes; import de.tum.cit.aet.artemis.lti.repository.Lti13ResourceLaunchRepository; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; -import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; @Service @Profile("lti") diff --git a/src/main/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationService.java b/src/main/java/de/tum/cit/aet/artemis/lti/service/OnlineCourseConfigurationService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationService.java rename to src/main/java/de/tum/cit/aet/artemis/lti/service/OnlineCourseConfigurationService.java index b3d36ccd0010..2677b865201e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/service/OnlineCourseConfigurationService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.lti.service; import static de.tum.cit.aet.artemis.core.config.Constants.LOGIN_REGEX; import static de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration.ENTITY_NAME; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java b/src/main/java/de/tum/cit/aet/artemis/lti/web/AdminLtiConfigurationResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java rename to src/main/java/de/tum/cit/aet/artemis/lti/web/AdminLtiConfigurationResource.java index 2f8b5e988236..965d323560a3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminLtiConfigurationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/web/AdminLtiConfigurationResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.web.admin; +package de.tum.cit.aet.artemis.lti.web; import java.util.UUID; diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/web/LtiResource.java b/src/main/java/de/tum/cit/aet/artemis/lti/web/LtiResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/atlas/web/LtiResource.java rename to src/main/java/de/tum/cit/aet/artemis/lti/web/LtiResource.java index 60a141081c77..43fe4cfbec74 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/web/LtiResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/web/LtiResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.atlas.web; +package de.tum.cit.aet.artemis.lti.web; import java.text.ParseException; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseService.java index db555a7595a7..558b975bafe6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseService.java @@ -11,6 +11,8 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.core.util.PageUtil; import de.tum.cit.aet.artemis.exercise.service.ExerciseSpecificationService; @@ -19,8 +21,6 @@ import de.tum.cit.aet.artemis.modeling.repository.ModelClusterRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelElementRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseWithSubmissionsExportService.java index 52873e68fb92..586f6eaa383d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseWithSubmissionsExportService.java @@ -10,10 +10,10 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.service.ArchivalReportEntry; +import de.tum.cit.aet.artemis.core.service.FileService; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionExportOptionsDTO; import de.tum.cit.aet.artemis.exercise.service.ExerciseWithSubmissionsExportService; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.exercise.dto.SubmissionExportOptionsDTO; /** * Service for exporting Modeling Exercises with the student submissions. diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionExportService.java index 6e095a637c99..3daced54e48b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionExportService.java @@ -11,13 +11,13 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.service.FileService; +import de.tum.cit.aet.artemis.core.service.ZipFileService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.service.SubmissionExportService; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.ZipFileService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java index 694e73d837ab..cfba2463185b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java @@ -37,15 +37,15 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; +import de.tum.cit.aet.artemis.exercise.service.SubmissionService; +import de.tum.cit.aet.artemis.exercise.service.SubmissionVersionService; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.domain.SimilarElementCount; import de.tum.cit.aet.artemis.modeling.repository.ModelElementRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; import de.tum.cit.aet.artemis.modeling.service.compass.CompassService; -import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.SubmissionService; -import de.tum.cit.aet.artemis.service.SubmissionVersionService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminModelingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/modeling/web/AdminModelingExerciseResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminModelingExerciseResource.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/web/AdminModelingExerciseResource.java index abeb50c89b39..25c4c6a83df8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminModelingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/web/AdminModelingExerciseResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.web.admin; +package de.tum.cit.aet.artemis.modeling.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/text/web/ApollonConversionResource.java b/src/main/java/de/tum/cit/aet/artemis/modeling/web/ApollonConversionResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/text/web/ApollonConversionResource.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/web/ApollonConversionResource.java index ebb13152ec6c..7580f2206221 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/web/ApollonConversionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/web/ApollonConversionResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.text.web; +package de.tum.cit.aet.artemis.modeling.web; import java.io.InputStream; diff --git a/src/main/java/de/tum/cit/aet/artemis/text/web/ApollonDiagramResource.java b/src/main/java/de/tum/cit/aet/artemis/modeling/web/ApollonDiagramResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/text/web/ApollonDiagramResource.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/web/ApollonDiagramResource.java index 55fa957b8efc..e1d38a996e49 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/web/ApollonDiagramResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/web/ApollonDiagramResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.text.web; +package de.tum.cit.aet.artemis.modeling.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/web/ModelingAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/modeling/web/ModelingAssessmentResource.java index ea38baddf824..721dc7c91d7c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/web/ModelingAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/web/ModelingAssessmentResource.java @@ -22,9 +22,11 @@ import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.service.AssessmentService; +import de.tum.cit.aet.artemis.assessment.web.AssessmentResource; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ErrorConstants; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -36,13 +38,11 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.exercise.web.AssessmentResource; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.modeling.dto.ModelingAssessmentDTO; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; -import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; -import de.tum.cit.aet.artemis.modeling.dto.ModelingAssessmentDTO; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/web/ModelingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/modeling/web/ModelingExerciseResource.java index f01edb7ade51..da9195b214d5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/web/ModelingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/web/ModelingExerciseResource.java @@ -36,6 +36,8 @@ import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.ConflictException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -45,12 +47,14 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.CourseService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.core.util.ResponseUtil; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionExportOptionsDTO; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDeletionService; import de.tum.cit.aet.artemis.exercise.service.ExerciseService; @@ -60,14 +64,10 @@ import de.tum.cit.aet.artemis.modeling.service.ModelingExerciseImportService; import de.tum.cit.aet.artemis.modeling.service.ModelingExerciseService; import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingPlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismResultDTO; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismDetectionConfigHelper; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismDetectionService; -import de.tum.cit.aet.artemis.service.CourseService; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.exercise.dto.SubmissionExportOptionsDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismResultDTO; /** * REST controller for managing ModelingExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/dto/PlagiarismResultDTO.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/dto/PlagiarismResultDTO.java index 8e35923e11c1..6b4bff5abcef 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/dto/PlagiarismResultDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/dto/PlagiarismResultDTO.java @@ -4,7 +4,6 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmissionElement; -import de.tum.cit.aet.artemis.plagiarism.web.PlagiarismResultStats; /** * Transfers information about plagiarism checks result and its statistics diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismResultStats.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/dto/PlagiarismResultStats.java similarity index 91% rename from src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismResultStats.java rename to src/main/java/de/tum/cit/aet/artemis/plagiarism/dto/PlagiarismResultStats.java index e592bc074882..d0aa9be7e364 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismResultStats.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/dto/PlagiarismResultStats.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.plagiarism.web; +package de.tum.cit.aet.artemis.plagiarism.dto; /** * Stores statistics about particular plagiarism checks result. diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismAnswerPostService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismAnswerPostService.java index 68b5c808d3da..0c3ff1beb754 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismAnswerPostService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismAnswerPostService.java @@ -10,10 +10,13 @@ import de.tum.cit.aet.artemis.communication.domain.AnswerPost; import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; +import de.tum.cit.aet.artemis.communication.dto.PostDTO; import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.communication.service.PostingService; +import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; @@ -24,9 +27,6 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; -import de.tum.cit.aet.artemis.communication.dto.PostDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismCaseService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismCaseService.java index 1994c4cc658f..91f50198855a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismCaseService.java @@ -20,11 +20,11 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmission; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismCaseInfoDTO; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismVerdictDTO; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismSubmissionRepository; -import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismCaseInfoDTO; -import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismVerdictDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismPostService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismPostService.java index d1d6ae88a379..fc5bda5882c3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismPostService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismPostService.java @@ -11,9 +11,13 @@ import de.tum.cit.aet.artemis.communication.domain.DisplayPriority; import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; +import de.tum.cit.aet.artemis.communication.dto.PostContextFilterDTO; +import de.tum.cit.aet.artemis.communication.dto.PostDTO; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.communication.service.PostingService; +import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; @@ -26,10 +30,6 @@ import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.communication.dto.PostContextFilterDTO; -import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; -import de.tum.cit.aet.artemis.communication.dto.PostDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismWebsocketService.java index d3de78038c53..7cc3f6590fdd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/PlagiarismWebsocketService.java @@ -14,8 +14,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCheckState; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ProgrammingPlagiarismDetectionService.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ProgrammingPlagiarismDetectionService.java index d4f1c51f5171..a3c2cec8e9df 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ProgrammingPlagiarismDetectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/service/ProgrammingPlagiarismDetectionService.java @@ -39,6 +39,7 @@ import de.jplag.swift.SwiftLanguage; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.GitException; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCheckState; @@ -51,9 +52,8 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseExportService; +import de.tum.cit.aet.artemis.programming.service.UriService; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseGitDiffReportService; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.UriService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismCaseResource.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismCaseResource.java index a5b35ed0f0c1..a91580b0d3c8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismCaseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismCaseResource.java @@ -32,10 +32,10 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismDetectionConfig; -import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; -import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismCaseService; import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismCaseInfoDTO; import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismVerdictDTO; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; +import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismCaseService; /** * REST controller for managing Plagiarism Cases. diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismPostResource.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismPostResource.java index c58acc6cb45b..a1a6d6adb4a3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismPostResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismPostResource.java @@ -28,13 +28,13 @@ import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.dto.PostContextFilterDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismPostService; -import de.tum.cit.aet.artemis.communication.dto.PostContextFilterDTO; import tech.jhipster.web.util.PaginationUtil; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismResource.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismResource.java index 49182530bb50..a879224a1a55 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismResource.java @@ -32,10 +32,10 @@ import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismComparisonStatusDTO; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismService; -import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismComparisonStatusDTO; /** * REST controller for managing Plagiarism Cases. diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismResultResponseBuilder.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismResultResponseBuilder.java index d5676793467d..3d482e50138e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismResultResponseBuilder.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/web/PlagiarismResultResponseBuilder.java @@ -12,6 +12,7 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmissionElement; import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismResultDTO; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismResultStats; /** * A class containing a shared logic for creating an HTTP response about plagiarism checks results diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildRunState.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildRunState.java deleted file mode 100644 index 3b9c29dd4015..000000000000 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildRunState.java +++ /dev/null @@ -1,5 +0,0 @@ -package de.tum.cit.aet.artemis.programming.domain; - -public enum BuildRunState { - RUNNING, COMPLETED -} diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java index 7e0680126916..df7911670a22 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingExercise.java @@ -48,6 +48,7 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; +import de.tum.cit.aet.artemis.programming.domain.build.BuildPlanType; import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingSubmission.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingSubmission.java index 02fa279b0031..4133faced311 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingSubmission.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/ProgrammingSubmission.java @@ -22,6 +22,7 @@ import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; /** * A ProgrammingSubmission. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildJob.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/build/BuildJob.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildJob.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/build/BuildJob.java index 59516c3606ae..53f3b75305f2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildJob.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/build/BuildJob.java @@ -1,7 +1,8 @@ -package de.tum.cit.aet.artemis.programming.domain; +package de.tum.cit.aet.artemis.programming.domain.build; import java.time.ZonedDateTime; +import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; @@ -15,7 +16,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.domain.DomainObject; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.buildagent.dto.BuildJobQueueItem; @Entity @Table(name = "build_job") diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildLogEntry.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/build/BuildLogEntry.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildLogEntry.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/build/BuildLogEntry.java index 84c5f2c72901..02a3b0f8721f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildLogEntry.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/build/BuildLogEntry.java @@ -1,7 +1,8 @@ -package de.tum.cit.aet.artemis.programming.domain; +package de.tum.cit.aet.artemis.programming.domain.build; import java.time.ZonedDateTime; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.ManyToOne; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildLogStatisticsEntry.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/build/BuildLogStatisticsEntry.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildLogStatisticsEntry.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/build/BuildLogStatisticsEntry.java index c342fd374510..fe33ce0af59b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildLogStatisticsEntry.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/build/BuildLogStatisticsEntry.java @@ -1,8 +1,9 @@ -package de.tum.cit.aet.artemis.programming.domain; +package de.tum.cit.aet.artemis.programming.domain.build; import java.time.ZonedDateTime; import java.time.temporal.ChronoUnit; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import jakarta.annotation.Nullable; import jakarta.persistence.Entity; import jakarta.persistence.OneToOne; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildPlan.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/build/BuildPlan.java similarity index 93% rename from src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildPlan.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/build/BuildPlan.java index 873101a389dd..7d155cc98359 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildPlan.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/build/BuildPlan.java @@ -1,10 +1,11 @@ -package de.tum.cit.aet.artemis.programming.domain; +package de.tum.cit.aet.artemis.programming.domain.build; import java.util.HashSet; import java.util.Objects; import java.util.Optional; import java.util.Set; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import jakarta.annotation.Nullable; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildPlanType.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/build/BuildPlanType.java similarity index 80% rename from src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildPlanType.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/build/BuildPlanType.java index 639a39a375a8..aa3a1163fbb2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildPlanType.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/build/BuildPlanType.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.domain; +package de.tum.cit.aet.artemis.programming.domain.build; public enum BuildPlanType { diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/build/BuildRunState.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/build/BuildRunState.java new file mode 100644 index 000000000000..82c1142ec630 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/build/BuildRunState.java @@ -0,0 +1,5 @@ +package de.tum.cit.aet.artemis.programming.domain.build; + +public enum BuildRunState { + RUNNING, COMPLETED +} diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildStatus.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/build/BuildStatus.java similarity index 79% rename from src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildStatus.java rename to src/main/java/de/tum/cit/aet/artemis/programming/domain/build/BuildStatus.java index a8d3e47c40fc..0b03f877c4f9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/BuildStatus.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/build/BuildStatus.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.domain; +package de.tum.cit.aet.artemis.programming.domain.build; /** * SUCCESSFUL: the build was successful diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/AbstractBuildResultNotificationDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/dto/AbstractBuildResultNotificationDTO.java similarity index 94% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/AbstractBuildResultNotificationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/programming/dto/AbstractBuildResultNotificationDTO.java index 78e521900d3d..9435fdf8e463 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/AbstractBuildResultNotificationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/dto/AbstractBuildResultNotificationDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto; +package de.tum.cit.aet.artemis.programming.dto; import java.time.ZonedDateTime; import java.util.List; @@ -10,11 +10,12 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; -import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestwiseCoverageReportDTO; @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) +// TODO: convert subclasses to records public abstract class AbstractBuildResultNotificationDTO { public abstract ZonedDateTime getBuildRunDate(); diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/BuildJobDTOInterface.java b/src/main/java/de/tum/cit/aet/artemis/programming/dto/BuildJobDTOInterface.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/BuildJobDTOInterface.java rename to src/main/java/de/tum/cit/aet/artemis/programming/dto/BuildJobDTOInterface.java index 9164c088bb02..3d838ca6233b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/BuildJobDTOInterface.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/dto/BuildJobDTOInterface.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto; +package de.tum.cit.aet.artemis.programming.dto; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/dto/CheckoutDirectoriesDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/dto/CheckoutDirectoriesDTO.java index 7e4548c2e6a4..97a5c8b69892 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/dto/CheckoutDirectoriesDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/dto/CheckoutDirectoriesDTO.java @@ -1,7 +1,6 @@ package de.tum.cit.aet.artemis.programming.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.programming.dto.BuildPlanCheckoutDirectoriesDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record CheckoutDirectoriesDTO(BuildPlanCheckoutDirectoriesDTO submissionBuildPlanCheckoutDirectories, BuildPlanCheckoutDirectoriesDTO solutionBuildPlanCheckoutDirectories) { diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/ConsistencyErrorDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/dto/ConsistencyErrorDTO.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/ConsistencyErrorDTO.java rename to src/main/java/de/tum/cit/aet/artemis/programming/dto/ConsistencyErrorDTO.java index 0ad73d0713ad..d200a62e3422 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/ConsistencyErrorDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/dto/ConsistencyErrorDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto; +package de.tum.cit.aet.artemis.programming.dto; import java.util.Objects; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/CoverageReportAndSubmissionDateDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/dto/CoverageReportAndSubmissionDateDTO.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/CoverageReportAndSubmissionDateDTO.java rename to src/main/java/de/tum/cit/aet/artemis/programming/dto/CoverageReportAndSubmissionDateDTO.java index a152dd33d8f9..a5ddfd8550d6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/CoverageReportAndSubmissionDateDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/dto/CoverageReportAndSubmissionDateDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto; +package de.tum.cit.aet.artemis.programming.dto; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/ProgrammingSubmissionIdAndSubmissionDateDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/dto/ProgrammingSubmissionIdAndSubmissionDateDTO.java similarity index 84% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/ProgrammingSubmissionIdAndSubmissionDateDTO.java rename to src/main/java/de/tum/cit/aet/artemis/programming/dto/ProgrammingSubmissionIdAndSubmissionDateDTO.java index 519cb32f2471..835ce39d1185 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/ProgrammingSubmissionIdAndSubmissionDateDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/dto/ProgrammingSubmissionIdAndSubmissionDateDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto; +package de.tum.cit.aet.artemis.programming.dto; import java.time.ZonedDateTime; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/dto/ResultDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/dto/ResultDTO.java index 4051a457e18f..cfab7c3a3840 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/dto/ResultDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/dto/ResultDTO.java @@ -4,8 +4,6 @@ import java.time.ZonedDateTime; import java.util.List; -import de.tum.cit.aet.artemis.exercise.dto.ParticipationDTO; -import de.tum.cit.aet.artemis.exercise.dto.SubmissionDTO; import org.hibernate.Hibernate; import com.fasterxml.jackson.annotation.JsonInclude; @@ -15,6 +13,8 @@ import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.domain.Visibility; +import de.tum.cit.aet.artemis.exercise.dto.ParticipationDTO; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionDTO; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; /** @@ -25,8 +25,8 @@ // this would also simplify the logic in result.component.ts and and result.service.ts and make the experience more consistent among different clients (webapp, ios, android) @JsonInclude(JsonInclude.Include.NON_EMPTY) public record ResultDTO(Long id, ZonedDateTime completionDate, Boolean successful, Double score, Boolean rated, SubmissionDTO submission, ParticipationDTO participation, - List feedbacks, AssessmentType assessmentType, Boolean hasComplaint, Boolean exampleResult, Integer testCaseCount, Integer passedTestCaseCount, - Integer codeIssueCount) implements Serializable { + List feedbacks, AssessmentType assessmentType, Boolean hasComplaint, Boolean exampleResult, Integer testCaseCount, Integer passedTestCaseCount, + Integer codeIssueCount) implements Serializable { @JsonInclude(JsonInclude.Include.NON_EMPTY) public record FeedbackDTO(Long id, String text, String detailText, boolean hasLongFeedbackText, String reference, Double credits, Boolean positive, FeedbackType type, diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/StaticCodeAnalysisIssue.java b/src/main/java/de/tum/cit/aet/artemis/programming/dto/StaticCodeAnalysisIssue.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/StaticCodeAnalysisIssue.java rename to src/main/java/de/tum/cit/aet/artemis/programming/dto/StaticCodeAnalysisIssue.java index 5b124e64dab7..8b471c9c6a9e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/StaticCodeAnalysisIssue.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/dto/StaticCodeAnalysisIssue.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto; +package de.tum.cit.aet.artemis.programming.dto; import java.io.Serializable; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/StaticCodeAnalysisReportDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/dto/StaticCodeAnalysisReportDTO.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/StaticCodeAnalysisReportDTO.java rename to src/main/java/de/tum/cit/aet/artemis/programming/dto/StaticCodeAnalysisReportDTO.java index e78bb5f61231..f7366c6bd5f5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/StaticCodeAnalysisReportDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/dto/StaticCodeAnalysisReportDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto; +package de.tum.cit.aet.artemis.programming.dto; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/TestCaseBaseDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/dto/TestCaseBaseDTO.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/service/dto/TestCaseBaseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/programming/dto/TestCaseBaseDTO.java index 613f9a12c8e4..267caa9256db 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/TestCaseBaseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/dto/TestCaseBaseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service.dto; +package de.tum.cit.aet.artemis.programming.dto; import java.util.List; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java index 6ced332f4de2..0545d26e670d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java @@ -20,12 +20,12 @@ import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.buildagent.dto.BuildJobResultCountDTO; +import de.tum.cit.aet.artemis.buildagent.dto.DockerImageBuild; +import de.tum.cit.aet.artemis.buildagent.dto.ResultBuildJob; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.programming.domain.BuildJob; -import de.tum.cit.aet.artemis.programming.domain.BuildStatus; -import de.tum.cit.aet.artemis.programming.service.localci.dto.DockerImageBuild; -import de.tum.cit.aet.artemis.programming.service.localci.dto.ResultBuildJob; -import de.tum.cit.aet.artemis.service.dto.BuildJobResultCountDTO; +import de.tum.cit.aet.artemis.programming.domain.build.BuildJob; +import de.tum.cit.aet.artemis.programming.domain.build.BuildStatus; @Profile(PROFILE_CORE) @Repository diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogEntryRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogEntryRepository.java index a7d1b07c535b..1757ab924230 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogEntryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogEntryRepository.java @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; /** * Spring Data JPA repository for the BuildLogEntry entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogStatisticsEntryRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogStatisticsEntryRepository.java index 6fcbe5bcb0bd..b653d693bbf2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogStatisticsEntryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogStatisticsEntryRepository.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.programming.repository; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.programming.domain.BuildLogStatisticsEntry.BuildJobPartDuration; +import static de.tum.cit.aet.artemis.programming.domain.build.BuildLogStatisticsEntry.BuildJobPartDuration; import org.springframework.context.annotation.Profile; import org.springframework.data.jpa.repository.Modifying; @@ -11,9 +11,9 @@ import org.springframework.transaction.annotation.Transactional; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.programming.domain.BuildLogStatisticsEntry; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogStatisticsEntry; import de.tum.cit.aet.artemis.programming.dto.BuildLogStatisticsDTO; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildPlanRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildPlanRepository.java index f025c6a52aa3..1a1cd6167bea 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildPlanRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildPlanRepository.java @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import de.tum.cit.aet.artemis.programming.domain.BuildPlan; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.build.BuildPlan; public interface BuildPlanRepository extends ArtemisJpaRepository { diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingSubmissionRepository.java index 05b3d769834f..950411063959 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingSubmissionRepository.java @@ -19,7 +19,7 @@ import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.service.dto.ProgrammingSubmissionIdAndSubmissionDateDTO; +import de.tum.cit.aet.artemis.programming.dto.ProgrammingSubmissionIdAndSubmissionDateDTO; /** * Spring Data JPA repository for the ProgrammingSubmission entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageReportRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageReportRepository.java index 78e45cca34ee..4b31eb1d9831 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageReportRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageReportRepository.java @@ -19,7 +19,7 @@ import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.programming.domain.hestia.CoverageReport; -import de.tum.cit.aet.artemis.service.dto.CoverageReportAndSubmissionDateDTO; +import de.tum.cit.aet.artemis.programming.dto.CoverageReportAndSubmissionDateDTO; /** * Spring Data JPA repository for the CoverageReport entity. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/AutomaticProgrammingExerciseCleanupService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/AutomaticProgrammingExerciseCleanupService.java index e02d69decd87..e1ba117d2148 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/AutomaticProgrammingExerciseCleanupService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/AutomaticProgrammingExerciseCleanupService.java @@ -21,12 +21,12 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.ProfileService; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.ProfileService; @Service @Profile(PROFILE_SCHEDULING) diff --git a/src/main/java/de/tum/cit/aet/artemis/service/BuildLogEntryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildLogEntryService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/BuildLogEntryService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/BuildLogEntryService.java index f4456adb2c9d..1c235dcce3b7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/BuildLogEntryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildLogEntryService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -23,9 +23,10 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.core.service.ProfileService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; import de.tum.cit.aet.artemis.programming.repository.BuildLogEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildScriptProviderService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildScriptProviderService.java index 8ad5a2b92949..db9e37239d9e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildScriptProviderService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/BuildScriptProviderService.java @@ -18,12 +18,12 @@ import org.springframework.core.io.Resource; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.service.ResourceLoaderService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusTemplateService; -import de.tum.cit.aet.artemis.service.ResourceLoaderService; /** * Service for providing build scripts for programming exercises diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/CommitHistoryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/CommitHistoryService.java index 097e0336b644..3d8beec05006 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/CommitHistoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/CommitHistoryService.java @@ -18,11 +18,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.service.ProfileService; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffEntry; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; -import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.programming.web.GitDiffReportParserService; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ConsistencyCheckService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ConsistencyCheckService.java index 49facc4e3fb1..5ad904c675a9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ConsistencyCheckService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ConsistencyCheckService.java @@ -10,10 +10,10 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.dto.ConsistencyErrorDTO; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; -import de.tum.cit.aet.artemis.service.dto.ConsistencyErrorDTO; /** * Service Implementation for consistency checks diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/GitService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/GitService.java index 2e4b7ff6bdaf..dab2a60def8c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/GitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/GitService.java @@ -27,7 +27,6 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import de.tum.cit.aet.artemis.programming.dto.CommitInfoDTO; import jakarta.annotation.Nullable; import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; @@ -75,6 +74,9 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.exception.GitException; +import de.tum.cit.aet.artemis.core.service.FileService; +import de.tum.cit.aet.artemis.core.service.ProfileService; +import de.tum.cit.aet.artemis.core.service.ZipFileService; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.programming.domain.File; @@ -85,10 +87,8 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.dto.CommitInfoDTO; import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCRepositoryUri; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.service.ZipFileService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/JavaTemplateUpgradeService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/JavaTemplateUpgradeService.java index c1cfc62fad3e..9e6a796307a0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/JavaTemplateUpgradeService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/JavaTemplateUpgradeService.java @@ -29,12 +29,12 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.FileService; +import de.tum.cit.aet.artemis.core.service.ResourceLoaderService; import de.tum.cit.aet.artemis.programming.domain.File; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.ResourceLoaderService; /** * Service for upgrading of Java template files diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/PlantUmlService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/PlantUmlService.java index ef73ac5408ec..5a31f0a81a46 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/PlantUmlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/PlantUmlService.java @@ -20,7 +20,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import de.tum.cit.aet.artemis.service.ResourceLoaderService; +import de.tum.cit.aet.artemis.core.service.ResourceLoaderService; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.FileFormatOption; import net.sourceforge.plantuml.SourceStringReader; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingAssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingAssessmentService.java index 56af3f50cc84..a97887171fae 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingAssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingAssessmentService.java @@ -20,6 +20,7 @@ import de.tum.cit.aet.artemis.assessment.service.AssessmentService; import de.tum.cit.aet.artemis.assessment.service.ComplaintResponseService; import de.tum.cit.aet.artemis.assessment.service.ResultService; +import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService; import de.tum.cit.aet.artemis.athena.service.AthenaFeedbackSendingService; import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.core.domain.User; @@ -29,12 +30,11 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; +import de.tum.cit.aet.artemis.exercise.service.SubmissionService; import de.tum.cit.aet.artemis.lti.service.LtiNewResultService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.service.SubmissionService; -import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java index 13577848449c..8c92446d22d0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java @@ -23,11 +23,11 @@ import de.tum.cit.aet.artemis.athena.service.AthenaFeedbackSuggestionsService; import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.exercise.service.SubmissionService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.service.SubmissionService; /** * Service class for managing code review feedback on programming exercises. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseExportService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseExportService.java index 39ed731cf804..c8a4ae521e55 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseExportService.java @@ -53,8 +53,11 @@ import org.xml.sax.SAXException; import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.dto.RepositoryExportOptionsDTO; import de.tum.cit.aet.artemis.core.exception.GitException; import de.tum.cit.aet.artemis.core.service.ArchivalReportEntry; +import de.tum.cit.aet.artemis.core.service.FileService; +import de.tum.cit.aet.artemis.core.service.ZipFileService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -72,9 +75,6 @@ import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.ZipFileService; -import de.tum.cit.aet.artemis.core.dto.RepositoryExportOptionsDTO; /** * Service for exporting programming exercises. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseFeedbackCreationService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseFeedbackCreationService.java index c6183b702dff..d22c13ebe3d8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseFeedbackCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseFeedbackCreationService.java @@ -32,6 +32,7 @@ import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.domain.Visibility; +import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.config.StaticCodeAnalysisConfigurer; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -41,14 +42,13 @@ import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisDefaultCategory; import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTestCaseType; +import de.tum.cit.aet.artemis.programming.dto.AbstractBuildResultNotificationDTO; +import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisIssue; +import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisReportDTO; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; -import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; -import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; /** * Service for creating feedback for programming exercises. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java index f90ce3f28b55..3ac67af4b28f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java @@ -61,6 +61,8 @@ import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPenaltyPolicy; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; +import de.tum.cit.aet.artemis.programming.dto.AbstractBuildResultNotificationDTO; +import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseGradingStatisticsDTO; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; @@ -69,9 +71,6 @@ import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationResultService; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; -import de.tum.cit.aet.artemis.service.BuildLogEntryService; -import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; -import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseGradingStatisticsDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportFromFileService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportFromFileService.java index 8f947133106b..3c8b1671cba9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportFromFileService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportFromFileService.java @@ -29,15 +29,15 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; +import de.tum.cit.aet.artemis.core.service.FilePathService; +import de.tum.cit.aet.artemis.core.service.FileService; +import de.tum.cit.aet.artemis.core.service.ProfileService; +import de.tum.cit.aet.artemis.core.service.ZipFileService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; -import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.service.ZipFileService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportService.java index 102c7fd78311..710837ac4fb4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportService.java @@ -23,21 +23,20 @@ import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; -import de.tum.cit.aet.artemis.programming.domain.BuildPlanType; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.domain.build.BuildPlanType; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationTriggerService; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.UriService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseParticipationService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseParticipationService.java index 181dabd88f3d..4731295ed3c3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseParticipationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseParticipationService.java @@ -31,7 +31,6 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; -import de.tum.cit.aet.artemis.programming.domain.BuildPlanType; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; @@ -40,11 +39,11 @@ import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.domain.build.BuildPlanType; +import de.tum.cit.aet.artemis.programming.dto.CommitInfoDTO; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; -import de.tum.cit.aet.artemis.programming.dto.CommitInfoDTO; -import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlRepositoryPermission; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseRepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseRepositoryService.java index 99593d307132..db7803c21c22 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseRepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseRepositoryService.java @@ -26,6 +26,8 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.FileService; +import de.tum.cit.aet.artemis.core.service.ResourceLoaderService; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -36,9 +38,7 @@ import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.ResourceLoaderService; -import de.tum.cit.aet.artemis.exercise.web.SubmissionPolicyResource; +import de.tum.cit.aet.artemis.programming.web.SubmissionPolicyResource; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java index dee96e83968a..00e854f1d218 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseService.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import static de.tum.cit.aet.artemis.programming.domain.BuildPlanType.SOLUTION; -import static de.tum.cit.aet.artemis.programming.domain.BuildPlanType.TEMPLATE; +import static de.tum.cit.aet.artemis.programming.domain.build.BuildPlanType.SOLUTION; +import static de.tum.cit.aet.artemis.programming.domain.build.BuildPlanType.TEMPLATE; import static de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository.ProgrammingExerciseFetchOptions.AuxiliaryRepositories; import static de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository.ProgrammingExerciseFetchOptions.GradingCriteria; import static de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository.SolutionParticipationFetchOptions; @@ -48,15 +48,19 @@ import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.ProfileService; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.core.util.PageUtil; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseService; import de.tum.cit.aet.artemis.exercise.service.ExerciseSpecificationService; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -88,10 +92,6 @@ import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; import de.tum.cit.aet.artemis.programming.service.structureoraclegenerator.OracleGenerator; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; -import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseTestCaseService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseTestCaseService.java index fbb8c68d0524..f0d9f6f426e5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseTestCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseTestCaseService.java @@ -24,10 +24,10 @@ import de.tum.cit.aet.artemis.core.exception.ErrorConstants; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseTestCaseDTO; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; -import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseTestCaseDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingMessagingService.java index e12c563bc83f..fe961473c8e3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingMessagingService.java @@ -16,20 +16,20 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService; +import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionDTO; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.lti.service.LtiNewResultService; -import de.tum.cit.aet.artemis.programming.domain.BuildRunState; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.exercise.dto.SubmissionDTO; -import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService; +import de.tum.cit.aet.artemis.programming.domain.build.BuildRunState; import de.tum.cit.aet.artemis.programming.exceptions.BuildTriggerWebsocketError; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingSubmissionService.java index 70336c385636..58665d8beae4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingSubmissionService.java @@ -48,6 +48,9 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; +import de.tum.cit.aet.artemis.exercise.service.ParticipationAuthorizationCheckService; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; +import de.tum.cit.aet.artemis.exercise.service.SubmissionService; import de.tum.cit.aet.artemis.programming.domain.AbstractBaseProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.Commit; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -65,9 +68,6 @@ import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationTriggerService; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseGitDiffReportService; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; -import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.SubmissionService; // TODO: this class has too many dependencies to other services. We should reduce this @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingTriggerService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingTriggerService.java index 179decf5d9c4..3d153b1d8c34 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingTriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingTriggerService.java @@ -23,25 +23,25 @@ import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.ProfileService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.exceptions.BuildTriggerWebsocketError; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationTriggerService; -import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.programming.exceptions.BuildTriggerWebsocketError; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryService.java index 185b93bbec5b..c181815e2143 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/RepositoryService.java @@ -36,6 +36,8 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ConflictException; +import de.tum.cit.aet.artemis.core.service.FileService; +import de.tum.cit.aet.artemis.core.service.ProfileService; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.programming.domain.File; import de.tum.cit.aet.artemis.programming.domain.FileType; @@ -44,8 +46,6 @@ import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.programming.dto.FileMove; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/SubmissionPolicyService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/SubmissionPolicyService.java index 56920bc7dffc..b6010ea5354b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/SubmissionPolicyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/SubmissionPolicyService.java @@ -24,7 +24,7 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.repository.SubmissionPolicyRepository; -import de.tum.cit.aet.artemis.exercise.web.SubmissionPolicyResource; +import de.tum.cit.aet.artemis.programming.web.SubmissionPolicyResource; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/service/UriService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/UriService.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/service/UriService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/UriService.java index 1a3928e1cf0b..b7d98b2215ca 100644 --- a/src/main/java/de/tum/cit/aet/artemis/service/UriService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/UriService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.service; +package de.tum.cit.aet.artemis.programming.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusBuildScriptGenerationService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusBuildScriptGenerationService.java index 71a06a68e512..b83bb30bcdd7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusBuildScriptGenerationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusBuildScriptGenerationService.java @@ -5,11 +5,11 @@ import com.fasterxml.jackson.core.JsonProcessingException; +import de.tum.cit.aet.artemis.core.service.ProfileService; import de.tum.cit.aet.artemis.programming.domain.AeolusTarget; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.service.BuildScriptGenerationService; import de.tum.cit.aet.artemis.programming.service.BuildScriptProviderService; -import de.tum.cit.aet.artemis.service.ProfileService; /** * Service for generating build scripts for programming exercises using Aeolus diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusTemplateService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusTemplateService.java index c0b51a9377d3..14bde3cf26b1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusTemplateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusTemplateService.java @@ -20,13 +20,13 @@ import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import de.tum.cit.aet.artemis.core.config.ProgrammingLanguageConfiguration; +import de.tum.cit.aet.artemis.core.service.ResourceLoaderService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.programming.service.BuildScriptProviderService; import de.tum.cit.aet.artemis.programming.web.localci.AeolusTemplateResource; -import de.tum.cit.aet.artemis.service.ResourceLoaderService; /** * Handles the request to {@link AeolusTemplateResource} and Artemis internal diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/AbstractContinuousIntegrationResultService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/AbstractContinuousIntegrationResultService.java index 8cf1d2f72149..238d4ffca0fc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/AbstractContinuousIntegrationResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/AbstractContinuousIntegrationResultService.java @@ -8,16 +8,16 @@ import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; -import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.dto.AbstractBuildResultNotificationDTO; +import de.tum.cit.aet.artemis.programming.dto.BuildJobDTOInterface; import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseFeedbackCreationService; import de.tum.cit.aet.artemis.programming.service.hestia.TestwiseCoverageService; -import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; -import de.tum.cit.aet.artemis.service.dto.BuildJobDTOInterface; public abstract class AbstractContinuousIntegrationResultService implements ContinuousIntegrationResultService { diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/ContinuousIntegrationResultService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/ContinuousIntegrationResultService.java index aa8b3959ed67..b81239c44f0e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/ContinuousIntegrationResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/ContinuousIntegrationResultService.java @@ -3,12 +3,12 @@ import java.util.List; import de.tum.cit.aet.artemis.assessment.domain.Result; -import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.ProjectType; -import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.dto.AbstractBuildResultNotificationDTO; /** * Abstract service for managing entities related to continuous integration. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/BuildLogParseUtils.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/BuildLogParseUtils.java index c5e5a24165fc..fa9ebb77e623 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/BuildLogParseUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/BuildLogParseUtils.java @@ -7,7 +7,7 @@ import org.apache.commons.lang3.StringUtils; -import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; public class BuildLogParseUtils { diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/TestCaseDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/TestCaseDTO.java index 81b67e656bb9..e4e15c9227bf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/TestCaseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/TestCaseDTO.java @@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.Nulls; import de.tum.cit.aet.artemis.assessment.domain.Feedback; -import de.tum.cit.aet.artemis.service.dto.TestCaseBaseDTO; +import de.tum.cit.aet.artemis.programming.dto.TestCaseBaseDTO; @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/TestResultsDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/TestResultsDTO.java index a5513131ac24..cd029f5adf5e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/TestResultsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/TestResultsDTO.java @@ -13,12 +13,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.dto.AbstractBuildResultNotificationDTO; +import de.tum.cit.aet.artemis.programming.dto.BuildJobDTOInterface; +import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisReportDTO; import de.tum.cit.aet.artemis.programming.service.ci.notification.BuildLogParseUtils; -import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; -import de.tum.cit.aet.artemis.service.dto.BuildJobDTOInterface; -import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/TestSuiteDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/TestSuiteDTO.java index 20b8ee7c4f51..9be20c1a8ad9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/TestSuiteDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ci/notification/dto/TestSuiteDTO.java @@ -9,8 +9,8 @@ import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; -import de.tum.cit.aet.artemis.service.dto.BuildJobDTOInterface; -import de.tum.cit.aet.artemis.service.dto.TestCaseBaseDTO; +import de.tum.cit.aet.artemis.programming.dto.BuildJobDTOInterface; +import de.tum.cit.aet.artemis.programming.dto.TestCaseBaseDTO; @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/GitLabService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/GitLabService.java index 9ec3b8ef3bc6..cef89ea1b714 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/GitLabService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlab/GitLabService.java @@ -61,10 +61,10 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.service.GitService; +import de.tum.cit.aet.artemis.programming.service.UriService; import de.tum.cit.aet.artemis.programming.service.gitlab.dto.GitLabPushNotificationDTO; import de.tum.cit.aet.artemis.programming.service.vcs.AbstractVersionControlService; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlRepositoryPermission; -import de.tum.cit.aet.artemis.service.UriService; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIBuildPlanService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIBuildPlanService.java index 3b2e3736d0fb..30bba7783c04 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIBuildPlanService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIBuildPlanService.java @@ -12,12 +12,12 @@ import org.springframework.stereotype.Service; import org.springframework.util.StreamUtils; +import de.tum.cit.aet.artemis.core.service.ResourceLoaderService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.service.ci.AbstractBuildPlanCreator; -import de.tum.cit.aet.artemis.service.ResourceLoaderService; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIResultService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIResultService.java index f2f560342f89..fa63482e88ca 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIResultService.java @@ -9,21 +9,21 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.programming.domain.BuildLogStatisticsEntry; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogStatisticsEntry; +import de.tum.cit.aet.artemis.programming.dto.AbstractBuildResultNotificationDTO; import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.programming.service.BuildLogEntryService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseFeedbackCreationService; import de.tum.cit.aet.artemis.programming.service.ci.AbstractContinuousIntegrationResultService; import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestResultsDTO; import de.tum.cit.aet.artemis.programming.service.hestia.TestwiseCoverageService; -import de.tum.cit.aet.artemis.service.BuildLogEntryService; -import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIService.java index ccc89b0641ad..9292031adba5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCIService.java @@ -8,7 +8,6 @@ import java.util.Map; import java.util.Optional; -import de.tum.cit.aet.artemis.programming.dto.CheckoutDirectoriesDTO; import org.gitlab4j.api.GitLabApi; import org.gitlab4j.api.GitLabApiException; import org.gitlab4j.api.ProjectApi; @@ -28,19 +27,20 @@ import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.GitLabCIException; import de.tum.cit.aet.artemis.core.service.connectors.ConnectorHealth; -import de.tum.cit.aet.artemis.programming.domain.BuildPlan; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.domain.build.BuildPlan; +import de.tum.cit.aet.artemis.programming.dto.CheckoutDirectoriesDTO; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.service.UriService; import de.tum.cit.aet.artemis.programming.service.ci.AbstractContinuousIntegrationService; import de.tum.cit.aet.artemis.programming.service.ci.CIPermission; import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestResultsDTO; -import de.tum.cit.aet.artemis.service.UriService; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCITriggerService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCITriggerService.java index 4974e50055a0..ae907fc82117 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCITriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/gitlabci/GitLabCITriggerService.java @@ -12,8 +12,8 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; +import de.tum.cit.aet.artemis.programming.service.UriService; import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationTriggerService; -import de.tum.cit.aet.artemis.service.UriService; // Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 @Deprecated(since = "7.5.0", forRemoval = true) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseGitDiffReportService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseGitDiffReportService.java index 23762a3809b0..7ace2505cf1c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseGitDiffReportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseGitDiffReportService.java @@ -22,6 +22,7 @@ import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; @@ -37,7 +38,6 @@ import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseGitDiffReportRepository; import de.tum.cit.aet.artemis.programming.service.GitService; -import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.programming.web.GitDiffReportParserService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsResultService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsResultService.java index 1921e289088a..9c27aa4c5733 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsResultService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.programming.service.jenkins; -import static de.tum.cit.aet.artemis.programming.domain.BuildLogStatisticsEntry.BuildJobPartDuration; +import static de.tum.cit.aet.artemis.programming.domain.build.BuildLogStatisticsEntry.BuildJobPartDuration; import java.time.ZonedDateTime; import java.util.List; @@ -11,20 +11,20 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; -import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.dto.AbstractBuildResultNotificationDTO; import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; +import de.tum.cit.aet.artemis.programming.service.BuildLogEntryService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseFeedbackCreationService; import de.tum.cit.aet.artemis.programming.service.ci.AbstractContinuousIntegrationResultService; import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestResultsDTO; import de.tum.cit.aet.artemis.programming.service.hestia.TestwiseCoverageService; -import de.tum.cit.aet.artemis.service.BuildLogEntryService; -import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; @Profile("jenkins") @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsService.java index 58fbc4b254b5..4a4e42f602a4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsService.java @@ -6,7 +6,6 @@ import java.util.Map; import java.util.Optional; -import de.tum.cit.aet.artemis.programming.dto.CheckoutDirectoriesDTO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Qualifier; @@ -22,13 +21,15 @@ import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.JenkinsException; +import de.tum.cit.aet.artemis.core.service.ProfileService; import de.tum.cit.aet.artemis.core.service.connectors.ConnectorHealth; -import de.tum.cit.aet.artemis.programming.domain.BuildPlanType; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.domain.build.BuildPlanType; +import de.tum.cit.aet.artemis.programming.dto.CheckoutDirectoriesDTO; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusTemplateService; import de.tum.cit.aet.artemis.programming.service.aeolus.Windfile; @@ -37,7 +38,6 @@ import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestResultsDTO; import de.tum.cit.aet.artemis.programming.service.jenkins.build_plan.JenkinsBuildPlanService; import de.tum.cit.aet.artemis.programming.service.jenkins.jobs.JenkinsJobService; -import de.tum.cit.aet.artemis.service.ProfileService; @Profile("jenkins") @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanCreator.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanCreator.java index a5470683d247..3991904b5db2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanCreator.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanCreator.java @@ -19,12 +19,12 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationBuildPlanException; +import de.tum.cit.aet.artemis.core.service.ResourceLoaderService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.programming.service.jenkins.JenkinsXmlConfigBuilder; import de.tum.cit.aet.artemis.programming.service.jenkins.JenkinsXmlFileUtils; -import de.tum.cit.aet.artemis.service.ResourceLoaderService; @Profile("jenkins") @Component diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsPipelineScriptCreator.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsPipelineScriptCreator.java index 46bffb803c84..92fca529c68b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsPipelineScriptCreator.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsPipelineScriptCreator.java @@ -18,13 +18,13 @@ import de.tum.cit.aet.artemis.core.config.ProgrammingLanguageConfiguration; import de.tum.cit.aet.artemis.core.exception.JenkinsException; +import de.tum.cit.aet.artemis.core.service.ResourceLoaderService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.service.ci.AbstractBuildPlanCreator; -import de.tum.cit.aet.artemis.service.ResourceLoaderService; @Profile(PROFILE_CORE) @Component diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIPriorityQueueComparator.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIPriorityQueueComparator.java index 961b840c380a..c30e6e5107a4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIPriorityQueueComparator.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIPriorityQueueComparator.java @@ -2,7 +2,7 @@ import java.util.Comparator; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.buildagent.dto.BuildJobQueueItem; /** * This comparator allows to prioritize build jobs in the shared build queue diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIQueueWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIQueueWebsocketService.java index 662ca006b73d..bfd04f5ba49d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIQueueWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIQueueWebsocketService.java @@ -2,7 +2,6 @@ import java.util.List; -import de.tum.cit.aet.artemis.programming.web.LocalCIWebsocketMessagingService; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; @@ -20,8 +19,8 @@ import com.hazelcast.map.listener.EntryRemovedListener; import com.hazelcast.map.listener.EntryUpdatedListener; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildAgentInformation; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.buildagent.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.buildagent.dto.BuildJobQueueItem; /** * This service is responsible for sending build job queue information over websockets. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultProcessingService.java index 0ad18f4f8816..4e27fd113c58 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultProcessingService.java @@ -7,8 +7,6 @@ import java.util.UUID; import java.util.concurrent.CancellationException; -import de.tum.cit.aet.artemis.programming.dto.ResultDTO; -import de.tum.cit.aet.artemis.programming.exceptions.BuildTriggerWebsocketError; import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; @@ -25,26 +23,28 @@ import com.hazelcast.map.IMap; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.buildagent.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.buildagent.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.buildagent.dto.BuildResult; +import de.tum.cit.aet.artemis.buildagent.dto.ResultQueueItem; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.programming.domain.BuildJob; -import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.programming.domain.BuildStatus; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.build.BuildJob; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.build.BuildStatus; +import de.tum.cit.aet.artemis.programming.dto.ResultDTO; +import de.tum.cit.aet.artemis.programming.exceptions.BuildTriggerWebsocketError; import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.BuildLogEntryService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseGradingService; import de.tum.cit.aet.artemis.programming.service.ProgrammingMessagingService; import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildAgentInformation; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildResult; -import de.tum.cit.aet.artemis.programming.service.localci.dto.ResultQueueItem; -import de.tum.cit.aet.artemis.service.BuildLogEntryService; @Profile(PROFILE_LOCALCI) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultService.java index 18d8ee197a20..42a93904b97b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultService.java @@ -7,19 +7,19 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.buildagent.dto.BuildResult; import de.tum.cit.aet.artemis.core.exception.LocalCIException; -import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.dto.AbstractBuildResultNotificationDTO; import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseFeedbackCreationService; import de.tum.cit.aet.artemis.programming.service.ci.AbstractContinuousIntegrationResultService; import de.tum.cit.aet.artemis.programming.service.hestia.TestwiseCoverageService; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildResult; -import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; /** * Service implementation for integrated CI. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIService.java index a6246c790800..844b8c2357ff 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIService.java @@ -6,8 +6,6 @@ import java.util.Map; import java.util.Optional; -import de.tum.cit.aet.artemis.programming.dto.BuildPlanCheckoutDirectoriesDTO; -import de.tum.cit.aet.artemis.programming.dto.CheckoutDirectoriesDTO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Profile; @@ -25,6 +23,8 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.dto.BuildPlanCheckoutDirectoriesDTO; +import de.tum.cit.aet.artemis.programming.dto.CheckoutDirectoriesDTO; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.service.BuildScriptProviderService; import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusTemplateService; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCITriggerService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCITriggerService.java index ffe9c0d56ea6..8a9aa499ea2e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCITriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCITriggerService.java @@ -22,6 +22,10 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.map.IMap; +import de.tum.cit.aet.artemis.buildagent.dto.BuildConfig; +import de.tum.cit.aet.artemis.buildagent.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.buildagent.dto.JobTimingInfo; +import de.tum.cit.aet.artemis.buildagent.dto.RepositoryInfo; import de.tum.cit.aet.artemis.core.config.ProgrammingLanguageConfiguration; import de.tum.cit.aet.artemis.core.exception.LocalCIException; import de.tum.cit.aet.artemis.core.exception.localvc.LocalVCInternalException; @@ -44,10 +48,6 @@ import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusTemplateService; import de.tum.cit.aet.artemis.programming.service.aeolus.Windfile; import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationTriggerService; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildConfig; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.programming.service.localci.dto.JobTimingInfo; -import de.tum.cit.aet.artemis.programming.service.localci.dto.RepositoryInfo; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/LocalCIWebsocketMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIWebsocketMessagingService.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/programming/web/LocalCIWebsocketMessagingService.java rename to src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIWebsocketMessagingService.java index aa02c478e551..7c527a155b49 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/LocalCIWebsocketMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIWebsocketMessagingService.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.web; +package de.tum.cit.aet.artemis.programming.service.localci; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; @@ -12,9 +12,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildAgentInformation; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; +import de.tum.cit.aet.artemis.buildagent.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.buildagent.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; /** * This service sends out websocket messages for the local continuous integration system. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/SharedQueueManagementService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/SharedQueueManagementService.java index 4840e8c3169d..a99766da005b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/SharedQueueManagementService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/SharedQueueManagementService.java @@ -30,14 +30,14 @@ import com.hazelcast.map.IMap; import com.hazelcast.topic.ITopic; +import de.tum.cit.aet.artemis.buildagent.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.buildagent.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.buildagent.dto.DockerImageBuild; import de.tum.cit.aet.artemis.core.dto.SortingOrder; -import de.tum.cit.aet.artemis.programming.domain.BuildJob; -import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildAgentInformation; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.programming.service.localci.dto.DockerImageBuild; -import de.tum.cit.aet.artemis.service.ProfileService; import de.tum.cit.aet.artemis.core.dto.pageablesearch.FinishedBuildJobPageableSearchDTO; +import de.tum.cit.aet.artemis.core.service.ProfileService; +import de.tum.cit.aet.artemis.programming.domain.build.BuildJob; +import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; /** * Includes methods for managing and retrieving the shared build job queue and build agent information. Also contains methods for cancelling build jobs. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/ResultQueueItem.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/ResultQueueItem.java deleted file mode 100644 index 73fd846ed3f0..000000000000 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/dto/ResultQueueItem.java +++ /dev/null @@ -1,12 +0,0 @@ -package de.tum.cit.aet.artemis.programming.service.localci.dto; - -import java.io.Serializable; -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonInclude; - -import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; - -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public record ResultQueueItem(BuildResult buildResult, BuildJobQueueItem buildJobQueueItem, List buildLogs, Throwable exception) implements Serializable { -} diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/ReportParser.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/ReportParser.java index 6540a88a930c..74f53cb16f64 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/ReportParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/ReportParser.java @@ -9,12 +9,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisReportDTO; import de.tum.cit.aet.artemis.programming.service.localci.scaparser.exception.ParserException; import de.tum.cit.aet.artemis.programming.service.localci.scaparser.exception.UnsupportedToolException; import de.tum.cit.aet.artemis.programming.service.localci.scaparser.strategy.ParserPolicy; import de.tum.cit.aet.artemis.programming.service.localci.scaparser.strategy.ParserStrategy; import de.tum.cit.aet.artemis.programming.service.localci.scaparser.utils.FileUtils; -import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; /** * Public API for parsing of static code analysis reports diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/CheckstyleParser.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/CheckstyleParser.java index f0b01e79b1ab..e50be8d57997 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/CheckstyleParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/CheckstyleParser.java @@ -10,8 +10,8 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; -import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; -import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; +import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisIssue; +import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisReportDTO; @JsonIgnoreProperties(ignoreUnknown = true) record CheckstyleFile(@JacksonXmlProperty(isAttribute = true, localName = "name") String name, diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/PMDCPDParser.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/PMDCPDParser.java index ca68f6ff66aa..11fbab145fd4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/PMDCPDParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/PMDCPDParser.java @@ -11,8 +11,8 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; -import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; -import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; +import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisIssue; +import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisReportDTO; @JsonIgnoreProperties(ignoreUnknown = true) record PmdCpc(@JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "duplication") List duplications) { diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/PMDParser.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/PMDParser.java index e39fe9926189..4c19428da9c9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/PMDParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/PMDParser.java @@ -11,8 +11,8 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText; import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; -import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; -import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; +import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisIssue; +import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisReportDTO; @JsonIgnoreProperties(ignoreUnknown = true) record PMDReport(@JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "file") List files) { diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/ParserStrategy.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/ParserStrategy.java index 847bbd9f5065..ea7e8e356179 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/ParserStrategy.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/ParserStrategy.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.programming.service.localci.scaparser.strategy; -import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; +import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisReportDTO; /** * Strategy interface for the parser strategies. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/SpotbugsParser.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/SpotbugsParser.java index 92a0c860de9e..f4db7cbb351b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/SpotbugsParser.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/strategy/SpotbugsParser.java @@ -11,8 +11,8 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; -import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; -import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; +import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisIssue; +import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisReportDTO; @JsonIgnoreProperties(ignoreUnknown = true) record BugInstance(@JacksonXmlProperty(isAttribute = true, localName = "type") String type, diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/utils/ReportUtils.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/utils/ReportUtils.java index 61172bebbcb0..3b38d2597a4f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/utils/ReportUtils.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/scaparser/utils/ReportUtils.java @@ -3,8 +3,8 @@ import java.util.List; import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; -import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; -import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; +import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisIssue; +import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisReportDTO; public final class ReportUtils { diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/GitPublickeyAuthenticatorService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/GitPublickeyAuthenticatorService.java index 94d5332a3908..4f0cad0aa4e9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/GitPublickeyAuthenticatorService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/GitPublickeyAuthenticatorService.java @@ -16,9 +16,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.buildagent.dto.BuildAgentInformation; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.programming.service.localci.SharedQueueManagementService; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildAgentInformation; import de.tum.cit.aet.artemis.programming.service.localvc.ssh.HashUtils; import de.tum.cit.aet.artemis.programming.service.localvc.ssh.SshConstants; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCService.java index 89316bcade92..6e575916557d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localvc/LocalVCService.java @@ -43,9 +43,9 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.service.GitService; +import de.tum.cit.aet.artemis.programming.service.UriService; import de.tum.cit.aet.artemis.programming.service.vcs.AbstractVersionControlService; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlRepositoryPermission; -import de.tum.cit.aet.artemis.service.UriService; /** * Implementation of VersionControlService for the local VC server. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/vcs/AbstractVersionControlService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/vcs/AbstractVersionControlService.java index 7b033261de37..454814afc442 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/vcs/AbstractVersionControlService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/vcs/AbstractVersionControlService.java @@ -24,7 +24,7 @@ import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.service.GitService; -import de.tum.cit.aet.artemis.service.UriService; +import de.tum.cit.aet.artemis.programming.service.UriService; public abstract class AbstractVersionControlService implements VersionControlService { diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/IdeSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/IdeSettingsResource.java index 829c55569ef3..d4d3cd236275 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/IdeSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/IdeSettingsResource.java @@ -23,10 +23,10 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ide.Ide; import de.tum.cit.aet.artemis.programming.domain.ide.UserIdeMapping; -import de.tum.cit.aet.artemis.programming.repository.settings.IdeRepository; -import de.tum.cit.aet.artemis.programming.repository.settings.UserIdeMappingRepository; import de.tum.cit.aet.artemis.programming.dto.IdeDTO; import de.tum.cit.aet.artemis.programming.dto.IdeMappingDTO; +import de.tum.cit.aet.artemis.programming.repository.settings.IdeRepository; +import de.tum.cit.aet.artemis.programming.repository.settings.UserIdeMappingRepository; /** * REST controller for managing Ide Settings (IdeSettings). diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingAssessmentResource.java index 931519dfd751..0bc005e6a085 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingAssessmentResource.java @@ -21,8 +21,10 @@ import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.assessment.web.AssessmentResource; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @@ -36,12 +38,10 @@ import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.exercise.web.AssessmentResource; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingAssessmentService; -import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; /** * REST controller for managing ProgrammingAssessment. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseExportImportResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseExportImportResource.java index e9ee580cfb9d..f1da13be2453 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseExportImportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseExportImportResource.java @@ -45,6 +45,7 @@ import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.RepositoryExportOptionsDTO; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.ConflictException; @@ -60,6 +61,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.CourseService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.core.util.HeaderUtil; @@ -79,8 +81,6 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeature; import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeatureService; import de.tum.cit.aet.artemis.programming.service.SubmissionPolicyService; -import de.tum.cit.aet.artemis.service.CourseService; -import de.tum.cit.aet.artemis.core.dto.RepositoryExportOptionsDTO; /** * REST controller for managing ProgrammingExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseGradingResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseGradingResource.java index b82260a009d7..8dc64c81a72d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseGradingResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseGradingResource.java @@ -24,9 +24,9 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseGradingStatisticsDTO; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseGradingService; -import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseGradingStatisticsDTO; /** * REST controller for managing ProgrammingExerciseTestCase. Test cases are created automatically from build run results which is why there are no endpoints available for POST, diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseParticipationResource.java index 518555b686c9..a1e104e6fde4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseParticipationResource.java @@ -36,19 +36,19 @@ import de.tum.cit.aet.artemis.exam.service.ExamService; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.dto.CommitInfoDTO; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseParticipationService; import de.tum.cit.aet.artemis.programming.service.ProgrammingSubmissionService; import de.tum.cit.aet.artemis.programming.service.RepositoryService; -import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; -import de.tum.cit.aet.artemis.programming.dto.CommitInfoDTO; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExercisePlagiarismResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExercisePlagiarismResource.java index 2bca8bebfb1f..4388e386ab39 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExercisePlagiarismResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExercisePlagiarismResource.java @@ -28,13 +28,13 @@ import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.core.util.TimeLogUtil; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismResultDTO; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismDetectionConfigHelper; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismDetectionService; import de.tum.cit.aet.artemis.plagiarism.service.ProgrammingLanguageNotSupportedForPlagiarismDetectionException; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismResultDTO; /** * REST controller for managing ProgrammingExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResource.java index 3a97b247c98d..7462f19512c1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseResource.java @@ -46,6 +46,8 @@ import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.ConflictException; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; @@ -58,6 +60,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.CourseService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.core.util.HeaderUtil; @@ -70,6 +73,10 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.dto.BuildLogStatisticsDTO; +import de.tum.cit.aet.artemis.programming.dto.CheckoutDirectoriesDTO; +import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseResetOptionsDTO; +import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseTestCaseStateDTO; import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; @@ -84,13 +91,6 @@ import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; -import de.tum.cit.aet.artemis.service.CourseService; -import de.tum.cit.aet.artemis.programming.dto.BuildLogStatisticsDTO; -import de.tum.cit.aet.artemis.programming.dto.CheckoutDirectoriesDTO; -import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseResetOptionsDTO; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseTestCaseStateDTO; import io.jsonwebtoken.lang.Arrays; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseTestCaseResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseTestCaseResource.java index f31d5e00d6dd..250054ba155d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseTestCaseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseTestCaseResource.java @@ -24,11 +24,11 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseTestCaseDTO; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseTestCaseService; -import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseTestCaseDTO; /** * REST controller for managing ProgrammingExerciseTestCase. Test cases are created automatically from build run results which is why there are no endpoints available for POST, diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingSubmissionResource.java index 26eebf7c7c56..db197fed2c26 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingSubmissionResource.java @@ -44,6 +44,7 @@ import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; +import de.tum.cit.aet.artemis.exercise.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; @@ -55,7 +56,6 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingSubmissionService; import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; -import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; /** * REST controller for managing ProgrammingSubmission. diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/web/SubmissionPolicyResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/SubmissionPolicyResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/exercise/web/SubmissionPolicyResource.java rename to src/main/java/de/tum/cit/aet/artemis/programming/web/SubmissionPolicyResource.java index b27e75ec1afc..d4e34e75ae49 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/web/SubmissionPolicyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/SubmissionPolicyResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.exercise.web; +package de.tum.cit.aet.artemis.programming.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -28,12 +28,12 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.util.HeaderUtil; +import de.tum.cit.aet.artemis.exercise.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.service.SubmissionPolicyService; -import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ProgrammingExerciseGitDiffReportResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ProgrammingExerciseGitDiffReportResource.java index b4be86d8458d..5dad0330b670 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ProgrammingExerciseGitDiffReportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/ProgrammingExerciseGitDiffReportResource.java @@ -23,17 +23,17 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseGitDiffReport; +import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseGitDiffReportDTO; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.service.CommitHistoryService; import de.tum.cit.aet.artemis.programming.service.RepositoryService; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseGitDiffReportService; -import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; -import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseGitDiffReportDTO; /** * REST controller for managing ProgrammingExerciseGitDiffReports and its entries. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildJobQueueResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildJobQueueResource.java index 78bae40e3b77..1243f455563a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildJobQueueResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildJobQueueResource.java @@ -20,20 +20,20 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import de.tum.cit.aet.artemis.buildagent.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.buildagent.dto.BuildJobResultCountDTO; +import de.tum.cit.aet.artemis.buildagent.dto.BuildJobsStatisticsDTO; +import de.tum.cit.aet.artemis.buildagent.dto.FinishedBuildJobDTO; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.FinishedBuildJobPageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.programming.domain.BuildJob; +import de.tum.cit.aet.artemis.programming.domain.build.BuildJob; import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; import de.tum.cit.aet.artemis.programming.service.localci.SharedQueueManagementService; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.service.dto.BuildJobResultCountDTO; -import de.tum.cit.aet.artemis.service.dto.BuildJobsStatisticsDTO; -import de.tum.cit.aet.artemis.service.dto.FinishedBuildJobDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.FinishedBuildJobPageableSearchDTO; import tech.jhipster.web.util.PaginationUtil; @Profile(PROFILE_LOCALCI) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildLogResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildLogResource.java index 14043dd2c075..9ab8cfba30db 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildLogResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildLogResource.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; -import de.tum.cit.aet.artemis.service.BuildLogEntryService; +import de.tum.cit.aet.artemis.programming.service.BuildLogEntryService; @Profile(PROFILE_LOCALCI) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildPlanResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildPlanResource.java index 89c1c974fc48..ec7e0b7c74c4 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildPlanResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/localci/BuildPlanResource.java @@ -15,8 +15,8 @@ import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastEditor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.programming.domain.BuildPlan; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.build.BuildPlan; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/open/PublicBuildPlanResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/open/PublicBuildPlanResource.java index 1db51890110e..d4b7937a0087 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/open/PublicBuildPlanResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/open/PublicBuildPlanResource.java @@ -13,8 +13,8 @@ import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; -import de.tum.cit.aet.artemis.programming.domain.BuildPlan; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.domain.build.BuildPlan; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; @Profile("gitlabci | jenkins") diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryProgrammingExerciseParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryProgrammingExerciseParticipationResource.java index 6950ca4dc48a..6cb9df0b10ee 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryProgrammingExerciseParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryProgrammingExerciseParticipationResource.java @@ -36,11 +36,12 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.ProfileService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; -import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; +import de.tum.cit.aet.artemis.exercise.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.programming.domain.FileType; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; @@ -49,9 +50,13 @@ import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.dto.FileMove; +import de.tum.cit.aet.artemis.programming.dto.RepositoryStatusDTO; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; import de.tum.cit.aet.artemis.programming.repository.SubmissionPolicyRepository; +import de.tum.cit.aet.artemis.programming.service.BuildLogEntryService; import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseParticipationService; import de.tum.cit.aet.artemis.programming.service.RepositoryAccessService; @@ -59,11 +64,6 @@ import de.tum.cit.aet.artemis.programming.service.RepositoryService; import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCServletService; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; -import de.tum.cit.aet.artemis.service.BuildLogEntryService; -import de.tum.cit.aet.artemis.service.ParticipationAuthorizationCheckService; -import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.programming.dto.FileMove; -import de.tum.cit.aet.artemis.programming.dto.RepositoryStatusDTO; /** * Executes repository actions on repositories related to the participation id transmitted. Available to the owner of the participation, TAs/Instructors of the exercise and Admins. diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryResource.java index fdf718cdc575..bd50617ee04d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/RepositoryResource.java @@ -34,10 +34,14 @@ import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.ProfileService; import de.tum.cit.aet.artemis.programming.domain.File; import de.tum.cit.aet.artemis.programming.domain.FileType; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.dto.FileMove; +import de.tum.cit.aet.artemis.programming.dto.RepositoryStatusDTO; +import de.tum.cit.aet.artemis.programming.dto.RepositoryStatusDTOType; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.RepositoryAccessService; @@ -45,10 +49,6 @@ import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCServletService; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.programming.web.repository.util.RepositoryExecutor; -import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.programming.dto.FileMove; -import de.tum.cit.aet.artemis.programming.dto.RepositoryStatusDTO; -import de.tum.cit.aet.artemis.programming.dto.RepositoryStatusDTOType; /** * Abstract class that can be extended to make repository endpoints available that retrieve the repository based on the implemented method getRepository. This way the retrieval of diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/TestRepositoryResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/TestRepositoryResource.java index 8273c7f4eee8..e125a1517eff 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/TestRepositoryResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/repository/TestRepositoryResource.java @@ -32,21 +32,21 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.ProfileService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.programming.domain.FileType; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.dto.FileMove; +import de.tum.cit.aet.artemis.programming.dto.RepositoryStatusDTO; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.RepositoryAccessService; import de.tum.cit.aet.artemis.programming.service.RepositoryService; import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCServletService; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; -import de.tum.cit.aet.artemis.service.ProfileService; -import de.tum.cit.aet.artemis.programming.dto.FileMove; -import de.tum.cit.aet.artemis.programming.dto.RepositoryStatusDTO; /** * Executes requested actions on the test repository of a programming exercise. Only available to TAs, Instructors and Admins. diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragAndDropQuestion.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragAndDropQuestion.java index e01450a07254..1c972a588a96 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragAndDropQuestion.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragAndDropQuestion.java @@ -30,13 +30,13 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; +import de.tum.cit.aet.artemis.core.service.FilePathService; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.quiz.config.QuizView; import de.tum.cit.aet.artemis.quiz.domain.scoring.ScoringStrategy; import de.tum.cit.aet.artemis.quiz.domain.scoring.ScoringStrategyDragAndDropAllOrNothing; import de.tum.cit.aet.artemis.quiz.domain.scoring.ScoringStrategyDragAndDropProportionalWithPenalty; import de.tum.cit.aet.artemis.quiz.domain.scoring.ScoringStrategyDragAndDropProportionalWithoutPenalty; -import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.service.FileService; /** * A DragAndDropQuestion. diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragItem.java b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragItem.java index c998ed9ccf8f..bcf311e9e31c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragItem.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/domain/DragItem.java @@ -26,9 +26,9 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; +import de.tum.cit.aet.artemis.core.service.FilePathService; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.quiz.config.QuizView; -import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.service.FileService; /** * A DragItem. diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/service/AbstractQuizSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/AbstractQuizSubmissionService.java index fd8d60c18f9c..5b304e8a3ca8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/service/AbstractQuizSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/AbstractQuizSubmissionService.java @@ -12,9 +12,9 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; +import de.tum.cit.aet.artemis.exercise.service.SubmissionVersionService; import de.tum.cit.aet.artemis.quiz.domain.AbstractQuizSubmission; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; -import de.tum.cit.aet.artemis.service.SubmissionVersionService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/service/DragAndDropQuizAnswerConversionService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/DragAndDropQuizAnswerConversionService.java index 69deb6071f52..a840a5af2626 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/service/DragAndDropQuizAnswerConversionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/DragAndDropQuizAnswerConversionService.java @@ -27,11 +27,11 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.service.FilePathService; import de.tum.cit.aet.artemis.quiz.domain.DragAndDropMapping; import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; import de.tum.cit.aet.artemis.quiz.domain.DragAndDropSubmittedAnswer; import de.tum.cit.aet.artemis.quiz.domain.DropLocation; -import de.tum.cit.aet.artemis.service.FilePathService; /** * Service for converting a DragAndDropSubmittedAnswer to a PDF file displaying the submitted answer. diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizBatchService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizBatchService.java index 02e3f06f53a2..9607c2c5f77e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizBatchService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizBatchService.java @@ -20,13 +20,13 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.QuizJoinException; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.quiz.repository.QuizBatchRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; -import de.tum.cit.aet.artemis.service.ParticipationService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseImportService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseImportService.java index 234a951bba25..d6f432199a27 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseImportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseImportService.java @@ -25,6 +25,8 @@ import de.tum.cit.aet.artemis.assessment.service.FeedbackService; import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; +import de.tum.cit.aet.artemis.core.service.FilePathService; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseImportService; import de.tum.cit.aet.artemis.quiz.domain.AnswerOption; @@ -40,8 +42,6 @@ import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestion; import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSolution; import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSpot; -import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.service.FileService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseService.java index 5115ba8bfda4..8071c2c1eeb8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseService.java @@ -35,8 +35,12 @@ import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; +import de.tum.cit.aet.artemis.core.service.FilePathService; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.core.util.PageUtil; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -54,10 +58,6 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.quiz.repository.ShortAnswerMappingRepository; -import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseWithSubmissionsExportService.java index bc3bb76ab41d..207a84d3220d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseWithSubmissionsExportService.java @@ -16,12 +16,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.core.service.ArchivalReportEntry; +import de.tum.cit.aet.artemis.core.service.FilePathService; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.core.service.export.DataExportQuizExerciseCreationService; import de.tum.cit.aet.artemis.quiz.domain.DragAndDropQuestion; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; -import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.service.FileService; /** * Service responsible for exporting quiz exercises with their submissions. diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizMessagingService.java index fddf18b0eab3..0c5900072048 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizMessagingService.java @@ -15,11 +15,11 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; import de.tum.cit.aet.artemis.quiz.domain.QuizAction; import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizScheduleService.java index 992771d4ca14..7aa104280256 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizScheduleService.java @@ -19,6 +19,7 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.ProfileService; import de.tum.cit.aet.artemis.core.service.ScheduleService; import de.tum.cit.aet.artemis.core.util.Tuple; import de.tum.cit.aet.artemis.exercise.domain.ExerciseLifecycle; @@ -27,7 +28,6 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.quiz.repository.QuizBatchRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; -import de.tum.cit.aet.artemis.service.ProfileService; @Profile(PROFILE_SCHEDULING) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizStatisticService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizStatisticService.java index 264a4d2261a0..fe39e27058d5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizStatisticService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizStatisticService.java @@ -14,6 +14,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.lti.service.LtiNewResultService; @@ -24,7 +25,6 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizPointStatisticRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizQuestionStatisticRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizSubmissionService.java index 04b6865f279b..3892a0e8e44e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizSubmissionService.java @@ -14,6 +14,7 @@ import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.exception.QuizSubmissionException; @@ -23,6 +24,8 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; +import de.tum.cit.aet.artemis.exercise.service.SubmissionVersionService; import de.tum.cit.aet.artemis.quiz.domain.AbstractQuizSubmission; import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; @@ -31,9 +34,6 @@ import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; -import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.SubmissionVersionService; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizExerciseResource.java index 7595915f4e8d..2f055ac9bf09 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizExerciseResource.java @@ -47,6 +47,8 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; @@ -61,6 +63,9 @@ import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastInstructorInExercise; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.CourseService; +import de.tum.cit.aet.artemis.core.service.FilePathService; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.exam.service.ExamDateService; @@ -73,6 +78,7 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizBatch; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizMode; +import de.tum.cit.aet.artemis.quiz.dto.QuizBatchJoinDTO; import de.tum.cit.aet.artemis.quiz.repository.QuizBatchRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.service.QuizBatchService; @@ -82,12 +88,6 @@ import de.tum.cit.aet.artemis.quiz.service.QuizResultService; import de.tum.cit.aet.artemis.quiz.service.QuizStatisticService; import de.tum.cit.aet.artemis.quiz.service.QuizSubmissionService; -import de.tum.cit.aet.artemis.service.CourseService; -import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.quiz.dto.QuizBatchJoinDTO; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; /** * REST controller for managing QuizExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizParticipationResource.java index f76daa5eb922..ce0f750ba6af 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizParticipationResource.java @@ -25,13 +25,13 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.quiz.service.QuizBatchService; -import de.tum.cit.aet.artemis.service.ParticipationService; /** * REST controller for managing quiz participations. diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizSubmissionResource.java index a7be501f54fe..73cfd8a27e20 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizSubmissionResource.java @@ -22,6 +22,7 @@ import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.QuizSubmissionException; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -35,13 +36,12 @@ import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.service.QuizSubmissionService; -import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService; /** * REST controller for managing QuizSubmission. diff --git a/src/main/java/de/tum/cit/aet/artemis/service/dto/package-info.java b/src/main/java/de/tum/cit/aet/artemis/service/dto/package-info.java deleted file mode 100644 index 52341c9b0f63..000000000000 --- a/src/main/java/de/tum/cit/aet/artemis/service/dto/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Data Transfer Objects. - */ -package de.tum.cit.aet.artemis.service.dto; diff --git a/src/main/java/de/tum/cit/aet/artemis/service/package-info.java b/src/main/java/de/tum/cit/aet/artemis/service/package-info.java deleted file mode 100644 index ec59da99736b..000000000000 --- a/src/main/java/de/tum/cit/aet/artemis/service/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Service layer beans. - */ -package de.tum.cit.aet.artemis.service; diff --git a/src/main/java/de/tum/cit/aet/artemis/text/service/TextAssessmentService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextAssessmentService.java index 161093f7491d..b46a28bedb66 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/service/TextAssessmentService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextAssessmentService.java @@ -20,16 +20,16 @@ import de.tum.cit.aet.artemis.assessment.service.AssessmentService; import de.tum.cit.aet.artemis.assessment.service.ComplaintResponseService; import de.tum.cit.aet.artemis.assessment.service.ResultService; +import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService; import de.tum.cit.aet.artemis.communication.service.notifications.SingleUserNotificationService; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.exam.service.ExamDateService; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.service.SubmissionService; import de.tum.cit.aet.artemis.lti.service.LtiNewResultService; -import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.text.domain.TextSubmission; -import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseFeedbackService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseFeedbackService.java index 5d980ec6a859..69f345c535cd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseFeedbackService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseFeedbackService.java @@ -18,16 +18,16 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.service.ResultService; +import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService; import de.tum.cit.aet.artemis.athena.service.AthenaFeedbackSuggestionsService; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.InternalServerErrorException; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; -import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.SubmissionService; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; +import de.tum.cit.aet.artemis.exercise.service.SubmissionService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; -import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseService.java index 51a1140b95d4..3b98213977f5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseService.java @@ -10,13 +10,13 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.core.util.PageUtil; import de.tum.cit.aet.artemis.exercise.service.ExerciseSpecificationService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseWithSubmissionsExportService.java index 9d6f5285b75b..efda87f1b45b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextExerciseWithSubmissionsExportService.java @@ -10,10 +10,10 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.service.ArchivalReportEntry; +import de.tum.cit.aet.artemis.core.service.FileService; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionExportOptionsDTO; import de.tum.cit.aet.artemis.exercise.service.ExerciseWithSubmissionsExportService; -import de.tum.cit.aet.artemis.service.FileService; import de.tum.cit.aet.artemis.text.domain.TextExercise; -import de.tum.cit.aet.artemis.exercise.dto.SubmissionExportOptionsDTO; /** * Service for exporting Text Exercises with the student submissions. diff --git a/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionExportService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionExportService.java index 6a14e66519f8..6025b30fbea2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionExportService.java @@ -11,12 +11,12 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.service.FileService; +import de.tum.cit.aet.artemis.core.service.ZipFileService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.service.SubmissionExportService; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.ZipFileService; import de.tum.cit.aet.artemis.text.domain.TextSubmission; @Profile(PROFILE_CORE) diff --git a/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionService.java index b137177a27b1..a7f5ff325f1a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionService.java @@ -31,9 +31,9 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; -import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.SubmissionService; -import de.tum.cit.aet.artemis.service.SubmissionVersionService; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; +import de.tum.cit.aet.artemis.exercise.service.SubmissionService; +import de.tum.cit.aet.artemis.exercise.service.SubmissionVersionService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminTextAssessmentEventResource.java b/src/main/java/de/tum/cit/aet/artemis/text/web/AdminTextAssessmentEventResource.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminTextAssessmentEventResource.java rename to src/main/java/de/tum/cit/aet/artemis/text/web/AdminTextAssessmentEventResource.java index 8faaa57ad1fe..51ee57b167b2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminTextAssessmentEventResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/web/AdminTextAssessmentEventResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.web.admin; +package de.tum.cit.aet.artemis.text.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/text/web/TextAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/text/web/TextAssessmentResource.java index 58ccee17f7fc..8ec980049277 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/web/TextAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/web/TextAssessmentResource.java @@ -39,6 +39,7 @@ import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.service.ResultService; +import de.tum.cit.aet.artemis.assessment.web.AssessmentResource; import de.tum.cit.aet.artemis.athena.service.AthenaFeedbackSendingService; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; @@ -55,17 +56,16 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; -import de.tum.cit.aet.artemis.exercise.web.AssessmentResource; import de.tum.cit.aet.artemis.text.domain.TextBlock; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; +import de.tum.cit.aet.artemis.text.dto.TextAssessmentDTO; +import de.tum.cit.aet.artemis.text.dto.TextAssessmentUpdateDTO; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.text.service.TextAssessmentService; import de.tum.cit.aet.artemis.text.service.TextBlockService; import de.tum.cit.aet.artemis.text.service.TextSubmissionService; -import de.tum.cit.aet.artemis.text.dto.TextAssessmentDTO; -import de.tum.cit.aet.artemis.text.dto.TextAssessmentUpdateDTO; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; diff --git a/src/main/java/de/tum/cit/aet/artemis/text/web/TextExerciseResource.java b/src/main/java/de/tum/cit/aet/artemis/text/web/TextExerciseResource.java index 2456a704ca93..8f98cd911c51 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/web/TextExerciseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/web/TextExerciseResource.java @@ -47,6 +47,8 @@ import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.ConflictException; @@ -59,6 +61,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; +import de.tum.cit.aet.artemis.core.service.CourseService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; @@ -68,26 +71,23 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionExportOptionsDTO; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseDateService; import de.tum.cit.aet.artemis.exercise.service.ExerciseDeletionService; import de.tum.cit.aet.artemis.exercise.service.ExerciseService; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismResultDTO; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismDetectionConfigHelper; import de.tum.cit.aet.artemis.plagiarism.service.PlagiarismDetectionService; -import de.tum.cit.aet.artemis.service.CourseService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.text.service.TextExerciseImportService; import de.tum.cit.aet.artemis.text.service.TextExerciseService; import de.tum.cit.aet.artemis.text.service.TextSubmissionExportService; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.exercise.dto.SubmissionExportOptionsDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; -import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismResultDTO; /** * REST controller for managing TextExercise. diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroup.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroup.java index 620affb2f254..5a4f4c4b2f45 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroup.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/domain/TutorialGroup.java @@ -27,7 +27,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; +import de.tum.cit.aet.artemis.communication.dto.ChannelDTO; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.domain.User; diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupService.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupService.java index 386c3ed3b725..e339fc473e52 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupService.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/service/TutorialGroupService.java @@ -38,11 +38,11 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.StudentDTO; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistrationType; diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupFreePeriodResource.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupFreePeriodResource.java index e6444f58f6be..d8a59414d71c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupFreePeriodResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupFreePeriodResource.java @@ -31,10 +31,10 @@ import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupFreePeriod; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupsConfiguration; +import de.tum.cit.aet.artemis.tutorialgroup.dto.TutorialGroupFreePeriodDTO; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupFreePeriodRepository; import de.tum.cit.aet.artemis.tutorialgroup.repository.TutorialGroupsConfigurationRepository; import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupFreePeriodService; -import de.tum.cit.aet.artemis.tutorialgroup.dto.TutorialGroupFreePeriodDTO; @Profile(PROFILE_CORE) @RestController diff --git a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupResource.java b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupResource.java index 01fdf3778250..daa50435cf94 100644 --- a/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/tutorialgroup/web/TutorialGroupResource.java @@ -46,6 +46,7 @@ import de.tum.cit.aet.artemis.communication.service.notifications.TutorialGroupNotificationService; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.StudentDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; @@ -58,7 +59,6 @@ import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggle; -import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistrationType; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSchedule; diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractArtemisIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractArtemisIntegrationTest.java index 2a5651592456..14a7ed09cb02 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractArtemisIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractArtemisIntegrationTest.java @@ -26,6 +26,7 @@ import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.communication.service.notifications.ConversationNotificationService; import de.tum.cit.aet.artemis.communication.service.notifications.GeneralInstantNotificationService; import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; @@ -37,7 +38,9 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.core.service.ScheduleService; +import de.tum.cit.aet.artemis.core.service.ZipFileService; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exam.service.ExamAccessService; @@ -52,10 +55,7 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseParticipationService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseScheduleService; import de.tum.cit.aet.artemis.programming.service.ProgrammingTriggerService; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.UriService; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.service.ZipFileService; +import de.tum.cit.aet.artemis.programming.service.UriService; import de.tum.cit.aet.artemis.text.service.TextBlockService; import de.tum.cit.aet.artemis.text.service.TextSubmissionService; import de.tum.cit.aet.artemis.user.UserFactory; diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java index 2916e9e9bc2f..dfc387abb208 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java @@ -4,8 +4,8 @@ import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import static de.tum.cit.aet.artemis.core.config.Constants.TEST_REPO_NAME; -import static de.tum.cit.aet.artemis.programming.domain.BuildPlanType.SOLUTION; -import static de.tum.cit.aet.artemis.programming.domain.BuildPlanType.TEMPLATE; +import static de.tum.cit.aet.artemis.programming.domain.build.BuildPlanType.SOLUTION; +import static de.tum.cit.aet.artemis.programming.domain.build.BuildPlanType.TEMPLATE; import static de.tum.cit.aet.artemis.util.TestConstants.COMMIT_HASH_OBJECT_ID; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doReturn; @@ -29,6 +29,7 @@ import com.offbytwo.jenkins.JenkinsServer; +import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService; import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.connector.AeolusRequestMockProvider; import de.tum.cit.aet.artemis.connector.GitlabRequestMockProvider; @@ -47,7 +48,6 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingMessagingService; import de.tum.cit.aet.artemis.programming.service.gitlab.GitLabService; import de.tum.cit.aet.artemis.programming.service.jenkins.JenkinsService; -import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService; @ResourceLock("AbstractSpringIntegrationJenkinsGitlabTest") // NOTE: we use a common set of active profiles to reduce the number of application launches during testing. This significantly saves time and memory! diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java index b87eff59c1cf..eb9e0de59d24 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java @@ -29,6 +29,7 @@ import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.service.ResourceLoaderService; import de.tum.cit.aet.artemis.core.service.ldap.LdapUserService; import de.tum.cit.aet.artemis.exam.service.ExamLiveEventsService; import de.tum.cit.aet.artemis.exercise.domain.Team; @@ -48,7 +49,6 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingMessagingService; import de.tum.cit.aet.artemis.programming.service.localci.LocalCIService; import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCService; -import de.tum.cit.aet.artemis.service.ResourceLoaderService; import de.tum.cit.aet.artemis.user.UserUtilService; // Must start up an actual web server such that the tests can communicate with the ArtemisGitServlet using JGit. diff --git a/src/test/java/de/tum/cit/aet/artemis/BuildPlanIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/BuildPlanIntegrationTest.java index 86e18e893f61..880d34fb3c51 100644 --- a/src/test/java/de/tum/cit/aet/artemis/BuildPlanIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/BuildPlanIntegrationTest.java @@ -10,11 +10,11 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; -import de.tum.cit.aet.artemis.programming.domain.BuildPlan; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.build.BuildPlan; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/ClientForwardTest.java b/src/test/java/de/tum/cit/aet/artemis/ClientForwardTest.java index 5e9bee240698..9e2b5bbd6324 100644 --- a/src/test/java/de/tum/cit/aet/artemis/ClientForwardTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/ClientForwardTest.java @@ -14,9 +14,9 @@ import org.springframework.test.web.servlet.ResultActions; import de.tum.cit.aet.artemis.core.config.SecurityConfiguration; +import de.tum.cit.aet.artemis.core.security.filter.SpaWebFilter; import de.tum.cit.aet.artemis.core.security.jwt.JWTCookieService; import de.tum.cit.aet.artemis.core.security.jwt.JWTFilter; -import de.tum.cit.aet.artemis.core.web.filter.SpaWebFilter; /** * Test class for the ClientForwardController REST controller. diff --git a/src/test/java/de/tum/cit/aet/artemis/ContentVersionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/ContentVersionIntegrationTest.java index dc84771ef5f5..c277d76bcbb0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/ContentVersionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/ContentVersionIntegrationTest.java @@ -11,7 +11,7 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import de.tum.cit.aet.artemis.core.web.filter.ApiVersionFilter; +import de.tum.cit.aet.artemis.core.security.filter.ApiVersionFilter; class ContentVersionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/DatabaseQueryCountTest.java b/src/test/java/de/tum/cit/aet/artemis/DatabaseQueryCountTest.java index ca974a35c362..6b8172b5a557 100644 --- a/src/test/java/de/tum/cit/aet/artemis/DatabaseQueryCountTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/DatabaseQueryCountTest.java @@ -12,11 +12,11 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.CoursesForDashboardDTO; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.lecture.LectureUtilService; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.core.dto.CoursesForDashboardDTO; class DatabaseQueryCountTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/FileIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/FileIntegrationTest.java index ed8b7981f687..c50e47d2aaf5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/FileIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/FileIntegrationTest.java @@ -28,6 +28,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.ExamUser; +import de.tum.cit.aet.artemis.exam.dto.ExamUserDTO; import de.tum.cit.aet.artemis.lecture.LectureFactory; import de.tum.cit.aet.artemis.lecture.LectureUtilService; import de.tum.cit.aet.artemis.lecture.domain.Attachment; @@ -39,7 +40,6 @@ import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; -import de.tum.cit.aet.artemis.exam.dto.ExamUserDTO; class FileIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/MetricsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/MetricsIntegrationTest.java index 89c654ea6999..be4fcd14a70a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/MetricsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/MetricsIntegrationTest.java @@ -24,13 +24,13 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; +import de.tum.cit.aet.artemis.atlas.dto.metrics.ResourceTimestampDTO; +import de.tum.cit.aet.artemis.atlas.dto.metrics.StudentMetricsDTO; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; -import de.tum.cit.aet.artemis.exercise.repository.ExerciseMetricsRepository; import de.tum.cit.aet.artemis.exercise.dto.ExerciseInformationDTO; -import de.tum.cit.aet.artemis.atlas.dto.metrics.ResourceTimestampDTO; -import de.tum.cit.aet.artemis.atlas.dto.metrics.StudentMetricsDTO; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseMetricsRepository; class MetricsIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/StatisticsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/StatisticsIntegrationTest.java index af6c74505216..5e98f689fc33 100644 --- a/src/test/java/de/tum/cit/aet/artemis/StatisticsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/StatisticsIntegrationTest.java @@ -33,6 +33,8 @@ import de.tum.cit.aet.artemis.core.domain.SpanType; import de.tum.cit.aet.artemis.core.domain.StatisticsView; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.CourseManagementStatisticsDTO; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseManagementStatisticsDTO; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; @@ -41,8 +43,6 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; -import de.tum.cit.aet.artemis.core.dto.CourseManagementStatisticsDTO; -import de.tum.cit.aet.artemis.exercise.dto.ExerciseManagementStatisticsDTO; class StatisticsIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java index d551b480c338..302e18788eec 100644 --- a/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/architecture/ArchitectureTest.java @@ -73,11 +73,11 @@ import de.tum.cit.aet.artemis.AbstractArtemisIntegrationTest; import de.tum.cit.aet.artemis.authorization.AuthorizationTestService; +import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.core.config.ApplicationConfiguration; import de.tum.cit.aet.artemis.core.config.ConditionalMetricsExclusionConfiguration; import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.web.repository.RepositoryResource; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; /** * This class contains architecture tests that apply for the whole project. diff --git a/src/test/java/de/tum/cit/aet/artemis/architecture/ServiceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/architecture/ServiceArchitectureTest.java index a03f8f3cae9a..54b994557e6a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/architecture/ServiceArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/architecture/ServiceArchitectureTest.java @@ -18,14 +18,14 @@ import com.tngtech.archunit.lang.ArchRule; import com.tngtech.archunit.lang.ConditionEvents; +import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService; import de.tum.cit.aet.artemis.core.config.migration.MigrationService; import de.tum.cit.aet.artemis.core.management.SecurityMetersService; import de.tum.cit.aet.artemis.core.security.DomainUserDetailsService; import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; import de.tum.cit.aet.artemis.core.security.jwt.JWTCookieService; +import de.tum.cit.aet.artemis.programming.service.localci.LocalCIWebsocketMessagingService; import de.tum.cit.aet.artemis.programming.web.GitDiffReportParserService; -import de.tum.cit.aet.artemis.assessment.web.ResultWebsocketService; -import de.tum.cit.aet.artemis.programming.web.LocalCIWebsocketMessagingService; class ServiceArchitectureTest extends AbstractArchitectureTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentComplaintIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentComplaintIntegrationTest.java index af23a513bb37..1eed5b32df7f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentComplaintIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentComplaintIntegrationTest.java @@ -24,6 +24,10 @@ import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; +import de.tum.cit.aet.artemis.assessment.dto.ComplaintAction; +import de.tum.cit.aet.artemis.assessment.dto.ComplaintRequestDTO; +import de.tum.cit.aet.artemis.assessment.dto.ComplaintResponseUpdateDTO; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; import de.tum.cit.aet.artemis.core.domain.Course; @@ -34,6 +38,7 @@ import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionWithComplaintDTO; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; @@ -45,14 +50,9 @@ import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.service.dto.ComplaintAction; -import de.tum.cit.aet.artemis.service.dto.ComplaintRequestDTO; -import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.util.TestResourceUtils; -import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; -import de.tum.cit.aet.artemis.exercise.dto.SubmissionWithComplaintDTO; class AssessmentComplaintIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java index 7363cadc9aa6..7ef8267ed785 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java @@ -21,6 +21,10 @@ import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; +import de.tum.cit.aet.artemis.assessment.dto.ComplaintAction; +import de.tum.cit.aet.artemis.assessment.dto.ComplaintRequestDTO; +import de.tum.cit.aet.artemis.assessment.dto.ComplaintResponseUpdateDTO; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; @@ -33,12 +37,8 @@ import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.service.dto.ComplaintAction; -import de.tum.cit.aet.artemis.service.dto.ComplaintRequestDTO; -import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; import de.tum.cit.aet.artemis.team.TeamUtilService; import de.tum.cit.aet.artemis.util.TestResourceUtils; -import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; class AssessmentTeamComplaintIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintResponseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintResponseIntegrationTest.java index b10c52049136..7026c88294d5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintResponseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintResponseIntegrationTest.java @@ -19,6 +19,8 @@ import de.tum.cit.aet.artemis.assessment.domain.ComplaintResponse; import de.tum.cit.aet.artemis.assessment.domain.ComplaintType; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.ComplaintAction; +import de.tum.cit.aet.artemis.assessment.dto.ComplaintResponseUpdateDTO; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; import de.tum.cit.aet.artemis.core.config.Constants; @@ -27,11 +29,9 @@ import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.participation.ParticipationFactory; -import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.dto.ComplaintAction; -import de.tum.cit.aet.artemis.service.dto.ComplaintResponseUpdateDTO; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintUtilService.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintUtilService.java index ac1620eb6d3b..67072c4a38be 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ComplaintUtilService.java @@ -7,6 +7,7 @@ import de.tum.cit.aet.artemis.assessment.domain.ComplaintResponse; import de.tum.cit.aet.artemis.assessment.domain.ComplaintType; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; @@ -16,7 +17,6 @@ import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; /** * Service responsible for initializing the database with specific testdata related to complaints for use in integration tests. diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ExampleSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ExampleSubmissionIntegrationTest.java index 0e9b31de485f..b30771e42c5a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ExampleSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ExampleSubmissionIntegrationTest.java @@ -42,8 +42,8 @@ import de.tum.cit.aet.artemis.text.domain.TextBlock; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; -import de.tum.cit.aet.artemis.util.TestResourceUtils; import de.tum.cit.aet.artemis.text.dto.TextAssessmentDTO; +import de.tum.cit.aet.artemis.util.TestResourceUtils; class ExampleSubmissionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java index 9dd5ccd2db37..7aecdc57d201 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ExerciseScoresChartIntegrationTest.java @@ -24,12 +24,12 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Team; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseScoresDTO; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.team.TeamUtilService; import de.tum.cit.aet.artemis.text.domain.TextExercise; -import de.tum.cit.aet.artemis.exercise.dto.ExerciseScoresDTO; class ExerciseScoresChartIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/GradeStepIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/GradeStepIntegrationTest.java index b5bb7d61892d..793a6c77d053 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/GradeStepIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/GradeStepIntegrationTest.java @@ -16,6 +16,8 @@ import de.tum.cit.aet.artemis.assessment.domain.GradeStep; import de.tum.cit.aet.artemis.assessment.domain.GradeType; import de.tum.cit.aet.artemis.assessment.domain.GradingScale; +import de.tum.cit.aet.artemis.assessment.dto.GradeDTO; +import de.tum.cit.aet.artemis.assessment.dto.GradeStepsDTO; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; @@ -28,8 +30,6 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; -import de.tum.cit.aet.artemis.assessment.dto.GradeDTO; -import de.tum.cit.aet.artemis.assessment.dto.GradeStepsDTO; class GradeStepIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java index de99a986b029..a5d523e31d62 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ParticipantScoreIntegrationTest.java @@ -19,6 +19,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; import de.tum.cit.aet.artemis.assessment.domain.GradingScale; +import de.tum.cit.aet.artemis.assessment.dto.score.ScoreDTO; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; @@ -40,7 +41,6 @@ import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.team.TeamUtilService; import de.tum.cit.aet.artemis.text.domain.TextExercise; -import de.tum.cit.aet.artemis.assessment.dto.score.ScoreDTO; class ParticipantScoreIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java index b3e4465e0130..b0b28eb32133 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java @@ -31,6 +31,8 @@ import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; import de.tum.cit.aet.artemis.assessment.domain.GradingInstruction; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.FeedbackDetailDTO; +import de.tum.cit.aet.artemis.assessment.dto.ResultWithPointsPerGradingCriterionDTO; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.core.domain.Course; @@ -73,8 +75,6 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; -import de.tum.cit.aet.artemis.assessment.dto.ResultWithPointsPerGradingCriterionDTO; -import de.tum.cit.aet.artemis.assessment.dto.FeedbackDetailDTO; class ResultServiceIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java index c3fe342a01b2..1f86f9c85d79 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java @@ -16,11 +16,11 @@ import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.assessment.service.TutorLeaderboardService; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.dto.TutorLeaderboardDTO; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.core.dto.TutorLeaderboardDTO; class TutorLeaderboardServiceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationIntegrationTest.java index 21a768b86d8b..5eea0d938b44 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/TutorParticipationIntegrationTest.java @@ -30,10 +30,10 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.service.SubmissionService; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.service.SubmissionService; import de.tum.cit.aet.artemis.text.domain.TextBlock; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; diff --git a/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java index ab16169890e2..79cbbbfd3db4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authentication/LdapAuthenticationIntegrationTest.java @@ -24,6 +24,7 @@ import de.tum.cit.aet.artemis.core.domain.Authority; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.StudentDTO; import de.tum.cit.aet.artemis.core.dto.vm.LoginVM; import de.tum.cit.aet.artemis.core.repository.AuthorityRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -33,7 +34,6 @@ import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.service.dto.StudentDTO; class LdapAuthenticationIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/bonus/BonusIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/bonus/BonusIntegrationTest.java index b26b50e1c779..5ca197382d45 100644 --- a/src/test/java/de/tum/cit/aet/artemis/bonus/BonusIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/bonus/BonusIntegrationTest.java @@ -24,6 +24,7 @@ import de.tum.cit.aet.artemis.assessment.domain.GradeStep; import de.tum.cit.aet.artemis.assessment.domain.GradeType; import de.tum.cit.aet.artemis.assessment.domain.GradingScale; +import de.tum.cit.aet.artemis.assessment.dto.BonusExampleDTO; import de.tum.cit.aet.artemis.assessment.repository.BonusRepository; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.core.domain.Course; @@ -33,7 +34,6 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; -import de.tum.cit.aet.artemis.assessment.dto.BonusExampleDTO; class BonusIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/AbstractCompetencyPrerequisiteIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/AbstractCompetencyPrerequisiteIntegrationTest.java index fe140f60585b..7b1bf0d4fb8f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/AbstractCompetencyPrerequisiteIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/AbstractCompetencyPrerequisiteIntegrationTest.java @@ -22,6 +22,8 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; import de.tum.cit.aet.artemis.atlas.domain.competency.RelationType; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportResponseDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; @@ -43,8 +45,6 @@ import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; -import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportResponseDTO; -import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; abstract class AbstractCompetencyPrerequisiteIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyIntegrationTest.java index 84c4389780cd..99ce9e864b88 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyIntegrationTest.java @@ -15,9 +15,9 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportResponseDTO; import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; class CompetencyIntegrationTest extends AbstractCompetencyPrerequisiteIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyJolIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyJolIntegrationTest.java index 32add750456c..4f7ae3b9818e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyJolIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyJolIntegrationTest.java @@ -16,9 +16,9 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyProgress; -import de.tum.cit.aet.artemis.atlas.repository.competency.CompetencyJolRepository; -import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.atlas.dto.CompetencyJolPairDTO; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyJolRepository; +import de.tum.cit.aet.artemis.core.domain.User; class CompetencyJolIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyUtilService.java b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyUtilService.java index 0103cef27a60..f8f6c3aa97c4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/CompetencyUtilService.java @@ -12,9 +12,9 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyRelation; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyTaxonomy; import de.tum.cit.aet.artemis.atlas.domain.competency.RelationType; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyJolRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; -import de.tum.cit.aet.artemis.atlas.repository.competency.CompetencyJolRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.Exercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/CourseCompetencyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/CourseCompetencyIntegrationTest.java index 017d73c0aba3..a413ae808e1d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/CourseCompetencyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/CourseCompetencyIntegrationTest.java @@ -29,12 +29,16 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; import de.tum.cit.aet.artemis.atlas.domain.competency.RelationType; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyRelationDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.repository.PrerequisiteRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.CourseCompetencyProgressDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exercise.domain.DifficultyLevel; import de.tum.cit.aet.artemis.exercise.domain.Exercise; @@ -46,6 +50,7 @@ import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseFactory; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.lecture.LectureUtilService; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; @@ -62,16 +67,11 @@ import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; -import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.team.TeamUtilService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; -import de.tum.cit.aet.artemis.core.dto.CourseCompetencyProgressDTO; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.atlas.dto.CompetencyRelationDTO; -import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; class CourseCompetencyIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java index 64ba9ef941da..1d3db7ad24e7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/LearningPathIntegrationTest.java @@ -32,10 +32,21 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyRelation; import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; import de.tum.cit.aet.artemis.atlas.domain.competency.RelationType; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyGraphNodeDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyNameDTO; +import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathCompetencyGraphDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathHealthDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathInformationDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationObjectDTO; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationOverviewDTO; +import de.tum.cit.aet.artemis.atlas.dto.NgxLearningPathDTO; import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.LearningPathRepository; import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; +import de.tum.cit.aet.artemis.atlas.web.LearningPathResource; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.Exercise; @@ -49,17 +60,6 @@ import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; -import de.tum.cit.aet.artemis.atlas.web.LearningPathResource; -import de.tum.cit.aet.artemis.atlas.dto.CompetencyGraphNodeDTO; -import de.tum.cit.aet.artemis.atlas.dto.CompetencyNameDTO; -import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; -import de.tum.cit.aet.artemis.atlas.dto.LearningPathCompetencyGraphDTO; -import de.tum.cit.aet.artemis.atlas.dto.LearningPathHealthDTO; -import de.tum.cit.aet.artemis.atlas.dto.LearningPathInformationDTO; -import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationDTO; -import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationObjectDTO; -import de.tum.cit.aet.artemis.atlas.dto.LearningPathNavigationOverviewDTO; -import de.tum.cit.aet.artemis.atlas.dto.NgxLearningPathDTO; class LearningPathIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteIntegrationTest.java index f92b4da2a86d..edbbc3b5849d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/PrerequisiteIntegrationTest.java @@ -15,9 +15,9 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.domain.competency.Prerequisite; -import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportResponseDTO; import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; +import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; class PrerequisiteIntegrationTest extends AbstractCompetencyPrerequisiteIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyIntegrationTest.java index 156b1a3e15cf..27dd0bb81a9c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyIntegrationTest.java @@ -23,16 +23,16 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.KnowledgeArea; import de.tum.cit.aet.artemis.atlas.domain.competency.Source; import de.tum.cit.aet.artemis.atlas.domain.competency.StandardizedCompetency; -import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; -import de.tum.cit.aet.artemis.atlas.repository.SourceRepository; -import de.tum.cit.aet.artemis.atlas.repository.competency.KnowledgeAreaRepository; -import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.KnowledgeAreaRequestDTO; import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.KnowledgeAreaResultDTO; import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.SourceDTO; import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO; import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyRequestDTO; import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyResultDTO; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; +import de.tum.cit.aet.artemis.atlas.repository.KnowledgeAreaRepository; +import de.tum.cit.aet.artemis.atlas.repository.SourceRepository; +import de.tum.cit.aet.artemis.atlas.repository.StandardizedCompetencyRepository; class StandardizedCompetencyIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyUtilService.java b/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyUtilService.java index ec11421670d3..c8170df85953 100644 --- a/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/competency/StandardizedCompetencyUtilService.java @@ -13,10 +13,10 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.KnowledgeArea; import de.tum.cit.aet.artemis.atlas.domain.competency.Source; import de.tum.cit.aet.artemis.atlas.domain.competency.StandardizedCompetency; -import de.tum.cit.aet.artemis.atlas.repository.competency.KnowledgeAreaRepository; -import de.tum.cit.aet.artemis.atlas.repository.competency.StandardizedCompetencyRepository; import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.KnowledgeAreaRequestDTO; import de.tum.cit.aet.artemis.atlas.dto.standardizedCompetency.StandardizedCompetencyRequestDTO; +import de.tum.cit.aet.artemis.atlas.repository.KnowledgeAreaRepository; +import de.tum.cit.aet.artemis.atlas.repository.StandardizedCompetencyRepository; @Service public class StandardizedCompetencyUtilService { diff --git a/src/test/java/de/tum/cit/aet/artemis/connector/GitlabRequestMockProvider.java b/src/test/java/de/tum/cit/aet/artemis/connector/GitlabRequestMockProvider.java index 7f659fc6914a..de0c4d7b77e1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connector/GitlabRequestMockProvider.java +++ b/src/test/java/de/tum/cit/aet/artemis/connector/GitlabRequestMockProvider.java @@ -97,12 +97,12 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.UriService; import de.tum.cit.aet.artemis.programming.service.gitlab.GitLabException; import de.tum.cit.aet.artemis.programming.service.gitlab.GitLabUserDoesNotExistException; import de.tum.cit.aet.artemis.programming.service.gitlab.GitLabUserManagementService; import de.tum.cit.aet.artemis.programming.service.gitlab.dto.GitLabPersonalAccessTokenListResponseDTO; import de.tum.cit.aet.artemis.programming.service.gitlab.dto.GitLabPersonalAccessTokenResponseDTO; -import de.tum.cit.aet.artemis.service.UriService; @Component @Profile("gitlab") diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java index 61c0478451c1..360f7a31b56f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java @@ -65,8 +65,8 @@ import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.lti.service.Lti13Service; import de.tum.cit.aet.artemis.lti.service.LtiService; +import de.tum.cit.aet.artemis.lti.service.OnlineCourseConfigurationService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import uk.ac.ox.ctl.lti13.lti.Claims; diff --git a/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java b/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java index 09cadc5faa6e..a322be8f61ab 100644 --- a/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java @@ -68,6 +68,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.domain.TutorParticipation; +import de.tum.cit.aet.artemis.assessment.dto.UserNameAndLoginDTO; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; @@ -77,11 +78,11 @@ import de.tum.cit.aet.artemis.atlas.repository.LearningPathRepository; import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; import de.tum.cit.aet.artemis.communication.domain.DefaultChannelType; +import de.tum.cit.aet.artemis.communication.dto.ChannelDTO; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationRepository; import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.competency.PrerequisiteUtilService; import de.tum.cit.aet.artemis.core.config.Constants; @@ -89,11 +90,24 @@ import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.core.domain.Organization; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO; +import de.tum.cit.aet.artemis.core.dto.CourseForImportDTO; +import de.tum.cit.aet.artemis.core.dto.CourseManagementDetailViewDTO; +import de.tum.cit.aet.artemis.core.dto.CourseManagementOverviewStatisticsDTO; +import de.tum.cit.aet.artemis.core.dto.CoursesForDashboardDTO; +import de.tum.cit.aet.artemis.core.dto.OnlineCourseDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; +import de.tum.cit.aet.artemis.core.dto.StudentDTO; +import de.tum.cit.aet.artemis.core.dto.TutorLeaderboardDTO; +import de.tum.cit.aet.artemis.core.dto.UserDTO; +import de.tum.cit.aet.artemis.core.dto.UserPublicInfoDTO; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.CustomAuditEventRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.FilePathService; import de.tum.cit.aet.artemis.core.service.export.CourseExamExportService; import de.tum.cit.aet.artemis.core.service.export.DataExportUtil; import de.tum.cit.aet.artemis.exam.ExamFactory; @@ -116,6 +130,7 @@ import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; @@ -140,14 +155,10 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; -import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.dto.StudentDTO; -import de.tum.cit.aet.artemis.service.dto.UserDTO; -import de.tum.cit.aet.artemis.service.dto.UserPublicInfoDTO; import de.tum.cit.aet.artemis.team.TeamUtilService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; +import de.tum.cit.aet.artemis.text.dto.TextAssessmentUpdateDTO; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorParticipationStatus; import de.tum.cit.aet.artemis.user.UserFactory; @@ -156,17 +167,6 @@ import de.tum.cit.aet.artemis.util.RequestUtilService; import de.tum.cit.aet.artemis.util.TestResourceUtils; import de.tum.cit.aet.artemis.util.ZipFileTestUtilService; -import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO; -import de.tum.cit.aet.artemis.core.dto.CourseForImportDTO; -import de.tum.cit.aet.artemis.core.dto.CourseManagementDetailViewDTO; -import de.tum.cit.aet.artemis.core.dto.CourseManagementOverviewStatisticsDTO; -import de.tum.cit.aet.artemis.core.dto.CoursesForDashboardDTO; -import de.tum.cit.aet.artemis.core.dto.OnlineCourseDTO; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; -import de.tum.cit.aet.artemis.text.dto.TextAssessmentUpdateDTO; -import de.tum.cit.aet.artemis.core.dto.TutorLeaderboardDTO; -import de.tum.cit.aet.artemis.assessment.dto.UserNameAndLoginDTO; @Service public class CourseTestService { diff --git a/src/test/java/de/tum/cit/aet/artemis/course/CourseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/course/CourseUtilService.java index c81e535dea2c..80360509c72f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/course/CourseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/course/CourseUtilService.java @@ -34,6 +34,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.FilePathService; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; @@ -81,7 +82,6 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; -import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/dataexport/DataExportResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/dataexport/DataExportResourceIntegrationTest.java index c7d2d0dc92a3..6867828905d4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/dataexport/DataExportResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/dataexport/DataExportResourceIntegrationTest.java @@ -29,10 +29,10 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.core.domain.DataExport; import de.tum.cit.aet.artemis.core.domain.DataExportState; -import de.tum.cit.aet.artemis.core.repository.DataExportRepository; -import de.tum.cit.aet.artemis.core.service.export.DataExportService; import de.tum.cit.aet.artemis.core.dto.DataExportDTO; import de.tum.cit.aet.artemis.core.dto.RequestDataExportDTO; +import de.tum.cit.aet.artemis.core.repository.DataExportRepository; +import de.tum.cit.aet.artemis.core.service.export.DataExportService; @ExtendWith(MockitoExtension.class) class DataExportResourceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamFactory.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamFactory.java index 6ae9c828ceee..735195d87177 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamFactory.java @@ -7,15 +7,15 @@ import java.util.Set; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.dto.CourseWithIdDTO; +import de.tum.cit.aet.artemis.core.dto.UserWithIdAndLoginDTO; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExamSession; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.StudentExam; -import de.tum.cit.aet.artemis.core.dto.CourseWithIdDTO; import de.tum.cit.aet.artemis.exam.dto.ExamSessionDTO; import de.tum.cit.aet.artemis.exam.dto.ExamWithIdAndCourseDTO; import de.tum.cit.aet.artemis.exam.dto.StudentExamWithIdAndExamAndUserDTO; -import de.tum.cit.aet.artemis.core.dto.UserWithIdAndLoginDTO; /** * Factory for creating Exams and related objects. diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java index 10a4233ecd95..47c7231129a3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamIntegrationTest.java @@ -46,6 +46,9 @@ import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.CourseWithIdDTO; +import de.tum.cit.aet.artemis.core.dto.StudentDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.service.user.PasswordService; import de.tum.cit.aet.artemis.exam.domain.Exam; @@ -53,6 +56,12 @@ import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.domain.SuspiciousSessionReason; +import de.tum.cit.aet.artemis.exam.dto.ExamChecklistDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamInformationDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamScoresDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamSessionDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamWithIdAndCourseDTO; +import de.tum.cit.aet.artemis.exam.dto.SuspiciousExamSessionsDTO; import de.tum.cit.aet.artemis.exam.repository.ExamLiveEventRepository; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; @@ -63,6 +72,8 @@ import de.tum.cit.aet.artemis.exercise.domain.ExerciseType; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseForPlagiarismCasesOverviewDTO; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseGroupWithIdAndExamDTO; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.quiz.QuizExerciseFactory; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; @@ -79,22 +90,11 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizPoolRepository; import de.tum.cit.aet.artemis.quiz.service.QuizPoolService; -import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; import de.tum.cit.aet.artemis.util.ZipFileTestUtilService; -import de.tum.cit.aet.artemis.core.dto.CourseWithIdDTO; -import de.tum.cit.aet.artemis.exam.dto.ExamChecklistDTO; -import de.tum.cit.aet.artemis.exam.dto.ExamInformationDTO; -import de.tum.cit.aet.artemis.exam.dto.ExamScoresDTO; -import de.tum.cit.aet.artemis.exam.dto.ExamSessionDTO; -import de.tum.cit.aet.artemis.exam.dto.ExamWithIdAndCourseDTO; -import de.tum.cit.aet.artemis.exercise.dto.ExerciseForPlagiarismCasesOverviewDTO; -import de.tum.cit.aet.artemis.exercise.dto.ExerciseGroupWithIdAndExamDTO; -import de.tum.cit.aet.artemis.exam.dto.SuspiciousExamSessionsDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; @TestInstance(TestInstance.Lifecycle.PER_CLASS) class ExamIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java index e4ec5b6da070..d4385663a247 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java @@ -47,10 +47,14 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.DueDateStat; +import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.StudentExam; +import de.tum.cit.aet.artemis.exam.dto.ExamChecklistDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamScoresDTO; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; @@ -84,10 +88,6 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.util.ExamPrepareExercisesTestUtil; import de.tum.cit.aet.artemis.util.LocalRepository; -import de.tum.cit.aet.artemis.core.dto.DueDateStat; -import de.tum.cit.aet.artemis.exam.dto.ExamChecklistDTO; -import de.tum.cit.aet.artemis.exam.dto.ExamScoresDTO; -import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; class ExamParticipationIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java index c2b1453da4fd..961efcba6bf5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamRegistrationIntegrationTest.java @@ -24,6 +24,7 @@ import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.StudentDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.service.ldap.LdapUserDto; import de.tum.cit.aet.artemis.core.service.user.PasswordService; @@ -32,7 +33,6 @@ import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; import de.tum.cit.aet.artemis.exam.service.ExamRegistrationService; -import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.user.UserFactory; class ExamRegistrationIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamUserIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamUserIntegrationTest.java index d42be55cdde3..4c5d61e95770 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamUserIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamUserIntegrationTest.java @@ -37,13 +37,13 @@ import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.domain.StudentExam; +import de.tum.cit.aet.artemis.exam.dto.ExamUserAttendanceCheckDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamUserDTO; +import de.tum.cit.aet.artemis.exam.dto.ExamUsersNotFoundDTO; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.StudentExamRepository; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseTestService; import de.tum.cit.aet.artemis.util.LocalRepository; -import de.tum.cit.aet.artemis.exam.dto.ExamUserAttendanceCheckDTO; -import de.tum.cit.aet.artemis.exam.dto.ExamUserDTO; -import de.tum.cit.aet.artemis.exam.dto.ExamUsersNotFoundDTO; class ExamUserIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java index efbc0c4819b7..981bf3f20820 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java @@ -78,6 +78,11 @@ import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.StudentExam; +import de.tum.cit.aet.artemis.exam.dto.StudentExamWithGradeDTO; +import de.tum.cit.aet.artemis.exam.dto.examevent.ExamAttendanceCheckEventDTO; +import de.tum.cit.aet.artemis.exam.dto.examevent.ExamLiveEventBaseDTO; +import de.tum.cit.aet.artemis.exam.dto.examevent.ExamWideAnnouncementEventDTO; +import de.tum.cit.aet.artemis.exam.dto.examevent.WorkingTimeUpdateEventDTO; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.repository.ExamSessionRepository; import de.tum.cit.aet.artemis.exam.repository.ExamUserRepository; @@ -94,6 +99,7 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionVersionRepository; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; @@ -123,16 +129,10 @@ import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.util.ExamPrepareExercisesTestUtil; import de.tum.cit.aet.artemis.util.LocalRepository; -import de.tum.cit.aet.artemis.exam.dto.StudentExamWithGradeDTO; -import de.tum.cit.aet.artemis.exam.dto.examevent.ExamAttendanceCheckEventDTO; -import de.tum.cit.aet.artemis.exam.dto.examevent.ExamLiveEventBaseDTO; -import de.tum.cit.aet.artemis.exam.dto.examevent.ExamWideAnnouncementEventDTO; -import de.tum.cit.aet.artemis.exam.dto.examevent.WorkingTimeUpdateEventDTO; class StudentExamIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java index 9e97ac518672..8fa60195e1c7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/ExerciseIntegrationTest.java @@ -28,6 +28,7 @@ import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; @@ -37,6 +38,7 @@ import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseDetailsDTO; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; @@ -55,8 +57,6 @@ import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorParticipationStatus; import de.tum.cit.aet.artemis.util.TestResourceUtils; -import de.tum.cit.aet.artemis.exercise.dto.ExerciseDetailsDTO; -import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; class ExerciseIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java index 577efcf716b9..6ad79e7241e2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java @@ -31,6 +31,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; @@ -47,11 +48,10 @@ import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; +import de.tum.cit.aet.artemis.fileupload.dto.FileUploadAssessmentDTO; import de.tum.cit.aet.artemis.fileupload.repository.FileUploadExerciseRepository; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; -import de.tum.cit.aet.artemis.fileupload.dto.FileUploadAssessmentDTO; import de.tum.cit.aet.artemis.programming.dto.ResultDTO; class FileUploadAssessmentIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java index bad3f9dacbc3..4125fccbc947 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java @@ -41,6 +41,8 @@ import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; @@ -56,8 +58,6 @@ import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider; import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider.InvalidExamExerciseDateConfiguration; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; -import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; class FileUploadExerciseIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java index cd62f97af7a5..bbd03d41c6e7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java @@ -34,6 +34,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.service.FilePathService; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -46,7 +47,6 @@ import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.service.FilePathService; class FileUploadSubmissionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java index b769feac4b24..9d3b828824c1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java @@ -35,6 +35,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ComplaintResponseRepository; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; @@ -54,9 +55,11 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; import de.tum.cit.aet.artemis.modeling.domain.DiagramType; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; +import de.tum.cit.aet.artemis.modeling.dto.ModelingAssessmentDTO; import de.tum.cit.aet.artemis.modeling.repository.ModelClusterRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelElementRepository; import de.tum.cit.aet.artemis.modeling.repository.ModelingSubmissionRepository; @@ -67,11 +70,8 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus; import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingSubmissionElement; -import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; -import de.tum.cit.aet.artemis.modeling.dto.ModelingAssessmentDTO; -import de.tum.cit.aet.artemis.programming.dto.ResultDTO; import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismResultDTO; +import de.tum.cit.aet.artemis.programming.dto.ResultDTO; class ModelingAssessmentIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java index dda82612e9e4..874fc5a63650 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java @@ -45,6 +45,7 @@ import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; @@ -63,14 +64,13 @@ import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.plagiarism.domain.modeling.ModelingPlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismResultDTO; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorParticipationStatus; import de.tum.cit.aet.artemis.util.ExerciseIntegrationTestService; import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider; import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider.InvalidExamExerciseDateConfiguration; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; import de.tum.cit.aet.artemis.util.TestResourceUtils; -import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO; -import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismResultDTO; class ModelingExerciseIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java index aa4865850300..a1c02ab967d5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java @@ -35,6 +35,7 @@ import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; import de.tum.cit.aet.artemis.assessment.domain.LongFeedbackText; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; @@ -56,12 +57,11 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.dto.ResultDTO; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.util.TestResourceUtils; -import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; -import de.tum.cit.aet.artemis.programming.dto.ResultDTO; class ProgrammingAssessmentIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseFactory.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseFactory.java index d1bf0593b5df..076826603971 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseFactory.java @@ -27,13 +27,13 @@ import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisCategory; import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; +import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisIssue; +import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisReportDTO; import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.CommitDTO; import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestCaseDTO; import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestCaseDetailMessageDTO; import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestResultsDTO; import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestSuiteDTO; -import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; -import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; import de.tum.cit.aet.artemis.util.TestConstants; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java index 8c7a21becf3f..9a4704c80b2d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java @@ -57,13 +57,13 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseGradingStatisticsDTO; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseGradingService; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseGradingStatisticsDTO; /** * Tests the {@link ProgrammingExerciseGradingService}. diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java index c33508108206..6e49b375283c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.cit.aet.artemis.programming.domain.BuildPlanType.SOLUTION; -import static de.tum.cit.aet.artemis.programming.domain.BuildPlanType.TEMPLATE; +import static de.tum.cit.aet.artemis.programming.domain.build.BuildPlanType.SOLUTION; +import static de.tum.cit.aet.artemis.programming.domain.build.BuildPlanType.TEMPLATE; import static org.assertj.core.api.Assertions.assertThatNoException; import java.io.IOException; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java index cdadf4c01d7c..05aee46f8ba4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java @@ -1,7 +1,7 @@ package de.tum.cit.aet.artemis.exercise.programming; -import static de.tum.cit.aet.artemis.programming.domain.BuildPlanType.SOLUTION; -import static de.tum.cit.aet.artemis.programming.domain.BuildPlanType.TEMPLATE; +import static de.tum.cit.aet.artemis.programming.domain.build.BuildPlanType.SOLUTION; +import static de.tum.cit.aet.artemis.programming.domain.build.BuildPlanType.TEMPLATE; import static de.tum.cit.aet.artemis.programming.web.ProgrammingExerciseResourceErrorKeys.INVALID_SOLUTION_BUILD_PLAN_ID; import static de.tum.cit.aet.artemis.programming.web.ProgrammingExerciseResourceErrorKeys.INVALID_SOLUTION_REPOSITORY_URL; import static de.tum.cit.aet.artemis.programming.web.ProgrammingExerciseResourceErrorKeys.INVALID_TEMPLATE_BUILD_PLAN_ID; @@ -72,8 +72,10 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.DomainObject; +import de.tum.cit.aet.artemis.core.dto.RepositoryExportOptionsDTO; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; @@ -89,6 +91,7 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextSubmissionElement; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismResultDTO; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; @@ -98,28 +101,25 @@ import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseResetOptionsDTO; +import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseTestCaseDTO; +import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseTestCaseStateDTO; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.service.GitService; +import de.tum.cit.aet.artemis.programming.service.UriService; import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlRepositoryPermission; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestRepository; -import de.tum.cit.aet.artemis.service.FileService; -import de.tum.cit.aet.artemis.service.UriService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.GitUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; import de.tum.cit.aet.artemis.util.RequestUtilService; import de.tum.cit.aet.artemis.util.TestResourceUtils; import de.tum.cit.aet.artemis.util.ZipFileTestUtilService; -import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseResetOptionsDTO; -import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseTestCaseDTO; -import de.tum.cit.aet.artemis.core.dto.RepositoryExportOptionsDTO; -import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismResultDTO; -import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseTestCaseStateDTO; /** * Note: this class should be independent of the actual VCS and CIS and contains common test logic for scenarios: diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java index 069b65f4e44e..6be28e320fb2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java @@ -42,9 +42,9 @@ import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.dto.CheckoutDirectoriesDTO; import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCRepositoryUri; import de.tum.cit.aet.artemis.util.LocalRepository; -import de.tum.cit.aet.artemis.programming.dto.CheckoutDirectoriesDTO; @TestInstance(TestInstance.Lifecycle.PER_CLASS) class ProgrammingExerciseLocalVCLocalCIIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java index e5212e4f0e32..3f4d1d3a8eda 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java @@ -40,9 +40,9 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.dto.CommitInfoDTO; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.programming.dto.CommitInfoDTO; class ProgrammingExerciseParticipationIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java index bef9c58c1609..9e9744c5d69b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java @@ -39,6 +39,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; +import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; @@ -53,6 +54,8 @@ import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTestCaseType; +import de.tum.cit.aet.artemis.programming.dto.AbstractBuildResultNotificationDTO; +import de.tum.cit.aet.artemis.programming.dto.ResultDTO; import de.tum.cit.aet.artemis.programming.repository.ParticipationVCSAccessTokenRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; @@ -63,12 +66,9 @@ import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseGradingService; import de.tum.cit.aet.artemis.programming.service.StaticCodeAnalysisService; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; -import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.RequestUtilService; import de.tum.cit.aet.artemis.util.TestConstants; -import de.tum.cit.aet.artemis.programming.dto.ResultDTO; /** * Note: this class should be independent of the actual VCS and CIS and contains common test logic for both scenarios: diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java index d88dc1ff4281..244920a008ec 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java @@ -30,12 +30,12 @@ import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; +import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseTestCaseDTO; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseFeedbackCreationService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseTestCaseService; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.programming.dto.ProgrammingExerciseTestCaseDTO; class ProgrammingExerciseTestCaseServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java index 6f19a40eb806..3d87def679a1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java @@ -75,11 +75,13 @@ import de.tum.cit.aet.artemis.core.domain.Authority; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO; import de.tum.cit.aet.artemis.core.exception.GitException; import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; +import de.tum.cit.aet.artemis.core.service.FilePathService; import de.tum.cit.aet.artemis.core.service.export.CourseExamExportService; import de.tum.cit.aet.artemis.core.service.user.PasswordService; import de.tum.cit.aet.artemis.course.CourseUtilService; @@ -103,11 +105,11 @@ import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismDetectionConfig; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; -import de.tum.cit.aet.artemis.programming.domain.BuildLogStatisticsEntry; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; @@ -117,9 +119,11 @@ import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisCategory; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogStatisticsEntry; import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTask; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; +import de.tum.cit.aet.artemis.programming.dto.BuildLogStatisticsDTO; import de.tum.cit.aet.artemis.programming.repository.AuxiliaryRepositoryRepository; import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; @@ -133,6 +137,7 @@ import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.JavaTemplateUpgradeService; import de.tum.cit.aet.artemis.programming.service.ProgrammingLanguageFeature; +import de.tum.cit.aet.artemis.programming.service.UriService; import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.programming.service.gitlab.GitLabException; import de.tum.cit.aet.artemis.programming.service.jenkins.build_plan.JenkinsBuildPlanUtils; @@ -141,9 +146,6 @@ import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationTestRepository; import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestRepository; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.service.FilePathService; -import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.UriService; import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.ExamPrepareExercisesTestUtil; @@ -153,8 +155,6 @@ import de.tum.cit.aet.artemis.util.RequestUtilService; import de.tum.cit.aet.artemis.util.TestConstants; import de.tum.cit.aet.artemis.util.ZipFileTestUtilService; -import de.tum.cit.aet.artemis.programming.dto.BuildLogStatisticsDTO; -import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO; /** * Note: this class should be independent of the actual VCS and CIS and contains common test logic for scenarios: diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java index 3662db7bd6a0..928f580f5e8e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java @@ -48,7 +48,6 @@ import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; -import de.tum.cit.aet.artemis.programming.domain.BuildPlanType; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; @@ -57,6 +56,7 @@ import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.SolutionProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; +import de.tum.cit.aet.artemis.programming.domain.build.BuildPlanType; import de.tum.cit.aet.artemis.programming.domain.hestia.CodeHint; import de.tum.cit.aet.artemis.programming.domain.hestia.ExerciseHint; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseSolutionEntry; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java index 66aef2fe9e81..cf31408ba6cd 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java @@ -31,11 +31,11 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java index 2e78521f1161..5329c8357a14 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java @@ -47,6 +47,7 @@ import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionDTO; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; @@ -63,7 +64,6 @@ import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.util.TestConstants; import de.tum.cit.aet.artemis.util.TestResourceUtils; -import de.tum.cit.aet.artemis.exercise.dto.SubmissionDTO; class ProgrammingSubmissionIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java index 9a45c78419c8..003e917a1db5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryIntegrationTest.java @@ -74,24 +74,24 @@ import de.tum.cit.aet.artemis.plagiarism.domain.text.TextSubmissionElement; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; -import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.FileType; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.Repository; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.dto.FileMove; +import de.tum.cit.aet.artemis.programming.dto.RepositoryStatusDTO; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.cit.aet.artemis.programming.service.BuildLogEntryService; import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseParticipationService; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlRepositoryPermission; import de.tum.cit.aet.artemis.programming.web.repository.FileSubmission; -import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.util.GitUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; import de.tum.cit.aet.artemis.util.TestConstants; -import de.tum.cit.aet.artemis.programming.dto.FileMove; -import de.tum.cit.aet.artemis.programming.dto.RepositoryStatusDTO; class RepositoryIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryProgrammingExerciseParticipationJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryProgrammingExerciseParticipationJenkinsIntegrationTest.java index ec9cedc1e17b..d41c20c1d1a9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryProgrammingExerciseParticipationJenkinsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/RepositoryProgrammingExerciseParticipationJenkinsIntegrationTest.java @@ -23,9 +23,9 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.util.TestConstants; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java index cf73077fb49c..b0ca8f8bf9c4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java @@ -34,11 +34,11 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisCategory; +import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisIssue; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.StaticCodeAnalysisCategoryRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseFeedbackCreationService; import de.tum.cit.aet.artemis.programming.service.StaticCodeAnalysisService; -import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; class StaticCodeAnalysisIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java index 42037f611d0f..89402e73f6b2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java @@ -37,14 +37,14 @@ import de.tum.cit.aet.artemis.programming.domain.FileType; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.Repository; +import de.tum.cit.aet.artemis.programming.dto.FileMove; +import de.tum.cit.aet.artemis.programming.dto.RepositoryStatusDTO; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.web.repository.FileSubmission; import de.tum.cit.aet.artemis.util.GitUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; -import de.tum.cit.aet.artemis.programming.dto.FileMove; -import de.tum.cit.aet.artemis.programming.dto.RepositoryStatusDTO; class TestRepositoryResourceIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseFactory.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseFactory.java index 2e83a5341fdf..21f4119ea8bd 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseFactory.java @@ -15,6 +15,7 @@ import org.springframework.util.ResourceUtils; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.service.FilePathService; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.ExerciseFactory; import de.tum.cit.aet.artemis.participation.ParticipationFactory; @@ -41,7 +42,6 @@ import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedAnswer; import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedText; import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; -import de.tum.cit.aet.artemis.service.FilePathService; /** * Factory for creating QuizExercises and related objects. diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java index 95d1c553ec8f..36e6bdf7bd6e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseIntegrationTest.java @@ -46,6 +46,7 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; @@ -78,14 +79,13 @@ import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerQuestionStatistic; import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSolution; import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSpot; +import de.tum.cit.aet.artemis.quiz.dto.QuizBatchJoinDTO; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.quiz.service.QuizExerciseService; import de.tum.cit.aet.artemis.util.ExerciseIntegrationTestService; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; -import de.tum.cit.aet.artemis.quiz.dto.QuizBatchJoinDTO; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; class QuizExerciseIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseUtilService.java index 87d3f50134fa..daba9493edea 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizExerciseUtilService.java @@ -17,6 +17,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.service.FilePathService; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exam.ExamFactory; @@ -51,7 +52,6 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.quiz.service.QuizScheduleService; -import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.user.UserUtilService; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java index 0f70cd9a44af..95b58dce37ef 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java @@ -63,12 +63,12 @@ import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedAnswer; import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedText; import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; +import de.tum.cit.aet.artemis.quiz.dto.QuizBatchJoinDTO; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.quiz.service.QuizBatchService; import de.tum.cit.aet.artemis.quiz.service.QuizExerciseService; import de.tum.cit.aet.artemis.quiz.service.QuizStatisticService; -import de.tum.cit.aet.artemis.quiz.dto.QuizBatchJoinDTO; class QuizSubmissionIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatWebsocketTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatWebsocketTest.java index f25d7ee43897..ecff837660a5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatWebsocketTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatWebsocketTest.java @@ -13,6 +13,7 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.test.context.ActiveProfiles; +import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.iris.domain.message.IrisTextMessageContent; import de.tum.cit.aet.artemis.iris.dto.IrisChatWebsocketDTO; @@ -20,7 +21,6 @@ import de.tum.cit.aet.artemis.iris.service.session.IrisExerciseChatSessionService; import de.tum.cit.aet.artemis.iris.service.websocket.IrisChatWebsocketService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.service.WebsocketMessagingService; @ActiveProfiles("iris") class IrisChatWebsocketTest extends AbstractIrisIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/IrisExerciseChatSessionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisExerciseChatSessionIntegrationTest.java index c1d0169b621a..38a613e24379 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/IrisExerciseChatSessionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisExerciseChatSessionIntegrationTest.java @@ -13,8 +13,8 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.iris.domain.session.IrisExerciseChatSession; import de.tum.cit.aet.artemis.iris.domain.session.IrisSession; +import de.tum.cit.aet.artemis.iris.dto.IrisStatusDTO; import de.tum.cit.aet.artemis.iris.repository.IrisExerciseChatSessionRepository; -import de.tum.cit.aet.artemis.iris.web.IrisStatusDTO; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; class IrisExerciseChatSessionIntegrationTest extends AbstractIrisIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java index b104349c199b..35622c1c3367 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java @@ -31,11 +31,11 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.Lecture; +import de.tum.cit.aet.artemis.lecture.dto.LectureUnitInformationDTO; +import de.tum.cit.aet.artemis.lecture.dto.LectureUnitSplitDTO; import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.SlideRepository; import de.tum.cit.aet.artemis.lecture.service.LectureUnitProcessingService; -import de.tum.cit.aet.artemis.lecture.dto.LectureUnitInformationDTO; -import de.tum.cit.aet.artemis.lecture.dto.LectureUnitSplitDTO; class AttachmentUnitsIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureFactory.java b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureFactory.java index cd904046b938..4848460a768a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureFactory.java @@ -11,11 +11,11 @@ import org.springframework.util.ResourceUtils; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.service.FilePathService; import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.lecture.domain.AttachmentType; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.Lecture; -import de.tum.cit.aet.artemis.service.FilePathService; /** * Factory for creating Lectures and related objects. diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitIntegrationTest.java index 47e06fabc4a9..e5c539107c0a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitIntegrationTest.java @@ -26,10 +26,10 @@ import de.tum.cit.aet.artemis.lecture.domain.LectureUnitCompletion; import de.tum.cit.aet.artemis.lecture.domain.OnlineUnit; import de.tum.cit.aet.artemis.lecture.domain.TextUnit; +import de.tum.cit.aet.artemis.lecture.dto.LectureUnitForLearningPathNodeDetailsDTO; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; -import de.tum.cit.aet.artemis.lecture.dto.LectureUnitForLearningPathNodeDetailsDTO; class LectureUnitIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUtilService.java b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUtilService.java index 69e2d0d58aac..c9fe9f1e6fdd 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUtilService.java @@ -21,6 +21,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.service.FilePathService; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; @@ -45,7 +46,6 @@ import de.tum.cit.aet.artemis.lecture.repository.TextUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.VideoUnitRepository; import de.tum.cit.aet.artemis.post.ConversationFactory; -import de.tum.cit.aet.artemis.service.FilePathService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/OnlineUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/OnlineUnitIntegrationTest.java index 07811a7eef09..62cf2eab7bc2 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/OnlineUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/OnlineUnitIntegrationTest.java @@ -31,12 +31,12 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; +import de.tum.cit.aet.artemis.core.dto.OnlineResourceDTO; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.domain.OnlineUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.repository.OnlineUnitRepository; -import de.tum.cit.aet.artemis.core.dto.OnlineResourceDTO; class OnlineUnitIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentDockerServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentDockerServiceTest.java index 556131553f76..fa31a0eefc30 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentDockerServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentDockerServiceTest.java @@ -29,13 +29,13 @@ import com.hazelcast.map.IMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.buildagent.dto.BuildConfig; +import de.tum.cit.aet.artemis.buildagent.dto.BuildJobQueueItem; import de.tum.cit.aet.artemis.buildagent.service.BuildAgentDockerService; import de.tum.cit.aet.artemis.buildagent.service.BuildLogsMap; import de.tum.cit.aet.artemis.core.exception.LocalCIException; -import de.tum.cit.aet.artemis.programming.domain.BuildJob; -import de.tum.cit.aet.artemis.programming.domain.BuildStatus; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildConfig; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.programming.domain.build.BuildJob; +import de.tum.cit.aet.artemis.programming.domain.build.BuildStatus; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) class BuildAgentDockerServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentSshAuthenticationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentSshAuthenticationIntegrationTest.java index b56bfd78cb0c..c0d16101f65d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentSshAuthenticationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildAgentSshAuthenticationIntegrationTest.java @@ -14,9 +14,9 @@ import com.hazelcast.map.IMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.buildagent.dto.BuildAgentInformation; import de.tum.cit.aet.artemis.buildagent.service.BuildAgentSshKeyService; import de.tum.cit.aet.artemis.buildagent.service.SharedQueueProcessingService; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildAgentInformation; class BuildAgentSshAuthenticationIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildResultTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildResultTest.java index 0e2136a13d34..7b89aec82354 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildResultTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/BuildResultTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildResult; +import de.tum.cit.aet.artemis.buildagent.dto.BuildResult; class BuildResultTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java index 316338b4ef32..a54df82a465c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java @@ -51,19 +51,19 @@ import com.github.dockerjava.api.model.Frame; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.buildagent.dto.ResultBuildJob; import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; import de.tum.cit.aet.artemis.exercise.domain.Team; -import de.tum.cit.aet.artemis.programming.domain.BuildJob; -import de.tum.cit.aet.artemis.programming.domain.BuildStatus; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.build.BuildJob; +import de.tum.cit.aet.artemis.programming.domain.build.BuildStatus; +import de.tum.cit.aet.artemis.programming.service.BuildLogEntryService; import de.tum.cit.aet.artemis.programming.service.ParticipationVcsAccessTokenService; -import de.tum.cit.aet.artemis.programming.service.localci.dto.ResultBuildJob; import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCServletService; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.service.BuildLogEntryService; import de.tum.cit.aet.artemis.util.LocalRepository; @TestInstance(TestInstance.Lifecycle.PER_CLASS) diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResourceIntegrationTest.java index 2fa9014eee99..0a553702716a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIResourceIntegrationTest.java @@ -23,22 +23,22 @@ import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.buildagent.dto.BuildAgentInformation; +import de.tum.cit.aet.artemis.buildagent.dto.BuildConfig; +import de.tum.cit.aet.artemis.buildagent.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.buildagent.dto.BuildJobsStatisticsDTO; +import de.tum.cit.aet.artemis.buildagent.dto.FinishedBuildJobDTO; +import de.tum.cit.aet.artemis.buildagent.dto.JobTimingInfo; +import de.tum.cit.aet.artemis.buildagent.dto.RepositoryInfo; import de.tum.cit.aet.artemis.buildagent.service.SharedQueueProcessingService; import de.tum.cit.aet.artemis.core.dto.SortingOrder; -import de.tum.cit.aet.artemis.programming.domain.BuildJob; -import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; -import de.tum.cit.aet.artemis.programming.domain.BuildStatus; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.PageableSearchDTO; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildAgentInformation; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildConfig; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.programming.service.localci.dto.JobTimingInfo; -import de.tum.cit.aet.artemis.programming.service.localci.dto.RepositoryInfo; -import de.tum.cit.aet.artemis.service.BuildLogEntryService; -import de.tum.cit.aet.artemis.service.dto.BuildJobsStatisticsDTO; -import de.tum.cit.aet.artemis.service.dto.FinishedBuildJobDTO; +import de.tum.cit.aet.artemis.programming.domain.build.BuildJob; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.domain.build.BuildStatus; +import de.tum.cit.aet.artemis.programming.service.BuildLogEntryService; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.PageableSearchDTO; class LocalCIResourceIntegrationTest extends AbstractLocalCILocalVCIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIServiceTest.java index df7b48b1d29a..7a2e6fe3f578 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIServiceTest.java @@ -24,6 +24,10 @@ import com.hazelcast.map.IMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; +import de.tum.cit.aet.artemis.buildagent.dto.BuildConfig; +import de.tum.cit.aet.artemis.buildagent.dto.BuildJobQueueItem; +import de.tum.cit.aet.artemis.buildagent.dto.JobTimingInfo; +import de.tum.cit.aet.artemis.buildagent.dto.RepositoryInfo; import de.tum.cit.aet.artemis.buildagent.service.SharedQueueProcessingService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; @@ -34,15 +38,11 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +import de.tum.cit.aet.artemis.programming.dto.CheckoutDirectoriesDTO; import de.tum.cit.aet.artemis.programming.service.BuildScriptProviderService; import de.tum.cit.aet.artemis.programming.service.aeolus.AeolusTemplateService; import de.tum.cit.aet.artemis.programming.service.aeolus.Windfile; import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService.BuildStatus; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildConfig; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildJobQueueItem; -import de.tum.cit.aet.artemis.programming.service.localci.dto.JobTimingInfo; -import de.tum.cit.aet.artemis.programming.service.localci.dto.RepositoryInfo; -import de.tum.cit.aet.artemis.programming.dto.CheckoutDirectoriesDTO; class LocalCIServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { @@ -105,9 +105,9 @@ void testReturnCorrectBuildStatus() { RepositoryInfo repositoryInfo = new RepositoryInfo("test", null, RepositoryType.USER, "test", "test", "test", null, null); BuildJobQueueItem job1 = new BuildJobQueueItem("1", "job1", "address1", participation.getId(), course.getId(), 1, 1, 1, - de.tum.cit.aet.artemis.programming.domain.BuildStatus.SUCCESSFUL, repositoryInfo, jobTimingInfo, buildConfig, null); + de.tum.cit.aet.artemis.programming.domain.build.BuildStatus.SUCCESSFUL, repositoryInfo, jobTimingInfo, buildConfig, null); BuildJobQueueItem job2 = new BuildJobQueueItem("2", "job2", "address1", participation.getId(), course.getId(), 1, 1, 1, - de.tum.cit.aet.artemis.programming.domain.BuildStatus.SUCCESSFUL, repositoryInfo, jobTimingInfo, buildConfig, null); + de.tum.cit.aet.artemis.programming.domain.build.BuildStatus.SUCCESSFUL, repositoryInfo, jobTimingInfo, buildConfig, null); queuedJobs = hazelcastInstance.getQueue("buildJobQueue"); processingJobs = hazelcastInstance.getMap("processingJobs"); diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIIntegrationTest.java index fd48b4837cb2..ada7b3c72c8b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCIIntegrationTest.java @@ -49,10 +49,10 @@ import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; -import de.tum.cit.aet.artemis.programming.domain.BuildJob; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; +import de.tum.cit.aet.artemis.programming.domain.build.BuildJob; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.cit.aet.artemis.programming.domain.submissionpolicy.SubmissionPolicy; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/SharedQueueManagementServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/SharedQueueManagementServiceTest.java index 3fdb6e26685c..d8b968be9ed4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/SharedQueueManagementServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/SharedQueueManagementServiceTest.java @@ -12,7 +12,7 @@ import com.hazelcast.map.IMap; import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; -import de.tum.cit.aet.artemis.programming.domain.BuildJob; +import de.tum.cit.aet.artemis.programming.domain.build.BuildJob; import de.tum.cit.aet.artemis.programming.service.localci.SharedQueueManagementService; class SharedQueueManagementServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java index 9d5ddb126d8d..d12bf29a6baa 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/AbstractConversationTest.java @@ -22,6 +22,11 @@ import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; import de.tum.cit.aet.artemis.communication.domain.DisplayPriority; import de.tum.cit.aet.artemis.communication.domain.Post; +import de.tum.cit.aet.artemis.communication.dto.ChannelDTO; +import de.tum.cit.aet.artemis.communication.dto.ConversationWebsocketDTO; +import de.tum.cit.aet.artemis.communication.dto.GroupChatDTO; +import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; +import de.tum.cit.aet.artemis.communication.dto.PostContextFilterDTO; import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; @@ -29,8 +34,6 @@ import de.tum.cit.aet.artemis.communication.repository.conversation.GroupChatRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.OneToOneChatRepository; import de.tum.cit.aet.artemis.communication.service.conversation.ConversationService; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.GroupChatDTO; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.core.domain.User; @@ -38,9 +41,6 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.communication.dto.PostContextFilterDTO; -import de.tum.cit.aet.artemis.communication.dto.ConversationWebsocketDTO; -import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; /** * Contains useful methods for testing the conversations futures diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/AnswerMessageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/AnswerMessageIntegrationTest.java index d163ae81dbc5..a47ab459a3db 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/AnswerMessageIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/AnswerMessageIntegrationTest.java @@ -30,6 +30,7 @@ import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotification; +import de.tum.cit.aet.artemis.communication.dto.PostDTO; import de.tum.cit.aet.artemis.communication.repository.AnswerPostRepository; import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; import de.tum.cit.aet.artemis.core.domain.Course; @@ -41,7 +42,6 @@ import de.tum.cit.aet.artemis.lecture.LectureUtilService; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.post.ConversationUtilService; -import de.tum.cit.aet.artemis.communication.dto.PostDTO; class AnswerMessageIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java index 742a8e34032a..7d0f15fec1d8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/ChannelIntegrationTest.java @@ -20,8 +20,9 @@ import org.springframework.util.LinkedMultiValueMap; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelIdAndNameDTO; +import de.tum.cit.aet.artemis.communication.dto.ChannelDTO; +import de.tum.cit.aet.artemis.communication.dto.ChannelIdAndNameDTO; +import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.core.domain.Language; @@ -36,7 +37,6 @@ import de.tum.cit.aet.artemis.tutorialgroup.service.TutorialGroupChannelManagementService; import de.tum.cit.aet.artemis.tutorialgroups.TutorialGroupUtilService; import de.tum.cit.aet.artemis.user.UserFactory; -import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; class ChannelIntegrationTest extends AbstractConversationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/ConversationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/ConversationIntegrationTest.java index 795c3e1bfae8..41ad12b7219c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/ConversationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/ConversationIntegrationTest.java @@ -19,11 +19,12 @@ import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ChannelDTO; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationDTO; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.ConversationUserDTO; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.GroupChatDTO; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.OneToOneChatDTO; +import de.tum.cit.aet.artemis.communication.dto.ChannelDTO; +import de.tum.cit.aet.artemis.communication.dto.ConversationDTO; +import de.tum.cit.aet.artemis.communication.dto.ConversationUserDTO; +import de.tum.cit.aet.artemis.communication.dto.GroupChatDTO; +import de.tum.cit.aet.artemis.communication.dto.OneToOneChatDTO; +import de.tum.cit.aet.artemis.communication.dto.ResponsibleUserDTO; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; import de.tum.cit.aet.artemis.core.domain.User; @@ -34,7 +35,6 @@ import de.tum.cit.aet.artemis.lecture.LectureUtilService; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.post.ConversationUtilService; -import de.tum.cit.aet.artemis.service.dto.ResponsibleUserDTO; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.user.UserFactory; diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/GroupChatIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/GroupChatIntegrationTest.java index 1279a5ed466b..a6a71c1ca325 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/GroupChatIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/GroupChatIntegrationTest.java @@ -16,11 +16,11 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.GroupChatDTO; -import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; -import de.tum.cit.aet.artemis.user.UserFactory; +import de.tum.cit.aet.artemis.communication.dto.GroupChatDTO; import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; import de.tum.cit.aet.artemis.communication.dto.PostDTO; +import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.user.UserFactory; class GroupChatIntegrationTest extends AbstractConversationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/MessageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/MessageIntegrationTest.java index 388de5d7254a..6c3f6702985f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/MessageIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/MessageIntegrationTest.java @@ -53,6 +53,8 @@ import de.tum.cit.aet.artemis.communication.domain.conversation.OneToOneChat; import de.tum.cit.aet.artemis.communication.domain.notification.ConversationNotification; import de.tum.cit.aet.artemis.communication.domain.notification.Notification; +import de.tum.cit.aet.artemis.communication.dto.PostContextFilterDTO; +import de.tum.cit.aet.artemis.communication.dto.PostDTO; import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; import de.tum.cit.aet.artemis.communication.repository.ConversationParticipantRepository; import de.tum.cit.aet.artemis.communication.repository.conversation.ConversationNotificationRepository; @@ -65,8 +67,6 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.post.ConversationUtilService; -import de.tum.cit.aet.artemis.communication.dto.PostContextFilterDTO; -import de.tum.cit.aet.artemis.communication.dto.PostDTO; class MessageIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/metis/OneToOneChatIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/metis/OneToOneChatIntegrationTest.java index f3f8812566df..a3fe6817831b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/metis/OneToOneChatIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/metis/OneToOneChatIntegrationTest.java @@ -16,11 +16,11 @@ import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import de.tum.cit.aet.artemis.communication.web.conversation.dtos.OneToOneChatDTO; -import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; -import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.communication.dto.MetisCrudAction; +import de.tum.cit.aet.artemis.communication.dto.OneToOneChatDTO; import de.tum.cit.aet.artemis.communication.dto.PostDTO; +import de.tum.cit.aet.artemis.core.domain.CourseInformationSharingConfiguration; +import de.tum.cit.aet.artemis.user.UserFactory; class OneToOneChatIntegrationTest extends AbstractConversationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/notification/PushNotificationResourceTest.java b/src/test/java/de/tum/cit/aet/artemis/notification/PushNotificationResourceTest.java index db956a220af0..db28d70aacfe 100644 --- a/src/test/java/de/tum/cit/aet/artemis/notification/PushNotificationResourceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/notification/PushNotificationResourceTest.java @@ -16,10 +16,10 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfiguration; import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceType; +import de.tum.cit.aet.artemis.communication.dto.PushNotificationRegisterBody; +import de.tum.cit.aet.artemis.communication.dto.PushNotificationRegisterDTO; +import de.tum.cit.aet.artemis.communication.dto.PushNotificationUnregisterRequest; import de.tum.cit.aet.artemis.communication.repository.PushNotificationDeviceConfigurationRepository; -import de.tum.cit.aet.artemis.communication.web.push_notification.PushNotificationRegisterBody; -import de.tum.cit.aet.artemis.communication.web.push_notification.PushNotificationRegisterDTO; -import de.tum.cit.aet.artemis.communication.web.push_notification.PushNotificationUnregisterRequest; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationIntegrationTest.java index 6003e1abd048..21afb3fd3288 100644 --- a/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/organization/OrganizationIntegrationTest.java @@ -17,10 +17,10 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.Organization; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.OrganizationCountDTO; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.OrganizationRepository; import de.tum.cit.aet.artemis.course.CourseFactory; -import de.tum.cit.aet.artemis.core.dto.OrganizationCountDTO; class OrganizationIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java index 31236148d5d5..a8609b619bd8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java @@ -70,6 +70,7 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; @@ -87,13 +88,12 @@ import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSpot; import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedAnswer; import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedText; +import de.tum.cit.aet.artemis.quiz.dto.QuizBatchJoinDTO; import de.tum.cit.aet.artemis.quiz.service.QuizBatchService; import de.tum.cit.aet.artemis.quiz.service.QuizScheduleService; -import de.tum.cit.aet.artemis.service.ParticipationService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.util.LocalRepository; -import de.tum.cit.aet.artemis.quiz.dto.QuizBatchJoinDTO; class ParticipationIntegrationTest extends AbstractAthenaTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java index 5590f435bc75..7f471717d770 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java @@ -49,6 +49,7 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; @@ -60,13 +61,12 @@ import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.service.ParticipationVcsAccessTokenService; +import de.tum.cit.aet.artemis.programming.service.UriService; import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; -import de.tum.cit.aet.artemis.service.ParticipationService; -import de.tum.cit.aet.artemis.service.UriService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionExportIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionExportIntegrationTest.java index ad973ab7eae1..03c87ecef4f8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionExportIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionExportIntegrationTest.java @@ -24,6 +24,7 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionExportOptionsDTO; import de.tum.cit.aet.artemis.exercise.fileupload.FileUploadExerciseUtilService; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; @@ -33,7 +34,6 @@ import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; -import de.tum.cit.aet.artemis.exercise.dto.SubmissionExportOptionsDTO; class SubmissionExportIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionIntegrationTest.java index 78324531a711..90ac3144a96b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/SubmissionIntegrationTest.java @@ -17,16 +17,16 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.exercise.domain.SubmissionVersion; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionVersionDTO; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionVersionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; -import de.tum.cit.aet.artemis.exercise.dto.SubmissionVersionDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; class SubmissionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCaseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCaseIntegrationTest.java index acd01b5f7cd4..8d7d7a640104 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCaseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCaseIntegrationTest.java @@ -30,11 +30,11 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmission; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextSubmissionElement; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismCaseInfoDTO; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismVerdictDTO; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; -import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismCaseInfoDTO; -import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismVerdictDTO; class PlagiarismCaseIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCheckIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCheckIntegrationTest.java index b9348d703eb2..0246d2ebf6d0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCheckIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismCheckIntegrationTest.java @@ -12,8 +12,8 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.util.TestResourceUtils; import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismResultDTO; +import de.tum.cit.aet.artemis.util.TestResourceUtils; class PlagiarismCheckIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismIntegrationTest.java index 5556d215183d..63bb14a38027 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismIntegrationTest.java @@ -25,12 +25,12 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmission; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextSubmissionElement; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismComparisonStatusDTO; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismResultRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; -import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismComparisonStatusDTO; class PlagiarismIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismPostIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismPostIntegrationTest.java index 8ec8ae980477..b128d1d31835 100644 --- a/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismPostIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/plagiarism/PlagiarismPostIntegrationTest.java @@ -29,6 +29,8 @@ import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.UserRole; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.dto.PostContextFilterDTO; +import de.tum.cit.aet.artemis.communication.dto.PostDTO; import de.tum.cit.aet.artemis.communication.repository.ConversationMessageRepository; import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; @@ -38,8 +40,6 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismCase; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismCaseRepository; import de.tum.cit.aet.artemis.post.ConversationUtilService; -import de.tum.cit.aet.artemis.communication.dto.PostContextFilterDTO; -import de.tum.cit.aet.artemis.communication.dto.PostDTO; class PlagiarismPostIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/repository/UserTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/repository/UserTestRepository.java index 19eb4f5ec23e..c4f680645bec 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repository/UserTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/repository/UserTestRepository.java @@ -2,9 +2,10 @@ import java.util.Set; +import org.springframework.stereotype.Repository; + import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; -import org.springframework.stereotype.Repository; @Repository public interface UserTestRepository extends ArtemisJpaRepository { diff --git a/src/test/java/de/tum/cit/aet/artemis/science/ScienceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/science/ScienceIntegrationTest.java index 78d5f1711ec2..9105429b6126 100644 --- a/src/test/java/de/tum/cit/aet/artemis/science/ScienceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/science/ScienceIntegrationTest.java @@ -13,10 +13,10 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.atlas.domain.science.ScienceEventType; -import de.tum.cit.aet.artemis.atlas.repository.science.ScienceEventRepository; +import de.tum.cit.aet.artemis.atlas.dto.ScienceEventDTO; +import de.tum.cit.aet.artemis.atlas.repository.ScienceEventRepository; import de.tum.cit.aet.artemis.core.service.feature.Feature; import de.tum.cit.aet.artemis.core.service.feature.FeatureToggleService; -import de.tum.cit.aet.artemis.atlas.dto.science.ScienceEventDTO; class ScienceIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/science/ScienceSettingsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/science/ScienceSettingsIntegrationTest.java index 37fd5bb78551..9681adb42498 100644 --- a/src/test/java/de/tum/cit/aet/artemis/science/ScienceSettingsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/science/ScienceSettingsIntegrationTest.java @@ -13,7 +13,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.atlas.domain.science.ScienceSetting; -import de.tum.cit.aet.artemis.atlas.repository.science.ScienceSettingRepository; +import de.tum.cit.aet.artemis.atlas.repository.ScienceSettingRepository; import de.tum.cit.aet.artemis.core.domain.User; class ScienceSettingsIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/science/ScienceUtilService.java b/src/test/java/de/tum/cit/aet/artemis/science/ScienceUtilService.java index 044952bcedab..b844e00e5d5a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/science/ScienceUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/science/ScienceUtilService.java @@ -9,7 +9,7 @@ import de.tum.cit.aet.artemis.atlas.domain.science.ScienceEvent; import de.tum.cit.aet.artemis.atlas.domain.science.ScienceEventType; -import de.tum.cit.aet.artemis.atlas.repository.science.ScienceEventRepository; +import de.tum.cit.aet.artemis.atlas.repository.ScienceEventRepository; @Service public class ScienceUtilService { diff --git a/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java b/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java index fa838ef9877c..2989c25fdd74 100644 --- a/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java @@ -45,7 +45,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import de.tum.cit.aet.artemis.core.exception.LtiEmailAlreadyInUseException; -import de.tum.cit.aet.artemis.core.web.filter.Lti13LaunchFilter; +import de.tum.cit.aet.artemis.core.security.filter.Lti13LaunchFilter; import de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/security/OAuth2JWKSServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/security/OAuth2JWKSServiceTest.java index 4834226eb5b0..462f811d3565 100644 --- a/src/test/java/de/tum/cit/aet/artemis/security/OAuth2JWKSServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/security/OAuth2JWKSServiceTest.java @@ -18,7 +18,7 @@ import com.nimbusds.jose.jwk.JWK; import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; -import de.tum.cit.aet.artemis.service.OnlineCourseConfigurationService; +import de.tum.cit.aet.artemis.lti.service.OnlineCourseConfigurationService; class OAuth2JWKSServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/BuildLogEntryServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/BuildLogEntryServiceTest.java index 5b85d4b04579..50319d7d03af 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/BuildLogEntryServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/BuildLogEntryServiceTest.java @@ -15,8 +15,9 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; +import de.tum.cit.aet.artemis.programming.service.BuildLogEntryService; class BuildLogEntryServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ConductAgreementServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ConductAgreementServiceTest.java index 9e0cb3a22c96..fa9b00991456 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ConductAgreementServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ConductAgreementServiceTest.java @@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.communication.service.ConductAgreementService; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ConsistencyCheckTestService.java b/src/test/java/de/tum/cit/aet/artemis/service/ConsistencyCheckTestService.java index 1a2dca356b94..e3831e7b7016 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ConsistencyCheckTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ConsistencyCheckTestService.java @@ -17,8 +17,8 @@ import de.tum.cit.aet.artemis.exercise.programming.MockDelegate; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; +import de.tum.cit.aet.artemis.programming.dto.ConsistencyErrorDTO; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.service.dto.ConsistencyErrorDTO; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.RequestUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationServiceTest.java index f4a3268a5a94..bbf4cb5ebd06 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/CourseScoreCalculationServiceTest.java @@ -21,11 +21,16 @@ import de.tum.cit.aet.artemis.assessment.GradingScaleFactory; import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.BonusSourceResultDTO; +import de.tum.cit.aet.artemis.assessment.dto.MaxAndReachablePoints; +import de.tum.cit.aet.artemis.assessment.dto.score.StudentScoresDTO; import de.tum.cit.aet.artemis.assessment.repository.GradingScaleRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.service.CourseScoreCalculationService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO; +import de.tum.cit.aet.artemis.core.dto.CourseScoresDTO; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; @@ -35,12 +40,7 @@ import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismVerdict; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; -import de.tum.cit.aet.artemis.service.dto.MaxAndReachablePoints; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.assessment.dto.BonusSourceResultDTO; -import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO; -import de.tum.cit.aet.artemis.core.dto.CourseScoresDTO; -import de.tum.cit.aet.artemis.assessment.dto.score.StudentScoresDTO; class CourseScoreCalculationServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java index 719a510f3742..680d96836fec 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/CourseServiceTest.java @@ -23,8 +23,10 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationLocalCILocalVCTest; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.dto.StudentDTO; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; +import de.tum.cit.aet.artemis.core.service.CourseService; import de.tum.cit.aet.artemis.core.service.ldap.LdapUserDto; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -32,7 +34,6 @@ import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseFactory; -import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/EmailSummaryServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/EmailSummaryServiceTest.java index b991fd9d526e..2f74b8e34df8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/EmailSummaryServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/EmailSummaryServiceTest.java @@ -24,6 +24,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.communication.domain.NotificationSetting; import de.tum.cit.aet.artemis.communication.repository.NotificationSettingRepository; +import de.tum.cit.aet.artemis.communication.service.EmailSummaryService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.course.CourseUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/FilePathServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/FilePathServiceTest.java index de54e4ea74aa..4d27ceaf1a38 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/FilePathServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/FilePathServiceTest.java @@ -10,6 +10,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.core.exception.FilePathParsingException; +import de.tum.cit.aet.artemis.core.service.FilePathService; +import de.tum.cit.aet.artemis.core.service.FileService; class FilePathServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/FileServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/FileServiceTest.java index 8b4037aa9099..a0987c14405d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/FileServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/FileServiceTest.java @@ -43,6 +43,9 @@ import org.springframework.web.multipart.MultipartFile; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.service.FilePathService; +import de.tum.cit.aet.artemis.core.service.FileService; +import de.tum.cit.aet.artemis.core.service.ResourceLoaderService; class FileServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java index 1e61825b78da..e224abafd0fa 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/GitlabCIServiceTest.java @@ -35,12 +35,12 @@ import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.ParticipationRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; import de.tum.cit.aet.artemis.programming.repository.BuildLogStatisticsEntryRepository; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsServiceTest.java index 5c2547c46e80..372b9f679ed3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/JenkinsServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/JenkinsServiceTest.java @@ -1,8 +1,8 @@ package de.tum.cit.aet.artemis.service; import static de.tum.cit.aet.artemis.core.config.Constants.ASSIGNMENT_REPO_NAME; -import static de.tum.cit.aet.artemis.programming.domain.BuildPlanType.SOLUTION; -import static de.tum.cit.aet.artemis.programming.domain.BuildPlanType.TEMPLATE; +import static de.tum.cit.aet.artemis.programming.domain.build.BuildPlanType.SOLUTION; +import static de.tum.cit.aet.artemis.programming.domain.build.BuildPlanType.TEMPLATE; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIllegalStateException; @@ -37,10 +37,10 @@ import de.tum.cit.aet.artemis.exercise.programming.ContinuousIntegrationTestService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.programming.domain.BuildPlan; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; +import de.tum.cit.aet.artemis.programming.domain.build.BuildPlan; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/LearningObjectServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/LearningObjectServiceTest.java index a219e5212ac8..35509630a95e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/LearningObjectServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/LearningObjectServiceTest.java @@ -25,6 +25,7 @@ import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.lecture.LectureFactory; import de.tum.cit.aet.artemis.lecture.LectureUtilService; +import de.tum.cit.aet.artemis.lecture.service.LearningObjectService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; class LearningObjectServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java index 2e3c52dd7a8f..902ac5f916bb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/LearningPathServiceTest.java @@ -24,10 +24,13 @@ import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; import de.tum.cit.aet.artemis.atlas.domain.competency.RelationType; +import de.tum.cit.aet.artemis.atlas.dto.LearningPathHealthDTO; +import de.tum.cit.aet.artemis.atlas.dto.NgxLearningPathDTO; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathNgxService; import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathRecommendationService; import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; +import de.tum.cit.aet.artemis.atlas.web.LearningPathResource; import de.tum.cit.aet.artemis.competency.CompetencyProgressUtilService; import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.competency.LearningPathUtilService; @@ -45,9 +48,6 @@ import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.atlas.web.LearningPathResource; -import de.tum.cit.aet.artemis.atlas.dto.LearningPathHealthDTO; -import de.tum.cit.aet.artemis.atlas.dto.NgxLearningPathDTO; class LearningPathServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/LectureServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/LectureServiceTest.java index ff414ac7158b..6e75b3f91c77 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/LectureServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/LectureServiceTest.java @@ -17,6 +17,8 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; import de.tum.cit.aet.artemis.lecture.LectureFactory; import de.tum.cit.aet.artemis.lecture.LectureUtilService; import de.tum.cit.aet.artemis.lecture.domain.Attachment; @@ -25,8 +27,6 @@ import de.tum.cit.aet.artemis.lecture.service.LectureService; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; -import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; -import de.tum.cit.aet.artemis.core.dto.pageablesearch.SearchTermPageableSearchDTO; class LectureServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationServiceTest.java index 6346be15408f..3f891a10c280 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/OnlineCourseConfigurationServiceTest.java @@ -23,6 +23,7 @@ import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; +import de.tum.cit.aet.artemis.lti.service.OnlineCourseConfigurationService; class OnlineCourseConfigurationServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckServiceTest.java index ef4104d948ee..e3db26d3f6f1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationAuthorizationCheckServiceTest.java @@ -17,6 +17,7 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.ParticipationInterface; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; +import de.tum.cit.aet.artemis.exercise.service.ParticipationAuthorizationCheckService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleServiceTest.java index 52a015f17505..7f82dedd1a85 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationLifecycleServiceTest.java @@ -17,6 +17,7 @@ import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.service.ParticipationLifecycleService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.domain.ParticipationLifecycle; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java index 79fd94d6bf61..f27beb586fb3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java @@ -32,13 +32,15 @@ import de.tum.cit.aet.artemis.exercise.domain.participation.Participant; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.service.ParticipationService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; -import de.tum.cit.aet.artemis.programming.domain.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; import de.tum.cit.aet.artemis.programming.repository.BuildLogEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; +import de.tum.cit.aet.artemis.programming.service.BuildLogEntryService; import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationTeamWebsocketServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationTeamWebsocketServiceTest.java index a654ae9f95df..4b62026849ac 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationTeamWebsocketServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationTeamWebsocketServiceTest.java @@ -24,16 +24,16 @@ import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionPatch; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.web.ParticipationTeamWebsocketService; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.exercise.dto.SubmissionPatch; -import de.tum.cit.aet.artemis.exercise.web.ParticipationTeamWebsocketService; class ParticipationTeamWebsocketServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ResourceLoaderServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ResourceLoaderServiceTest.java index 122f57800d97..8c6a4c36d0dc 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ResourceLoaderServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ResourceLoaderServiceTest.java @@ -28,6 +28,7 @@ import org.springframework.core.io.ResourceLoader; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.service.ResourceLoaderService; class ResourceLoaderServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java index 96028d08d9fd..e4e0bfd309fc 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/SubmissionServiceTest.java @@ -35,7 +35,9 @@ import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.dto.SubmissionWithComplaintDTO; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.exercise.service.SubmissionService; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadExercise; import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; @@ -46,7 +48,6 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.exercise.dto.SubmissionWithComplaintDTO; class SubmissionServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/TeamWebsocketServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/TeamWebsocketServiceTest.java index 5bdbb8420a46..842953c308b1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/TeamWebsocketServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/TeamWebsocketServiceTest.java @@ -22,6 +22,7 @@ import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; import de.tum.cit.aet.artemis.exercise.domain.Team; +import de.tum.cit.aet.artemis.exercise.dto.TeamAssignmentPayload; import de.tum.cit.aet.artemis.exercise.dto.TeamImportStrategyType; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; @@ -29,7 +30,6 @@ import de.tum.cit.aet.artemis.team.TeamUtilService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.exercise.dto.TeamAssignmentPayload; class TeamWebsocketServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionServiceTest.java index 60973d0f3e98..ad05b894c856 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/TitleCacheEvictionServiceTest.java @@ -11,6 +11,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.core.repository.OrganizationRepository; +import de.tum.cit.aet.artemis.core.service.TitleCacheEvictionService; import de.tum.cit.aet.artemis.core.util.Tuple; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exam.ExamUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/WeeklyEmailSummaryScheduleServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/WeeklyEmailSummaryScheduleServiceTest.java index 3d1ae13cc76d..4bfe611d511d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/WeeklyEmailSummaryScheduleServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/WeeklyEmailSummaryScheduleServiceTest.java @@ -24,7 +24,9 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import de.tum.cit.aet.artemis.communication.service.EmailSummaryService; import de.tum.cit.aet.artemis.communication.service.WeeklyEmailSummaryScheduleService; +import de.tum.cit.aet.artemis.core.service.ProfileService; /** * Tests if the WeeklyEmailSummaryScheduleService correctly calls the EmailSummaryService with the expected times and intervals diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ZipFileServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ZipFileServiceTest.java index 1c954a6b2c73..cbbeea2e1fe3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ZipFileServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ZipFileServiceTest.java @@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.service.ZipFileService; class ZipFileServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreatorTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreatorTest.java index 6f4b64454c26..a4e63e9d095d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreatorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/jenkins/build_plan/JenkinsPipelineScriptCreatorTest.java @@ -10,11 +10,11 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.course.CourseUtilService; -import de.tum.cit.aet.artemis.programming.domain.BuildPlan; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseBuildConfig; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ProjectType; +import de.tum.cit.aet.artemis.programming.domain.build.BuildPlan; import de.tum.cit.aet.artemis.programming.repository.BuildPlanRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/TestResultXmlParserTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/TestResultXmlParserTest.java index 87b065616cf7..56ea258e9952 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/TestResultXmlParserTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/localci/buildagent/TestResultXmlParserTest.java @@ -8,8 +8,8 @@ import org.junit.jupiter.api.Test; +import de.tum.cit.aet.artemis.buildagent.dto.BuildResult; import de.tum.cit.aet.artemis.buildagent.service.TestResultXmlParser; -import de.tum.cit.aet.artemis.programming.service.localci.dto.BuildResult; class TestResultXmlParserTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java index 99c90985ed1a..548e2b4ef779 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/exam/ExamServiceTest.java @@ -24,6 +24,7 @@ import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exam.domain.StudentExam; +import de.tum.cit.aet.artemis.exam.dto.ExamChecklistDTO; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exam.service.ExamService; import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; @@ -33,7 +34,6 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.user.UserUtilService; -import de.tum.cit.aet.artemis.exam.dto.ExamChecklistDTO; class ExamServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/notifications/MailServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/notifications/MailServiceTest.java index 4a1fd4cb1a82..803fbe1098cc 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/notifications/MailServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/notifications/MailServiceTest.java @@ -33,7 +33,7 @@ import de.tum.cit.aet.artemis.communication.service.notifications.MailService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.service.TimeService; +import de.tum.cit.aet.artemis.core.service.TimeService; import tech.jhipster.config.JHipsterProperties; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java index e3437475d4be..2042a1fc8d91 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java @@ -27,13 +27,13 @@ import de.tum.cit.aet.artemis.programming.domain.ProjectType; import de.tum.cit.aet.artemis.programming.domain.StaticCodeAnalysisTool; import de.tum.cit.aet.artemis.programming.domain.hestia.ProgrammingExerciseTestCaseType; +import de.tum.cit.aet.artemis.programming.dto.AbstractBuildResultNotificationDTO; +import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisIssue; +import de.tum.cit.aet.artemis.programming.dto.StaticCodeAnalysisReportDTO; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseTestCaseRepository; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseFeedbackCreationService; -import de.tum.cit.aet.artemis.service.dto.AbstractBuildResultNotificationDTO; -import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisIssue; -import de.tum.cit.aet.artemis.service.dto.StaticCodeAnalysisReportDTO; class ProgrammingExerciseFeedbackCreationServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/settings/ide/IdePreferencesIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/settings/ide/IdePreferencesIntegrationTest.java index e4a158a16a0d..7a0ba5b22b2f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/settings/ide/IdePreferencesIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/settings/ide/IdePreferencesIntegrationTest.java @@ -18,10 +18,10 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.ide.Ide; import de.tum.cit.aet.artemis.programming.domain.ide.UserIdeMapping; -import de.tum.cit.aet.artemis.programming.repository.settings.IdeRepository; -import de.tum.cit.aet.artemis.programming.repository.settings.UserIdeMappingRepository; import de.tum.cit.aet.artemis.programming.dto.IdeDTO; import de.tum.cit.aet.artemis.programming.dto.IdeMappingDTO; +import de.tum.cit.aet.artemis.programming.repository.settings.IdeRepository; +import de.tum.cit.aet.artemis.programming.repository.settings.UserIdeMappingRepository; class IdePreferencesIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/team/TeamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/team/TeamIntegrationTest.java index 07ab964eac34..6281d327147d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/team/TeamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/team/TeamIntegrationTest.java @@ -20,11 +20,14 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.CoursesForDashboardDTO; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.TeamAssignmentConfig; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseDetailsDTO; +import de.tum.cit.aet.artemis.exercise.dto.TeamSearchUserDTO; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.text.TextExerciseUtilService; @@ -32,11 +35,8 @@ import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -import de.tum.cit.aet.artemis.service.dto.TeamSearchUserDTO; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; -import de.tum.cit.aet.artemis.core.dto.CoursesForDashboardDTO; -import de.tum.cit.aet.artemis.exercise.dto.ExerciseDetailsDTO; class TeamIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java index 1ee51600e3c7..89f95b8bd92e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/TextAssessmentIntegrationTest.java @@ -42,6 +42,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; import de.tum.cit.aet.artemis.assessment.repository.ComplaintRepository; import de.tum.cit.aet.artemis.assessment.repository.ExampleSubmissionRepository; import de.tum.cit.aet.artemis.assessment.repository.TextBlockRepository; @@ -70,16 +71,15 @@ import de.tum.cit.aet.artemis.fileupload.domain.FileUploadSubmission; import de.tum.cit.aet.artemis.participation.ParticipationFactory; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; +import de.tum.cit.aet.artemis.programming.dto.ResultDTO; import de.tum.cit.aet.artemis.text.domain.TextBlock; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; +import de.tum.cit.aet.artemis.text.dto.TextAssessmentDTO; +import de.tum.cit.aet.artemis.text.dto.TextAssessmentUpdateDTO; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; import de.tum.cit.aet.artemis.text.service.TextAssessmentService; -import de.tum.cit.aet.artemis.assessment.dto.AssessmentUpdateDTO; -import de.tum.cit.aet.artemis.programming.dto.ResultDTO; -import de.tum.cit.aet.artemis.text.dto.TextAssessmentDTO; -import de.tum.cit.aet.artemis.text.dto.TextAssessmentUpdateDTO; class TextAssessmentIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/text/TextExerciseIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/TextExerciseIntegrationTest.java index cba8a64b1827..78204f1541c3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/text/TextExerciseIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/TextExerciseIntegrationTest.java @@ -50,6 +50,7 @@ import de.tum.cit.aet.artemis.competency.CompetencyUtilService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; @@ -70,6 +71,8 @@ import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; import de.tum.cit.aet.artemis.plagiarism.domain.text.TextSubmissionElement; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismComparisonStatusDTO; +import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismResultDTO; import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; import de.tum.cit.aet.artemis.text.domain.TextBlock; import de.tum.cit.aet.artemis.text.domain.TextExercise; @@ -80,9 +83,6 @@ import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider; import de.tum.cit.aet.artemis.util.InvalidExamExerciseDatesArgumentProvider.InvalidExamExerciseDateConfiguration; import de.tum.cit.aet.artemis.util.PageableSearchUtilService; -import de.tum.cit.aet.artemis.core.dto.CourseForDashboardDTO; -import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismComparisonStatusDTO; -import de.tum.cit.aet.artemis.plagiarism.dto.PlagiarismResultDTO; class TextExerciseIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java index 8bb451ed03ce..bcf8827a3d81 100644 --- a/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/text/TextSubmissionIntegrationTest.java @@ -32,6 +32,7 @@ import de.tum.cit.aet.artemis.exercise.domain.SubmissionVersion; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.dto.ExerciseDetailsDTO; import de.tum.cit.aet.artemis.exercise.repository.StudentParticipationRepository; import de.tum.cit.aet.artemis.exercise.repository.SubmissionVersionRepository; import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; @@ -49,7 +50,6 @@ import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; -import de.tum.cit.aet.artemis.exercise.dto.ExerciseDetailsDTO; class TextSubmissionIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/theia/TheiaInfoContributorTest.java b/src/test/java/de/tum/cit/aet/artemis/theia/TheiaInfoContributorTest.java index 4d3d55d99273..bb1160555967 100644 --- a/src/test/java/de/tum/cit/aet/artemis/theia/TheiaInfoContributorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/theia/TheiaInfoContributorTest.java @@ -8,8 +8,8 @@ import org.springframework.boot.actuate.info.Info; import org.springframework.context.annotation.Profile; -import de.tum.cit.aet.artemis.core.component.TheiaInfoContributor; import de.tum.cit.aet.artemis.core.config.Constants; +import de.tum.cit.aet.artemis.core.config.TheiaInfoContributor; @Profile(PROFILE_THEIA) class TheiaInfoContributorTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFreePeriodIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFreePeriodIntegrationTest.java index 77b1c6eee30b..ef357016efb8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFreePeriodIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupFreePeriodIntegrationTest.java @@ -20,8 +20,8 @@ import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupFreePeriod; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupSession; -import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.tutorialgroup.dto.TutorialGroupFreePeriodDTO; +import de.tum.cit.aet.artemis.user.UserFactory; class TutorialGroupFreePeriodIntegrationTest extends AbstractTutorialGroupIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java index 9dc8845ee2b2..ce0d2da9e029 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroups/TutorialGroupIntegrationTest.java @@ -35,8 +35,8 @@ import de.tum.cit.aet.artemis.communication.repository.PostRepository; import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.StudentDTO; import de.tum.cit.aet.artemis.post.ConversationUtilService; -import de.tum.cit.aet.artemis.service.dto.StudentDTO; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroup; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistration; import de.tum.cit.aet.artemis.tutorialgroup.domain.TutorialGroupRegistrationType; diff --git a/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java index 65e60d10ad92..86054d9adeba 100644 --- a/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/AccountResourceIntegrationTest.java @@ -16,14 +16,14 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.PasswordChangeDTO; +import de.tum.cit.aet.artemis.core.dto.UserDTO; import de.tum.cit.aet.artemis.core.dto.vm.KeyAndPasswordVM; import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; import de.tum.cit.aet.artemis.core.service.AccountService; import de.tum.cit.aet.artemis.core.service.user.PasswordService; import de.tum.cit.aet.artemis.core.web.AccountResource; import de.tum.cit.aet.artemis.core.web.open.PublicAccountResource; -import de.tum.cit.aet.artemis.service.dto.PasswordChangeDTO; -import de.tum.cit.aet.artemis.service.dto.UserDTO; import de.tum.cit.aet.artemis.util.ConfigUtil; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/user/UserFactory.java b/src/test/java/de/tum/cit/aet/artemis/user/UserFactory.java index ce211dca7cf0..72cf4dd48f05 100644 --- a/src/test/java/de/tum/cit/aet/artemis/user/UserFactory.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/UserFactory.java @@ -8,7 +8,7 @@ import de.tum.cit.aet.artemis.core.domain.Authority; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.service.dto.StudentDTO; +import de.tum.cit.aet.artemis.core.dto.StudentDTO; /** * Factory for creating Users and related objects. diff --git a/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java b/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java index 2fdf41d4115d..158cbd6ffa79 100644 --- a/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/UserTestService.java @@ -29,11 +29,13 @@ import de.tum.cit.aet.artemis.atlas.domain.science.ScienceEvent; import de.tum.cit.aet.artemis.atlas.domain.science.ScienceEventType; -import de.tum.cit.aet.artemis.atlas.repository.science.ScienceEventRepository; +import de.tum.cit.aet.artemis.atlas.repository.ScienceEventRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Authority; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.UserDTO; +import de.tum.cit.aet.artemis.core.dto.UserInitializationDTO; import de.tum.cit.aet.artemis.core.dto.vm.ManagedUserVM; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.AuthorityRepository; @@ -52,8 +54,6 @@ import de.tum.cit.aet.artemis.programming.repository.ParticipationVCSAccessTokenRepository; import de.tum.cit.aet.artemis.programming.service.ci.CIUserManagementService; import de.tum.cit.aet.artemis.programming.service.vcs.VcsUserManagementService; -import de.tum.cit.aet.artemis.service.dto.UserDTO; -import de.tum.cit.aet.artemis.service.dto.UserInitializationDTO; import de.tum.cit.aet.artemis.util.RequestUtilService; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/web/rest/AndroidAppSiteAssociationResourceTest.java b/src/test/java/de/tum/cit/aet/artemis/web/rest/AndroidAppSiteAssociationResourceTest.java index baa6de6737b7..b8787bbae008 100644 --- a/src/test/java/de/tum/cit/aet/artemis/web/rest/AndroidAppSiteAssociationResourceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/web/rest/AndroidAppSiteAssociationResourceTest.java @@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.core.web.AndroidAppSiteAssociationResource; +import de.tum.cit.aet.artemis.communication.web.AndroidAppSiteAssociationResource; class AndroidAppSiteAssociationResourceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/web/rest/AppleAppSiteAssociationResourceTest.java b/src/test/java/de/tum/cit/aet/artemis/web/rest/AppleAppSiteAssociationResourceTest.java index 0ff3ff7edb2e..f96f795bc20e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/web/rest/AppleAppSiteAssociationResourceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/web/rest/AppleAppSiteAssociationResourceTest.java @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; -import de.tum.cit.aet.artemis.core.web.AppleAppSiteAssociationResource; +import de.tum.cit.aet.artemis.communication.web.AppleAppSiteAssociationResource; class AppleAppSiteAssociationResourceTest extends AbstractSpringIntegrationIndependentTest { From 07aed983d3cd6c0f775e12b81659b2b79d59bb98 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Wed, 11 Sep 2024 21:13:24 +0200 Subject: [PATCH 22/43] fix DTO references in repositories --- .../cit/aet/artemis/buildagent/dto/FinishedBuildJobDTO.java | 1 - .../tum/cit/aet/artemis/core/repository/UserRepository.java | 2 +- .../artemis/programming/repository/BuildJobRepository.java | 6 +++--- .../repository/ProgrammingSubmissionRepository.java | 4 ++-- .../repository/hestia/CoverageReportRepository.java | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/FinishedBuildJobDTO.java b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/FinishedBuildJobDTO.java index c655693646df..c7086c9acf29 100644 --- a/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/FinishedBuildJobDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/buildagent/dto/FinishedBuildJobDTO.java @@ -17,7 +17,6 @@ /** * A DTO representing a finished build job */ - @JsonInclude(JsonInclude.Include.NON_EMPTY) public record FinishedBuildJobDTO(String id, String name, String buildAgentAddress, long participationId, long courseId, long exerciseId, BuildStatus status, RepositoryType repositoryType, String repositoryName, RepositoryType triggeredByPushTo, ZonedDateTime buildStartDate, ZonedDateTime buildCompletionDate, String commitHash, diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java index e01f172f0ca2..7451e637c56b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/UserRepository.java @@ -135,7 +135,7 @@ public interface UserRepository extends ArtemisJpaRepository, JpaSpe * @return a list of {@link UserRoleDTO} objects containing the user ID, user login, and role for each user */ @Query(""" - SELECT new de.tum.cit.aet.artemis.service.dto.UserRoleDTO(user.id, user.login, + SELECT new de.tum.cit.aet.artemis.core.dto.UserRoleDTO(user.id, user.login, CASE WHEN :#{T(de.tum.cit.aet.artemis.core.domain.Authority).ADMIN_AUTHORITY} MEMBER OF user.authorities THEN 'INSTRUCTOR' WHEN course.instructorGroupName MEMBER OF user.groups THEN 'INSTRUCTOR' diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java index 0545d26e670d..d97b7f03abd7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildJobRepository.java @@ -58,7 +58,7 @@ Page findIdsByFilterCriteria(@Param("buildStatus") BuildStatus buildStatus @Param("durationLower") Duration durationLower, @Param("durationUpper") Duration durationUpper, Pageable pageable); @Query(""" - SELECT new de.tum.cit.aet.artemis.programming.service.localci.dto.DockerImageBuild( + SELECT new de.tum.cit.aet.artemis.buildagent.dto.DockerImageBuild( b.dockerImage, MAX(b.buildStartDate) ) @@ -93,7 +93,7 @@ default Page findAllWithDataByCourseId(long courseId, Pageable pageabl } @Query(""" - SELECT new de.tum.cit.aet.artemis.programming.service.localci.dto.ResultBuildJob( + SELECT new de.tum.cit.aet.artemis.buildagent.dto.ResultBuildJob( b.result.id, b.buildJobId ) @@ -103,7 +103,7 @@ default Page findAllWithDataByCourseId(long courseId, Pageable pageabl Set findBuildJobIdsForResultIds(@Param("resultIds") List resultIds); @Query(""" - SELECT new de.tum.cit.aet.artemis.service.dto.BuildJobResultCountDTO( + SELECT new de.tum.cit.aet.artemis.buildagent.dto.BuildJobResultCountDTO( b.buildStatus, COUNT(b.buildStatus) ) diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingSubmissionRepository.java index 950411063959..ffe438217b64 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingSubmissionRepository.java @@ -48,7 +48,7 @@ default ProgrammingSubmission findFirstByParticipationIdAndCommitHashOrderByIdDe } @Query(value = """ - SELECT new de.tum.cit.aet.artemis.service.dto.ProgrammingSubmissionIdAndSubmissionDateDTO(ps.id, ps.submissionDate) + SELECT new de.tum.cit.aet.artemis.programming.dto.ProgrammingSubmissionIdAndSubmissionDateDTO(ps.id, ps.submissionDate) FROM ProgrammingSubmission ps WHERE ps.participation.id = :participationId ORDER BY ps.submissionDate DESC """) @@ -77,7 +77,7 @@ default Optional findFirstByParticipationIdWithResultsOrd } @Query(""" - SELECT new de.tum.cit.aet.artemis.service.dto.ProgrammingSubmissionIdAndSubmissionDateDTO(s.id, s.submissionDate) + SELECT new de.tum.cit.aet.artemis.programming.dto.ProgrammingSubmissionIdAndSubmissionDateDTO(s.id, s.submissionDate) FROM ProgrammingSubmission s JOIN s.participation p JOIN p.exercise e diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageReportRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageReportRepository.java index 4b31eb1d9831..eefc9aeb5848 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageReportRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/hestia/CoverageReportRepository.java @@ -35,7 +35,7 @@ public interface CoverageReportRepository extends ArtemisJpaRepository Date: Wed, 11 Sep 2024 21:34:15 +0200 Subject: [PATCH 23/43] move files to their respective service --- .../aet/artemis/assessment/{listener => }/ResultListener.java | 2 +- .../java/de/tum/cit/aet/artemis/assessment/domain/Result.java | 2 +- .../assessment/service/ParticipantScoreScheduleService.java | 2 +- .../artemis/assessment/service/ParticipantScoreService.java | 2 +- .../aet/artemis/assessment/web/ParticipantScoreResource.java | 2 +- .../{validation => config}/InetSocketAddressValidator.java | 2 +- .../artemis/core/config/websocket/WebsocketConfiguration.java | 2 +- .../cit/aet/artemis/exercise/domain/TeamAssignmentConfig.java | 2 +- .../web}/TeamAssignmentConfigConstraints.java | 4 +--- .../web}/TeamAssignmentConfigValidator.java | 3 +-- .../tum/cit/aet/artemis/lti/config/CustomLti13Configurer.java | 1 - .../security/filter => lti/config}/Lti13LaunchFilter.java | 3 +-- .../security/lti => lti/config}/Lti13TokenRetriever.java | 2 +- .../java/de/tum/cit/aet/artemis/lti/service/Lti13Service.java | 2 +- .../cit/aet/artemis/lti/service/LtiDeepLinkingService.java | 2 +- .../{exceptions => exception}/BuildTriggerWebsocketError.java | 2 +- .../programming/service/ProgrammingMessagingService.java | 2 +- .../programming/service/ProgrammingTriggerService.java | 2 +- .../service/localci/LocalCIResultProcessingService.java | 2 +- .../tum/cit/aet/artemis/InetSocketAddressValidatorTest.java | 2 +- .../de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java | 2 +- .../tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java | 2 +- .../cit/aet/artemis/security/lti/Lti13TokenRetrieverTest.java | 2 +- .../service/connectors/lti/LtiDeepLinkingServiceTest.java | 2 +- 24 files changed, 23 insertions(+), 28 deletions(-) rename src/main/java/de/tum/cit/aet/artemis/assessment/{listener => }/ResultListener.java (98%) rename src/main/java/de/tum/cit/aet/artemis/core/{validation => config}/InetSocketAddressValidator.java (96%) rename src/main/java/de/tum/cit/aet/artemis/{core/validation/constraints => exercise/web}/TeamAssignmentConfigConstraints.java (87%) rename src/main/java/de/tum/cit/aet/artemis/{core/validation => exercise/web}/TeamAssignmentConfigValidator.java (84%) rename src/main/java/de/tum/cit/aet/artemis/{core/security/filter => lti/config}/Lti13LaunchFilter.java (98%) rename src/main/java/de/tum/cit/aet/artemis/{core/security/lti => lti/config}/Lti13TokenRetriever.java (99%) rename src/main/java/de/tum/cit/aet/artemis/programming/{exceptions => exception}/BuildTriggerWebsocketError.java (92%) diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/listener/ResultListener.java b/src/main/java/de/tum/cit/aet/artemis/assessment/ResultListener.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/assessment/listener/ResultListener.java rename to src/main/java/de/tum/cit/aet/artemis/assessment/ResultListener.java index 49ff2094e180..154d7ee78144 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/listener/ResultListener.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/ResultListener.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.assessment.listener; +package de.tum.cit.aet.artemis.assessment; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java index 759d36e2dc7f..cc14d7a35e34 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/domain/Result.java @@ -43,7 +43,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonView; -import de.tum.cit.aet.artemis.assessment.listener.ResultListener; +import de.tum.cit.aet.artemis.assessment.ResultListener; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.domain.User; diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreScheduleService.java index 8c23327d2e2b..fffd4957b5b2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreScheduleService.java @@ -28,11 +28,11 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.ResultListener; import de.tum.cit.aet.artemis.assessment.domain.ParticipantScore; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.domain.StudentScore; import de.tum.cit.aet.artemis.assessment.domain.TeamScore; -import de.tum.cit.aet.artemis.assessment.listener.ResultListener; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreService.java index 689734a21812..812c2f3b31ea 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ParticipantScoreService.java @@ -18,12 +18,12 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.assessment.ResultListener; import de.tum.cit.aet.artemis.assessment.domain.GradingScale; import de.tum.cit.aet.artemis.assessment.domain.ParticipantScore; import de.tum.cit.aet.artemis.assessment.dto.score.ScoreDTO; import de.tum.cit.aet.artemis.assessment.dto.score.StudentScoreSum; import de.tum.cit.aet.artemis.assessment.dto.score.TeamScoreSum; -import de.tum.cit.aet.artemis.assessment.listener.ResultListener; import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; import de.tum.cit.aet.artemis.assessment.repository.TeamScoreRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ParticipantScoreResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ParticipantScoreResource.java index 6b5a38ba0574..136795a2cc87 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ParticipantScoreResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ParticipantScoreResource.java @@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.assessment.ResultListener; import de.tum.cit.aet.artemis.assessment.dto.score.ScoreDTO; -import de.tum.cit.aet.artemis.assessment.listener.ResultListener; import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/validation/InetSocketAddressValidator.java b/src/main/java/de/tum/cit/aet/artemis/core/config/InetSocketAddressValidator.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/core/validation/InetSocketAddressValidator.java rename to src/main/java/de/tum/cit/aet/artemis/core/config/InetSocketAddressValidator.java index a7c6e1f20a00..a2b4a158a125 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/validation/InetSocketAddressValidator.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/InetSocketAddressValidator.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.validation; +package de.tum.cit.aet.artemis.core.config; import java.net.InetSocketAddress; import java.net.URI; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java index 6f3f02131a7c..9163cfb7d7f1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/websocket/WebsocketConfiguration.java @@ -57,12 +57,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Iterators; +import de.tum.cit.aet.artemis.core.config.InetSocketAddressValidator; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.jwt.JWTFilter; import de.tum.cit.aet.artemis.core.security.jwt.TokenProvider; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; -import de.tum.cit.aet.artemis.core.validation.InetSocketAddressValidator; import de.tum.cit.aet.artemis.exam.repository.ExamRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/TeamAssignmentConfig.java b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/TeamAssignmentConfig.java index 5391f0907b2f..86c91a8de65e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/domain/TeamAssignmentConfig.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/domain/TeamAssignmentConfig.java @@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.core.domain.DomainObject; -import de.tum.cit.aet.artemis.core.validation.constraints.TeamAssignmentConfigConstraints; +import de.tum.cit.aet.artemis.exercise.web.TeamAssignmentConfigConstraints; /** * A team assignment configuration. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/validation/constraints/TeamAssignmentConfigConstraints.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/TeamAssignmentConfigConstraints.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/core/validation/constraints/TeamAssignmentConfigConstraints.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/web/TeamAssignmentConfigConstraints.java index 76fc554da6ef..253baa25c864 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/validation/constraints/TeamAssignmentConfigConstraints.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/TeamAssignmentConfigConstraints.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.validation.constraints; +package de.tum.cit.aet.artemis.exercise.web; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -8,8 +8,6 @@ import jakarta.validation.Constraint; import jakarta.validation.Payload; -import de.tum.cit.aet.artemis.core.validation.TeamAssignmentConfigValidator; - /** * Custom constraint annotation for team assignment configurations * Validation is performed by TeamAssignmentConfigValidator before saving. If it fails, an error will be thrown. diff --git a/src/main/java/de/tum/cit/aet/artemis/core/validation/TeamAssignmentConfigValidator.java b/src/main/java/de/tum/cit/aet/artemis/exercise/web/TeamAssignmentConfigValidator.java similarity index 84% rename from src/main/java/de/tum/cit/aet/artemis/core/validation/TeamAssignmentConfigValidator.java rename to src/main/java/de/tum/cit/aet/artemis/exercise/web/TeamAssignmentConfigValidator.java index afef48c0141a..c7857ff241fb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/validation/TeamAssignmentConfigValidator.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/web/TeamAssignmentConfigValidator.java @@ -1,9 +1,8 @@ -package de.tum.cit.aet.artemis.core.validation; +package de.tum.cit.aet.artemis.exercise.web; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; -import de.tum.cit.aet.artemis.core.validation.constraints.TeamAssignmentConfigConstraints; import de.tum.cit.aet.artemis.exercise.domain.TeamAssignmentConfig; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/config/CustomLti13Configurer.java b/src/main/java/de/tum/cit/aet/artemis/lti/config/CustomLti13Configurer.java index 30456f545dd7..503c0f9cbc16 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/config/CustomLti13Configurer.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/config/CustomLti13Configurer.java @@ -7,7 +7,6 @@ import org.springframework.security.web.authentication.logout.LogoutFilter; import org.springframework.stereotype.Component; -import de.tum.cit.aet.artemis.core.security.filter.Lti13LaunchFilter; import de.tum.cit.aet.artemis.core.security.jwt.JWTFilter; import de.tum.cit.aet.artemis.lti.service.Lti13Service; import de.tum.cit.aet.artemis.lti.service.OnlineCourseConfigurationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/security/filter/Lti13LaunchFilter.java b/src/main/java/de/tum/cit/aet/artemis/lti/config/Lti13LaunchFilter.java similarity index 98% rename from src/main/java/de/tum/cit/aet/artemis/core/security/filter/Lti13LaunchFilter.java rename to src/main/java/de/tum/cit/aet/artemis/lti/config/Lti13LaunchFilter.java index 55eb9c385fcc..e12741b6dea6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/security/filter/Lti13LaunchFilter.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/config/Lti13LaunchFilter.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.security.filter; +package de.tum.cit.aet.artemis.lti.config; import java.io.IOException; import java.io.PrintWriter; @@ -23,7 +23,6 @@ import de.tum.cit.aet.artemis.core.exception.LtiEmailAlreadyInUseException; import de.tum.cit.aet.artemis.core.security.SecurityUtils; -import de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer; import de.tum.cit.aet.artemis.lti.dto.Claims; import de.tum.cit.aet.artemis.lti.dto.LtiAuthenticationResponse; import de.tum.cit.aet.artemis.lti.service.Lti13Service; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/security/lti/Lti13TokenRetriever.java b/src/main/java/de/tum/cit/aet/artemis/lti/config/Lti13TokenRetriever.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/core/security/lti/Lti13TokenRetriever.java rename to src/main/java/de/tum/cit/aet/artemis/lti/config/Lti13TokenRetriever.java index 4ed828b8e5ab..a1ee2c042cd6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/security/lti/Lti13TokenRetriever.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/config/Lti13TokenRetriever.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.security.lti; +package de.tum.cit.aet.artemis.lti.config; import java.net.URI; import java.security.KeyPair; diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/service/Lti13Service.java b/src/main/java/de/tum/cit/aet/artemis/lti/service/Lti13Service.java index 7d3c06dee2db..dc6675931e65 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/service/Lti13Service.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/service/Lti13Service.java @@ -40,10 +40,10 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProvider; -import de.tum.cit.aet.artemis.core.security.lti.Lti13TokenRetriever; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.lti.config.Lti13TokenRetriever; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.domain.LtiResourceLaunch; import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiDeepLinkingService.java b/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiDeepLinkingService.java index 4f5c88112468..2e80503fd0a8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiDeepLinkingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiDeepLinkingService.java @@ -14,10 +14,10 @@ import org.springframework.web.util.UriComponentsBuilder; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.security.lti.Lti13TokenRetriever; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.lti.config.Lti13TokenRetriever; import de.tum.cit.aet.artemis.lti.dto.Lti13DeepLinkingResponse; /** diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/exceptions/BuildTriggerWebsocketError.java b/src/main/java/de/tum/cit/aet/artemis/programming/exception/BuildTriggerWebsocketError.java similarity index 92% rename from src/main/java/de/tum/cit/aet/artemis/programming/exceptions/BuildTriggerWebsocketError.java rename to src/main/java/de/tum/cit/aet/artemis/programming/exception/BuildTriggerWebsocketError.java index e8b107518e16..9f482858f858 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/exceptions/BuildTriggerWebsocketError.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/exception/BuildTriggerWebsocketError.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.exceptions; +package de.tum.cit.aet.artemis.programming.exception; import de.tum.cit.aet.artemis.core.exception.WebsocketError; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingMessagingService.java index fe961473c8e3..dfb4e931ac27 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingMessagingService.java @@ -30,7 +30,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.build.BuildRunState; -import de.tum.cit.aet.artemis.programming.exceptions.BuildTriggerWebsocketError; +import de.tum.cit.aet.artemis.programming.exception.BuildTriggerWebsocketError; @Profile(PROFILE_CORE) @Service diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingTriggerService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingTriggerService.java index 3d153b1d8c34..dfa3a174ab65 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingTriggerService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingTriggerService.java @@ -35,7 +35,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; import de.tum.cit.aet.artemis.programming.domain.TemplateProgrammingExerciseParticipation; -import de.tum.cit.aet.artemis.programming.exceptions.BuildTriggerWebsocketError; +import de.tum.cit.aet.artemis.programming.exception.BuildTriggerWebsocketError; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingSubmissionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultProcessingService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultProcessingService.java index 4e27fd113c58..5c033aab1aaa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultProcessingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIResultProcessingService.java @@ -38,7 +38,7 @@ import de.tum.cit.aet.artemis.programming.domain.build.BuildLogEntry; import de.tum.cit.aet.artemis.programming.domain.build.BuildStatus; import de.tum.cit.aet.artemis.programming.dto.ResultDTO; -import de.tum.cit.aet.artemis.programming.exceptions.BuildTriggerWebsocketError; +import de.tum.cit.aet.artemis.programming.exception.BuildTriggerWebsocketError; import de.tum.cit.aet.artemis.programming.repository.BuildJobRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.BuildLogEntryService; diff --git a/src/test/java/de/tum/cit/aet/artemis/InetSocketAddressValidatorTest.java b/src/test/java/de/tum/cit/aet/artemis/InetSocketAddressValidatorTest.java index 848076e8b45e..7ec87bbf6ed5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/InetSocketAddressValidatorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/InetSocketAddressValidatorTest.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; -import de.tum.cit.aet.artemis.core.validation.InetSocketAddressValidator; +import de.tum.cit.aet.artemis.core.config.InetSocketAddressValidator; class InetSocketAddressValidatorTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java index 360f7a31b56f..c774ebfaf0b0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/Lti13ServiceTest.java @@ -53,10 +53,10 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.ArtemisAuthenticationProvider; -import de.tum.cit.aet.artemis.core.security.lti.Lti13TokenRetriever; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.lti.config.Lti13TokenRetriever; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.domain.LtiResourceLaunch; import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; diff --git a/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java b/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java index 2989c25fdd74..ede5772ee666 100644 --- a/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/security/Lti13LaunchFilterTest.java @@ -45,8 +45,8 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import de.tum.cit.aet.artemis.core.exception.LtiEmailAlreadyInUseException; -import de.tum.cit.aet.artemis.core.security.filter.Lti13LaunchFilter; import de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer; +import de.tum.cit.aet.artemis.lti.config.Lti13LaunchFilter; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.lti.service.Lti13Service; diff --git a/src/test/java/de/tum/cit/aet/artemis/security/lti/Lti13TokenRetrieverTest.java b/src/test/java/de/tum/cit/aet/artemis/security/lti/Lti13TokenRetrieverTest.java index 3a8df35fbc9b..d5d5bd909b1c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/security/lti/Lti13TokenRetrieverTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/security/lti/Lti13TokenRetrieverTest.java @@ -48,7 +48,7 @@ import com.nimbusds.jwt.SignedJWT; import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; -import de.tum.cit.aet.artemis.core.security.lti.Lti13TokenRetriever; +import de.tum.cit.aet.artemis.lti.config.Lti13TokenRetriever; import de.tum.cit.aet.artemis.lti.dto.Scopes; class Lti13TokenRetrieverTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java index 09dc3ce8f6f5..f116e5a80c39 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/lti/LtiDeepLinkingServiceTest.java @@ -34,9 +34,9 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.security.lti.Lti13TokenRetriever; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; +import de.tum.cit.aet.artemis.lti.config.Lti13TokenRetriever; import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.lti.service.LtiDeepLinkingService; import de.tum.cit.aet.artemis.text.domain.TextExercise; From 23078553bd880e37b8a3c809f268e18785e4792d Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Wed, 11 Sep 2024 21:42:11 +0200 Subject: [PATCH 24/43] remove unrelated file --- ...s:src:main:java:de:tum:in:www1:artemis.uml | 4633 ----------------- 1 file changed, 4633 deletions(-) delete mode 100644 vester:Development:private:Artemis:src:main:java:de:tum:in:www1:artemis.uml diff --git a/vester:Development:private:Artemis:src:main:java:de:tum:in:www1:artemis.uml b/vester:Development:private:Artemis:src:main:java:de:tum:in:www1:artemis.uml deleted file mode 100644 index 927416e16803..000000000000 --- a/vester:Development:private:Artemis:src:main:java:de:tum:in:www1:artemis.uml +++ /dev/null @@ -1,4633 +0,0 @@ - - - JAVA - /Users/ole.vester/Development/private/Artemis/src/main/java/de/tum/in/www1/artemis - - de.tum.in.www1.artemis.domain.quiz.DragAndDropQuestionStatistic - de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLPackage - de.tum.in.www1.artemis.service.science.ScienceEventService - de.tum.in.www1.artemis.domain.iris.session.IrisHestiaSession - de.tum.in.www1.artemis.service.connectors.athena.AthenaSubmissionSelectionService - de.tum.in.www1.artemis.web.rest.dto.pageablesearch.CompetencyPageableSearchDTO - de.tum.in.www1.artemis.web.websocket.dto.OnlineTeamStudentDTO - de.tum.in.www1.artemis.domain.iris.settings.IrisHestiaSubSettings - de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyRequestDTO - de.tum.in.www1.artemis.repository.GroupNotificationRepository - de.tum.in.www1.artemis.service.dto.athena.ModelingFeedbackDTO - de.tum.in.www1.artemis.service.metis.AnswerMessageService - de.tum.in.www1.artemis.web.rest.dto.QuizBatchJoinDTO - de.tum.in.www1.artemis.service.linkpreview.ogparser.Content - de.tum.in.www1.artemis.web.rest.vm.KeyAndPasswordVM - de.tum.in.www1.artemis.config.migration.DatabaseMigration - de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationServerHealthIndicator - de.tum.in.www1.artemis.service.connectors.jenkins.build_plan.JenkinsBuildPlanService - de.tum.in.www1.artemis.web.rest.plagiarism.PlagiarismPostResource - de.tum.in.www1.artemis.service.linkpreview.ogparser.htmlparser.OgMetaElementHtmlParser - de.tum.in.www1.artemis.web.rest.open.PublicUserJwtResource - de.tum.in.www1.artemis.domain.metrics.ExerciseTypeMetricsEntry - de.tum.in.www1.artemis.web.rest.plagiarism.PlagiarismResultStats - de.tum.in.www1.artemis.service.competency.KnowledgeAreaService - de.tum.in.www1.artemis.repository.AttachmentRepository - de.tum.in.www1.artemis.domain.metis.conversation.ConversationSettings - de.tum.in.www1.artemis.repository.ApollonDiagramRepository - de.tum.in.www1.artemis.service.iris.session.IrisChatBasedFeatureInterface - de.tum.in.www1.artemis.service.programming.ProgrammingExerciseRepositoryService - de.tum.in.www1.artemis.service.quiz.QuizSubmissionService - de.tum.in.www1.artemis.service.ExerciseLifecycleService - de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsXmlConfigBuilder - de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.ParserStrategy - de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3.ActivityDiagramParser - de.tum.in.www1.artemis.config.SAML2Configuration - de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseGitDiffReportRepository - de.tum.in.www1.artemis.domain.quiz.QuizGroup - de.tum.in.www1.artemis.domain.statistics.BuildLogStatisticsEntry - de.tum.in.www1.artemis.web.rest.errors.HttpStatusException - de.tum.in.www1.artemis.web.rest.dto.CoursesForDashboardDTO - de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLAttribute - de.tum.in.www1.artemis.domain.enumeration.ComplaintType - de.tum.in.www1.artemis.web.rest.errors.StudentsNotFoundException - de.tum.in.www1.artemis.service.connectors.pyris.PyrisPipelineService - de.tum.in.www1.artemis.domain.assessment.dashboard.ExerciseRatingCount - de.tum.in.www1.artemis.domain.FileType - de.tum.in.www1.artemis.service.RatingService - de.tum.in.www1.artemis.repository.TextAssessmentEventRepository - de.tum.in.www1.artemis.domain.enumeration.SystemNotificationType - de.tum.in.www1.artemis.domain.iris.session.IrisSession - de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisExamDTO - de.tum.in.www1.artemis.domain.Submission - de.tum.in.www1.artemis.service.competency.CompetencyJolService - de.tum.in.www1.artemis.config.BuildAgentWithoutCoreCondition - de.tum.in.www1.artemis.web.rest.metis.conversation.ConversationResource - de.tum.in.www1.artemis.domain.competency.Competency - de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaResultDTO - de.tum.in.www1.artemis.service.plagiarism.PlagiarismWebsocketService - de.tum.in.www1.artemis.service.icl.ArtemisGitServletService - de.tum.in.www1.artemis.domain.quiz.QuizBatch - de.tum.in.www1.artemis.domain.BonusStrategy - de.tum.in.www1.artemis.service.compass.umlmodel.UMLContainerElement - de.tum.in.www1.artemis.domain.lecture.Slide - de.tum.in.www1.artemis.domain.enumeration.ExerciseMode - de.tum.in.www1.artemis.domain.push_notification.PushNotificationDeviceConfigurationId - de.tum.in.www1.artemis.web.websocket.localci.LocalCIWebsocketMessagingService - de.tum.in.www1.artemis.web.rest.dto.ExamSessionDTO - de.tum.in.www1.artemis.repository.StudentParticipationRepository - de.tum.in.www1.artemis.web.rest.programming.ProgrammingExerciseTestCaseResource - de.tum.in.www1.artemis.service.connectors.localci.scaparser.utils.ReportUtils - de.tum.in.www1.artemis.service.connectors.ci.CIPermission - de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralTestCaseService - de.tum.in.www1.artemis.exception.localvc.LocalVCInternalException - de.tum.in.www1.artemis.domain.hestia.TestwiseCoverageReportEntry - de.tum.in.www1.artemis.domain.participation.Participant - de.tum.in.www1.artemis.web.rest.open.PublicBuildPlanResource - de.tum.in.www1.artemis.web.rest.dto.examevent.ExamAttendanceCheckEventDTO - de.tum.in.www1.artemis.service.AuthorizationCheckService - de.tum.in.www1.artemis.web.rest.util.StringUtil - de.tum.in.www1.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeNonterminal - de.tum.in.www1.artemis.service.connectors.athena.AthenaFeedbackSendingService - de.tum.in.www1.artemis.repository.iris.IrisExerciseChatSessionRepository - de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisTextMessageContentDTO - de.tum.in.www1.artemis.config.DatabaseConfiguration - de.tum.in.www1.artemis.web.rest.ModelingExerciseResource - de.tum.in.www1.artemis.domain.enumeration.tutorialgroups.TutorialGroupRegistrationType - de.tum.in.www1.artemis.service.connectors.gitlabci.GitLabCIService - de.tum.in.www1.artemis.domain.enumeration.ParticipationLifecycle - de.tum.in.www1.artemis.repository.base.FetchOptions - de.tum.in.www1.artemis.domain.leaderboard.tutor.TutorLeaderboardComplaints - de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.PyrisChatPipelineExecutionBaseDataDTO - de.tum.in.www1.artemis.service.user.AuthorityService - de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsInternalUrlService - de.tum.in.www1.artemis.domain.participation.Participation - de.tum.in.www1.artemis.service.compass.controller.ModelClusterFactory - de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO - de.tum.in.www1.artemis.service.connectors.localvc.LocalVCPrePushHook - de.tum.in.www1.artemis.service.ModelingExerciseImportService - de.tum.in.www1.artemis.web.rest.hestia.CoverageReportResource - de.tum.in.www1.artemis.web.rest.dto.SubmissionExportOptionsDTO - de.tum.in.www1.artemis.service.learningpath.LearningPathNgxService - de.tum.in.www1.artemis.domain.metis.conversation.UserConversationInfo - de.tum.in.www1.artemis.service.export.DataExportExamCreationService - de.tum.in.www1.artemis.service.connectors.jenkins.jobs.JenkinsJobService - de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestCaseDetailMessageDTO - de.tum.in.www1.artemis.domain.enumeration.DataExportState - de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository - de.tum.in.www1.artemis.domain.lecture.LectureUnitCompletion - de.tum.in.www1.artemis.service.connectors.gitlab.GitLabException - de.tum.in.www1.artemis.web.rest.GradeStepResource - de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException - de.tum.in.www1.artemis.service.FeedbackService - de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNDataStore - de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNStartEvent - de.tum.in.www1.artemis.domain.competency.CompetencyProgress - de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionService - de.tum.in.www1.artemis.web.rest.dto.ResultWithPointsPerGradingCriterionDTO - de.tum.in.www1.artemis.service.LegalDocumentService - de.tum.in.www1.artemis.service.notifications.ConversationNotificationService - de.tum.in.www1.artemis.service.SubmissionService - de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLControlFlow - de.tum.in.www1.artemis.web.rest.dto.science.ScienceEventDTO - de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObjectAttribute - de.tum.in.www1.artemis.repository.base.DynamicSpecificationRepository - de.tum.in.www1.artemis.web.rest.ExerciseResource - de.tum.in.www1.artemis.web.rest.dto.ModelingAssessmentDTO - de.tum.in.www1.artemis.service.FileService - de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse - de.tum.in.www1.artemis.web.rest.science.ScienceSettingsResource - de.tum.in.www1.artemis.service.connectors.BuildScriptProviderService - de.tum.in.www1.artemis.repository.specs.UserSpecs - de.tum.in.www1.artemis.config.icl.ssh.HashUtils - de.tum.in.www1.artemis.web.rest.dto.BonusResultDTO - de.tum.in.www1.artemis.domain.enumeration.QuizMode - de.tum.in.www1.artemis.service.feature.FeatureToggleService - de.tum.in.www1.artemis.service.hestia.structural.StructuralClass - de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationUpdateService - de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLRelationship - de.tum.in.www1.artemis.domain.Rating - de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyDragAndDropProportionalWithPenalty - de.tum.in.www1.artemis.domain.quiz.ShortAnswerMapping - de.tum.in.www1.artemis.web.rest.dto.metrics.LectureUnitInformationDTO - de.tum.in.www1.artemis.domain.quiz.MultipleChoiceQuestionStatistic - de.tum.in.www1.artemis.service.compass.umlmodel.deployment.UMLDeploymentDiagram - de.tum.in.www1.artemis.domain.iris.session.IrisCompetencyGenerationSession - de.tum.in.www1.artemis.service.hestia.structural.StructuralElement - de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.FileViolation - de.tum.in.www1.artemis.service.TextExerciseService - de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLClassDiagram - de.tum.in.www1.artemis.service.learningpath.LearningPathRecommendationService - de.tum.in.www1.artemis.web.websocket.dto.TeamAssignmentPayload - de.tum.in.www1.artemis.repository.SourceRepository - de.tum.in.www1.artemis.service.compass.umlmodel.usecase.UMLUseCase - de.tum.in.www1.artemis.domain.enumeration.StaticCodeAnalysisTool - de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO - de.tum.in.www1.artemis.service.scheduled.IExerciseScheduleService - de.tum.in.www1.artemis.service.TimeService - de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.SourceDTO - de.tum.in.www1.artemis.service.connectors.gitlab.dto.GitLabPersonalAccessTokenResponseDTO - de.tum.in.www1.artemis.web.rest.dto.CourseManagementStatisticsDTO - de.tum.in.www1.artemis.service.connectors.aeolus.Action - de.tum.in.www1.artemis.domain.Organization - de.tum.in.www1.artemis.repository.SubmissionVersionRepository - de.tum.in.www1.artemis.service.plagiarism.ContinuousPlagiarismControlPostContentProvider - de.tum.in.www1.artemis.service.notifications.push_notifications.ApplePushNotificationService - de.tum.in.www1.artemis.domain.lti.Claims - de.tum.in.www1.artemis.domain.lti.Lti13PlatformConfiguration - de.tum.in.www1.artemis.domain.Feedback - de.tum.in.www1.artemis.web.rest.dto.metrics.MapEntryLongLong - de.tum.in.www1.artemis.service.messaging.MainInstanceMessageSendService - de.tum.in.www1.artemis.domain.enumeration.CategoryState - de.tum.in.www1.artemis.domain.exam.event.ExamWideAnnouncementEvent - de.tum.in.www1.artemis.repository.metrics.ExerciseMetricsRepository - de.tum.in.www1.artemis.web.rest.QuizExerciseResource - de.tum.in.www1.artemis.service.icl.GitPublickeyAuthenticatorService - de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorAlertException - de.tum.in.www1.artemis.service.ExerciseImportService - de.tum.in.www1.artemis.web.rest.errors.ComplaintResponseLockedException - de.tum.in.www1.artemis.service.linkpreview.ogparser.htmlparser.OgMetaElement - de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO - de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3.ClassDiagramParser - de.tum.in.www1.artemis.domain.quiz.QuizStatisticCounter - de.tum.in.www1.artemis.service.dto.UserRoleDTO - de.tum.in.www1.artemis.service.connectors.localci.LocalCIBuildConfigurationService - de.tum.in.www1.artemis.web.rest.programming.ProgrammingExerciseResourceErrorKeys - de.tum.in.www1.artemis.domain.iris.settings.IrisSettingsType - de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyMultipleChoiceProportionalWithPenalty - de.tum.in.www1.artemis.web.websocket.programmingSubmission.BuildTriggerWebsocketError - de.tum.in.www1.artemis.service.iris.dto.IrisCombinedSubSettingsInterface - de.tum.in.www1.artemis.web.rest.dto.metrics.CompetencyStudentMetricsDTO - de.tum.in.www1.artemis.service.connectors.aeolus.AeolusRepository - de.tum.in.www1.artemis.repository.metrics.CompetencyMetricsRepository - de.tum.in.www1.artemis.service.connectors.localci.dto.BuildConfig - de.tum.in.www1.artemis.repository.RatingRepository - de.tum.in.www1.artemis.domain.PlagiarismCheckState - de.tum.in.www1.artemis.ApplicationWebXml - de.tum.in.www1.artemis.service.iris.websocket.IrisWebsocketDTO - de.tum.in.www1.artemis.service.connectors.pyris.PyrisHealthIndicator - de.tum.in.www1.artemis.domain.PersistentAuditEvent - de.tum.in.www1.artemis.repository.competency.StandardizedCompetencyRepository - de.tum.in.www1.artemis.repository.TextExerciseRepository - de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository - de.tum.in.www1.artemis.service.hestia.structural.StructuralTestCaseService - de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2.SyntaxTreeParser - de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentInterface - de.tum.in.www1.artemis.service.plagiarism.PlagiarismAnswerPostService - de.tum.in.www1.artemis.config.LoggingAspectConfiguration - de.tum.in.www1.artemis.domain.ConversationNotificationRecipientSummary - de.tum.in.www1.artemis.domain.quiz.DropLocation - de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3.UseCaseDiagramParser - de.tum.in.www1.artemis.security.annotations.AnnotationUtils - de.tum.in.www1.artemis.service.connectors.gitlabci.GitLabCIProgrammingLanguageFeatureService - de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyProgressDTO - de.tum.in.www1.artemis.repository.hestia.ExerciseHintRepository - de.tum.in.www1.artemis.config.DateTimeFormatConfiguration - de.tum.in.www1.artemis.domain.metis.conversation.Channel - de.tum.in.www1.artemis.web.rest.ExerciseGroupResource - de.tum.in.www1.artemis.repository.SingleUserNotificationRepository - de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.Violation - de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisBuildLogEntryDTO - de.tum.in.www1.artemis.repository.LectureUnitCompletionRepository - de.tum.in.www1.artemis.web.rest.dto.score.StudentScoreSum - de.tum.in.www1.artemis.domain.notification.SingleUserNotificationFactory - de.tum.in.www1.artemis.service.SlideSplitterService - de.tum.in.www1.artemis.repository.CourseRepository - de.tum.in.www1.artemis.service.connectors.aeolus.DockerConfig - de.tum.in.www1.artemis.service.exam.ImageExtractor - de.tum.in.www1.artemis.service.dto.athena.ModelingExerciseDTO - de.tum.in.www1.artemis.repository.StudentScoreRepository - de.tum.in.www1.artemis.service.user.UserCreationService - de.tum.in.www1.artemis.web.rest.programming.ProgrammingExerciseParticipationResource - de.tum.in.www1.artemis.repository.iris.IrisHestiaSessionRepository - de.tum.in.www1.artemis.service.connectors.jenkins.build_plan.JenkinsBuildPlanUtils - de.tum.in.www1.artemis.web.rest.hestia.ExerciseHintResource - de.tum.in.www1.artemis.web.rest.TutorParticipationResource - de.tum.in.www1.artemis.web.websocket.dto.ProgrammingExerciseTestCaseStateDTO - de.tum.in.www1.artemis.web.rest.ParticipantScoreResource - de.tum.in.www1.artemis.service.metis.ReactionService - de.tum.in.www1.artemis.domain.enumeration.DiagramType - de.tum.in.www1.artemis.web.rest.open.PublicImprintResource - de.tum.in.www1.artemis.service.plagiarism.ProgrammingLanguageNotSupportedForPlagiarismDetectionException - de.tum.in.www1.artemis.service.dto.TeamSearchUserDTO - de.tum.in.www1.artemis.service.connectors.aeolus.AeolusBuildScriptGenerationService - de.tum.in.www1.artemis.web.websocket.team.ParticipationTeamWebsocketService - de.tum.in.www1.artemis.service.compass.umlmodel.deployment.UMLDeploymentComponent - de.tum.in.www1.artemis.web.rest.dto.ProgrammingExerciseGitDiffEntryDTO - de.tum.in.www1.artemis.service.exam.ExamSessionService - de.tum.in.www1.artemis.service.iris.exception.IrisException - de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupSession - de.tum.in.www1.artemis.web.rest.dto.ImageDTO - de.tum.in.www1.artemis.service.compass.controller.FeedbackSelector - de.tum.in.www1.artemis.repository.ShortAnswerMappingRepository - de.tum.in.www1.artemis.web.rest.dto.SubmissionWithParticipationDTO - de.tum.in.www1.artemis.repository.ParticipationRepository - de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartDecision - de.tum.in.www1.artemis.service.iris.session.IrisCompetencyGenerationSessionService - de.tum.in.www1.artemis.domain.quiz.AnswerOption - de.tum.in.www1.artemis.service.iris.settings.IrisSettingsService - de.tum.in.www1.artemis.service.TeamService - de.tum.in.www1.artemis.web.rest.LearningPathResource - de.tum.in.www1.artemis.web.rest.dto.lectureunit.LectureUnitForLearningPathNodeDetailsDTO - de.tum.in.www1.artemis.domain.Result - de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO - de.tum.in.www1.artemis.service.ldap.LdapUserService - de.tum.in.www1.artemis.web.rest.dto.ProgrammingExerciseGradingStatisticsDTO - de.tum.in.www1.artemis.web.rest.BonusResource - de.tum.in.www1.artemis.domain.lti.Lti13AgsClaim - de.tum.in.www1.artemis.web.rest.dto.ExerciseManagementStatisticsDTO - de.tum.in.www1.artemis.web.rest.dto.ExamUserDTO - de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisCourseDTO - de.tum.in.www1.artemis.service.quiz.QuizService - de.tum.in.www1.artemis.domain.MigrationChangelog - de.tum.in.www1.artemis.web.rest.repository.FileSubmission - de.tum.in.www1.artemis.domain.notification.NotificationTargetFactory - de.tum.in.www1.artemis.exception.LtiEmailAlreadyInUseException - de.tum.in.www1.artemis.domain.BuildRunState - de.tum.in.www1.artemis.web.rest.dto.StudentExamWithGradeDTO - de.tum.in.www1.artemis.config.migration.MigrationRegistry - de.tum.in.www1.artemis.config.lti.StateBasedOptimisticAuthorizationRequestRepository - de.tum.in.www1.artemis.security.lti.Lti13TokenRetriever - de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffReport - de.tum.in.www1.artemis.service.connectors.lti.LtiDeepLinkingService - de.tum.in.www1.artemis.repository.GradingScaleRepository - de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisSubmissionDTO - de.tum.in.www1.artemis.service.quiz.QuizBatchService - de.tum.in.www1.artemis.service.dto.GradingInstructionDTO - de.tum.in.www1.artemis.service.connectors.aeolus.ActionDeserializer - de.tum.in.www1.artemis.service.connectors.localci.LocalCIQueueWebsocketService - de.tum.in.www1.artemis.service.connectors.athena.AthenaConnector - de.tum.in.www1.artemis.web.rest.dto.DueDateStat - de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeatureService - de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObjectMethod - de.tum.in.www1.artemis.web.rest.GuidedTourSettingsResource - de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisExtendedCourseDTO - de.tum.in.www1.artemis.web.rest.admin.AdminPrivacyStatementResource - de.tum.in.www1.artemis.web.rest.ComplaintResponseResource - de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.KnowledgeAreaRequestDTO - de.tum.in.www1.artemis.service.linkpreview.LinkPreviewService - de.tum.in.www1.artemis.web.rest.programming.ProgrammingSubmissionResource - de.tum.in.www1.artemis.web.rest.RatingResource - de.tum.in.www1.artemis.web.rest.errors.ExamConfigurationException - de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2.PetriNetParser - de.tum.in.www1.artemis.repository.LongFeedbackTextRepository - de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2.ObjectDiagramParser - de.tum.in.www1.artemis.domain.competency.LearningPath - de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisJsonMessageContentDTO - de.tum.in.www1.artemis.web.rest.dto.metrics.ExerciseInformationDTO - de.tum.in.www1.artemis.service.connectors.athena.AthenaModuleService - de.tum.in.www1.artemis.service.dto.ComplaintResponseUpdateDTO - de.tum.in.www1.artemis.service.connectors.gitlabci.GitLabCIBuildPlanService - de.tum.in.www1.artemis.repository.DragItemRepository - de.tum.in.www1.artemis.service.connectors.GitService - de.tum.in.www1.artemis.service.export.DataExportUtil - de.tum.in.www1.artemis.service.connectors.gitlab.dto.GitLabPersonalAccessTokenRequestDTO - de.tum.in.www1.artemis.service.compass.utils.SimilarityUtils - de.tum.in.www1.artemis.service.plagiarism.cache.PlagiarismCacheService - de.tum.in.www1.artemis.web.rest.admin.AdminStatisticsResource - de.tum.in.www1.artemis.config.StaticCodeAnalysisConfigurer - de.tum.in.www1.artemis.repository.PersistenceAuditEventRepository - de.tum.in.www1.artemis.service.TextExerciseImportService - de.tum.in.www1.artemis.domain.quiz.ShortAnswerSpot - de.tum.in.www1.artemis.web.rest.ModelingSubmissionResource - de.tum.in.www1.artemis.service.FileUploadSubmissionService - de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO - de.tum.in.www1.artemis.domain.enumeration.CourseInformationSharingConfiguration - de.tum.in.www1.artemis.service.connectors.localci.scaparser.exception.ParserException - de.tum.in.www1.artemis.repository.AttachmentUnitRepository - de.tum.in.www1.artemis.domain.statistics.tutor.effort.TutorEffort - de.tum.in.www1.artemis.service.connectors.vcs.VcsTokenManagementService - de.tum.in.www1.artemis.service.connectors.gitlabci.GitLabCIAuthorizationInterceptor - de.tum.in.www1.artemis.service.ProfileService - de.tum.in.www1.artemis.web.rest.push_notification.PushNotificationUnregisterRequest - de.tum.in.www1.artemis.domain.competency.CompetencyJol - de.tum.in.www1.artemis.service.programming.ProgrammingExerciseImportBasicService - de.tum.in.www1.artemis.domain.plagiarism.PlagiarismResult - de.tum.in.www1.artemis.web.rest.plagiarism.PlagiarismResource - de.tum.in.www1.artemis.domain.quiz.ShortAnswerSolution - de.tum.in.www1.artemis.web.rest.push_notification.PushNotificationRegisterDTO - de.tum.in.www1.artemis.web.websocket.dto.SubmissionSyncPayload - de.tum.in.www1.artemis.service.connectors.localci.dto.BuildResult - de.tum.in.www1.artemis.service.AssessmentService - de.tum.in.www1.artemis.service.dto.PasswordChangeDTO - de.tum.in.www1.artemis.domain.hestia.ExerciseHintActivation - de.tum.in.www1.artemis.domain.quiz.QuizQuestionStatistic - de.tum.in.www1.artemis.domain.iris.settings.IrisChatSubSettings - de.tum.in.www1.artemis.domain.exam.SuspiciousSessionsAnalysisOptions - de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2.ComponentDiagramParser - de.tum.in.www1.artemis.domain.IBonusStrategy - de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismResultDTO - de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyCatalogDTO - de.tum.in.www1.artemis.web.rest.dto.GradeDTO - de.tum.in.www1.artemis.service.compass.umlmodel.usecase.UMLActor - de.tum.in.www1.artemis.web.rest.dto.CourseForImportDTO - de.tum.in.www1.artemis.domain.competency.Source - de.tum.in.www1.artemis.config.connector.GitLabApiConfiguration - de.tum.in.www1.artemis.web.rest.metis.conversation.ChannelResource - de.tum.in.www1.artemis.service.connectors.ldap.LdapAuthenticationProvider - de.tum.in.www1.artemis.web.rest.dto.SubmissionVersionDTO - de.tum.in.www1.artemis.service.TextAssessmentService - de.tum.in.www1.artemis.web.rest.repository.util.RepositoryExecutor - de.tum.in.www1.artemis.web.rest.dto.FileMove - de.tum.in.www1.artemis.web.rest.tutorialgroups.TutorialGroupsConfigurationResource - de.tum.in.www1.artemis.service.iris.session.IrisSubFeatureInterface - de.tum.in.www1.artemis.domain.notification.TutorialGroupNotificationFactory - de.tum.in.www1.artemis.service.WebsocketMessagingService - de.tum.in.www1.artemis.service.exam.ExamUserService - de.tum.in.www1.artemis.domain.lecture.LectureUnit - de.tum.in.www1.artemis.domain.Attachment - de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartInputOutput - de.tum.in.www1.artemis.service.listeners.ResultListener - de.tum.in.www1.artemis.service.hestia.structural.StructuralSolutionEntryGenerationException - de.tum.in.www1.artemis.service.icl.SshGitCommandFactoryService - de.tum.in.www1.artemis.service.connectors.pyris.PyrisConnectorService - de.tum.in.www1.artemis.service.exam.ExamService - de.tum.in.www1.artemis.service.connectors.aeolus.dto.AeolusGenerationResponseDTO - de.tum.in.www1.artemis.service.connectors.aeolus.AeolusTemplateService - de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository - de.tum.in.www1.artemis.service.compass.utils.CompassConfiguration - de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.SpotbugsParser - de.tum.in.www1.artemis.service.dto.athena.SubmissionBaseDTO - de.tum.in.www1.artemis.domain.iris.settings.IrisCompetencyGenerationSubSettings - de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.GroupChatDTO - de.tum.in.www1.artemis.service.programming.DefaultTemplateUpgradeService - de.tum.in.www1.artemis.service.compass.umlmodel.deployment.UMLArtifact - de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNEndEvent - de.tum.in.www1.artemis.repository.plagiarism.PlagiarismComparisonRepository - de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityNode - de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.GroupGitDiffAndCoverageEntriesByFilePathAndTestCase - de.tum.in.www1.artemis.service.programming.ProgrammingExerciseImportFromFileService - de.tum.in.www1.artemis.domain.metis.PostSortCriterion - de.tum.in.www1.artemis.web.rest.admin.AdminCourseResource - de.tum.in.www1.artemis.domain.quiz.QuizStatistic - de.tum.in.www1.artemis.exception.ArtemisMailException - de.tum.in.www1.artemis.config.icl.BuildAgentConfiguration - de.tum.in.www1.artemis.service.dto.ResponsibleUserDTO - de.tum.in.www1.artemis.service.ExerciseService - de.tum.in.www1.artemis.service.notifications.GroupNotificationService - de.tum.in.www1.artemis.service.LectureService - de.tum.in.www1.artemis.web.rest.MetricsResource - de.tum.in.www1.artemis.domain.Lecture - de.tum.in.www1.artemis.service.iris.IrisDefaultTemplateService - de.tum.in.www1.artemis.web.rest.metis.conversation.OneToOneChatResource - de.tum.in.www1.artemis.service.plagiarism.PlagiarismPostService - de.tum.in.www1.artemis.web.rest.dto.SubmissionWithComplaintDTO - de.tum.in.www1.artemis.domain.GradeType - de.tum.in.www1.artemis.domain.exam.SuspiciousExamSessions - de.tum.in.www1.artemis.repository.QuizGroupRepository - de.tum.in.www1.artemis.web.rest.dto.UserWithIdAndLoginDTO - de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismCaseInfoDTO - de.tum.in.www1.artemis.service.connectors.localci.buildagent.BuildJobExecutionService - de.tum.in.www1.artemis.domain.iris.settings.IrisSettings - de.tum.in.www1.artemis.web.rest.programming.ProgrammingExerciseLockResource - de.tum.in.www1.artemis.domain.DataExport - de.tum.in.www1.artemis.config.ConditionalMetricsExclusionConfiguration - de.tum.in.www1.artemis.domain.exam.event.ExamLiveEvent - de.tum.in.www1.artemis.service.exam.ExamAccessService - de.tum.in.www1.artemis.web.rest.util.PageUtil - de.tum.in.www1.artemis.service.export.ModelingExerciseWithSubmissionsExportService - de.tum.in.www1.artemis.domain.lecture.VideoUnit - de.tum.in.www1.artemis.repository.SlideRepository - de.tum.in.www1.artemis.domain.iris.message.IrisMessageSender - de.tum.in.www1.artemis.repository.metis.conversation.OneToOneChatRepository - de.tum.in.www1.artemis.repository.OnlineUnitRepository - de.tum.in.www1.artemis.service.programming.CommitHistoryService - de.tum.in.www1.artemis.service.ExerciseDateService - de.tum.in.www1.artemis.service.iris.IrisRateLimitService - de.tum.in.www1.artemis.repository.TextSubmissionRepository - de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupFreePeriod - de.tum.in.www1.artemis.repository.VideoUnitRepository - de.tum.in.www1.artemis.config.LoggingConfiguration - de.tum.in.www1.artemis.service.programming.TemplateUpgradePolicyService - de.tum.in.www1.artemis.web.rest.FileUploadExerciseResource - de.tum.in.www1.artemis.web.rest.AeolusTemplateResource - de.tum.in.www1.artemis.repository.BuildLogEntryRepository - de.tum.in.www1.artemis.service.compass.umlmodel.usecase.UMLUseCaseAssociation - de.tum.in.www1.artemis.domain.TempIdObject - de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestwiseCoverageReportDTO - de.tum.in.www1.artemis.service.quiz.QuizExerciseImportService - de.tum.in.www1.artemis.repository.iris.IrisSubSettingsRepository - de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.PMDCPDParser - de.tum.in.www1.artemis.web.filter.SpaWebFilter - de.tum.in.www1.artemis.service.hestia.structural.StructuralAttribute - de.tum.in.www1.artemis.web.rest.FileResource - de.tum.in.www1.artemis.service.connectors.pyris.job.CourseChatJob - de.tum.in.www1.artemis.web.rest.dto.DataExportDTO - de.tum.in.www1.artemis.config.CacheConfiguration - de.tum.in.www1.artemis.domain.plagiarism.PlagiarismMatch - de.tum.in.www1.artemis.management.SecurityMetersService - de.tum.in.www1.artemis.service.iris.session.IrisButtonBasedFeatureInterface - de.tum.in.www1.artemis.domain.GradeStep - de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsProgrammingLanguageFeatureService - de.tum.in.www1.artemis.domain.notification.GroupNotification - de.tum.in.www1.artemis.domain.competency.RelationType - de.tum.in.www1.artemis.web.rest.ExamResource - de.tum.in.www1.artemis.repository.NotificationRepository - de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupFreePeriodRepository - de.tum.in.www1.artemis.service.connectors.athena.AthenaFeedbackSuggestionsService - de.tum.in.www1.artemis.web.rest.tutorialgroups.errors.SessionOverlapsWithSessionException - de.tum.in.www1.artemis.service.tutorialgroups.TutorialGroupService - de.tum.in.www1.artemis.service.LectureImportService - de.tum.in.www1.artemis.domain.enumeration.NotificationType - de.tum.in.www1.artemis.service.util.structureoraclegenerator.JavaClassDiff - de.tum.in.www1.artemis.service.metrics.LearningMetricsService - de.tum.in.www1.artemis.service.programming.ProgrammingExerciseCodeReviewFeedbackService - de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3.BPMNDiagramParser - de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartFunctionCall - de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisUserDTO - de.tum.in.www1.artemis.web.rest.dto.CourseWithIdDTO - de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.Duplication - de.tum.in.www1.artemis.service.dto.StaticCodeAnalysisIssue - de.tum.in.www1.artemis.repository.metis.CustomPostRepository - de.tum.in.www1.artemis.domain.metis.conversation.GeneralConversationInfo - de.tum.in.www1.artemis.service.connectors.jenkins.jobs.JenkinsJobPermissionsUtils - de.tum.in.www1.artemis.config.icl.ssh.SshGitCommand - de.tum.in.www1.artemis.config.MetricsBean - de.tum.in.www1.artemis.security.DomainUserDetailsService - de.tum.in.www1.artemis.config.websocket.WebsocketBrokerHealthIndicator - de.tum.in.www1.artemis.service.connectors.gitlab.GitLabUserManagementService - de.tum.in.www1.artemis.service.connectors.localci.buildagent.BuildJobGitService - de.tum.in.www1.artemis.domain.enumeration.NotificationPriority - de.tum.in.www1.artemis.service.connectors.vcs.VcsUserManagementService - de.tum.in.www1.artemis.repository.TeamScoreRepository - de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObject - de.tum.in.www1.artemis.domain.competency.StandardizedCompetency - de.tum.in.www1.artemis.service.connectors.athena.AthenaSubmissionSendingService - de.tum.in.www1.artemis.service.programming.ProgrammingAssessmentService - de.tum.in.www1.artemis.domain.VcsRepositoryUri - de.tum.in.www1.artemis.service.compass.umlmodel.usecase.UMLSystemBoundary - de.tum.in.www1.artemis.service.exam.ExamSubmissionService - de.tum.in.www1.artemis.domain.enumeration.DisplayPriority - de.tum.in.www1.artemis.domain.Commit - de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.CheckstyleParser - de.tum.in.www1.artemis.web.rest.admin.AuditResource - de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsEndpoints - de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupSessionRepository - de.tum.in.www1.artemis.repository.UserRepository - de.tum.in.www1.artemis.service.programming.RepositoryParticipationService - de.tum.in.www1.artemis.service.iris.dto.IrisCombinedSettingsDTO - de.tum.in.www1.artemis.repository.metis.PostRepository - de.tum.in.www1.artemis.web.rest.ComplaintResource - de.tum.in.www1.artemis.service.user.UserService - de.tum.in.www1.artemis.web.rest.errors.FieldErrorVM - de.tum.in.www1.artemis.domain.enumeration.GroupNotificationType - de.tum.in.www1.artemis.domain.notification.SingleUserNotification - de.tum.in.www1.artemis.service.connectors.vcs.VersionControlRepositoryPermission - de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2.UMLModelV2Parser - de.tum.in.www1.artemis.service.InternalUrlService - de.tum.in.www1.artemis.service.connectors.aeolus.WindfileMetadata - de.tum.in.www1.artemis.web.rest.open.PublicAccountResource - de.tum.in.www1.artemis.service.connectors.jenkins.jobs.JenkinsJobPermission - de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict - de.tum.in.www1.artemis.config.icl.ssh.MultipleHostKeyProvider - de.tum.in.www1.artemis.service.plagiarism.ProgrammingPlagiarismDetectionService - de.tum.in.www1.artemis.web.rest.QuizSubmissionResource - de.tum.in.www1.artemis.service.FilePathService - de.tum.in.www1.artemis.service.dto.UserDTO - de.tum.in.www1.artemis.web.rest.SystemNotificationResource - de.tum.in.www1.artemis.web.rest.dto.examevent.ExamLiveEventBaseDTO - de.tum.in.www1.artemis.config.RestTemplateConfiguration - de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNGroup - de.tum.in.www1.artemis.domain.quiz.QuizPointStatistic - de.tum.in.www1.artemis.service.compass.umlmodel.communication.UMLCommunicationDiagram - de.tum.in.www1.artemis.service.connectors.localci.scaparser.utils.FileUtils - de.tum.in.www1.artemis.web.rest.ExamLockResource - de.tum.in.www1.artemis.config.auth.PyrisAuthorizationInterceptor - de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyShortAnswerAllOrNothing - de.tum.in.www1.artemis.web.rest.open.PublicTimeResource - de.tum.in.www1.artemis.security.annotations.EnforceAtLeastEditor - de.tum.in.www1.artemis.service.quiz.QuizMessagingService - de.tum.in.www1.artemis.domain.quiz.DropLocationCounter - de.tum.in.www1.artemis.web.rest.dto.ExerciseScoresAggregatedInformation - de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupNotificationRepository - de.tum.in.www1.artemis.web.rest.dto.ExerciseScoresDTO - de.tum.in.www1.artemis.repository.ComplaintResponseRepository - de.tum.in.www1.artemis.service.connectors.pyris.PyrisStatusUpdateService - de.tum.in.www1.artemis.service.metis.conversation.OneToOneChatService - de.tum.in.www1.artemis.service.dto.athena.ProgrammingExerciseDTO - de.tum.in.www1.artemis.web.rest.ExampleSubmissionResource - de.tum.in.www1.artemis.service.notifications.NotificationSettingsCommunicationChannel - de.tum.in.www1.artemis.config.icl.JGitServletConfiguration - de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.BugInstance - de.tum.in.www1.artemis.web.rest.science.ScienceResource - de.tum.in.www1.artemis.service.quiz.QuizPoolService - de.tum.in.www1.artemis.config.icl.ssh.SshConstants - de.tum.in.www1.artemis.service.tutorialgroups.TutorialGroupFreePeriodService - de.tum.in.www1.artemis.web.rest.dto.metrics.LectureUnitStudentMetricsDTO - de.tum.in.www1.artemis.domain.leaderboard.tutor.TutorLeaderboardAnsweredMoreFeedbackRequests - de.tum.in.www1.artemis.config.migration.MigrationPath - de.tum.in.www1.artemis.service.programming.ProgrammingSubmissionService - de.tum.in.www1.artemis.service.util.RoundingUtil - de.tum.in.www1.artemis.web.rest.util.ResponseUtil - de.tum.in.www1.artemis.service.iris.session.IrisCourseChatSessionService - de.tum.in.www1.artemis.web.rest.push_notification.PushNotificationRegisterBody - de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupRepository - de.tum.in.www1.artemis.domain.iris.message.IrisMessageContent - de.tum.in.www1.artemis.service.AttachmentUnitService - de.tum.in.www1.artemis.service.ZipFileService - de.tum.in.www1.artemis.repository.FileUploadSubmissionRepository - de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2.ClassDiagramParser - de.tum.in.www1.artemis.repository.MigrationChangeRepository - de.tum.in.www1.artemis.web.rest.StaticCodeAnalysisResource - de.tum.in.www1.artemis.web.rest.StudentExamResource - de.tum.in.www1.artemis.domain.FileUploadExercise - de.tum.in.www1.artemis.service.util.Tuple - de.tum.in.www1.artemis.domain.analytics.TextAssessmentEvent - de.tum.in.www1.artemis.config.audit.AuditEventConverter - de.tum.in.www1.artemis.service.dto.ComplaintRequestDTO - de.tum.in.www1.artemis.domain.lecture.AttachmentUnit - de.tum.in.www1.artemis.service.programming.RepositoryAccessService - de.tum.in.www1.artemis.service.dto.athena.TextSubmissionDTO - de.tum.in.www1.artemis.domain.exam.event.WorkingTimeUpdateEvent - de.tum.in.www1.artemis.repository.plagiarism.PlagiarismResultRepository - de.tum.in.www1.artemis.domain.AuxiliaryRepository - de.tum.in.www1.artemis.service.ModelingExerciseService - de.tum.in.www1.artemis.service.connectors.localci.buildagent.BuildAgentDockerService - de.tum.in.www1.artemis.repository.QuizQuestionRepository - de.tum.in.www1.artemis.service.TitleCacheEvictionService - de.tum.in.www1.artemis.domain.notification.NotificationConstants - de.tum.in.www1.artemis.exception.JenkinsException - de.tum.in.www1.artemis.exception.localvc.LocalVCForbiddenException - de.tum.in.www1.artemis.config.JacksonConfiguration - de.tum.in.www1.artemis.repository.metis.AnswerPostRepository - de.tum.in.www1.artemis.config.lti.CustomLti13Configurer - de.tum.in.www1.artemis.repository.metis.conversation.GroupChatRepository - de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationTriggerService - de.tum.in.www1.artemis.service.export.FileUploadSubmissionExportService - de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2.CommunicationDiagramParser - de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralSolutionEntryGenerationException - de.tum.in.www1.artemis.validation.InetSocketAddressValidator - de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsTriggerService - de.tum.in.www1.artemis.domain.lecture.OnlineUnit - de.tum.in.www1.artemis.service.compass.umlmodel.petrinet.PetriNetArc - de.tum.in.www1.artemis.service.dto.athena.FeedbackBaseDTO - de.tum.in.www1.artemis.web.rest.programming.ProgrammingExerciseGradingResource - de.tum.in.www1.artemis.service.quiz.QuizExerciseService - de.tum.in.www1.artemis.domain.CourseExamExportErrorCause - de.tum.in.www1.artemis.web.rest.dto.CourseScoresDTO - de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyDragAndDropAllOrNothing - de.tum.in.www1.artemis.repository.DataExportRepository - de.tum.in.www1.artemis.domain.quiz.QuizQuestionStatisticComponent - de.tum.in.www1.artemis.repository.metis.CustomPostRepositoryImpl - de.tum.in.www1.artemis.domain.plagiarism.PlagiarismComparison - de.tum.in.www1.artemis.domain.exam.ExamSession - de.tum.in.www1.artemis.service.connectors.gitlab.AbstractGitLabAuthorizationInterceptor - de.tum.in.www1.artemis.repository.metis.ReactionRepository - de.tum.in.www1.artemis.service.messaging.InstanceMessageReceiveService - de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestCaseDTO - de.tum.in.www1.artemis.repository.BuildPlanRepository - de.tum.in.www1.artemis.web.rest.dto.score.StudentScoresDTO - de.tum.in.www1.artemis.service.connectors.localvc.LocalVCServletService - de.tum.in.www1.artemis.service.plagiarism.ModelingPlagiarismDetectionService - de.tum.in.www1.artemis.repository.science.ScienceSettingRepository - de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult - de.tum.in.www1.artemis.web.rest.metis.ReactionResource - de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedText - de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNAnnotation - de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException - de.tum.in.www1.artemis.service.exam.StudentExamService - de.tum.in.www1.artemis.service.hestia.behavioral.BehavioralBlackboard - de.tum.in.www1.artemis.service.connectors.localci.LocalCITriggerService - de.tum.in.www1.artemis.service.competency.CompetencyService - de.tum.in.www1.artemis.web.rest.programming.ProgrammingAssessmentResource - de.tum.in.www1.artemis.web.rest.errors.ErrorConstants - de.tum.in.www1.artemis.web.rest.dto.ExamUsersNotFoundDTO - de.tum.in.www1.artemis.service.iris.websocket.IrisChatWebsocketService - de.tum.in.www1.artemis.service.dto.athena.ProgrammingFeedbackDTO - de.tum.in.www1.artemis.domain.quiz.DragAndDropMapping - de.tum.in.www1.artemis.service.feature.Feature - de.tum.in.www1.artemis.web.rest.dto.AssessmentUpdateDTO - de.tum.in.www1.artemis.service.connectors.lti.LtiNewResultService - de.tum.in.www1.artemis.web.rest.errors.ServiceUnavailableException - de.tum.in.www1.artemis.domain.Authority - de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisExerciseWithStudentSubmissionsDTO - de.tum.in.www1.artemis.repository.QuizExerciseRepository - de.tum.in.www1.artemis.repository.iris.IrisCompetencyGenerationSessionRepository - de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.CombineChangeBlocks - de.tum.in.www1.artemis.domain.metis.AnswerPost - de.tum.in.www1.artemis.service.connectors.localci.dto.ResultBuildJob - de.tum.in.www1.artemis.web.rest.admin.AdminDataExportResource - de.tum.in.www1.artemis.domain.iris.settings.IrisModelListConverter - de.tum.in.www1.artemis.service.ParticipationAuthorizationCheckService - de.tum.in.www1.artemis.service.scheduled.ParticipantScoreScheduleService - de.tum.in.www1.artemis.repository.metis.conversation.ConversationRepository - de.tum.in.www1.artemis.domain.push_notification.PushNotificationDeviceType - de.tum.in.www1.artemis.service.scheduled.ScheduleService - de.tum.in.www1.artemis.service.iris.session.IrisRateLimitedFeatureInterface - de.tum.in.www1.artemis.web.rest.dto.OnlineResourceDTO - de.tum.in.www1.artemis.web.rest.dto.TextAssessmentDTO - de.tum.in.www1.artemis.web.rest.dto.user.UserNameAndLoginDTO - de.tum.in.www1.artemis.domain.exam.SuspiciousSessionReason - de.tum.in.www1.artemis.service.programming.ProgrammingMessagingService - de.tum.in.www1.artemis.service.plagiarism.PlagiarismService - de.tum.in.www1.artemis.web.rest.AttachmentResource - de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2.DeploymentDiagramParser - de.tum.in.www1.artemis.service.export.TextSubmissionExportService - de.tum.in.www1.artemis.service.notifications.GeneralInstantNotificationService - de.tum.in.www1.artemis.service.dto.FinishedBuildJobDTO - de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisImageMessageContentDTO - de.tum.in.www1.artemis.domain.hestia.ExerciseHint - de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram - de.tum.in.www1.artemis.web.rest.metis.AnswerMessageResource - de.tum.in.www1.artemis.domain.enumeration.ProjectType - de.tum.in.www1.artemis.web.rest.tutorialgroups.TutorialGroupResource - de.tum.in.www1.artemis.service.connectors.HazelcastHealthIndicator - de.tum.in.www1.artemis.repository.ExerciseUnitRepository - de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisCompetencyDTO - de.tum.in.www1.artemis.web.rest.QuizPoolResource - de.tum.in.www1.artemis.web.rest.ApollonConversionResource - de.tum.in.www1.artemis.domain.SubmissionVersion - de.tum.in.www1.artemis.web.rest.ExerciseScoresChartResource - de.tum.in.www1.artemis.service.learningpath.LearningPathService - de.tum.in.www1.artemis.service.notifications.push_notifications.RelayNotificationRequest - de.tum.in.www1.artemis.service.export.ExerciseWithSubmissionsExportService - de.tum.in.www1.artemis.domain.plagiarism.PlagiarismStatus - de.tum.in.www1.artemis.web.rest.dto.metrics.ExerciseStudentMetricsDTO - de.tum.in.www1.artemis.service.metis.conversation.auth.ChannelAuthorizationService - de.tum.in.www1.artemis.service.util.HttpRequestUtils - de.tum.in.www1.artemis.domain.metis.CourseWideContext - de.tum.in.www1.artemis.repository.QuizPointStatisticRepository - de.tum.in.www1.artemis.config.CustomMetricsExtensionConfiguration - de.tum.in.www1.artemis.service.connectors.gitlabci.GitLabCIResultService - de.tum.in.www1.artemis.web.rest.ConsistencyCheckResource - de.tum.in.www1.artemis.domain.iris.settings.IrisSubSettingsType - de.tum.in.www1.artemis.web.rest.dto.LectureUnitSplitDTO - de.tum.in.www1.artemis.web.rest.dto.StatsForDashboardDTO - de.tum.in.www1.artemis.security.jwt.JWTCookieService - de.tum.in.www1.artemis.service.connectors.ci.AbstractBuildPlanCreator - de.tum.in.www1.artemis.domain.quiz.QuizExercise - de.tum.in.www1.artemis.service.export.QuizExerciseWithSubmissionsExportService - de.tum.in.www1.artemis.service.user.PasswordService - de.tum.in.www1.artemis.service.OnlineCourseConfigurationService - de.tum.in.www1.artemis.service.export.FileUploadExerciseWithSubmissionsExportService - de.tum.in.www1.artemis.service.compass.umlmodel.petrinet.PetriNet - de.tum.in.www1.artemis.web.rest.admin.AdminExerciseResource - de.tum.in.www1.artemis.repository.LectureUnitRepository - de.tum.in.www1.artemis.web.filter.Lti13LaunchFilter - de.tum.in.www1.artemis.repository.metis.conversation.ConversationNotificationRepository - de.tum.in.www1.artemis.service.dto.MaxAndReachablePoints - de.tum.in.www1.artemis.service.scheduled.PushNotificationDeviceConfigurationCleanupService - de.tum.in.www1.artemis.config.AsyncConfiguration - de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3.ObjectDiagramParser - de.tum.in.www1.artemis.service.connectors.apollon.dto.ApollonModelDTO - de.tum.in.www1.artemis.aop.logging.LoggingAspect - de.tum.in.www1.artemis.service.iris.session.IrisHestiaSessionService - de.tum.in.www1.artemis.web.rest.StatisticsResource - de.tum.in.www1.artemis.repository.science.ScienceEventRepository - de.tum.in.www1.artemis.service.scheduled.ProgrammingExerciseScheduleService - de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3.DeploymentDiagramParser - de.tum.in.www1.artemis.service.compass.umlmodel.communication.UMLCommunicationLink - de.tum.in.www1.artemis.web.rest.dto.ExerciseDTO - de.tum.in.www1.artemis.domain.modeling.ModelElement - de.tum.in.www1.artemis.service.connectors.localci.buildagent.BuildLogsMap - de.tum.in.www1.artemis.service.user.UserManagementInfoContributor - de.tum.in.www1.artemis.service.connectors.aeolus.Windfile - de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyJolDTO - de.tum.in.www1.artemis.domain.lti.LtiResourceLaunch - de.tum.in.www1.artemis.exception.FilePathParsingException - de.tum.in.www1.artemis.domain.quiz.QuizSubmission - de.tum.in.www1.artemis.domain.NotificationSetting - de.tum.in.www1.artemis.repository.ConductAgreementRepository - de.tum.in.www1.artemis.security.annotations.ManualConfig - de.tum.in.www1.artemis.service.export.CourseExamExportService - de.tum.in.www1.artemis.domain.enumeration.ScoringType - de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastInstructorInExercise - de.tum.in.www1.artemis.domain.notification.ConversationNotificationFactory - de.tum.in.www1.artemis.web.rest.dto.CourseManagementOverviewStatisticsDTO - de.tum.in.www1.artemis.service.feature.FeatureToggleInfoContributor - de.tum.in.www1.artemis.service.OrganizationService - de.tum.in.www1.artemis.web.rest.dto.examevent.ExamWideAnnouncementEventDTO - de.tum.in.www1.artemis.service.notifications.TutorialGroupNotificationService - de.tum.in.www1.artemis.web.rest.admin.LogResource - de.tum.in.www1.artemis.domain.leaderboard.tutor.TutorLeaderboardComplaintResponses - de.tum.in.www1.artemis.service.metis.PostingService - de.tum.in.www1.artemis.security.ArtemisAuthenticationProviderImpl - de.tum.in.www1.artemis.web.rest.open.PublicResultResource - de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.DropRemovedGitDiffEntries - de.tum.in.www1.artemis.repository.TeamRepository - de.tum.in.www1.artemis.service.TutorParticipationService - de.tum.in.www1.artemis.web.rest.dto.ExamInformationDTO - de.tum.in.www1.artemis.service.icl.SshGitLocationResolverService - de.tum.in.www1.artemis.service.programming.ProgrammingExerciseGradingService - de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse - de.tum.in.www1.artemis.domain.quiz.SubmittedAnswer - de.tum.in.www1.artemis.web.rest.dto.SubmissionDTO - de.tum.in.www1.artemis.service.ResultService - de.tum.in.www1.artemis.service.connectors.localvc.LocalVCRepositoryUri - de.tum.in.www1.artemis.web.rest.iris.IrisStatusDTO - de.tum.in.www1.artemis.service.dto.BuildJobDTOInterface - de.tum.in.www1.artemis.repository.ExampleSubmissionRepository - de.tum.in.www1.artemis.service.ldap.LdapUserDto - de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathInformationDTO - de.tum.in.www1.artemis.service.ComplaintService - de.tum.in.www1.artemis.service.competency.CompetencyRelationService - de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.CheckstyleFile - de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3.UMLModelV3Parser - de.tum.in.www1.artemis.config.EurekaClientRestTemplateConfiguration - de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceRoleInExerciseAspect - de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.AddUncoveredLinesAsPotentialCodeBlocks - de.tum.in.www1.artemis.domain.participation.AbstractBaseProgrammingExerciseParticipation - de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3.PetriNetParser - de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseTaskService - de.tum.in.www1.artemis.domain.enumeration.TeamImportStrategyType - de.tum.in.www1.artemis.service.scheduled.DataExportScheduleService - de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartFlowline - de.tum.in.www1.artemis.web.rest.dto.BuildPlanCheckoutDirectoriesDTO - de.tum.in.www1.artemis.web.rest.iris.IrisSettingsResource - de.tum.in.www1.artemis.service.compass.utils.JSONMapping - de.tum.in.www1.artemis.config.ApplicationConfiguration - de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.BehavioralKnowledgeSource - de.tum.in.www1.artemis.service.messaging.InstanceMessageSendService - de.tum.in.www1.artemis.domain.quiz.QuizSubmittedAnswerCount - de.tum.in.www1.artemis.service.connectors.localci.LocalCIResultProcessingService - de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisMessageContentBaseDTO - de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestResultsDTO - de.tum.in.www1.artemis.domain.metis.ConversationParticipantSettingsView - de.tum.in.www1.artemis.domain.enumeration.InitializationState - de.tum.in.www1.artemis.domain.ProgrammingExercise - de.tum.in.www1.artemis.service.messaging.MessageTopic - de.tum.in.www1.artemis.service.compass.CompassService - de.tum.in.www1.artemis.web.rest.dto.metrics.ScoreDTO - de.tum.in.www1.artemis.repository.CustomAuditEventRepository - de.tum.in.www1.artemis.repository.ModelClusterRepository - de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.ConversationUserDTO - de.tum.in.www1.artemis.web.rest.open.PublicOAuth2JWKSResource - de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase - de.tum.in.www1.artemis.repository.AuthorityRepository - de.tum.in.www1.artemis.service.quiz.QuizScheduleService - de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult - de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNIntermediateEvent - de.tum.in.www1.artemis.domain.plagiarism.text.TextSubmissionElement - de.tum.in.www1.artemis.domain.iris.settings.IrisGlobalSettings - de.tum.in.www1.artemis.domain.quiz.AbstractQuizSubmission - de.tum.in.www1.artemis.service.notifications.MailService - de.tum.in.www1.artemis.service.connectors.localci.scaparser.exception.UnsupportedToolException - de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNTask - de.tum.in.www1.artemis.repository.QuizPoolRepository - de.tum.in.www1.artemis.domain.notification.NotificationTarget - de.tum.in.www1.artemis.web.rest.admin.AdminLtiConfigurationResource - de.tum.in.www1.artemis.repository.TextBlockRepository - de.tum.in.www1.artemis.repository.plagiarism.PlagiarismSubmissionRepository - de.tum.in.www1.artemis.domain.modeling.SimilarElementCount - de.tum.in.www1.artemis.domain.BuildJob - de.tum.in.www1.artemis.service.export.ModelingSubmissionExportService - de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.CheckstyleError - de.tum.in.www1.artemis.service.metis.conversation.ConversationDTOService - de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.PMDParser - de.tum.in.www1.artemis.service.connectors.pyris.PyrisJobService - de.tum.in.www1.artemis.exception.LocalCIException - de.tum.in.www1.artemis.service.messaging.DistributedInstanceMessageSendService - de.tum.in.www1.artemis.config.connector.JenkinsServerConfiguration - de.tum.in.www1.artemis.domain.notification.Notification - de.tum.in.www1.artemis.web.rest.metis.conversation.ConversationManagementResource - de.tum.in.www1.artemis.service.export.DataExportService - de.tum.in.www1.artemis.service.connectors.localci.buildagent.BuildJobManagementService - de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3.SyntaxTreeParser - de.tum.in.www1.artemis.service.connectors.lti.Lti13Service - de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyShortAnswerProportionalWithPenalty - de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3.ComponentDiagramParser - de.tum.in.www1.artemis.web.rest.iris.IrisResource - de.tum.in.www1.artemis.config.StartupDelayConfig - de.tum.in.www1.artemis.domain.statistics.ScoreDistribution - de.tum.in.www1.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeTerminal - de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisHealthStatusDTO - de.tum.in.www1.artemis.domain.iris.message.IrisMessage - de.tum.in.www1.artemis.service.hestia.structural.StructuralConstructor - de.tum.in.www1.artemis.service.plagiarism.PlagiarismCaseService - de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse - de.tum.in.www1.artemis.web.rest.repository.FileSubmissionError - de.tum.in.www1.artemis.service.dto.athena.TextFeedbackDTO - de.tum.in.www1.artemis.repository.DragAndDropMappingRepository - de.tum.in.www1.artemis.web.rest.programming.ProgrammingExercisePlagiarismResource - de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseTaskRepository - de.tum.in.www1.artemis.domain.metis.ReactionConstraintValidator - de.tum.in.www1.artemis.web.rest.LtiResource - de.tum.in.www1.artemis.service.notifications.SingleUserNotificationService - de.tum.in.www1.artemis.service.connectors.lti.LtiDynamicRegistrationService - de.tum.in.www1.artemis.web.websocket.dto.metis.ConversationWebsocketDTO - de.tum.in.www1.artemis.service.scheduled.WeeklyEmailSummaryScheduleService - de.tum.in.www1.artemis.repository.CompetencyRepository - de.tum.in.www1.artemis.exception.UsernameAlreadyUsedException - de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenAlertException - de.tum.in.www1.artemis.web.rest.admin.FeatureToggleResource - de.tum.in.www1.artemis.service.connectors.gitlab.dto.GitLabPersonalAccessTokenListResponseDTO - de.tum.in.www1.artemis.domain.File - de.tum.in.www1.artemis.repository.ExamSessionRepository - de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationResultService - de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisLectureUnitDTO - de.tum.in.www1.artemis.service.BonusService - de.tum.in.www1.artemis.web.rest.dto.AssessmentUpdateBaseDTO - de.tum.in.www1.artemis.service.export.ProgrammingExerciseExportService - de.tum.in.www1.artemis.domain.enumeration.TutorParticipationStatus - de.tum.in.www1.artemis.service.connectors.jenkins.build_plan.JenkinsPipelineScriptCreator - de.tum.in.www1.artemis.security.SecurityUtils - de.tum.in.www1.artemis.repository.competency.CompetencyJolRepository - de.tum.in.www1.artemis.service.connectors.gitlab.GitLabPersonalAccessTokenManagementService - de.tum.in.www1.artemis.service.iris.dto.IrisCombinedCompetencyGenerationSubSettingsDTO - de.tum.in.www1.artemis.domain.quiz.PointCounter - de.tum.in.www1.artemis.domain.Course - de.tum.in.www1.artemis.web.rest.admin.iris.AdminIrisSettingsResource - de.tum.in.www1.artemis.repository.LdapUserRepository - de.tum.in.www1.artemis.web.rest.localci.BuildLogResource - de.tum.in.www1.artemis.repository.ModelElementRepository - de.tum.in.www1.artemis.service.util.ExamExerciseStartPreparationStatus - de.tum.in.www1.artemis.web.rest.dto.RepositoryExportOptionsDTO - de.tum.in.www1.artemis.service.iris.websocket.IrisWebsocketService - de.tum.in.www1.artemis.service.connectors.localvc.LocalVCPostPushHook - de.tum.in.www1.artemis.service.connectors.BuildScriptGenerationService - de.tum.in.www1.artemis.repository.SubmissionRepository - de.tum.in.www1.artemis.domain.lti.Lti13LaunchRequest - de.tum.in.www1.artemis.service.dto.athena.TextExerciseDTO - de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.CreateCommonChangeBlocks - de.tum.in.www1.artemis.service.exam.ExamDateService - de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage - de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObjectDiagram - de.tum.in.www1.artemis.web.rest.programming.ProgrammingExerciseResource - de.tum.in.www1.artemis.web.rest.dto.ExamWithIdAndCourseDTO - de.tum.in.www1.artemis.domain.enumeration.SortingOrder - de.tum.in.www1.artemis.web.rest.open.PublicLtiResource - de.tum.in.www1.artemis.domain.quiz.ShortAnswerSpotCounter - de.tum.in.www1.artemis.service.metis.ConversationMessagingService - de.tum.in.www1.artemis.web.rest.AthenaResource - de.tum.in.www1.artemis.service.export.DataExportExerciseCreationService - de.tum.in.www1.artemis.domain.quiz.DragAndDropSubmittedAnswer - de.tum.in.www1.artemis.web.rest.localci.BuildJobQueueResource - de.tum.in.www1.artemis.service.exam.ExamRegistrationService - de.tum.in.www1.artemis.web.rest.admin.AdminImprintResource - de.tum.in.www1.artemis.service.connectors.localci.dto.BuildAgentInformation - de.tum.in.www1.artemis.domain.participation.TutorParticipation - de.tum.in.www1.artemis.service.notifications.NotificationSettingsService - de.tum.in.www1.artemis.service.util.UrlUtils - de.tum.in.www1.artemis.config.SecurityConfiguration - de.tum.in.www1.artemis.service.hestia.behavioral.GroupedFile - de.tum.in.www1.artemis.domain.metis.Reaction - de.tum.in.www1.artemis.service.connectors.ci.AbstractContinuousIntegrationService - de.tum.in.www1.artemis.domain.enumeration.TutorialGroupSessionStatus - de.tum.in.www1.artemis.web.rest.TutorEffortResource - de.tum.in.www1.artemis.web.rest.dto.ExamChecklistDTO - de.tum.in.www1.artemis.service.scheduled.NotificationScheduleService - de.tum.in.www1.artemis.domain.enumeration.DefaultChannelType - de.tum.in.www1.artemis.exception.NetworkingException - de.tum.in.www1.artemis.repository.hestia.CoverageReportRepository - de.tum.in.www1.artemis.service.TextBlockService - de.tum.in.www1.artemis.web.rest.admin.AdminSystemNotificationResource - de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor - de.tum.in.www1.artemis.repository.FeedbackRepository - de.tum.in.www1.artemis.web.rest.admin.AdminTextAssessmentEventResource - de.tum.in.www1.artemis.domain.metis.conversation.ConversationSummary - de.tum.in.www1.artemis.repository.GradingCriterionRepository - de.tum.in.www1.artemis.web.rest.vm.ManagedUserVM - de.tum.in.www1.artemis.domain.lti.Lti13ClientRegistration - de.tum.in.www1.artemis.web.rest.AssessmentResource - de.tum.in.www1.artemis.repository.hestia.TestwiseCoverageReportEntryRepository - de.tum.in.www1.artemis.domain.quiz.QuizQuestion - de.tum.in.www1.artemis.web.rest.util.HeaderUtil - de.tum.in.www1.artemis.web.rest.dto.CourseContentCount - de.tum.in.www1.artemis.service.util.CommonsMultipartFile - de.tum.in.www1.artemis.service.FileUploadExerciseImportService - de.tum.in.www1.artemis.web.rest.lecture.VideoUnitResource - de.tum.in.www1.artemis.domain.hestia.CoverageReport - de.tum.in.www1.artemis.service.connectors.lti.LtiService - de.tum.in.www1.artemis.service.connectors.jenkins.jobs.JenkinsJobPermissionsService - de.tum.in.www1.artemis.security.Role - de.tum.in.www1.artemis.service.dto.UserInitializationDTO - de.tum.in.www1.artemis.repository.QuizBatchRepository - de.tum.in.www1.artemis.domain.submissionpolicy.SubmissionPenaltyPolicy - de.tum.in.www1.artemis.service.team.strategies.PurgeExistingStrategy - de.tum.in.www1.artemis.domain.enumeration.IExerciseLifecycle - de.tum.in.www1.artemis.domain.quiz.ShortAnswerQuestionStatistic - de.tum.in.www1.artemis.service.iris.session.IrisExerciseChatSessionService - de.tum.in.www1.artemis.service.connectors.apollon.ApollonHealthIndicator - de.tum.in.www1.artemis.exception.ContinuousIntegrationBuildPlanException - de.tum.in.www1.artemis.repository.OrganizationRepository - de.tum.in.www1.artemis.domain.metis.ConversationType - de.tum.in.www1.artemis.domain.metis.conversation.OneToOneChat - de.tum.in.www1.artemis.domain.GuidedTourSetting - de.tum.in.www1.artemis.domain.enumeration.SubmissionType - de.tum.in.www1.artemis.service.connectors.jenkins.build_plan.JenkinsBuildPlanLinkInfoContributor - de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise - de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmission - de.tum.in.www1.artemis.web.rest.ogparser.LinkPreviewResource - de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisStudentSubmissionDTO - de.tum.in.www1.artemis.service.BuildLogEntryService - de.tum.in.www1.artemis.service.dto.TestCaseBaseDTO - de.tum.in.www1.artemis.repository.TutorParticipationRepository - de.tum.in.www1.artemis.repository.AuxiliaryRepositoryRepository - de.tum.in.www1.artemis.domain.quiz.QuizQuestionComponent - de.tum.in.www1.artemis.domain.CourseExamExportState - de.tum.in.www1.artemis.web.rest.errors.ConflictException - de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupsConfigurationRepository - de.tum.in.www1.artemis.web.rest.FileUploadSubmissionResource - de.tum.in.www1.artemis.domain.TextBlock - de.tum.in.www1.artemis.domain.quiz.compare.SAMapping - de.tum.in.www1.artemis.domain.enumeration.AeolusTarget - de.tum.in.www1.artemis.service.ldap.LdapConfig - de.tum.in.www1.artemis.config.SentryConfiguration - de.tum.in.www1.artemis.web.rest.dto.BonusSourceResultDTO - de.tum.in.www1.artemis.domain.TextBlockType - de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceRoleInExercise - de.tum.in.www1.artemis.service.connectors.pyris.PyrisConnectorException - de.tum.in.www1.artemis.web.rest.tutorialgroups.errors.ScheduleOverlapsWithSessionException - de.tum.in.www1.artemis.web.rest.repository.RepositoryProgrammingExerciseParticipationResource - de.tum.in.www1.artemis.service.exam.ExamQuizService - de.tum.in.www1.artemis.service.connectors.GenericBuildScriptGenerationService - de.tum.in.www1.artemis.web.rest.vm.LoginVM - de.tum.in.www1.artemis.config.websocket.WebsocketConfiguration - de.tum.in.www1.artemis.service.ParticipationLifecycleService - de.tum.in.www1.artemis.web.websocket.dto.SubmissionPatch - de.tum.in.www1.artemis.service.iris.exception.IrisInternalPyrisErrorException - de.tum.in.www1.artemis.domain.submissionpolicy.LockRepositoryPolicy - de.tum.in.www1.artemis.web.rest.PlantUmlResource - de.tum.in.www1.artemis.service.iris.exception.IrisRateLimitExceededException - de.tum.in.www1.artemis.domain.iris.settings.IrisSubSettings - de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.ChannelIdAndNameDTO - de.tum.in.www1.artemis.service.archival.ArchivalReportEntry - de.tum.in.www1.artemis.web.rest.dto.metrics.CompetencyInformationDTO - de.tum.in.www1.artemis.web.rest.TextAssessmentEventResource - de.tum.in.www1.artemis.domain.metis.UserRole - de.tum.in.www1.artemis.domain.quiz.DragItem - de.tum.in.www1.artemis.service.ExerciseSpecificationService - de.tum.in.www1.artemis.service.connectors.localvc.LocalVCService - de.tum.in.www1.artemis.domain.exam.event.ProblemStatementUpdateEvent - de.tum.in.www1.artemis.exception.EmptyFileException - de.tum.in.www1.artemis.security.OAuth2JWKSService - de.tum.in.www1.artemis.repository.GradeStepRepository - de.tum.in.www1.artemis.domain.enumeration.AttachmentType - de.tum.in.www1.artemis.service.connectors.ci.CIUserManagementService - de.tum.in.www1.artemis.domain.LongFeedbackText - de.tum.in.www1.artemis.exception.ContinuousIntegrationException - de.tum.in.www1.artemis.service.exam.StudentExamAccessService - de.tum.in.www1.artemis.service.compass.umlmodel.petrinet.PetriNetPlace - de.tum.in.www1.artemis.config.TomcatConfiguration - de.tum.in.www1.artemis.service.EmailSummaryService - de.tum.in.www1.artemis.domain.notification.ConversationNotification - de.tum.in.www1.artemis.repository.NotificationSettingRepository - de.tum.in.www1.artemis.web.rest.LongFeedbackTextResource - de.tum.in.www1.artemis.service.compass.umlmodel.syntaxtree.SyntaxTreeLink - de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisMessageDTO - de.tum.in.www1.artemis.service.connectors.localvc.LocalVCPushFilter - de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException - de.tum.in.www1.artemis.web.rest.programming.ProgrammingExerciseExportImportResource - de.tum.in.www1.artemis.web.rest.dto.CourseManagementDetailViewDTO - de.tum.in.www1.artemis.repository.LectureRepository - de.tum.in.www1.artemis.domain.ProgrammingSubmission - de.tum.in.www1.artemis.domain.metis.conversation.Conversation - de.tum.in.www1.artemis.web.rest.dto.LectureUnitInformationDTO - de.tum.in.www1.artemis.service.hestia.CodeHintService - de.tum.in.www1.artemis.domain.enumeration.Visibility - de.tum.in.www1.artemis.web.websocket.WebsocketError - de.tum.in.www1.artemis.web.rest.metis.conversation.GroupChatResource - de.tum.in.www1.artemis.domain.LearningObject - de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisFeedbackDTO - de.tum.in.www1.artemis.service.feature.FeatureToggle - de.tum.in.www1.artemis.service.ExerciseDeletionService - de.tum.in.www1.artemis.web.rest.ParticipationResource - de.tum.in.www1.artemis.web.rest.admin.AdminModelingExerciseResource - de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyJolPairDTO - de.tum.in.www1.artemis.service.SubmissionVersionService - de.tum.in.www1.artemis.domain.GradingScale - de.tum.in.www1.artemis.domain.TextExercise - de.tum.in.www1.artemis.web.rest.ResultResource - de.tum.in.www1.artemis.service.StaticCodeAnalysisService - de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNSwimlane - de.tum.in.www1.artemis.web.rest.plagiarism.PlagiarismResultResponseBuilder - de.tum.in.www1.artemis.service.metis.conversation.auth.GroupChatAuthorizationService - de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathHealthDTO - de.tum.in.www1.artemis.service.PresentationPointsCalculationService - de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastTutorInCourse - de.tum.in.www1.artemis.service.AssessmentDashboardService - de.tum.in.www1.artemis.service.dto.athena.ProgrammingSubmissionDTO - de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException - de.tum.in.www1.artemis.service.AccountService - de.tum.in.www1.artemis.service.connectors.ci.AbstractContinuousIntegrationResultService - de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyRelationDTO - de.tum.in.www1.artemis.domain.metis.Posting - de.tum.in.www1.artemis.web.rest.CustomMetricsExtension - de.tum.in.www1.artemis.domain.hestia.CodeHint - de.tum.in.www1.artemis.service.scheduled.UserScheduleService - de.tum.in.www1.artemis.service.linkpreview.ogparser.OpenGraph - de.tum.in.www1.artemis.domain.FileUploadSubmission - de.tum.in.www1.artemis.domain.TextEmbedding - de.tum.in.www1.artemis.web.rest.AppleAppSiteAssociationResource - de.tum.in.www1.artemis.web.rest.dto.BonusExampleDTO - de.tum.in.www1.artemis.domain.scores.ParticipantScore - de.tum.in.www1.artemis.service.notifications.InstantNotificationService - de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceRoleInCourseAspect - de.tum.in.www1.artemis.web.rest.repository.TestRepositoryResource - de.tum.in.www1.artemis.service.feature.FeatureToggleAspect - de.tum.in.www1.artemis.web.rest.dto.ExamScoresDTO - de.tum.in.www1.artemis.domain.lecture.ExerciseUnit - de.tum.in.www1.artemis.service.ParticipantScoreService - de.tum.in.www1.artemis.web.rest.dto.ResultDTO - de.tum.in.www1.artemis.config.LiquibaseConfiguration - de.tum.in.www1.artemis.domain.quiz.QuizPool - de.tum.in.www1.artemis.service.connectors.AbstractGitService - de.tum.in.www1.artemis.repository.ExamLiveEventRepository - de.tum.in.www1.artemis.service.programming.TemplateUpgradeService - de.tum.in.www1.artemis.service.util.structureoraclegenerator.OracleGenerator - de.tum.in.www1.artemis.service.util.structureoraclegenerator.SerializerUtil - de.tum.in.www1.artemis.exception.AccountRegistrationBlockedException - de.tum.in.www1.artemis.web.rest.iris.IrisExerciseChatSessionResource - de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyMultipleChoiceProportionalWithoutPenalty - de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionConfigHelper - de.tum.in.www1.artemis.domain.modeling.ModelingExercise - de.tum.in.www1.artemis.security.jwt.JWTConfigurer - de.tum.in.www1.artemis.service.ModelingSubmissionService - de.tum.in.www1.artemis.web.rest.competency.StandardizedCompetencyResource - de.tum.in.www1.artemis.service.compass.strategy.NameSimilarity - de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyDragAndDropProportionalWithoutPenalty - de.tum.in.www1.artemis.domain.enumeration.LegalDocumentType - de.tum.in.www1.artemis.service.exam.ExamDeletionService - de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation - de.tum.in.www1.artemis.domain.AbstractAuditingEntity - de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository - de.tum.in.www1.artemis.config.icl.ssh.SshConfiguration - de.tum.in.www1.artemis.security.SpringSecurityAuditorAware - de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismVerdictDTO - de.tum.in.www1.artemis.service.connectors.localci.LocalCIPriorityQueueComparator - de.tum.in.www1.artemis.web.rest.errors.StudentsAlreadyAssignedException - de.tum.in.www1.artemis.repository.BuildLogStatisticsEntryRepository - de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsService - de.tum.in.www1.artemis.web.rest.dto.ParticipationWithExerciseDTO - de.tum.in.www1.artemis.web.rest.dto.StudentExamWithIdAndExamAndUserDTO - de.tum.in.www1.artemis.service.tutorialgroups.TutorialGroupChannelManagementService - de.tum.in.www1.artemis.config.migration.MigrationService - de.tum.in.www1.artemis.service.dto.athena.ExerciseBaseDTO - de.tum.in.www1.artemis.service.TutorEffortService - de.tum.in.www1.artemis.domain.modeling.ApollonDiagram - de.tum.in.www1.artemis.service.ExerciseScoresChartService - de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.ExtractCoveredLines - de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroup - de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsUserManagementService - de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent - de.tum.in.www1.artemis.web.rest.UserResource - de.tum.in.www1.artemis.web.rest.AccountResource - de.tum.in.www1.artemis.service.dto.athena.ModelingSubmissionDTO - de.tum.in.www1.artemis.domain.leaderboard.tutor.TutorLeaderboardAssessments - de.tum.in.www1.artemis.domain.scores.TeamScore - de.tum.in.www1.artemis.domain.submissionpolicy.SubmissionPolicy - de.tum.in.www1.artemis.security.ArtemisAuthenticationProvider - de.tum.in.www1.artemis.service.connectors.localci.LocalCIProgrammingLanguageFeatureService - de.tum.in.www1.artemis.service.connectors.vcs.VersionControlService - de.tum.in.www1.artemis.domain.lti.LtiAuthenticationResponse - de.tum.in.www1.artemis.web.rest.hestia.ProgrammingExerciseGitDiffReportResource - de.tum.in.www1.artemis.domain.BaseExercise - de.tum.in.www1.artemis.service.connectors.apollon.ApollonConversionService - de.tum.in.www1.artemis.service.LectureUnitService - de.tum.in.www1.artemis.domain.exam.ExamUser - de.tum.in.www1.artemis.domain.enumeration.BuildPlanType - de.tum.in.www1.artemis.web.rest.dto.ExamUserAttendanceCheckDTO - de.tum.in.www1.artemis.service.connectors.aeolus.PlatformAction - de.tum.in.www1.artemis.service.hestia.structural.StructuralClassElements - de.tum.in.www1.artemis.domain.enumeration.FeedbackType - de.tum.in.www1.artemis.service.PlantUmlService - de.tum.in.www1.artemis.service.metis.conversation.auth.OneToOneChatAuthorizationService - de.tum.in.www1.artemis.service.dto.StaticCodeAnalysisReportDTO - de.tum.in.www1.artemis.service.metis.similarity.TitleJaccardSimilarityCompareStrategy - de.tum.in.www1.artemis.web.rest.dto.TutorialGroupFreePeriodDTO - de.tum.in.www1.artemis.domain.assessment.dashboard.ExerciseMapEntry - de.tum.in.www1.artemis.service.connectors.localci.scaparser.ReportParser - de.tum.in.www1.artemis.service.SystemNotificationService - de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.BugCollection - de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartProcess - de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNCallActivity - de.tum.in.www1.artemis.service.compass.umlmodel.deployment.UMLNode - de.tum.in.www1.artemis.security.jwt.JWTFilter - de.tum.in.www1.artemis.repository.metis.ConversationMessageRepository - de.tum.in.www1.artemis.domain.Team - de.tum.in.www1.artemis.service.metis.conversation.ConversationService - de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTestCaseType - de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupScheduleRepository - de.tum.in.www1.artemis.domain.science.ScienceEvent - de.tum.in.www1.artemis.domain.exam.ExerciseGroup - de.tum.in.www1.artemis.service.connectors.gitlab.GitLabAuthorizationInterceptor - de.tum.in.www1.artemis.repository.StatisticsRepository - de.tum.in.www1.artemis.service.ExampleSubmissionService - de.tum.in.www1.artemis.web.rest.dto.ProgrammingExerciseGitDiffReportDTO - de.tum.in.www1.artemis.security.annotations.EnforceNothing - de.tum.in.www1.artemis.domain.enumeration.TextAssessmentEventType - de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3.CommunicationDiagramParser - de.tum.in.www1.artemis.security.ArtemisInternalAuthenticationProvider - de.tum.in.www1.artemis.config.migration.MigrationEntry - de.tum.in.www1.artemis.service.iris.IrisMessageService - de.tum.in.www1.artemis.service.AbstractQuizSubmissionService - de.tum.in.www1.artemis.web.rest.dto.plagiarism.PlagiarismComparisonStatusDTO - de.tum.in.www1.artemis.web.rest.dto.LegalDocument - de.tum.in.www1.artemis.service.programming.AuxiliaryRepositoryService - de.tum.in.www1.artemis.service.ConsistencyCheckService - de.tum.in.www1.artemis.web.websocket.dto.metis.MetisCrudAction - de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategy - de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivity - de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupsConfiguration - de.tum.in.www1.artemis.web.rest.dto.ParticipationResultDTO - de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.DuplicationFile - de.tum.in.www1.artemis.repository.CompetencyRelationRepository - de.tum.in.www1.artemis.repository.ExerciseGroupRepository - de.tum.in.www1.artemis.service.compass.umlmodel.petrinet.PetriNetTransition - de.tum.in.www1.artemis.web.rest.TeamResource - de.tum.in.www1.artemis.repository.tutorialgroups.TutorialGroupRegistrationRepository - de.tum.in.www1.artemis.web.rest.dto.RepositoryStatusDTO - de.tum.in.www1.artemis.repository.ParticipantScoreRepository - de.tum.in.www1.artemis.web.rest.dto.competency.NgxLearningPathDTO - de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponent - de.tum.in.www1.artemis.domain.lecture.TextUnit - de.tum.in.www1.artemis.domain.assessment.dashboard.ResultCount - de.tum.in.www1.artemis.domain.competency.CompetencyRelation - de.tum.in.www1.artemis.service.connectors.athena.AthenaRepositoryExportService - de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor - de.tum.in.www1.artemis.domain.quiz.QuizConfiguration - de.tum.in.www1.artemis.service.competency.CompetencyProgressService - de.tum.in.www1.artemis.security.annotations.EnforceAdmin - de.tum.in.www1.artemis.web.rest.dto.GradeStepsDTO - de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupSchedule - de.tum.in.www1.artemis.service.TutorLeaderboardService - de.tum.in.www1.artemis.repository.iris.IrisCourseChatSessionRepository - de.tum.in.www1.artemis.web.rest.AbstractSubmissionResource - de.tum.in.www1.artemis.web.rest.dto.TextAssessmentUpdateDTO - de.tum.in.www1.artemis.domain.enumeration.AssessmentType - de.tum.in.www1.artemis.service.connectors.SAML2Service - de.tum.in.www1.artemis.domain.iris.message.IrisTextMessageContent - de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.CreateSolutionEntries - de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseSolutionEntry - de.tum.in.www1.artemis.web.rest.admin.AdminExamResource - de.tum.in.www1.artemis.web.websocket.dto.SubmissionPatchPayload - de.tum.in.www1.artemis.service.util.TimeLogUtil - de.tum.in.www1.artemis.domain.quiz.DragAndDropQuestion - de.tum.in.www1.artemis.domain.metis.ReactionConstraints - de.tum.in.www1.artemis.domain.enumeration.Language - de.tum.in.www1.artemis.web.rest.admin.AdminUserResource - de.tum.in.www1.artemis.web.rest.dto.OnlineCourseDTO - de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNSubprocess - de.tum.in.www1.artemis.domain.statistics.StatisticsEntry - de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingSubmissionElement - de.tum.in.www1.artemis.validation.constraints.TeamAssignmentConfigConstraints - de.tum.in.www1.artemis.web.rest.SubmissionResource - de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.course.PyrisCourseChatPipelineExecutionDTO - de.tum.in.www1.artemis.service.connectors.gitlab.dto.GitLabProjectDTO - de.tum.in.www1.artemis.service.connectors.localci.dto.JobTimingInfo - de.tum.in.www1.artemis.exception.QuizSubmissionException - de.tum.in.www1.artemis.web.rest.OrganizationResource - de.tum.in.www1.artemis.domain.DomainObject - de.tum.in.www1.artemis.domain.BuildLogEntry - de.tum.in.www1.artemis.domain.GradingInstruction - de.tum.in.www1.artemis.service.notifications.push_notifications.FirebasePushNotificationService - de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentDiagram - de.tum.in.www1.artemis.service.scheduled.AutomaticProgrammingExerciseCleanupService - de.tum.in.www1.artemis.exception.VersionControlException - de.tum.in.www1.artemis.web.rest.open.PublicPrivacyStatementResource - de.tum.in.www1.artemis.service.iris.dto.IrisCombinedChatSubSettingsDTO - de.tum.in.www1.artemis.repository.metis.ConversationParticipantRepository - de.tum.in.www1.artemis.service.metis.conversation.errors.ChannelNameDuplicateException - de.tum.in.www1.artemis.service.connectors.vcs.VcsTokenRenewalService - de.tum.in.www1.artemis.domain.statistics.CourseStatisticsAverageScore - de.tum.in.www1.artemis.service.StatisticsService - de.tum.in.www1.artemis.web.rest.dto.RepositoryStatusDTOType - de.tum.in.www1.artemis.web.rest.dto.SuspiciousExamSessionsDTO - de.tum.in.www1.artemis.repository.hestia.CoverageFileReportRepository - de.tum.in.www1.artemis.web.rest.dto.OrganizationCountDTO - de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisModelDTO - de.tum.in.www1.artemis.service.export.SubmissionExportService - de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestSuiteDTO - de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy - de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationService - de.tum.in.www1.artemis.repository.ResultRepository - de.tum.in.www1.artemis.config.SAML2Properties - de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisProgrammingExerciseDTO - de.tum.in.www1.artemis.service.connectors.jenkins.build_plan.JenkinsBuildPlanCreator - de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.exercise.PyrisExerciseChatPipelineExecutionDTO - de.tum.in.www1.artemis.repository.TemplateProgrammingExerciseParticipationRepository - de.tum.in.www1.artemis.service.dto.ComplaintAction - de.tum.in.www1.artemis.repository.QuizQuestionStatisticRepository - de.tum.in.www1.artemis.web.rest.iris.IrisModelsResource - de.tum.in.www1.artemis.service.plagiarism.ContinuousPlagiarismControlService - de.tum.in.www1.artemis.service.connectors.localci.dto.RepositoryInfo - de.tum.in.www1.artemis.web.rest.GradingScaleResource - de.tum.in.www1.artemis.service.connectors.gitlab.dto.GitLabRepositoryDTO - de.tum.in.www1.artemis.domain.notification.SystemNotification - de.tum.in.www1.artemis.service.metis.similarity.PostSimilarityComparisonStrategy - de.tum.in.www1.artemis.validation.TeamAssignmentConfigValidator - de.tum.in.www1.artemis.service.connectors.gitlab.GitlabInfoContributor - de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation - de.tum.in.www1.artemis.repository.ComplaintRepository - de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmissionElement - de.tum.in.www1.artemis.domain.notification.NotificationPlaceholderCreator - de.tum.in.www1.artemis.web.rest.SubmissionPolicyResource - de.tum.in.www1.artemis.web.rest.dto.CourseForDashboardDTO - de.tum.in.www1.artemis.web.rest.errors.LoginAlreadyUsedException - de.tum.in.www1.artemis.domain.participation.TemplateProgrammingExerciseParticipation - de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.InsertFileContents - de.tum.in.www1.artemis.service.connectors.localci.SharedQueueManagementService - de.tum.in.www1.artemis.domain.participation.ParticipationInterface - de.tum.in.www1.artemis.web.rest.CompetencyResource - de.tum.in.www1.artemis.service.scheduled.ModelingExerciseScheduleService - de.tum.in.www1.artemis.service.iris.settings.IrisSubSettingsService - de.tum.in.www1.artemis.domain.view.QuizView - de.tum.in.www1.artemis.web.rest.AndroidAppSiteAssociationResource - de.tum.in.www1.artemis.web.rest.ExamUserResource - de.tum.in.www1.artemis.web.rest.dto.LinkPreviewDTO - de.tum.in.www1.artemis.web.rest.dto.PrivacyStatementDTO - de.tum.in.www1.artemis.domain.iris.session.IrisCourseChatSession - de.tum.in.www1.artemis.web.websocket.team.TeamWebsocketService - de.tum.in.www1.artemis.repository.OnlineCourseConfigurationRepository - de.tum.in.www1.artemis.domain.iris.session.IrisExerciseChatSession - de.tum.in.www1.artemis.domain.exam.StudentExam - de.tum.in.www1.artemis.service.TextSubmissionService - de.tum.in.www1.artemis.web.rest.dto.CourseManagementOverviewExerciseStatisticsDTO - de.tum.in.www1.artemis.web.rest.dto.metrics.CompetencyProgressDTO - de.tum.in.www1.artemis.service.AuditEventService - de.tum.in.www1.artemis.service.dto.AbstractBuildResultNotificationDTO - de.tum.in.www1.artemis.web.rest.tutorialgroups.TutorialGroupSessionResource - de.tum.in.www1.artemis.exception.GitLabCIException - de.tum.in.www1.artemis.service.competency.StandardizedCompetencyService - de.tum.in.www1.artemis.domain.UserGroup - de.tum.in.www1.artemis.service.connectors.gitlabci.GitLabCIUserManagementService - de.tum.in.www1.artemis.domain.participation.StudentParticipation - de.tum.in.www1.artemis.web.rest.hestia.ProgrammingExerciseTaskResource - de.tum.in.www1.artemis.service.dto.AuditingEntityDTO - de.tum.in.www1.artemis.domain.StaticCodeAnalysisCategory - de.tum.in.www1.artemis.service.connectors.pyris.job.ExerciseChatJob - de.tum.in.www1.artemis.security.annotations.EnforceRoleInResourceAspect - de.tum.in.www1.artemis.service.connectors.gitlab.GitLabUserDoesNotExistException - de.tum.in.www1.artemis.domain.enumeration.ExerciseType - de.tum.in.www1.artemis.service.dto.GradingCriterionDTO - de.tum.in.www1.artemis.service.programming.ProgrammingExerciseService - de.tum.in.www1.artemis.repository.QuizSubmissionRepository - de.tum.in.www1.artemis.web.rest.repository.RepositoryActionType - de.tum.in.www1.artemis.web.rest.dto.score.TeamScoreSum - de.tum.in.www1.artemis.config.GuidedTourConfiguration - de.tum.in.www1.artemis.config.WebConfigurer - de.tum.in.www1.artemis.service.connectors.localci.buildagent.TestResultXmlParser - de.tum.in.www1.artemis.service.connectors.aeolus.ScriptAction - de.tum.in.www1.artemis.service.hestia.TestwiseCoverageService - de.tum.in.www1.artemis.web.rest.dto.score.ScoreDTO - de.tum.in.www1.artemis.service.util.ZonedDateTimeUtil - de.tum.in.www1.artemis.domain.TextSubmission - de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.ChannelDTO - de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityElement - de.tum.in.www1.artemis.domain.LtiPlatformConfiguration - de.tum.in.www1.artemis.config.Constants - de.tum.in.www1.artemis.service.compass.umlmodel.usecase.UMLUseCaseDiagram - de.tum.in.www1.artemis.domain.AssessmentNote - de.tum.in.www1.artemis.web.rest.iris.IrisCourseChatSessionResource - de.tum.in.www1.artemis.domain.enumeration.StatisticsView - de.tum.in.www1.artemis.domain.leaderboard.tutor.TutorLeaderboardMoreFeedbackRequests - de.tum.in.www1.artemis.web.rest.admin.AdminStandardizedCompetencyResource - de.tum.in.www1.artemis.web.rest.errors.StudentsAppearMultipleTimesException - de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v3.FlowchartParser - de.tum.in.www1.artemis.domain.metis.ConversationParticipant - de.tum.in.www1.artemis.config.auth.AthenaAuthorizationInterceptor - de.tum.in.www1.artemis.security.jwt.TokenProvider - de.tum.in.www1.artemis.web.rest.dto.ImprintDTO - de.tum.in.www1.artemis.service.compass.umlmodel.communication.UMLMessage - de.tum.in.www1.artemis.domain.enumeration.ExerciseLifecycle - de.tum.in.www1.artemis.web.rest.NotificationResource - de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask - de.tum.in.www1.artemis.service.team.strategies.CreateOnlyStrategy - de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository - de.tum.in.www1.artemis.service.exam.ExamImportService - de.tum.in.www1.artemis.ArtemisApp - de.tum.in.www1.artemis.service.connectors.aeolus.AeolusResult - de.tum.in.www1.artemis.web.rest.tutorialgroups.TutorialGroupFreePeriodResource - de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObjectLink - de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.FindCommonLines - de.tum.in.www1.artemis.service.LearningObjectService - de.tum.in.www1.artemis.service.team.TeamImportStrategy - de.tum.in.www1.artemis.domain.BuildPlan - de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyShortAnswerUtil - de.tum.in.www1.artemis.exception.localvc.LocalVCAuthException - de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceRoleInCourse - de.tum.in.www1.artemis.service.export.DataExportCommunicationDataService - de.tum.in.www1.artemis.exception.localvc.LocalVCOperationException - de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisLectureDTO - de.tum.in.www1.artemis.web.rest.dto.ProgrammingExerciseTestCaseDTO - de.tum.in.www1.artemis.web.rest.errors.ExceptionTranslator - de.tum.in.www1.artemis.service.programming.ProgrammingTriggerService - de.tum.in.www1.artemis.repository.ExamUserRepository - de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisResultDTO - de.tum.in.www1.artemis.config.TaskSchedulingConfiguration - de.tum.in.www1.artemis.domain.GradingCriterion - de.tum.in.www1.artemis.service.connectors.localvc.LocalVCFetchFilter - de.tum.in.www1.artemis.web.rest.plagiarism.PlagiarismCaseResource - de.tum.in.www1.artemis.repository.hestia.CodeHintRepository - de.tum.in.www1.artemis.repository.GradingInstructionRepository - de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyWithTailRelationDTO - de.tum.in.www1.artemis.domain.quiz.AnswerCounter - de.tum.in.www1.artemis.service.programming.RepositoryService - de.tum.in.www1.artemis.web.websocket.dto.metis.PostDTO - de.tum.in.www1.artemis.service.linkpreview.ogparser.OgParser - de.tum.in.www1.artemis.service.ResourceLoaderService - de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLMethod - de.tum.in.www1.artemis.service.connectors.jenkins.dto.JenkinsUserDTO - de.tum.in.www1.artemis.web.rest.open.PublicProgrammingSubmissionResource - de.tum.in.www1.artemis.web.rest.TextAssessmentResource - de.tum.in.www1.artemis.web.rest.dto.examevent.ProblemStatementUpdateEventDTO - de.tum.in.www1.artemis.service.ComplaintResponseService - de.tum.in.www1.artemis.web.filter.CachingHttpHeadersFilter - de.tum.in.www1.artemis.service.compass.umlmodel.deployment.UMLDeploymentInterface - de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository - de.tum.in.www1.artemis.service.notifications.GroupNotificationScheduleService - de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement - de.tum.in.www1.artemis.web.rest.dto.standardizedCompetency.StandardizedCompetencyResultDTO - de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNFlow - de.tum.in.www1.artemis.web.rest.dto.metrics.ResourceTimestampDTO - de.tum.in.www1.artemis.service.ParticipationService - de.tum.in.www1.artemis.service.programming.ProgrammingExerciseImportService - de.tum.in.www1.artemis.service.plagiarism.TextPlagiarismDetectionService - de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNTransaction - de.tum.in.www1.artemis.service.connectors.localci.dto.ResultQueueItem - de.tum.in.www1.artemis.domain.exam.event.ExamAttendanceCheckEvent - de.tum.in.www1.artemis.repository.BuildJobRepository - de.tum.in.www1.artemis.repository.metrics.LectureUnitMetricsRepository - de.tum.in.www1.artemis.domain.Complaint - de.tum.in.www1.artemis.web.rest.dto.FileUploadAssessmentDTO - de.tum.in.www1.artemis.domain.science.ScienceEventType - de.tum.in.www1.artemis.domain.TeamAssignmentConfig - de.tum.in.www1.artemis.repository.ModelingExerciseRepository - de.tum.in.www1.artemis.web.rest.ModelingAssessmentResource - de.tum.in.www1.artemis.domain.ComplaintResponse - de.tum.in.www1.artemis.service.connectors.localci.LocalCIResultService - de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLClass - de.tum.in.www1.artemis.domain.metis.CreatedConversationMessage - de.tum.in.www1.artemis.repository.StaticCodeAnalysisCategoryRepository - de.tum.in.www1.artemis.web.rest.plagiarism.PlagiarismAnswerPostResource - de.tum.in.www1.artemis.web.rest.push_notification.PushNotificationResource - de.tum.in.www1.artemis.web.rest.metis.ConversationMessageResource - de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyProgressForLearningPathDTO - de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2.UseCaseDiagramParser - de.tum.in.www1.artemis.web.websocket.ResultWebsocketService - de.tum.in.www1.artemis.service.connectors.pyris.job.PyrisJob - de.tum.in.www1.artemis.web.rest.lecture.AttachmentUnitResource - de.tum.in.www1.artemis.web.rest.hestia.ProgrammingExerciseSolutionEntryResource - de.tum.in.www1.artemis.repository.CompetencyProgressRepository - de.tum.in.www1.artemis.web.rest.DataExportResource - de.tum.in.www1.artemis.web.rest.dto.ExerciseGroupWithIdAndExamDTO - de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisErrorResponseDTO - de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser - de.tum.in.www1.artemis.service.dto.StudentDTO - de.tum.in.www1.artemis.service.FileUploadExerciseService - de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartTerminal - de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsXmlFileUtils - de.tum.in.www1.artemis.service.hestia.behavioral.knowledgesource.ExtractChangedLines - de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsInfoContributor - de.tum.in.www1.artemis.domain.exam.Exam - de.tum.in.www1.artemis.exception.GitException - de.tum.in.www1.artemis.domain.enumeration.SpanType - de.tum.in.www1.artemis.repository.GuidedTourSettingsRepository - de.tum.in.www1.artemis.web.rest.CourseResource - de.tum.in.www1.artemis.service.metis.conversation.GroupChatService - de.tum.in.www1.artemis.domain.modeling.ModelingSubmission - de.tum.in.www1.artemis.web.rest.lecture.ExerciseUnitResource - de.tum.in.www1.artemis.service.connectors.athena.AthenaDTOConverterService - de.tum.in.www1.artemis.service.HazelcastPathSerializer - de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase - de.tum.in.www1.artemis.repository.SystemNotificationRepository - de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.Flowchart - de.tum.in.www1.artemis.domain.User - de.tum.in.www1.artemis.web.rest.lecture.OnlineUnitResource - de.tum.in.www1.artemis.domain.hestia.CoverageFileReport - de.tum.in.www1.artemis.service.DragAndDropQuizAnswerConversionService - de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageState - de.tum.in.www1.artemis.domain.metis.conversation.ChannelSubType - de.tum.in.www1.artemis.service.LectureUnitProcessingService - de.tum.in.www1.artemis.web.rest.iris.IrisMessageResource - de.tum.in.www1.artemis.service.hestia.structural.StructuralMethod - de.tum.in.www1.artemis.service.dto.ConsistencyErrorDTO - de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry - de.tum.in.www1.artemis.web.rest.FileUploadAssessmentResource - de.tum.in.www1.artemis.domain.enumeration.GraphType - de.tum.in.www1.artemis.service.connectors.localci.LocalCIInfoContributor - de.tum.in.www1.artemis.domain.ExampleSubmission - de.tum.in.www1.artemis.repository.SubmissionPolicyRepository - de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNDiagram - de.tum.in.www1.artemis.web.rest.dto.TutorLeaderboardDTO - de.tum.in.www1.artemis.service.exam.ExamQuizQuestionsGenerator - de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseGitDiffReportService - de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyShortAnswerProportionalWithoutPenalty - de.tum.in.www1.artemis.repository.BonusRepository - de.tum.in.www1.artemis.domain.Repository - de.tum.in.www1.artemis.service.connectors.ci.notification.BuildLogParseUtils - de.tum.in.www1.artemis.service.connectors.ConnectorHealth - de.tum.in.www1.artemis.web.rest.dto.pageablesearch.UserPageableSearchDTO - de.tum.in.www1.artemis.service.metis.conversation.auth.ConversationAuthorizationService - de.tum.in.www1.artemis.service.iris.IrisSessionService - de.tum.in.www1.artemis.service.connectors.pyris.PyrisDTOService - de.tum.in.www1.artemis.web.rest.ApollonDiagramResource - de.tum.in.www1.artemis.domain.enumeration.RepositoryType - de.tum.in.www1.artemis.domain.modeling.ModelCluster - de.tum.in.www1.artemis.domain.iris.IrisTemplate - de.tum.in.www1.artemis.web.rest.LectureResource - de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation - de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.Project - de.tum.in.www1.artemis.web.rest.dto.metrics.StudentMetricsDTO - de.tum.in.www1.artemis.service.scheduled.AthenaScheduleService - de.tum.in.www1.artemis.domain.iris.session.IrisChatSession - de.tum.in.www1.artemis.config.websocket.WebsocketSecurityConfiguration - de.tum.in.www1.artemis.service.connectors.localci.buildagent.BuildJobContainerService - de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig - de.tum.in.www1.artemis.service.notifications.push_notifications.PushNotificationService - de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyImportResponseDTO - de.tum.in.www1.artemis.web.rest.dto.examevent.WorkingTimeUpdateEventDTO - de.tum.in.www1.artemis.service.export.DataExportQuizExerciseCreationService - de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityDiagram - de.tum.in.www1.artemis.service.connectors.localci.LocalCIService - de.tum.in.www1.artemis.service.quiz.QuizStatisticService - de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsResultService - de.tum.in.www1.artemis.service.connectors.localvc.LocalVCInfoContributor - de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedAnswer - de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.PmdCpc - de.tum.in.www1.artemis.web.rest.errors.EmailAlreadyUsedException - de.tum.in.www1.artemis.security.UserNotActivatedException - de.tum.in.www1.artemis.domain.ConductAgreementId - de.tum.in.www1.artemis.web.rest.localci.BuildPlanResource - de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.OneToOneChatDTO - de.tum.in.www1.artemis.service.metis.conversation.ChannelService - de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNPool - de.tum.in.www1.artemis.web.rest.open.PublicPyrisStatusUpdateResource - de.tum.in.www1.artemis.service.connectors.aeolus.AeolusBuildPlanService - de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore - de.tum.in.www1.artemis.service.export.DataExportCreationService - de.tum.in.www1.artemis.domain.metis.PostContextConstraintValidator - de.tum.in.www1.artemis.service.connectors.localci.dto.BuildJobQueueItem - de.tum.in.www1.artemis.web.rest.dto.CheckoutDirectoriesDTO - de.tum.in.www1.artemis.web.rest.hestia.CodeHintResource - de.tum.in.www1.artemis.web.rest.NotificationSettingsResource - de.tum.in.www1.artemis.service.connectors.vcs.AbstractVersionControlService - de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNGateway - de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.PMDReport - de.tum.in.www1.artemis.service.export.TextExerciseWithSubmissionsExportService - de.tum.in.www1.artemis.web.rest.admin.AdminOrganizationResource - de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise - de.tum.in.www1.artemis.web.rest.lecture.TextUnitResource - de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2.FlowchartParser - de.tum.in.www1.artemis.domain.metis.Post - de.tum.in.www1.artemis.service.connectors.jenkins.JenkinsAuthorizationInterceptor - de.tum.in.www1.artemis.domain.quiz.MultipleChoiceSubmittedAnswer - de.tum.in.www1.artemis.repository.ExerciseRepository - de.tum.in.www1.artemis.web.rest.dto.BuildLogStatisticsDTO - de.tum.in.www1.artemis.web.rest.errors.PasswordViolatesRequirementsException - de.tum.in.www1.artemis.service.SubmissionPolicyService - de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.ParserPolicy - de.tum.in.www1.artemis.domain.metis.conversation.GroupChat - de.tum.in.www1.artemis.service.GradingScaleService - de.tum.in.www1.artemis.service.connectors.gitlabci.GitLabCITriggerService - de.tum.in.www1.artemis.service.tutorialgroups.TutorialGroupScheduleService - de.tum.in.www1.artemis.web.rest.open.PublicSystemNotificationResource - de.tum.in.www1.artemis.service.connectors.vcs.VersionControlServerHealthIndicator - de.tum.in.www1.artemis.domain.notification.GroupNotificationFactory - de.tum.in.www1.artemis.domain.enumeration.DifficultyLevel - de.tum.in.www1.artemis.web.rest.dto.ProgrammingExerciseResetOptionsDTO - de.tum.in.www1.artemis.service.connectors.gitlab.dto.GitLabCommitDTO - de.tum.in.www1.artemis.service.programming.JavaTemplateUpgradeService - de.tum.in.www1.artemis.repository.SubmittedAnswerRepository - de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository - de.tum.in.www1.artemis.repository.FileUploadExerciseRepository - de.tum.in.www1.artemis.domain.competency.BaseCompetency - de.tum.in.www1.artemis.repository.LtiPlatformConfigurationRepository - de.tum.in.www1.artemis.web.rest.metis.conversation.dtos.ConversationDTO - de.tum.in.www1.artemis.service.tutorialgroups.TutorialGroupsConfigurationService - de.tum.in.www1.artemis.service.compass.umlmodel.syntaxtree.SyntaxTree - de.tum.in.www1.artemis.web.rest.vm.LoggerVM - de.tum.in.www1.artemis.config.ProgrammingLanguageConfiguration - de.tum.in.www1.artemis.domain.ConductAgreement - de.tum.in.www1.artemis.domain.quiz.compare.DnDMapping - de.tum.in.www1.artemis.web.rest.GitDiffReportParserService - de.tum.in.www1.artemis.config.migration.MigrationIntegrityException - de.tum.in.www1.artemis.domain.quiz.ShortAnswerQuestion - de.tum.in.www1.artemis.domain.enumeration.BuildStatus - de.tum.in.www1.artemis.repository.ModelingSubmissionRepository - de.tum.in.www1.artemis.service.connectors.gitlabci.GitLabCIInfoContributor - de.tum.in.www1.artemis.service.CourseService - de.tum.in.www1.artemis.repository.specs.MessageSpecs - de.tum.in.www1.artemis.service.programming.ProgrammingExerciseTestCaseService - de.tum.in.www1.artemis.domain.enumeration.QuizAction - de.tum.in.www1.artemis.domain.quiz.scoring.ScoringStrategyMultipleChoiceAllOrNothing - de.tum.in.www1.artemis.repository.Lti13ResourceLaunchRepository - de.tum.in.www1.artemis.service.connectors.gitlab.GitLabService - de.tum.in.www1.artemis.web.rest.dto.CourseCompetencyProgressDTO - de.tum.in.www1.artemis.domain.metis.PostConstraints - de.tum.in.www1.artemis.service.compass.umlmodel.parsers.v2.ActivityDiagramParser - de.tum.in.www1.artemis.domain.iris.settings.IrisCourseSettings - de.tum.in.www1.artemis.repository.ExamRepository - de.tum.in.www1.artemis.domain.lti.Scopes - de.tum.in.www1.artemis.domain.notification.TutorialGroupNotification - de.tum.in.www1.artemis.exception.QuizJoinException - de.tum.in.www1.artemis.domain.OnlineCourseConfiguration - de.tum.in.www1.artemis.domain.competency.KnowledgeArea - de.tum.in.www1.artemis.web.rest.dto.ParticipationDTO - de.tum.in.www1.artemis.service.hestia.ExerciseHintService - de.tum.in.www1.artemis.service.connectors.localci.scaparser.strategy.SourceLine - de.tum.in.www1.artemis.web.rest.TextSubmissionResource - de.tum.in.www1.artemis.web.rest.TextExerciseResource - de.tum.in.www1.artemis.web.rest.admin.AdminBuildJobQueueResource - de.tum.in.www1.artemis.repository.competency.KnowledgeAreaRepository - de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathCompetencyGraphDTO - de.tum.in.www1.artemis.web.rest.dto.RequestDataExportDTO - de.tum.in.www1.artemis.domain.quiz.MultipleChoiceQuestion - de.tum.in.www1.artemis.service.compass.umlmodel.communication.Direction - de.tum.in.www1.artemis.web.rest.lecture.LectureUnitResource - de.tum.in.www1.artemis.service.UriService - de.tum.in.www1.artemis.service.dto.UserPublicInfoDTO - de.tum.in.www1.artemis.web.rest.errors.CaptchaRequiredException - de.tum.in.www1.artemis.web.rest.dto.CommitInfoDTO - de.tum.in.www1.artemis.service.compass.umlmodel.Similarity - de.tum.in.www1.artemis.service.connectors.localci.buildagent.SharedQueueProcessingService - de.tum.in.www1.artemis.domain.Exercise - de.tum.in.www1.artemis.web.rest.repository.RepositoryResource - de.tum.in.www1.artemis.service.iris.exception.IrisForbiddenException - de.tum.in.www1.artemis.service.ConductAgreementService - de.tum.in.www1.artemis.domain.iris.message.IrisJsonMessageContent - de.tum.in.www1.artemis.repository.iris.IrisSessionRepository - de.tum.in.www1.artemis.service.CourseScoreCalculationService - de.tum.in.www1.artemis.domain.push_notification.PushNotificationDeviceConfiguration - de.tum.in.www1.artemis.web.filter.ApiVersionFilter - de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNDataObject - de.tum.in.www1.artemis.repository.LearningPathRepository - de.tum.in.www1.artemis.service.connectors.gitlab.dto.GitLabPushNotificationDTO - de.tum.in.www1.artemis.repository.PushNotificationDeviceConfigurationRepository - de.tum.in.www1.artemis.service.compass.assessment.Context - de.tum.in.www1.artemis.repository.TextUnitRepository - de.tum.in.www1.artemis.domain.science.ScienceSetting - de.tum.in.www1.artemis.repository.StudentExamRepository - de.tum.in.www1.artemis.domain.scores.StudentScore - de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeature - de.tum.in.www1.artemis.service.programming.ProgrammingExerciseFeedbackCreationService - de.tum.in.www1.artemis.repository.ProgrammingSubmissionRepository - de.tum.in.www1.artemis.service.connectors.lti.ExternalPasswordResetInfoContributor - de.tum.in.www1.artemis.web.rest.dto.PostContextFilterDTO - de.tum.in.www1.artemis.repository.iris.IrisTemplateRepository - de.tum.in.www1.artemis.web.rest.util.DateUtil - de.tum.in.www1.artemis.web.rest.QuizParticipationResource - de.tum.in.www1.artemis.web.rest.dto.pageablesearch.PageableSearchDTO - de.tum.in.www1.artemis.config.PublicResourcesConfiguration - de.tum.in.www1.artemis.domain.Bonus - de.tum.in.www1.artemis.domain.enumeration.Weekday - de.tum.in.www1.artemis.service.programming.ProgrammingExerciseParticipationService - de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupRegistration - de.tum.in.www1.artemis.service.iris.dto.IrisCombinedHestiaSubSettingsDTO - de.tum.in.www1.artemis.service.util.structureoraclegenerator.JavaClassDiffSerializer - de.tum.in.www1.artemis.service.connectors.ci.notification.dto.CommitDTO - de.tum.in.www1.artemis.web.rest.dto.ExerciseForPlagiarismCasesOverviewDTO - de.tum.in.www1.artemis.domain.StaticCodeAnalysisDefaultCategory - de.tum.in.www1.artemis.repository.iris.IrisMessageRepository - de.tum.in.www1.artemis.repository.hestia.ExerciseHintActivationRepository - de.tum.in.www1.artemis.service.connectors.athena.AthenaHealthIndicator - de.tum.in.www1.artemis.service.connectors.localci.dto.DockerImageBuild - de.tum.in.www1.artemis.domain.lti.Lti13DeepLinkingResponse - de.tum.in.www1.artemis.domain.iris.settings.IrisExerciseSettings - de.tum.in.www1.artemis.service.exam.ExamLiveEventsService - de.tum.in.www1.artemis.service.notifications.push_notifications.FirebaseRelayNotificationRequests - de.tum.in.www1.artemis.repository.iris.IrisSettingsRepository - de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentRelationship - de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - All - private - - From 98b6a6fca7b995ac43759fdfaa8b65556df90ef0 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Wed, 11 Sep 2024 21:45:07 +0200 Subject: [PATCH 25/43] remove unused field in test --- .../artemis/participation/ParticipationIntegrationTest.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java index a8609b619bd8..4b1736a90daa 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationIntegrationTest.java @@ -90,7 +90,6 @@ import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedText; import de.tum.cit.aet.artemis.quiz.dto.QuizBatchJoinDTO; import de.tum.cit.aet.artemis.quiz.service.QuizBatchService; -import de.tum.cit.aet.artemis.quiz.service.QuizScheduleService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.util.LocalRepository; @@ -117,9 +116,6 @@ class ParticipationIntegrationTest extends AbstractAthenaTest { @Autowired private QuizBatchService quizBatchService; - @Autowired - protected QuizScheduleService quizScheduleService; - @Autowired private ProgrammingExerciseTestService programmingExerciseTestService; From b419e148145df8a408fa6adb80d1dc3398c73ad4 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Wed, 11 Sep 2024 21:58:45 +0200 Subject: [PATCH 26/43] fix issues with lti files spread in different modules --- .../service/ExternalPasswordResetInfoContributor.java | 2 +- .../de/tum/cit/aet/artemis/core/web/CourseResource.java | 5 +++-- .../artemis/iris/service/pyris/PyrisConnectorService.java | 2 +- .../web}/PublicPyrisStatusUpdateResource.java | 2 +- .../cit/aet/artemis/lti/config/CustomLti13Configurer.java | 4 +++- .../DistributedStateAuthorizationRequestRepository.java | 4 +++- .../tum/cit/aet/artemis/lti/config/Lti13LaunchFilter.java | 4 +++- .../cit/aet/artemis/lti/config/Lti13TokenRetriever.java | 6 ++++-- .../lti/repository/Lti13ResourceLaunchRepository.java | 7 +++++++ .../repository/LtiPlatformConfigurationRepository.java | 4 ++-- .../repository/OnlineCourseConfigurationRepository.java | 4 ++-- .../de/tum/cit/aet/artemis/lti/service/Lti13Service.java | 4 +++- .../aet/artemis/lti/service/LtiDeepLinkingService.java | 4 +++- .../lti/service/LtiDynamicRegistrationService.java | 5 +++-- .../cit/aet/artemis/lti/service/LtiNewResultService.java | 4 +++- .../de/tum/cit/aet/artemis/lti/service/LtiService.java | 4 +++- .../{core/security => lti/service}/OAuth2JWKSService.java | 8 ++++---- .../lti/service/OnlineCourseConfigurationService.java | 3 ++- .../artemis/lti/web/AdminLtiConfigurationResource.java | 6 ++++-- .../java/de/tum/cit/aet/artemis/lti/web/LtiResource.java | 4 +++- .../cit/aet/artemis/lti/web/open/PublicLtiResource.java | 3 ++- .../artemis/lti/web/open/PublicOAuth2JWKSResource.java | 6 ++++-- .../artemis/AbstractSpringIntegrationIndependentTest.java | 2 +- .../aet/artemis/architecture/ServiceArchitectureTest.java | 2 +- .../connectors/LtiDynamicRegistrationServiceTest.java | 2 +- .../cit/aet/artemis/security/OAuth2JWKSServiceTest.java | 2 +- .../aet/artemis/security/lti/Lti13TokenRetrieverTest.java | 2 +- 27 files changed, 69 insertions(+), 36 deletions(-) rename src/main/java/de/tum/cit/aet/artemis/{lti => core}/service/ExternalPasswordResetInfoContributor.java (97%) rename src/main/java/de/tum/cit/aet/artemis/{lti/web/open => iris/web}/PublicPyrisStatusUpdateResource.java (99%) rename src/main/java/de/tum/cit/aet/artemis/{core/security => lti/service}/OAuth2JWKSService.java (96%) diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/service/ExternalPasswordResetInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/core/service/ExternalPasswordResetInfoContributor.java similarity index 97% rename from src/main/java/de/tum/cit/aet/artemis/lti/service/ExternalPasswordResetInfoContributor.java rename to src/main/java/de/tum/cit/aet/artemis/core/service/ExternalPasswordResetInfoContributor.java index 3c6cf56f793e..3cd1ff82c309 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/service/ExternalPasswordResetInfoContributor.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/ExternalPasswordResetInfoContributor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.lti.service; +package de.tum.cit.aet.artemis.core.service; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java index ac9bbc03d02f..10da69a96a5d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java @@ -1,6 +1,7 @@ package de.tum.cit.aet.artemis.core.web; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LTI; import static java.time.ZonedDateTime.now; import java.io.File; @@ -372,7 +373,7 @@ else if (courseUpdate.getCourseIcon() == null && existingCourse.getCourseIcon() // TODO: move into LTIResource @PutMapping("courses/{courseId}/onlineCourseConfiguration") @EnforceAtLeastInstructor - @Profile("lti") + @Profile(PROFILE_LTI) public ResponseEntity updateOnlineCourseConfiguration(@PathVariable Long courseId, @RequestBody OnlineCourseConfiguration onlineCourseConfiguration) { log.debug("REST request to update the online course configuration for Course : {}", courseId); @@ -414,7 +415,7 @@ public ResponseEntity updateOnlineCourseConfiguration */ @GetMapping("courses/for-lti-dashboard") @EnforceAtLeastInstructor - @Profile("lti") + @Profile(PROFILE_LTI) public ResponseEntity> findAllOnlineCoursesForLtiDashboard(@RequestParam("clientId") String clientId) { User user = userRepository.getUserWithGroupsAndAuthorities(); log.debug("REST request to get all online courses the user {} has access to", user.getLogin()); diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorService.java index 35940f9ce2e2..82ea29dca69c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorService.java @@ -22,7 +22,7 @@ import de.tum.cit.aet.artemis.iris.exception.IrisInternalPyrisErrorException; import de.tum.cit.aet.artemis.iris.service.pyris.dto.PyrisModelDTO; import de.tum.cit.aet.artemis.iris.service.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; -import de.tum.cit.aet.artemis.lti.web.open.PublicPyrisStatusUpdateResource; +import de.tum.cit.aet.artemis.iris.web.PublicPyrisStatusUpdateResource; /** * This service connects to the Python implementation of Iris (called Pyris). diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicPyrisStatusUpdateResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/PublicPyrisStatusUpdateResource.java similarity index 99% rename from src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicPyrisStatusUpdateResource.java rename to src/main/java/de/tum/cit/aet/artemis/iris/web/PublicPyrisStatusUpdateResource.java index 7c578a6bb687..800f2d3ed888 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicPyrisStatusUpdateResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/PublicPyrisStatusUpdateResource.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.lti.web.open; +package de.tum.cit.aet.artemis.iris.web; import java.util.Objects; diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/config/CustomLti13Configurer.java b/src/main/java/de/tum/cit/aet/artemis/lti/config/CustomLti13Configurer.java index 503c0f9cbc16..3597e6e3ebbd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/config/CustomLti13Configurer.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/config/CustomLti13Configurer.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.lti.config; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LTI; + import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Profile; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -19,7 +21,7 @@ /** * Configures and registers Security Filters to handle LTI 1.3 Resource Link Launches */ -@Profile("lti") +@Profile(PROFILE_LTI) @Component public class CustomLti13Configurer extends Lti13Configurer { diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/config/DistributedStateAuthorizationRequestRepository.java b/src/main/java/de/tum/cit/aet/artemis/lti/config/DistributedStateAuthorizationRequestRepository.java index 785731fbe9b4..e0761b75a710 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/config/DistributedStateAuthorizationRequestRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/config/DistributedStateAuthorizationRequestRepository.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.lti.config; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LTI; + import java.util.Map; import java.util.Objects; import java.util.concurrent.CompletableFuture; @@ -27,7 +29,7 @@ * This is based on a copy of {@link uk.ac.ox.ctl.lti13.security.oauth2.client.lti.web.StateAuthorizationRequestRepository}. */ @Component -@Profile("lti") +@Profile(PROFILE_LTI) class DistributedStateAuthorizationRequestRepository implements AuthorizationRequestRepository { private static final Logger log = LoggerFactory.getLogger(DistributedStateAuthorizationRequestRepository.class); diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/config/Lti13LaunchFilter.java b/src/main/java/de/tum/cit/aet/artemis/lti/config/Lti13LaunchFilter.java index e12741b6dea6..669e309566ef 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/config/Lti13LaunchFilter.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/config/Lti13LaunchFilter.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.lti.config; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LTI; + import java.io.IOException; import java.io.PrintWriter; @@ -35,7 +37,7 @@ * Step 3. of OpenID Connect Third Party Initiated Login is handled solely by spring-security-lti13 * OAuth2LoginAuthenticationFilter. */ -@Profile("lti") +@Profile(PROFILE_LTI) public class Lti13LaunchFilter extends OncePerRequestFilter { private final OAuth2LoginAuthenticationFilter defaultFilter; diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/config/Lti13TokenRetriever.java b/src/main/java/de/tum/cit/aet/artemis/lti/config/Lti13TokenRetriever.java index a1ee2c042cd6..9fd8a53d6abb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/config/Lti13TokenRetriever.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/config/Lti13TokenRetriever.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.lti.config; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LTI; + import java.net.URI; import java.security.KeyPair; import java.time.Instant; @@ -35,13 +37,13 @@ import com.nimbusds.jwt.JWTClaimsSet; import com.nimbusds.jwt.SignedJWT; -import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; +import de.tum.cit.aet.artemis.lti.service.OAuth2JWKSService; /** * This class is responsible to retrieve access tokens from an LTI 1.3 platform of a specific ClientRegistration. */ @Component -@Profile("lti") +@Profile(PROFILE_LTI) public class Lti13TokenRetriever { private final OAuth2JWKSService oAuth2JWKSService; diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/repository/Lti13ResourceLaunchRepository.java b/src/main/java/de/tum/cit/aet/artemis/lti/repository/Lti13ResourceLaunchRepository.java index 918d099aa16a..b2cd635b9b45 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/repository/Lti13ResourceLaunchRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/repository/Lti13ResourceLaunchRepository.java @@ -1,15 +1,22 @@ package de.tum.cit.aet.artemis.lti.repository; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LTI; + import java.util.Collection; import java.util.Optional; import jakarta.validation.constraints.NotNull; +import org.springframework.context.annotation.Profile; +import org.springframework.stereotype.Repository; + import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.lti.domain.LtiResourceLaunch; +@Profile(PROFILE_LTI) +@Repository public interface Lti13ResourceLaunchRepository extends ArtemisJpaRepository { Optional findByIssAndSubAndDeploymentIdAndResourceLinkId(@NotNull String iss, @NotNull String sub, @NotNull String deploymentId, diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/repository/LtiPlatformConfigurationRepository.java b/src/main/java/de/tum/cit/aet/artemis/lti/repository/LtiPlatformConfigurationRepository.java index 82e991ca8940..206671c53e9e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/repository/LtiPlatformConfigurationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/repository/LtiPlatformConfigurationRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.lti.repository; -import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LTI; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.Optional; @@ -18,7 +18,7 @@ /** * Repository for managing LtiPlatformConfiguration entities. */ -@Profile(PROFILE_CORE) +@Profile(PROFILE_LTI) @Repository public interface LtiPlatformConfigurationRepository extends ArtemisJpaRepository { diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/repository/OnlineCourseConfigurationRepository.java b/src/main/java/de/tum/cit/aet/artemis/lti/repository/OnlineCourseConfigurationRepository.java index d18f3852ddbf..e3c0a74e2fca 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/repository/OnlineCourseConfigurationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/repository/OnlineCourseConfigurationRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.lti.repository; -import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LTI; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; @@ -11,7 +11,7 @@ /** * Spring Data JPA repository for the OnlineCourseConfiguration entity. */ -@Profile(PROFILE_CORE) +@Profile(PROFILE_LTI) @Repository public interface OnlineCourseConfigurationRepository extends ArtemisJpaRepository { // This interface is intentionally left blank. Spring Data JPA generates the implementation at runtime. diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/service/Lti13Service.java b/src/main/java/de/tum/cit/aet/artemis/lti/service/Lti13Service.java index dc6675931e65..8b645aa4aaef 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/service/Lti13Service.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/service/Lti13Service.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.lti.service; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LTI; + import java.net.URI; import java.net.URISyntaxException; import java.util.Collection; @@ -55,7 +57,7 @@ import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; @Service -@Profile("lti") +@Profile(PROFILE_LTI) public class Lti13Service { private static final String EXERCISE_PATH_PATTERN = "/courses/{courseId}/exercises/{exerciseId}"; diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiDeepLinkingService.java b/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiDeepLinkingService.java index 2e80503fd0a8..7bd84f9c49c2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiDeepLinkingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiDeepLinkingService.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.lti.service; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LTI; + import java.util.ArrayList; import java.util.HashMap; import java.util.Map; @@ -24,7 +26,7 @@ * Service for handling LTI deep linking functionality. */ @Service -@Profile("lti") +@Profile(PROFILE_LTI) public class LtiDeepLinkingService { @Value("${server.url}") diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiDynamicRegistrationService.java b/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiDynamicRegistrationService.java index c1b128a1a7dd..bb4ba0abf16e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiDynamicRegistrationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiDynamicRegistrationService.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.lti.service; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LTI; + import java.util.UUID; import org.slf4j.Logger; @@ -16,14 +18,13 @@ import org.springframework.web.client.RestTemplate; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.dto.Lti13ClientRegistration; import de.tum.cit.aet.artemis.lti.dto.Lti13PlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; @Service -@Profile("lti") +@Profile(PROFILE_LTI) public class LtiDynamicRegistrationService { @Value("${server.url}") diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiNewResultService.java b/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiNewResultService.java index d9bf9b36575b..7a64018a6969 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiNewResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiNewResultService.java @@ -1,12 +1,14 @@ package de.tum.cit.aet.artemis.lti.service; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LTI; + import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @Service -@Profile("lti") +@Profile(PROFILE_LTI) public class LtiNewResultService { private final Lti13Service lti13Service; diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiService.java b/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiService.java index 6051e1df5680..0a77f89c8966 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/service/LtiService.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.lti.service; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LTI; + import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -40,7 +42,7 @@ import tech.jhipster.security.RandomUtil; @Service -@Profile("lti") +@Profile(PROFILE_LTI) public class LtiService { @Value("${artemis.lti.trustExternalLTISystems:false}") diff --git a/src/main/java/de/tum/cit/aet/artemis/core/security/OAuth2JWKSService.java b/src/main/java/de/tum/cit/aet/artemis/lti/service/OAuth2JWKSService.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/core/security/OAuth2JWKSService.java rename to src/main/java/de/tum/cit/aet/artemis/lti/service/OAuth2JWKSService.java index d8c80fd75385..9c761417dcfc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/security/OAuth2JWKSService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/service/OAuth2JWKSService.java @@ -1,4 +1,6 @@ -package de.tum.cit.aet.artemis.core.security; +package de.tum.cit.aet.artemis.lti.service; + +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LTI; import java.security.KeyPair; import java.security.KeyPairGenerator; @@ -25,14 +27,12 @@ import com.nimbusds.jose.jwk.KeyUse; import com.nimbusds.jose.jwk.RSAKey; -import de.tum.cit.aet.artemis.lti.service.OnlineCourseConfigurationService; - /** * This Service is responsible to manage JWKs for all OAuth2 ClientRegistrations. * On initialisation, each ClientRegistration gets assigned a fresh generated RSAKey. */ @Service -@Profile("lti") +@Profile(PROFILE_LTI) public class OAuth2JWKSService { private final OnlineCourseConfigurationService onlineCourseConfigurationService; diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/service/OnlineCourseConfigurationService.java b/src/main/java/de/tum/cit/aet/artemis/lti/service/OnlineCourseConfigurationService.java index 2677b865201e..ffbf6db62f82 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/service/OnlineCourseConfigurationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/service/OnlineCourseConfigurationService.java @@ -1,6 +1,7 @@ package de.tum.cit.aet.artemis.lti.service; import static de.tum.cit.aet.artemis.core.config.Constants.LOGIN_REGEX; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LTI; import static de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration.ENTITY_NAME; import java.util.List; @@ -28,7 +29,7 @@ * Service Implementation for OnlineCourseConfiguration. */ @Service -@Profile("lti") +@Profile(PROFILE_LTI) public class OnlineCourseConfigurationService implements ClientRegistrationRepository { private static final Logger log = LoggerFactory.getLogger(OnlineCourseConfigurationService.class); diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/web/AdminLtiConfigurationResource.java b/src/main/java/de/tum/cit/aet/artemis/lti/web/AdminLtiConfigurationResource.java index 965d323560a3..622879915037 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/web/AdminLtiConfigurationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/web/AdminLtiConfigurationResource.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.lti.web; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LTI; + import java.util.UUID; import org.slf4j.Logger; @@ -18,13 +20,13 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.lti.service.LtiDynamicRegistrationService; +import de.tum.cit.aet.artemis.lti.service.OAuth2JWKSService; /** * REST controller for managing LTI platform configurations. @@ -32,7 +34,7 @@ */ @RestController @RequestMapping("api/admin/") -@Profile("lti") +@Profile(PROFILE_LTI) public class AdminLtiConfigurationResource { private static final String ENTITY_NAME = "lti-platform"; diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/web/LtiResource.java b/src/main/java/de/tum/cit/aet/artemis/lti/web/LtiResource.java index 43fe4cfbec74..f1bb6ed318c1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/web/LtiResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/web/LtiResource.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.lti.web; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LTI; + import java.text.ParseException; import java.util.List; import java.util.Set; @@ -40,7 +42,7 @@ /** * REST controller to handle LTI13 launches. */ -@Profile("lti") +@Profile(PROFILE_LTI) @RestController @RequestMapping("api/") public class LtiResource { diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicLtiResource.java b/src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicLtiResource.java index b349d4307fd3..c0594b5ba1ca 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicLtiResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicLtiResource.java @@ -1,5 +1,6 @@ package de.tum.cit.aet.artemis.lti.web.open; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LTI; import static de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer.LTI13_DEEPLINK_REDIRECT_PATH; import static de.tum.cit.aet.artemis.lti.config.CustomLti13Configurer.LTI13_LOGIN_REDIRECT_PROXY_PATH; @@ -28,7 +29,7 @@ /** * REST controller for receiving LTI requests. */ -@Profile("lti") +@Profile(PROFILE_LTI) @RestController // TODO: should we adapt the mapping based on the profile? public class PublicLtiResource { diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicOAuth2JWKSResource.java b/src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicOAuth2JWKSResource.java index c5787b684c43..b01d5c307294 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicOAuth2JWKSResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/web/open/PublicOAuth2JWKSResource.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.lti.web.open; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LTI; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Profile; @@ -12,14 +14,14 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; import de.tum.cit.aet.artemis.core.security.annotations.EnforceNothing; import de.tum.cit.aet.artemis.core.security.annotations.ManualConfig; +import de.tum.cit.aet.artemis.lti.service.OAuth2JWKSService; /** * REST controller to serve the public JWKSet related to all OAuth2 clients. */ -@Profile("lti") +@Profile(PROFILE_LTI) // TODO: should we adapt the mapping based on the profile? @RestController public class PublicOAuth2JWKSResource { diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java index 16e9c3247636..c8c3948674ff 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java @@ -20,10 +20,10 @@ import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationScheduleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; import de.tum.cit.aet.artemis.exam.service.ExamLiveEventsService; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; +import de.tum.cit.aet.artemis.lti.service.OAuth2JWKSService; import de.tum.cit.aet.artemis.programming.domain.AbstractBaseProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; diff --git a/src/test/java/de/tum/cit/aet/artemis/architecture/ServiceArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/architecture/ServiceArchitectureTest.java index 54b994557e6a..80ebc5e038f3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/architecture/ServiceArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/architecture/ServiceArchitectureTest.java @@ -22,8 +22,8 @@ import de.tum.cit.aet.artemis.core.config.migration.MigrationService; import de.tum.cit.aet.artemis.core.management.SecurityMetersService; import de.tum.cit.aet.artemis.core.security.DomainUserDetailsService; -import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; import de.tum.cit.aet.artemis.core.security.jwt.JWTCookieService; +import de.tum.cit.aet.artemis.lti.service.OAuth2JWKSService; import de.tum.cit.aet.artemis.programming.service.localci.LocalCIWebsocketMessagingService; import de.tum.cit.aet.artemis.programming.web.GitDiffReportParserService; diff --git a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java index be1b729386dc..d219c79d84ce 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/connectors/LtiDynamicRegistrationServiceTest.java @@ -21,12 +21,12 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; -import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.lti.dto.Lti13ClientRegistration; import de.tum.cit.aet.artemis.lti.dto.Lti13PlatformConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.lti.service.LtiDynamicRegistrationService; +import de.tum.cit.aet.artemis.lti.service.OAuth2JWKSService; class LtiDynamicRegistrationServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/security/OAuth2JWKSServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/security/OAuth2JWKSServiceTest.java index 462f811d3565..9b195b99b013 100644 --- a/src/test/java/de/tum/cit/aet/artemis/security/OAuth2JWKSServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/security/OAuth2JWKSServiceTest.java @@ -17,7 +17,7 @@ import com.nimbusds.jose.jwk.JWK; -import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; +import de.tum.cit.aet.artemis.lti.service.OAuth2JWKSService; import de.tum.cit.aet.artemis.lti.service.OnlineCourseConfigurationService; class OAuth2JWKSServiceTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/security/lti/Lti13TokenRetrieverTest.java b/src/test/java/de/tum/cit/aet/artemis/security/lti/Lti13TokenRetrieverTest.java index d5d5bd909b1c..fbe80b802552 100644 --- a/src/test/java/de/tum/cit/aet/artemis/security/lti/Lti13TokenRetrieverTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/security/lti/Lti13TokenRetrieverTest.java @@ -47,9 +47,9 @@ import com.nimbusds.jwt.JWTClaimsSet; import com.nimbusds.jwt.SignedJWT; -import de.tum.cit.aet.artemis.core.security.OAuth2JWKSService; import de.tum.cit.aet.artemis.lti.config.Lti13TokenRetriever; import de.tum.cit.aet.artemis.lti.dto.Scopes; +import de.tum.cit.aet.artemis.lti.service.OAuth2JWKSService; class Lti13TokenRetrieverTest { From 08b6b16feaf29c7e35141ee261b4bf2fdd8bc73b Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Wed, 11 Sep 2024 22:13:21 +0200 Subject: [PATCH 27/43] use iris profile consistently, add missing repository annotations --- docs/dev/guidelines/server-tests.rst | 2 +- .../config}/AthenaAuthorizationInterceptor.java | 2 +- .../de/tum/cit/aet/artemis/core/config/Constants.java | 5 +++++ .../aet/artemis/core/config/DatabaseConfiguration.java | 3 +-- .../artemis/core/config/RestTemplateConfiguration.java | 9 +++++---- .../config}/PyrisAuthorizationInterceptor.java | 6 ++++-- .../iris/repository/IrisCourseChatSessionRepository.java | 8 ++++++-- .../repository/IrisExerciseChatSessionRepository.java | 7 ++++++- .../iris/repository/IrisHestiaSessionRepository.java | 5 +++++ .../artemis/iris/repository/IrisMessageRepository.java | 5 +++++ .../artemis/iris/repository/IrisSessionRepository.java | 6 ++++++ .../artemis/iris/repository/IrisSettingsRepository.java | 6 ++++++ .../iris/repository/IrisSubSettingsRepository.java | 7 +++++++ .../iris/service/IrisCompetencyGenerationService.java | 4 +++- .../artemis/iris/service/IrisDefaultTemplateService.java | 4 ++-- .../cit/aet/artemis/iris/service/IrisMessageService.java | 4 +++- .../aet/artemis/iris/service/IrisRateLimitService.java | 4 +++- .../cit/aet/artemis/iris/service/IrisSessionService.java | 4 +++- .../iris/service/pyris/PyrisConnectorService.java | 4 +++- .../aet/artemis/iris/service/pyris/PyrisDTOService.java | 3 ++- .../artemis/iris/service/pyris/PyrisHealthIndicator.java | 4 +++- .../aet/artemis/iris/service/pyris/PyrisJobService.java | 4 +++- .../artemis/iris/service/pyris/PyrisPipelineService.java | 4 +++- .../iris/service/pyris/PyrisStatusUpdateService.java | 4 +++- .../artemis/iris/service/pyris/PyrisWebhookService.java | 4 +++- .../service/session/IrisCourseChatSessionService.java | 4 +++- .../service/session/IrisExerciseChatSessionService.java | 4 +++- .../iris/service/session/IrisHestiaSessionService.java | 7 +++---- .../iris/service/settings/IrisSettingsService.java | 3 ++- .../iris/service/settings/IrisSubSettingsService.java | 4 +++- .../iris/service/websocket/IrisChatWebsocketService.java | 4 +++- .../iris/service/websocket/IrisWebsocketService.java | 4 +++- .../aet/artemis/iris/web/AdminIrisSettingsResource.java | 4 +++- .../artemis/iris/web/IrisCourseChatSessionResource.java | 4 +++- .../iris/web/IrisExerciseChatSessionResource.java | 4 +++- .../cit/aet/artemis/iris/web/IrisMessageResource.java | 4 +++- .../tum/cit/aet/artemis/iris/web/IrisModelsResource.java | 4 +++- .../de/tum/cit/aet/artemis/iris/web/IrisResource.java | 4 +++- .../cit/aet/artemis/iris/web/IrisSettingsResource.java | 4 +++- .../iris/web/PublicPyrisStatusUpdateResource.java | 4 +++- .../aeolus => }/dto/AeolusGenerationResponseDTO.java | 2 +- .../service/aeolus/AeolusBuildPlanService.java | 5 +++-- .../aeolus/AeolusBuildScriptGenerationService.java | 4 +++- .../AbstractSpringIntegrationIndependentTest.java | 2 +- .../AbstractSpringIntegrationLocalCILocalVCTest.java | 6 +++++- 45 files changed, 149 insertions(+), 50 deletions(-) rename src/main/java/de/tum/cit/aet/artemis/{core/config/auth => athena/config}/AthenaAuthorizationInterceptor.java (95%) rename src/main/java/de/tum/cit/aet/artemis/{core/config/auth => iris/config}/PyrisAuthorizationInterceptor.java (87%) rename src/main/java/de/tum/cit/aet/artemis/programming/{service/aeolus => }/dto/AeolusGenerationResponseDTO.java (83%) diff --git a/docs/dev/guidelines/server-tests.rst b/docs/dev/guidelines/server-tests.rst index befe120d587f..58af074553a3 100644 --- a/docs/dev/guidelines/server-tests.rst +++ b/docs/dev/guidelines/server-tests.rst @@ -219,7 +219,7 @@ the name of the test group (matching the ``abstract`` base class name) as a para @Execution(ExecutionMode.CONCURRENT) @ResourceLock("AbstractSpringIntegrationIndependentTest") @AutoConfigureEmbeddedDatabase - @ActiveProfiles({ SPRING_PROFILE_TEST, "artemis", PROFILE_SCHEDULING, "lti" }) + @ActiveProfiles({ SPRING_PROFILE_TEST, "artemis", PROFILE_SCHEDULING, PROFILE_IRIS }) @TestPropertySource(properties = { "artemis.user-management.use-external=false" }) public abstract class AbstractSpringIntegrationIndependentTest extends AbstractArtemisIntegrationTest { ... } diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/auth/AthenaAuthorizationInterceptor.java b/src/main/java/de/tum/cit/aet/artemis/athena/config/AthenaAuthorizationInterceptor.java similarity index 95% rename from src/main/java/de/tum/cit/aet/artemis/core/config/auth/AthenaAuthorizationInterceptor.java rename to src/main/java/de/tum/cit/aet/artemis/athena/config/AthenaAuthorizationInterceptor.java index 0da93581efca..399c68410b5e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/auth/AthenaAuthorizationInterceptor.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/config/AthenaAuthorizationInterceptor.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.config.auth; +package de.tum.cit.aet.artemis.athena.config; import java.io.IOException; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java b/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java index ef5ce5cc92e5..ce7ac63b7e44 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java @@ -302,6 +302,11 @@ public final class Constants { */ public static final String PROFILE_CORE = "core"; + /** + * The name of the Spring profile used for Artemis core functionality. + */ + public static final String PROFILE_IRIS = "iris"; + /** * The name of the Spring profile used for the Aeolus external system. */ diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/DatabaseConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/DatabaseConfiguration.java index 72ba6f2332d6..7ac4fa67043b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/DatabaseConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/DatabaseConfiguration.java @@ -12,8 +12,7 @@ @Profile(PROFILE_CORE) @Configuration -@EnableJpaRepositories(basePackages = { "de.tum.cit.aet.artemis.*.repository", "de.tum.cit.aet.artemis.repository.**" // ToDo: Remove once test files have been moved -}, repositoryBaseClass = RepositoryImpl.class) +@EnableJpaRepositories(basePackages = { "de.tum.cit.aet.artemis.*.repository.*" }, repositoryBaseClass = RepositoryImpl.class) @EnableJpaAuditing(auditorAwareRef = "springSecurityAuditorAware") @EnableTransactionManagement public class DatabaseConfiguration { diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/RestTemplateConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/RestTemplateConfiguration.java index a4d06e96c073..93519596dd50 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/RestTemplateConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/RestTemplateConfiguration.java @@ -1,6 +1,7 @@ package de.tum.cit.aet.artemis.core.config; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; import java.util.ArrayList; @@ -17,8 +18,8 @@ import org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConverter; import org.springframework.web.client.RestTemplate; -import de.tum.cit.aet.artemis.core.config.auth.AthenaAuthorizationInterceptor; -import de.tum.cit.aet.artemis.core.config.auth.PyrisAuthorizationInterceptor; +import de.tum.cit.aet.artemis.athena.config.AthenaAuthorizationInterceptor; +import de.tum.cit.aet.artemis.iris.config.PyrisAuthorizationInterceptor; import de.tum.cit.aet.artemis.programming.service.gitlab.GitLabAuthorizationInterceptor; import de.tum.cit.aet.artemis.programming.service.jenkins.JenkinsAuthorizationInterceptor; @@ -76,7 +77,7 @@ public RestTemplate aeolusRestTemplate() { } @Bean - @Profile("iris") + @Profile(PROFILE_IRIS) public RestTemplate pyrisRestTemplate(PyrisAuthorizationInterceptor pyrisAuthorizationInterceptor) { return initializeRestTemplateWithInterceptors(pyrisAuthorizationInterceptor, createRestTemplate()); } @@ -120,7 +121,7 @@ public RestTemplate veryShortTimeoutAthenaRestTemplate(AthenaAuthorizationInterc } @Bean - @Profile("iris") + @Profile(PROFILE_IRIS) public RestTemplate shortTimeoutPyrisRestTemplate(PyrisAuthorizationInterceptor pyrisAuthorizationInterceptor) { return initializeRestTemplateWithInterceptors(pyrisAuthorizationInterceptor, createShortTimeoutRestTemplate()); } diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/auth/PyrisAuthorizationInterceptor.java b/src/main/java/de/tum/cit/aet/artemis/iris/config/PyrisAuthorizationInterceptor.java similarity index 87% rename from src/main/java/de/tum/cit/aet/artemis/core/config/auth/PyrisAuthorizationInterceptor.java rename to src/main/java/de/tum/cit/aet/artemis/iris/config/PyrisAuthorizationInterceptor.java index fb7395e05073..70fd700e0832 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/auth/PyrisAuthorizationInterceptor.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/config/PyrisAuthorizationInterceptor.java @@ -1,4 +1,6 @@ -package de.tum.cit.aet.artemis.core.config.auth; +package de.tum.cit.aet.artemis.iris.config; + +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; import java.io.IOException; @@ -14,7 +16,7 @@ import org.springframework.stereotype.Component; @Component -@Profile("iris") +@Profile(PROFILE_IRIS) public class PyrisAuthorizationInterceptor implements ClientHttpRequestInterceptor { @Value("${artemis.iris.secret-token}") diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisCourseChatSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisCourseChatSessionRepository.java index 2c1ae6a49f39..9b12386e4593 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisCourseChatSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisCourseChatSessionRepository.java @@ -1,5 +1,6 @@ package de.tum.cit.aet.artemis.iris.repository; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.Collections; @@ -7,10 +8,12 @@ import jakarta.validation.constraints.NotNull; +import org.springframework.context.annotation.Profile; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @@ -20,6 +23,8 @@ /** * Repository interface for managing {@link IrisCourseChatSession} entities. */ +@Repository +@Profile(PROFILE_IRIS) public interface IrisCourseChatSessionRepository extends ArtemisJpaRepository { /** @@ -30,13 +35,12 @@ public interface IrisCourseChatSessionRepository extends ArtemisJpaRepository findByCourseIdAndUserId(@Param("courseId") long courseId, @Param("userId") long userId); @Query(""" diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisExerciseChatSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisExerciseChatSessionRepository.java index e12ade2c368b..514be1f1d575 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisExerciseChatSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisExerciseChatSessionRepository.java @@ -1,5 +1,6 @@ package de.tum.cit.aet.artemis.iris.repository; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.Collections; @@ -7,10 +8,12 @@ import jakarta.validation.constraints.NotNull; +import org.springframework.context.annotation.Profile; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; @@ -21,6 +24,8 @@ * Repository interface for managing {@link IrisExerciseChatSession} entities. * Provides custom queries for finding chat sessions based on different criteria. */ +@Repository +@Profile(PROFILE_IRIS) public interface IrisExerciseChatSessionRepository extends ArtemisJpaRepository { /** @@ -37,7 +42,7 @@ public interface IrisExerciseChatSessionRepository extends ArtemisJpaRepository< WHERE s.exercise.id = :exerciseId AND s.user.id = :userId ORDER BY s.creationDate DESC - """) + """) List findByExerciseIdAndUserId(@Param("exerciseId") Long exerciseId, @Param("userId") Long userId); @Query(""" diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisHestiaSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisHestiaSessionRepository.java index 1e1fb72106b7..346ca70d8cef 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisHestiaSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisHestiaSessionRepository.java @@ -1,10 +1,13 @@ package de.tum.cit.aet.artemis.iris.repository; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.util.List; +import org.springframework.context.annotation.Profile; import org.springframework.data.jpa.repository.EntityGraph; +import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.iris.domain.session.IrisHestiaSession; @@ -13,6 +16,8 @@ * Repository interface for managing {@link IrisHestiaSession} entities. * Provides custom queries for finding hestia sessions based on different criteria. */ +@Repository +@Profile(PROFILE_IRIS) public interface IrisHestiaSessionRepository extends ArtemisJpaRepository { /** diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisMessageRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisMessageRepository.java index 29a126a42936..608831867c79 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisMessageRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisMessageRepository.java @@ -1,5 +1,6 @@ package de.tum.cit.aet.artemis.iris.repository; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; import java.time.ZonedDateTime; @@ -8,9 +9,11 @@ import jakarta.validation.constraints.NotNull; +import org.springframework.context.annotation.Profile; import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.iris.domain.message.IrisMessage; @@ -19,6 +22,8 @@ /** * Spring Data repository for the IrisMessage entity. */ +@Repository +@Profile(PROFILE_IRIS) public interface IrisMessageRepository extends ArtemisJpaRepository { List findAllBySessionId(long sessionId); diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSessionRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSessionRepository.java index 245d3029ad4d..471504269cf1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSessionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSessionRepository.java @@ -1,11 +1,15 @@ package de.tum.cit.aet.artemis.iris.repository; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; + import java.util.Optional; import jakarta.validation.constraints.NotNull; +import org.springframework.context.annotation.Profile; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; @@ -14,6 +18,8 @@ /** * Spring Data repository for the IrisSession entity. */ +@Repository +@Profile(PROFILE_IRIS) public interface IrisSessionRepository extends ArtemisJpaRepository { @Query(""" diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSettingsRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSettingsRepository.java index 7560ddf6219b..8c4ffd56068e 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSettingsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSettingsRepository.java @@ -1,11 +1,15 @@ package de.tum.cit.aet.artemis.iris.repository; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; + import java.util.Comparator; import java.util.Optional; import java.util.Set; +import org.springframework.context.annotation.Profile; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.iris.domain.settings.IrisCourseSettings; @@ -16,6 +20,8 @@ /** * Spring Data repository for the IrisSettings entity. */ +@Repository +@Profile(PROFILE_IRIS) public interface IrisSettingsRepository extends ArtemisJpaRepository { @Query(""" diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSubSettingsRepository.java b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSubSettingsRepository.java index d3118f2e9203..0decd03b187a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSubSettingsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/repository/IrisSubSettingsRepository.java @@ -1,11 +1,18 @@ package de.tum.cit.aet.artemis.iris.repository; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; + +import org.springframework.context.annotation.Profile; +import org.springframework.stereotype.Repository; + import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettings; /** * Spring Data repository for the IrisSubSettings entity. */ +@Repository +@Profile(PROFILE_IRIS) public interface IrisSubSettingsRepository extends ArtemisJpaRepository { } diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisCompetencyGenerationService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisCompetencyGenerationService.java index 2efd0f3f7090..7c37831a611c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisCompetencyGenerationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisCompetencyGenerationService.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.iris.service; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; + import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; @@ -18,7 +20,7 @@ * Service to handle the Competency generation subsytem of Iris. */ @Service -@Profile("iris") +@Profile(PROFILE_IRIS) public class IrisCompetencyGenerationService { private final PyrisPipelineService pyrisPipelineService; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisDefaultTemplateService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisDefaultTemplateService.java index 1f55d964a794..2a4757596bf1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisDefaultTemplateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisDefaultTemplateService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.iris.service; -import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -20,7 +20,7 @@ /** * Service that loads default Iris templates from the resources/templates/iris folder. */ -@Profile(PROFILE_CORE) +@Profile(PROFILE_IRIS) @Service public class IrisDefaultTemplateService { diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisMessageService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisMessageService.java index 1b0464695140..a977413a8616 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisMessageService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisMessageService.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.iris.service; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; + import java.time.ZonedDateTime; import jakarta.ws.rs.BadRequestException; @@ -17,7 +19,7 @@ * Service for managing Iris messages. */ @Service -@Profile("iris") +@Profile(PROFILE_IRIS) public class IrisMessageService { private final IrisSessionRepository irisSessionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisRateLimitService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisRateLimitService.java index baa166e621be..ffa7db51a109 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisRateLimitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisRateLimitService.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.iris.service; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; + import java.time.ZonedDateTime; import java.util.Objects; @@ -15,7 +17,7 @@ * Service for the rate limit of the iris chatbot. */ @Service -@Profile("iris") +@Profile(PROFILE_IRIS) public class IrisRateLimitService { private final IrisMessageRepository irisMessageRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisSessionService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisSessionService.java index 6c113b773ff1..41fa1247b739 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/IrisSessionService.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.iris.service; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; + import jakarta.annotation.Nullable; import jakarta.ws.rs.BadRequestException; @@ -25,7 +27,7 @@ * Service for managing Iris sessions. */ @Service -@Profile("iris") +@Profile(PROFILE_IRIS) public class IrisSessionService { private final UserRepository userRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorService.java index 82ea29dca69c..6d54a5592771 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisConnectorService.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.iris.service.pyris; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; + import java.util.Arrays; import java.util.List; @@ -30,7 +32,7 @@ * Status updates are sent to Artemis via {@link PublicPyrisStatusUpdateResource} */ @Service -@Profile("iris") +@Profile(PROFILE_IRIS) public class PyrisConnectorService { private static final Logger log = LoggerFactory.getLogger(PyrisConnectorService.class); diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisDTOService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisDTOService.java index 931f7c311757..ca42f85363bc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisDTOService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisDTOService.java @@ -1,5 +1,6 @@ package de.tum.cit.aet.artemis.iris.service.pyris; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; import static de.tum.cit.aet.artemis.core.util.TimeUtil.toInstant; import java.io.IOException; @@ -31,7 +32,7 @@ import de.tum.cit.aet.artemis.programming.service.RepositoryService; @Service -@Profile("iris") +@Profile(PROFILE_IRIS) public class PyrisDTOService { private static final Logger log = LoggerFactory.getLogger(PyrisDTOService.class); diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisHealthIndicator.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisHealthIndicator.java index 1d75191b2e56..7caf9a50f307 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisHealthIndicator.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisHealthIndicator.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.iris.service.pyris; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; + import java.net.URI; import org.springframework.beans.factory.annotation.Qualifier; @@ -15,7 +17,7 @@ import de.tum.cit.aet.artemis.iris.service.pyris.dto.PyrisHealthStatusDTO; @Component -@Profile("iris") +@Profile(PROFILE_IRIS) public class PyrisHealthIndicator implements HealthIndicator { @Value("${artemis.iris.health-ttl:30000}") diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisJobService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisJobService.java index be84daeafc2a..7933e9e20920 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisJobService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisJobService.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.iris.service.pyris; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; + import java.security.SecureRandom; import java.util.concurrent.TimeUnit; import java.util.function.Function; @@ -29,7 +31,7 @@ * It uses Hazelcast to store the jobs in a distributed map. */ @Service -@Profile("iris") +@Profile(PROFILE_IRIS) public class PyrisJobService { private final HazelcastInstance hazelcastInstance; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisPipelineService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisPipelineService.java index f25479058f61..08861c06a773 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisPipelineService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisPipelineService.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.iris.service.pyris; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; + import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -42,7 +44,7 @@ * Uses {@link PyrisConnectorService} to execute the pipelines and {@link PyrisJobService} to manage the jobs. */ @Service -@Profile("iris") +@Profile(PROFILE_IRIS) public class PyrisPipelineService { private static final Logger log = LoggerFactory.getLogger(PyrisPipelineService.class); diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisStatusUpdateService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisStatusUpdateService.java index b5580932a74e..aed62b6049c1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisStatusUpdateService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisStatusUpdateService.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.iris.service.pyris; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; + import java.util.List; import org.slf4j.Logger; @@ -21,7 +23,7 @@ import de.tum.cit.aet.artemis.iris.service.session.IrisExerciseChatSessionService; @Service -@Profile("iris") +@Profile(PROFILE_IRIS) public class PyrisStatusUpdateService { private final PyrisJobService pyrisJobService; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisWebhookService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisWebhookService.java index 1c5c9fe6bcca..03f58ad5ba14 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisWebhookService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/pyris/PyrisWebhookService.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.iris.service.pyris; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; + import java.io.IOException; import java.net.URI; import java.nio.file.Files; @@ -27,7 +29,7 @@ import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; @Service -@Profile("iris") +@Profile(PROFILE_IRIS) public class PyrisWebhookService { private static final Logger log = LoggerFactory.getLogger(PyrisWebhookService.class); diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisCourseChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisCourseChatSessionService.java index 1e85d31d57d7..a2c404b13103 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisCourseChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisCourseChatSessionService.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.iris.service.session; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; + import java.time.LocalDate; import java.time.ZoneId; import java.util.Objects; @@ -36,7 +38,7 @@ * Service to handle the course chat subsystem of Iris. */ @Service -@Profile("iris") +@Profile(PROFILE_IRIS) public class IrisCourseChatSessionService extends AbstractIrisChatSessionService { private final IrisMessageService irisMessageService; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisExerciseChatSessionService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisExerciseChatSessionService.java index 0b6c3d4942ab..cec0a9322134 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisExerciseChatSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisExerciseChatSessionService.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.iris.service.session; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; + import java.util.Objects; import java.util.Optional; @@ -37,7 +39,7 @@ * Service to handle the chat subsystem of Iris. */ @Service -@Profile("iris") +@Profile(PROFILE_IRIS) public class IrisExerciseChatSessionService extends AbstractIrisChatSessionService implements IrisRateLimitedFeatureInterface { private final IrisMessageService irisMessageService; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisHestiaSessionService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisHestiaSessionService.java index 642cb8df2cd0..6762b6d23d43 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisHestiaSessionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/session/IrisHestiaSessionService.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.iris.service.session; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; + import java.time.ZonedDateTime; import org.slf4j.Logger; @@ -25,13 +27,11 @@ * Service to handle the Hestia integration of Iris. */ @Service -@Profile("iris") +@Profile(PROFILE_IRIS) public class IrisHestiaSessionService implements IrisButtonBasedFeatureInterface { private static final Logger log = LoggerFactory.getLogger(IrisHestiaSessionService.class); - private final PyrisConnectorService pyrisConnectorService; - private final IrisSettingsService irisSettingsService; private final AuthorizationCheckService authCheckService; @@ -42,7 +42,6 @@ public class IrisHestiaSessionService implements IrisButtonBasedFeatureInterface public IrisHestiaSessionService(PyrisConnectorService pyrisConnectorService, IrisSettingsService irisSettingsService, AuthorizationCheckService authCheckService, IrisSessionRepository irisSessionRepository, IrisHestiaSessionRepository irisHestiaSessionRepository) { - this.pyrisConnectorService = pyrisConnectorService; this.irisSettingsService = irisSettingsService; this.authCheckService = authCheckService; this.irisSessionRepository = irisSessionRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSettingsService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSettingsService.java index 4cb89a2cf4c6..39bb14ff31cd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSettingsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSettingsService.java @@ -1,5 +1,6 @@ package de.tum.cit.aet.artemis.iris.service.settings; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import static de.tum.cit.aet.artemis.iris.domain.settings.IrisSettingsType.COURSE; import static de.tum.cit.aet.artemis.iris.domain.settings.IrisSettingsType.EXERCISE; @@ -46,7 +47,7 @@ * See {@link IrisSubSettingsService} for more information on the handling of {@link IrisSubSettings}. */ @Service -@Profile("iris") +@Profile(PROFILE_IRIS) public class IrisSettingsService { private final IrisSettingsRepository irisSettingsRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSubSettingsService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSubSettingsService.java index 445bf5e60fe4..dfd555bb59c5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSubSettingsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/settings/IrisSubSettingsService.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.iris.service.settings; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; + import java.util.ArrayList; import java.util.Comparator; import java.util.List; @@ -33,7 +35,7 @@ * See {@link IrisSettingsService} for more information about handling {@link IrisSettings}. */ @Service -@Profile("iris") +@Profile(PROFILE_IRIS) public class IrisSubSettingsService { private final AuthorizationCheckService authCheckService; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/websocket/IrisChatWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/websocket/IrisChatWebsocketService.java index d5e81961f642..320a3103fe99 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/websocket/IrisChatWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/websocket/IrisChatWebsocketService.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.iris.service.websocket; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; + import java.util.List; import org.springframework.context.annotation.Profile; @@ -12,7 +14,7 @@ import de.tum.cit.aet.artemis.iris.service.pyris.dto.status.PyrisStageDTO; @Service -@Profile("iris") +@Profile(PROFILE_IRIS) public class IrisChatWebsocketService { private final IrisWebsocketService websocketService; diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/service/websocket/IrisWebsocketService.java b/src/main/java/de/tum/cit/aet/artemis/iris/service/websocket/IrisWebsocketService.java index 6c401c1eb8a3..91a42a586bc3 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/service/websocket/IrisWebsocketService.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/service/websocket/IrisWebsocketService.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.iris.service.websocket; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; + import java.util.concurrent.ExecutionException; import org.slf4j.Logger; @@ -13,7 +15,7 @@ * A service to send a message over the websocket to a specific user */ @Service -@Profile("iris") +@Profile(PROFILE_IRIS) public class IrisWebsocketService { private static final Logger log = LoggerFactory.getLogger(IrisWebsocketService.class); diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/AdminIrisSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/AdminIrisSettingsResource.java index e688774349c6..03bfaaad6c62 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/web/AdminIrisSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/AdminIrisSettingsResource.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.iris.web; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; + import org.springframework.context.annotation.Profile; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PutMapping; @@ -14,7 +16,7 @@ /** * REST controller for managing {@link IrisSettings}. */ -@Profile("iris") +@Profile(PROFILE_IRIS) @RestController @RequestMapping("api/admin/") public class AdminIrisSettingsResource { diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisCourseChatSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisCourseChatSessionResource.java index 37f4c34672b4..13c7a1b5894d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisCourseChatSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisCourseChatSessionResource.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.iris.web; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; + import java.net.URI; import java.net.URISyntaxException; import java.util.List; @@ -27,7 +29,7 @@ /** * REST controller for managing {@link IrisCourseChatSession}. */ -@Profile("iris") +@Profile(PROFILE_IRIS) @RestController @RequestMapping("api/iris/course-chat/") public class IrisCourseChatSessionResource { diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisExerciseChatSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisExerciseChatSessionResource.java index 90248c992688..55204aa63397 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisExerciseChatSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisExerciseChatSessionResource.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.iris.web; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; + import java.net.URI; import java.net.URISyntaxException; import java.util.List; @@ -30,7 +32,7 @@ /** * REST controller for managing {@link IrisExerciseChatSession}. */ -@Profile("iris") +@Profile(PROFILE_IRIS) @RestController @RequestMapping("api/iris/exercise-chat/") public class IrisExerciseChatSessionResource { diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisMessageResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisMessageResource.java index 4e8a3e7c3c5a..d30efec4e288 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisMessageResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisMessageResource.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.iris.web; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; + import java.net.URI; import java.net.URISyntaxException; import java.util.List; @@ -31,7 +33,7 @@ /** * REST controller for managing {@link IrisMessage}. */ -@Profile("iris") +@Profile(PROFILE_IRIS) @RestController @RequestMapping("api/iris/") public class IrisMessageResource { diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisModelsResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisModelsResource.java index 8fce02b0d4e5..ae4bedb82493 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisModelsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisModelsResource.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.iris.web; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; + import java.util.List; import org.springframework.context.annotation.Profile; @@ -17,7 +19,7 @@ /** * REST controller for managing the models Pyris provides. */ -@Profile("iris") +@Profile(PROFILE_IRIS) @RestController @RequestMapping("api/") public class IrisModelsResource { diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisResource.java index 17df925c4b1c..58f40981a861 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisResource.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.iris.web; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; + import org.springframework.boot.actuate.health.Status; import org.springframework.context.annotation.Profile; import org.springframework.http.ResponseEntity; @@ -13,7 +15,7 @@ import de.tum.cit.aet.artemis.iris.service.IrisRateLimitService; import de.tum.cit.aet.artemis.iris.service.pyris.PyrisHealthIndicator; -@Profile("iris") +@Profile(PROFILE_IRIS) @RestController @RequestMapping("api/iris/") public class IrisResource { diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisSettingsResource.java index 1a5e4f0ebe94..32676da073bb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisSettingsResource.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.iris.web; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; + import org.springframework.context.annotation.Profile; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; @@ -26,7 +28,7 @@ /** * REST controller for managing {@link IrisSettings}. */ -@Profile("iris") +@Profile(PROFILE_IRIS) @RestController @RequestMapping("api/") public class IrisSettingsResource { diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/PublicPyrisStatusUpdateResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/PublicPyrisStatusUpdateResource.java index 800f2d3ed888..117aa63c1202 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/web/PublicPyrisStatusUpdateResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/PublicPyrisStatusUpdateResource.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.iris.web; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; + import java.util.Objects; import jakarta.servlet.http.HttpServletRequest; @@ -32,7 +34,7 @@ * See {@link PyrisJobService#getAndAuthenticateJobFromHeaderElseThrow(HttpServletRequest, Class)} for more information. */ @RestController -@Profile("iris") +@Profile(PROFILE_IRIS) @RequestMapping("api/public/pyris/") public class PublicPyrisStatusUpdateResource { diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/dto/AeolusGenerationResponseDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/dto/AeolusGenerationResponseDTO.java similarity index 83% rename from src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/dto/AeolusGenerationResponseDTO.java rename to src/main/java/de/tum/cit/aet/artemis/programming/dto/AeolusGenerationResponseDTO.java index 924797bded89..1359b7430807 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/dto/AeolusGenerationResponseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/dto/AeolusGenerationResponseDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.programming.service.aeolus.dto; +package de.tum.cit.aet.artemis.programming.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusBuildPlanService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusBuildPlanService.java index 8485b7ada640..9cb410de37fa 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusBuildPlanService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusBuildPlanService.java @@ -1,6 +1,7 @@ package de.tum.cit.aet.artemis.programming.service.aeolus; import static de.tum.cit.aet.artemis.core.config.Constants.ASSIGNMENT_REPO_NAME; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_AEOLUS; import static de.tum.cit.aet.artemis.core.config.Constants.SOLUTION_REPO_NAME; import static de.tum.cit.aet.artemis.core.config.Constants.TEST_REPO_NAME; import static de.tum.cit.aet.artemis.programming.domain.AeolusTarget.JENKINS; @@ -33,15 +34,15 @@ import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingLanguage; import de.tum.cit.aet.artemis.programming.domain.VcsRepositoryUri; +import de.tum.cit.aet.artemis.programming.dto.AeolusGenerationResponseDTO; import de.tum.cit.aet.artemis.programming.service.InternalUrlService; -import de.tum.cit.aet.artemis.programming.service.aeolus.dto.AeolusGenerationResponseDTO; import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; /** * Service for publishing custom build plans using Aeolus */ @Service -@Profile("aeolus") +@Profile(PROFILE_AEOLUS) public class AeolusBuildPlanService { private static final Logger log = LoggerFactory.getLogger(AeolusBuildPlanService.class); diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusBuildScriptGenerationService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusBuildScriptGenerationService.java index b83bb30bcdd7..8830adb96389 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusBuildScriptGenerationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/aeolus/AeolusBuildScriptGenerationService.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.programming.service.aeolus; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_AEOLUS; + import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; @@ -14,7 +16,7 @@ /** * Service for generating build scripts for programming exercises using Aeolus */ -@Profile("aeolus") +@Profile(PROFILE_AEOLUS) @Service public class AeolusBuildScriptGenerationService extends BuildScriptGenerationService { diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java index c8c3948674ff..58f0f640f99b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java @@ -35,7 +35,7 @@ */ @ResourceLock("AbstractSpringIntegrationIndependentTest") // NOTE: we use a common set of active profiles to reduce the number of application launches during testing. This significantly saves time and memory! -@ActiveProfiles({ SPRING_PROFILE_TEST, "artemis", PROFILE_SCHEDULING, "athena", "apollon", "lti", "aeolus", PROFILE_THEIA, PROFILE_CORE }) +@ActiveProfiles({ SPRING_PROFILE_TEST, "artemis", PROFILE_SCHEDULING, "athena", "apollon", "lti", PROFILE_AEOLUS, PROFILE_THEIA, PROFILE_CORE }) @TestPropertySource(properties = { "artemis.user-management.use-external=false" }) public abstract class AbstractSpringIntegrationIndependentTest extends AbstractArtemisIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java index eb9e0de59d24..29b33155104e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java @@ -2,6 +2,9 @@ import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LTI; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import static tech.jhipster.config.JHipsterConstants.SPRING_PROFILE_TEST; @@ -57,7 +60,8 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT) @ResourceLock("AbstractSpringIntegrationLocalCILocalVCTest") // NOTE: we use a common set of active profiles to reduce the number of application launches during testing. This significantly saves time and memory! -@ActiveProfiles({ SPRING_PROFILE_TEST, "artemis", PROFILE_CORE, "localci", "localvc", PROFILE_SCHEDULING, "ldap-only", "lti", "aeolus", "iris", PROFILE_BUILDAGENT }) +@ActiveProfiles({ SPRING_PROFILE_TEST, "artemis", PROFILE_CORE, PROFILE_LOCALCI, PROFILE_LOCALVC, PROFILE_SCHEDULING, "ldap-only", PROFILE_LTI, "aeolus", "iris", + PROFILE_BUILDAGENT }) // Note: the server.port property must correspond to the port used in the artemis.version-control.url property. @TestPropertySource(properties = { "server.port=49152", "artemis.version-control.url=http://localhost:49152", "artemis.user-management.use-external=false", From c8a6a29d4cfd1329206c8c457bcf1b6f885758cd Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Wed, 11 Sep 2024 22:18:06 +0200 Subject: [PATCH 28/43] use athena profile consistently --- .../athena/config/AthenaAuthorizationInterceptor.java | 4 +++- .../athena/{service => config}/AthenaHealthIndicator.java | 6 ++++-- .../artemis/athena/service/AthenaDTOConverterService.java | 4 ++-- .../athena/service/AthenaFeedbackSendingService.java | 4 +++- .../athena/service/AthenaFeedbackSuggestionsService.java | 4 +++- .../aet/artemis/athena/service/AthenaModuleService.java | 4 +++- .../athena/service/AthenaRepositoryExportService.java | 4 +++- .../athena/service/AthenaSubmissionSelectionService.java | 4 +++- .../athena/service/AthenaSubmissionSendingService.java | 4 +++- .../de/tum/cit/aet/artemis/athena/web/AthenaResource.java | 4 +++- .../java/de/tum/cit/aet/artemis/core/config/Constants.java | 7 ++++++- .../aet/artemis/core/config/RestTemplateConfiguration.java | 7 ++++--- .../artemis/programming/web/hestia/CodeHintResource.java | 3 ++- .../artemis/AbstractSpringIntegrationIndependentTest.java | 4 +++- .../AbstractSpringIntegrationJenkinsGitlabTest.java | 3 ++- .../aet/artemis/connector/AthenaRequestMockProvider.java | 3 ++- .../cit/aet/artemis/connector/IrisRequestMockProvider.java | 3 ++- .../connectors/athena/AthenaHealthIndicatorTest.java | 2 +- 18 files changed, 52 insertions(+), 22 deletions(-) rename src/main/java/de/tum/cit/aet/artemis/athena/{service => config}/AthenaHealthIndicator.java (96%) diff --git a/src/main/java/de/tum/cit/aet/artemis/athena/config/AthenaAuthorizationInterceptor.java b/src/main/java/de/tum/cit/aet/artemis/athena/config/AthenaAuthorizationInterceptor.java index 399c68410b5e..b726bfc35e20 100644 --- a/src/main/java/de/tum/cit/aet/artemis/athena/config/AthenaAuthorizationInterceptor.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/config/AthenaAuthorizationInterceptor.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.athena.config; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATHENA; + import java.io.IOException; import jakarta.validation.constraints.NotNull; @@ -14,7 +16,7 @@ import org.springframework.stereotype.Component; @Component -@Profile("athena") +@Profile(PROFILE_ATHENA) public class AthenaAuthorizationInterceptor implements ClientHttpRequestInterceptor { @Value("${artemis.athena.secret}") diff --git a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaHealthIndicator.java b/src/main/java/de/tum/cit/aet/artemis/athena/config/AthenaHealthIndicator.java similarity index 96% rename from src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaHealthIndicator.java rename to src/main/java/de/tum/cit/aet/artemis/athena/config/AthenaHealthIndicator.java index 00ffd40708f5..4c0c36e6bb64 100644 --- a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaHealthIndicator.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/config/AthenaHealthIndicator.java @@ -1,4 +1,6 @@ -package de.tum.cit.aet.artemis.athena.service; +package de.tum.cit.aet.artemis.athena.config; + +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATHENA; import java.util.HashMap; import java.util.Map; @@ -19,7 +21,7 @@ * Service determining the health of the Athena service and its assessment modules. */ @Component -@Profile("athena") +@Profile(PROFILE_ATHENA) public class AthenaHealthIndicator implements HealthIndicator { private static final String GREEN_CIRCLE = "\uD83D\uDFE2"; // unicode green circle 🟢 diff --git a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaDTOConverterService.java b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaDTOConverterService.java index 48359ca5c767..dcd463f65ed1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaDTOConverterService.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaDTOConverterService.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.athena.service; -import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATHENA; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; @@ -34,7 +34,7 @@ /** * Service to convert exercises, submissions and feedback to DTOs for Athena. */ -@Profile(PROFILE_CORE) +@Profile(PROFILE_ATHENA) @Service public class AthenaDTOConverterService { diff --git a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaFeedbackSendingService.java b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaFeedbackSendingService.java index 135747bc4583..f943b2453fea 100644 --- a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaFeedbackSendingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaFeedbackSendingService.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.athena.service; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATHENA; + import java.util.List; import org.slf4j.Logger; @@ -25,7 +27,7 @@ * so that Athena can later give feedback suggestions on new submissions. */ @Service -@Profile("athena") +@Profile(PROFILE_ATHENA) public class AthenaFeedbackSendingService { private static final Logger log = LoggerFactory.getLogger(AthenaFeedbackSendingService.class); diff --git a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaFeedbackSuggestionsService.java b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaFeedbackSuggestionsService.java index 0fa25a3970a2..d9c81849b396 100644 --- a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaFeedbackSuggestionsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaFeedbackSuggestionsService.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.athena.service; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATHENA; + import java.util.List; import java.util.Objects; @@ -31,7 +33,7 @@ * Assumes that submissions and already given feedback have already been sent to Athena or that the feedback is non-graded. */ @Service -@Profile("athena") +@Profile(PROFILE_ATHENA) public class AthenaFeedbackSuggestionsService { private static final Logger log = LoggerFactory.getLogger(AthenaFeedbackSuggestionsService.class); diff --git a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaModuleService.java b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaModuleService.java index a150666f7d08..84f573485017 100644 --- a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaModuleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaModuleService.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.athena.service; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATHENA; + import java.time.ZonedDateTime; import java.util.List; import java.util.Objects; @@ -31,7 +33,7 @@ * Service to get the URL for an Athena module, depending on the type of exercise. */ @Service -@Profile("athena") +@Profile(PROFILE_ATHENA) public class AthenaModuleService { @Value("${artemis.athena.url}") diff --git a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaRepositoryExportService.java b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaRepositoryExportService.java index da034293eb7c..529f0f6e9076 100644 --- a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaRepositoryExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaRepositoryExportService.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.athena.service; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATHENA; + import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -28,7 +30,7 @@ * Service for exporting programming exercise repositories for Athena. */ @Service -@Profile("athena") +@Profile(PROFILE_ATHENA) public class AthenaRepositoryExportService { private static final Logger log = LoggerFactory.getLogger(AthenaRepositoryExportService.class); diff --git a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaSubmissionSelectionService.java b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaSubmissionSelectionService.java index 6de086e2a291..48d09c3b96d6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaSubmissionSelectionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaSubmissionSelectionService.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.athena.service; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATHENA; + import java.util.List; import java.util.Optional; @@ -25,7 +27,7 @@ * The default choice if Athena does not respond is to choose a random submission. */ @Service -@Profile("athena") +@Profile(PROFILE_ATHENA) public class AthenaSubmissionSelectionService { private static final Logger log = LoggerFactory.getLogger(AthenaSubmissionSelectionService.class); diff --git a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaSubmissionSendingService.java b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaSubmissionSendingService.java index 8a5aae325bea..65e9172e8a8c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaSubmissionSendingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaSubmissionSendingService.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.athena.service; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATHENA; + import java.time.ZonedDateTime; import java.util.HashSet; import java.util.List; @@ -29,7 +31,7 @@ * so that Athena can later give feedback suggestions on new submissions. */ @Service -@Profile("athena") +@Profile(PROFILE_ATHENA) public class AthenaSubmissionSendingService { private static final int SUBMISSIONS_PER_REQUEST = 100; diff --git a/src/main/java/de/tum/cit/aet/artemis/athena/web/AthenaResource.java b/src/main/java/de/tum/cit/aet/artemis/athena/web/AthenaResource.java index 32cc9f05d51b..177447b6b724 100644 --- a/src/main/java/de/tum/cit/aet/artemis/athena/web/AthenaResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/web/AthenaResource.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.athena.web; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATHENA; + import java.io.IOException; import java.util.List; import java.util.function.Function; @@ -49,7 +51,7 @@ /** * REST controller for Athena feedback suggestions. */ -@Profile("athena") +@Profile(PROFILE_ATHENA) @RestController @RequestMapping("api/") public class AthenaResource { diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java b/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java index ce7ac63b7e44..e2bb912b749b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java @@ -303,10 +303,15 @@ public final class Constants { public static final String PROFILE_CORE = "core"; /** - * The name of the Spring profile used for Artemis core functionality. + * The name of the Spring profile used for Iris / Pyris functionality. */ public static final String PROFILE_IRIS = "iris"; + /** + * The name of the Spring profile used for Athena functionality. + */ + public static final String PROFILE_ATHENA = "athena"; + /** * The name of the Spring profile used for the Aeolus external system. */ diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/RestTemplateConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/RestTemplateConfiguration.java index 93519596dd50..034963a35a55 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/RestTemplateConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/RestTemplateConfiguration.java @@ -1,5 +1,6 @@ package de.tum.cit.aet.artemis.core.config; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATHENA; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; @@ -54,7 +55,7 @@ public RestTemplate jenkinsRestTemplate(JenkinsAuthorizationInterceptor jenkinsI } @Bean - @Profile("athena") + @Profile(PROFILE_ATHENA) public RestTemplate athenaRestTemplate(AthenaAuthorizationInterceptor athenaAuthorizationInterceptor) { return initializeRestTemplateWithInterceptors(athenaAuthorizationInterceptor, createRestTemplate()); } @@ -100,7 +101,7 @@ public RestTemplate shortTimeoutJenkinsRestTemplate(JenkinsAuthorizationIntercep } @Bean - @Profile("athena") + @Profile(PROFILE_ATHENA) public RestTemplate shortTimeoutAthenaRestTemplate(AthenaAuthorizationInterceptor athenaAuthorizationInterceptor) { return initializeRestTemplateWithInterceptors(athenaAuthorizationInterceptor, createShortTimeoutRestTemplate()); } @@ -115,7 +116,7 @@ public RestTemplate shortTimeoutApollonRestTemplate() { // Therefore, we need additional rest templates. It is recommended to keep the timeout settings constant per rest template. @Bean - @Profile("athena") + @Profile(PROFILE_ATHENA) public RestTemplate veryShortTimeoutAthenaRestTemplate(AthenaAuthorizationInterceptor athenaAuthorizationInterceptor) { return initializeRestTemplateWithInterceptors(athenaAuthorizationInterceptor, createVeryShortTimeoutRestTemplate()); } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/CodeHintResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/CodeHintResource.java index 16c41978dda2..297e784f1e2b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/CodeHintResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/hestia/CodeHintResource.java @@ -1,6 +1,7 @@ package de.tum.cit.aet.artemis.programming.web.hestia; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; import java.util.List; import java.util.Objects; @@ -105,7 +106,7 @@ public ResponseEntity> generateCodeHintsForExercise(@PathVariable * @return the {@link ResponseEntity} with status {@code 200 (Ok)} and with body the updated code hint */ // TODO: move into some IrisResource - @Profile("iris") + @Profile(PROFILE_IRIS) @PostMapping("programming-exercises/{exerciseId}/code-hints/{codeHintId}/generate-description") @EnforceAtLeastEditorInExercise public ResponseEntity generateDescriptionForCodeHint(@PathVariable Long exerciseId, @PathVariable Long codeHintId) { diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java index 58f0f640f99b..e64ce50b20b9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_AEOLUS; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATHENA; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_THEIA; @@ -35,7 +37,7 @@ */ @ResourceLock("AbstractSpringIntegrationIndependentTest") // NOTE: we use a common set of active profiles to reduce the number of application launches during testing. This significantly saves time and memory! -@ActiveProfiles({ SPRING_PROFILE_TEST, "artemis", PROFILE_SCHEDULING, "athena", "apollon", "lti", PROFILE_AEOLUS, PROFILE_THEIA, PROFILE_CORE }) +@ActiveProfiles({ SPRING_PROFILE_TEST, "artemis", PROFILE_SCHEDULING, PROFILE_ATHENA, "apollon", "lti", PROFILE_AEOLUS, PROFILE_THEIA, PROFILE_CORE }) @TestPropertySource(properties = { "artemis.user-management.use-external=false" }) public abstract class AbstractSpringIntegrationIndependentTest extends AbstractArtemisIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java index dfc387abb208..2c7b68419945 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java @@ -1,6 +1,7 @@ package de.tum.cit.aet.artemis; import static de.tum.cit.aet.artemis.core.config.Constants.ASSIGNMENT_REPO_NAME; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATHENA; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import static de.tum.cit.aet.artemis.core.config.Constants.TEST_REPO_NAME; @@ -51,7 +52,7 @@ @ResourceLock("AbstractSpringIntegrationJenkinsGitlabTest") // NOTE: we use a common set of active profiles to reduce the number of application launches during testing. This significantly saves time and memory! -@ActiveProfiles({ SPRING_PROFILE_TEST, "artemis", PROFILE_CORE, "gitlab", "jenkins", "athena", PROFILE_SCHEDULING, "lti", "aeolus", "apollon" }) +@ActiveProfiles({ SPRING_PROFILE_TEST, "artemis", PROFILE_CORE, "gitlab", "jenkins", PROFILE_ATHENA, PROFILE_SCHEDULING, "lti", "aeolus", "apollon" }) @TestPropertySource(properties = { "info.guided-tour.course-group-tutors=artemis-artemistutorial-tutors", "info.guided-tour.course-group-students=artemis-artemistutorial-students", "info.guided-tour.course-group-editors=artemis-artemistutorial-editors", "info.guided-tour.course-group-instructors=artemis-artemistutorial-instructors", "artemis.user-management.use-external=false", "artemis.user-management.course-enrollment.allowed-username-pattern=^(?!authorizationservicestudent2).*$" }) diff --git a/src/test/java/de/tum/cit/aet/artemis/connector/AthenaRequestMockProvider.java b/src/test/java/de/tum/cit/aet/artemis/connector/AthenaRequestMockProvider.java index 5e17e3636ddb..6a252828c784 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connector/AthenaRequestMockProvider.java +++ b/src/test/java/de/tum/cit/aet/artemis/connector/AthenaRequestMockProvider.java @@ -1,5 +1,6 @@ package de.tum.cit.aet.artemis.connector; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATHENA; import static org.springframework.test.web.client.match.MockRestRequestMatchers.content; import static org.springframework.test.web.client.match.MockRestRequestMatchers.method; import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo; @@ -28,7 +29,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode; @Component -@Profile("athena") +@Profile(PROFILE_ATHENA) public class AthenaRequestMockProvider { private final RestTemplate restTemplate; diff --git a/src/test/java/de/tum/cit/aet/artemis/connector/IrisRequestMockProvider.java b/src/test/java/de/tum/cit/aet/artemis/connector/IrisRequestMockProvider.java index c305784ca463..c1791451de2f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connector/IrisRequestMockProvider.java +++ b/src/test/java/de/tum/cit/aet/artemis/connector/IrisRequestMockProvider.java @@ -1,5 +1,6 @@ package de.tum.cit.aet.artemis.connector; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; import static org.springframework.test.web.client.match.MockRestRequestMatchers.method; import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo; import static org.springframework.test.web.client.response.MockRestResponseCreators.withRawStatus; @@ -34,7 +35,7 @@ import de.tum.cit.aet.artemis.iris.service.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; @Component -@Profile("iris") +@Profile(PROFILE_IRIS) public class IrisRequestMockProvider { private final RestTemplate restTemplate; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaHealthIndicatorTest.java b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaHealthIndicatorTest.java index ca87e67bb774..2290863e30b5 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaHealthIndicatorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/connectors/athena/AthenaHealthIndicatorTest.java @@ -8,7 +8,7 @@ import org.springframework.boot.actuate.health.Status; import de.tum.cit.aet.artemis.AbstractAthenaTest; -import de.tum.cit.aet.artemis.athena.service.AthenaHealthIndicator; +import de.tum.cit.aet.artemis.athena.config.AthenaHealthIndicator; class AthenaHealthIndicatorTest extends AbstractAthenaTest { From 1cea424e41501028b81a54112faca8d8d40cde10 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Wed, 11 Sep 2024 22:21:54 +0200 Subject: [PATCH 29/43] use apollon profile consistently --- .../java/de/tum/cit/aet/artemis/core/config/Constants.java | 5 +++++ .../aet/artemis/core/config/RestTemplateConfiguration.java | 5 +++-- .../modeling/{service/apollon => }/dto/ApollonModelDTO.java | 2 +- .../modeling/repository/ApollonDiagramRepository.java | 4 ++-- .../ModelingExerciseWithSubmissionsExportService.java | 1 - .../modeling/service/apollon/ApollonConversionService.java | 6 ++++-- .../modeling/service/apollon/ApollonHealthIndicator.java | 4 +++- .../aet/artemis/modeling/web/ApollonConversionResource.java | 6 ++++-- .../aet/artemis/modeling/web/ApollonDiagramResource.java | 4 ++-- .../connector/apollon/ApollonRequestMockProvider.java | 3 ++- .../exercise/modeling/ApollonConversionIntegrationTest.java | 2 +- 11 files changed, 27 insertions(+), 15 deletions(-) rename src/main/java/de/tum/cit/aet/artemis/modeling/{service/apollon => }/dto/ApollonModelDTO.java (76%) diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java b/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java index e2bb912b749b..4bed875ddaea 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java @@ -312,6 +312,11 @@ public final class Constants { */ public static final String PROFILE_ATHENA = "athena"; + /** + * The name of the Spring profile used for Athena functionality. + */ + public static final String PROFILE_APOLLON = "apollon"; + /** * The name of the Spring profile used for the Aeolus external system. */ diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/RestTemplateConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/RestTemplateConfiguration.java index 034963a35a55..0730267fb379 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/RestTemplateConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/RestTemplateConfiguration.java @@ -1,5 +1,6 @@ package de.tum.cit.aet.artemis.core.config; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_APOLLON; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATHENA; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; @@ -61,7 +62,7 @@ public RestTemplate athenaRestTemplate(AthenaAuthorizationInterceptor athenaAuth } @Bean - @Profile("apollon") + @Profile(PROFILE_APOLLON) public RestTemplate apollonRestTemplate() { return createRestTemplate(); } @@ -107,7 +108,7 @@ public RestTemplate shortTimeoutAthenaRestTemplate(AthenaAuthorizationIntercepto } @Bean - @Profile("apollon") + @Profile(PROFILE_APOLLON) public RestTemplate shortTimeoutApollonRestTemplate() { return createShortTimeoutRestTemplate(); } diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/apollon/dto/ApollonModelDTO.java b/src/main/java/de/tum/cit/aet/artemis/modeling/dto/ApollonModelDTO.java similarity index 76% rename from src/main/java/de/tum/cit/aet/artemis/modeling/service/apollon/dto/ApollonModelDTO.java rename to src/main/java/de/tum/cit/aet/artemis/modeling/dto/ApollonModelDTO.java index 35fb816ae45d..e351f4160158 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/apollon/dto/ApollonModelDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/dto/ApollonModelDTO.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.modeling.service.apollon.dto; +package de.tum.cit.aet.artemis.modeling.dto; import java.io.Serializable; diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ApollonDiagramRepository.java b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ApollonDiagramRepository.java index 304eff6d8a6a..81feaed97cbc 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ApollonDiagramRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ApollonDiagramRepository.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.modeling.repository; -import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_APOLLON; import java.util.List; @@ -16,7 +16,7 @@ /** * Spring Data JPA repository for the ApollonDiagram entity. */ -@Profile(PROFILE_CORE) +@Profile(PROFILE_APOLLON) @Repository public interface ApollonDiagramRepository extends ArtemisJpaRepository { diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseWithSubmissionsExportService.java index 586f6eaa383d..306b5022feca 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseWithSubmissionsExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingExerciseWithSubmissionsExportService.java @@ -18,7 +18,6 @@ /** * Service for exporting Modeling Exercises with the student submissions. */ - @Profile(PROFILE_CORE) @Service public class ModelingExerciseWithSubmissionsExportService extends ExerciseWithSubmissionsExportService { diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/apollon/ApollonConversionService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/apollon/ApollonConversionService.java index 178bc76cdc7a..e45db8d1eb01 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/apollon/ApollonConversionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/apollon/ApollonConversionService.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.modeling.service.apollon; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_APOLLON; + import java.io.IOException; import java.io.InputStream; @@ -12,10 +14,10 @@ import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; -import de.tum.cit.aet.artemis.modeling.service.apollon.dto.ApollonModelDTO; +import de.tum.cit.aet.artemis.modeling.dto.ApollonModelDTO; @Service -@Profile("apollon") +@Profile(PROFILE_APOLLON) public class ApollonConversionService { private static final Logger log = LoggerFactory.getLogger(ApollonConversionService.class); diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/apollon/ApollonHealthIndicator.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/apollon/ApollonHealthIndicator.java index d1d9d107511c..561df536ca9a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/apollon/ApollonHealthIndicator.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/apollon/ApollonHealthIndicator.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.modeling.service.apollon; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_APOLLON; + import java.util.Map; import org.springframework.beans.factory.annotation.Qualifier; @@ -16,7 +18,7 @@ import de.tum.cit.aet.artemis.core.service.connectors.ConnectorHealth; @Component -@Profile("apollon") +@Profile(PROFILE_APOLLON) public class ApollonHealthIndicator implements HealthIndicator { private final RestTemplate shortTimeoutRestTemplate; diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/web/ApollonConversionResource.java b/src/main/java/de/tum/cit/aet/artemis/modeling/web/ApollonConversionResource.java index 7580f2206221..5a6f13d36ba1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/web/ApollonConversionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/web/ApollonConversionResource.java @@ -1,5 +1,7 @@ package de.tum.cit.aet.artemis.modeling.web; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_APOLLON; + import java.io.InputStream; import org.slf4j.Logger; @@ -14,13 +16,13 @@ import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; +import de.tum.cit.aet.artemis.modeling.dto.ApollonModelDTO; import de.tum.cit.aet.artemis.modeling.service.apollon.ApollonConversionService; -import de.tum.cit.aet.artemis.modeling.service.apollon.dto.ApollonModelDTO; /** * REST controller for managing ApollonDiagram. */ -@Profile("apollon") +@Profile(PROFILE_APOLLON) @RestController @RequestMapping("api/") public class ApollonConversionResource { diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/web/ApollonDiagramResource.java b/src/main/java/de/tum/cit/aet/artemis/modeling/web/ApollonDiagramResource.java index e1d38a996e49..54d74f28c155 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/web/ApollonDiagramResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/web/ApollonDiagramResource.java @@ -1,6 +1,6 @@ package de.tum.cit.aet.artemis.modeling.web; -import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_APOLLON; import java.net.URI; import java.net.URISyntaxException; @@ -35,7 +35,7 @@ /** * REST controller for managing ApollonDiagram. */ -@Profile(PROFILE_CORE) +@Profile(PROFILE_APOLLON) @RestController @RequestMapping("api/") public class ApollonDiagramResource { diff --git a/src/test/java/de/tum/cit/aet/artemis/connector/apollon/ApollonRequestMockProvider.java b/src/test/java/de/tum/cit/aet/artemis/connector/apollon/ApollonRequestMockProvider.java index 9fc1930f03bd..e78953752827 100644 --- a/src/test/java/de/tum/cit/aet/artemis/connector/apollon/ApollonRequestMockProvider.java +++ b/src/test/java/de/tum/cit/aet/artemis/connector/apollon/ApollonRequestMockProvider.java @@ -1,5 +1,6 @@ package de.tum.cit.aet.artemis.connector.apollon; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_APOLLON; import static org.springframework.test.web.client.match.MockRestRequestMatchers.method; import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo; import static org.springframework.test.web.client.response.MockRestResponseCreators.withException; @@ -21,7 +22,7 @@ import org.springframework.web.client.RestTemplate; @Component -@Profile("apollon") +@Profile(PROFILE_APOLLON) public class ApollonRequestMockProvider { private final RestTemplate restTemplate; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonConversionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonConversionIntegrationTest.java index d95203373779..deaa739c8ab7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonConversionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/modeling/ApollonConversionIntegrationTest.java @@ -20,8 +20,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.connector.apollon.ApollonRequestMockProvider; +import de.tum.cit.aet.artemis.modeling.dto.ApollonModelDTO; import de.tum.cit.aet.artemis.modeling.service.apollon.ApollonConversionService; -import de.tum.cit.aet.artemis.modeling.service.apollon.dto.ApollonModelDTO; class ApollonConversionIntegrationTest extends AbstractSpringIntegrationIndependentTest { From 61e529f328be58495c7edee646b6d2803fea804d Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Wed, 11 Sep 2024 22:25:53 +0200 Subject: [PATCH 30/43] fix base package in DatabaseConfiguration --- .../tum/cit/aet/artemis/core/config/DatabaseConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/DatabaseConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/DatabaseConfiguration.java index 7ac4fa67043b..0bbb7516cc3b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/DatabaseConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/DatabaseConfiguration.java @@ -12,7 +12,7 @@ @Profile(PROFILE_CORE) @Configuration -@EnableJpaRepositories(basePackages = { "de.tum.cit.aet.artemis.*.repository.*" }, repositoryBaseClass = RepositoryImpl.class) +@EnableJpaRepositories(basePackages = { "de.tum.cit.aet.artemis" }, repositoryBaseClass = RepositoryImpl.class) @EnableJpaAuditing(auditorAwareRef = "springSecurityAuditorAware") @EnableTransactionManagement public class DatabaseConfiguration { From 17c5cb50ac8fd023258650315324e0907792df86 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Wed, 11 Sep 2024 22:28:14 +0200 Subject: [PATCH 31/43] make LTI code optional in ExerciseService --- .../artemis/exercise/service/ExerciseService.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseService.java index 63ee9a79e159..816d2bfdb558 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseService.java @@ -98,7 +98,7 @@ public class ExerciseService { private final ResultRepository resultRepository; - private final Lti13ResourceLaunchRepository lti13ResourceLaunchRepository; + private final Optional lti13ResourceLaunchRepository; private final StudentParticipationRepository studentParticipationRepository; @@ -127,7 +127,7 @@ public class ExerciseService { private final GroupNotificationScheduleService groupNotificationScheduleService; public ExerciseService(ExerciseRepository exerciseRepository, AuthorizationCheckService authCheckService, AuditEventRepository auditEventRepository, - TeamRepository teamRepository, ProgrammingExerciseRepository programmingExerciseRepository, Lti13ResourceLaunchRepository lti13ResourceLaunchRepository, + TeamRepository teamRepository, ProgrammingExerciseRepository programmingExerciseRepository, Optional lti13ResourceLaunchRepository, StudentParticipationRepository studentParticipationRepository, ResultRepository resultRepository, SubmissionRepository submissionRepository, ParticipantScoreRepository participantScoreRepository, UserRepository userRepository, ComplaintRepository complaintRepository, TutorLeaderboardService tutorLeaderboardService, ComplaintResponseRepository complaintResponseRepository, GradingCriterionRepository gradingCriterionRepository, @@ -185,10 +185,12 @@ else if (authCheckService.isOnlyStudentInCourse(course, user)) { if (!exercise.isVisibleToStudents()) { continue; } - // students in online courses can only see exercises where the lti resource launch exists, otherwise the result cannot be reported later on - Collection ltiResourceLaunches = lti13ResourceLaunchRepository.findByUserAndExercise(user, exercise); - if (!ltiResourceLaunches.isEmpty()) { - exercisesUserIsAllowedToSee.add(exercise); + if (lti13ResourceLaunchRepository.isPresent()) { + // students in online courses can only see exercises where the lti resource launch exists, otherwise the result cannot be reported later on + Collection ltiResourceLaunches = lti13ResourceLaunchRepository.get().findByUserAndExercise(user, exercise); + if (!ltiResourceLaunches.isEmpty()) { + exercisesUserIsAllowedToSee.add(exercise); + } } } } From 60c507313c90d0b28a8218a5b68e80512399f9e0 Mon Sep 17 00:00:00 2001 From: Maximilian Anzinger Date: Wed, 11 Sep 2024 22:36:14 +0200 Subject: [PATCH 32/43] Adjust architecture tests --- .../artemis/authorization/AuthorizationArchitectureTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationArchitectureTest.java b/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationArchitectureTest.java index d6935ba7b900..4d9a9482250e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationArchitectureTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/authorization/AuthorizationArchitectureTest.java @@ -22,9 +22,9 @@ class AuthorizationArchitectureTest extends AbstractArchitectureTest { - private static final String ARTEMIS_PACKAGE = "de.tum.cit.aet.artemis"; + private static final String ARTEMIS_PACKAGE = "de.tum.cit.aet.artemis.*"; - private static final String REST_BASE_PACKAGE = ARTEMIS_PACKAGE + ".web.rest"; + private static final String REST_BASE_PACKAGE = ARTEMIS_PACKAGE + ".web"; private static final String REST_ADMIN_PACKAGE = REST_BASE_PACKAGE + ".admin"; @@ -80,6 +80,7 @@ void testEnforceAtLeastStudentAnnotations() { rule.check(productionClasses); } + @Disabled // TODO: Enable this test once the restructuring is done @Test void testEnforceNothingAnnotations() { ArchRule rule = methods().that().areAnnotatedWith(EnforceNothing.class).and().areNotAnnotatedWith(ManualConfig.class).should().beDeclaredInClassesThat() From 767dd14a88e407d32c90aade7f97191ccdb36ecc Mon Sep 17 00:00:00 2001 From: Maximilian Anzinger Date: Wed, 11 Sep 2024 22:39:32 +0200 Subject: [PATCH 33/43] Move test repositories into second package --- .../aet/artemis/exam/ExamParticipationIntegrationTest.java | 2 +- .../java/de/tum/cit/aet/artemis/exam/ExamStartTest.java | 2 +- .../cit/aet/artemis/exam/StudentExamIntegrationTest.java | 2 +- .../aet/artemis/exercise/AthenaResourceIntegrationTest.java | 2 +- .../programming/ProgrammingAssessmentIntegrationTest.java | 2 +- .../ProgrammingExerciseIntegrationTestService.java | 2 +- .../programming/ProgrammingExerciseResultTestService.java | 2 +- .../programming/ProgrammingExerciseServiceTest.java | 2 +- .../programming/ProgrammingExerciseTestService.java | 6 +++--- .../programming/ProgrammingExerciseUtilService.java | 4 ++-- ...mingSubmissionAndResultGitlabJenkinsIntegrationTest.java | 2 +- ...rogrammingSubmissionAndResultIntegrationTestService.java | 2 +- .../programming/ProgrammingSubmissionIntegrationTest.java | 2 +- .../cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java | 2 +- .../tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java | 2 +- .../aet/artemis/hestia/TestwiseCoverageIntegrationTest.java | 2 +- .../cit/aet/artemis/localvcci/LocalCIIntegrationTest.java | 2 +- .../cit/aet/artemis/localvcci/LocalVCIntegrationTest.java | 2 +- .../aet/artemis/localvcci/LocalVCLocalCITestService.java | 2 +- .../aet/artemis/participation/ParticipationUtilService.java | 2 +- .../{ => repo}/repository/ParticipationTestRepository.java | 2 +- ...ogrammingExerciseStudentParticipationTestRepository.java | 2 +- .../repository/ProgrammingExerciseTestRepository.java | 2 +- .../repository/ProgrammingSubmissionTestRepository.java | 2 +- .../{ => repo}/repository/StatisticsRepositoryTest.java | 2 +- .../artemis/{ => repo}/repository/UserRepositoryTest.java | 2 +- .../artemis/{ => repo}/repository/UserTestRepository.java | 2 +- .../cit/aet/artemis/service/ParticipationServiceTest.java | 2 +- .../java/de/tum/cit/aet/artemis/user/UserUtilService.java | 2 +- .../de/tum/cit/aet/artemis/util/HestiaUtilTestService.java | 2 +- 30 files changed, 33 insertions(+), 33 deletions(-) rename src/test/java/de/tum/cit/aet/artemis/{ => repo}/repository/ParticipationTestRepository.java (92%) rename src/test/java/de/tum/cit/aet/artemis/{ => repo}/repository/ProgrammingExerciseStudentParticipationTestRepository.java (96%) rename src/test/java/de/tum/cit/aet/artemis/{ => repo}/repository/ProgrammingExerciseTestRepository.java (98%) rename src/test/java/de/tum/cit/aet/artemis/{ => repo}/repository/ProgrammingSubmissionTestRepository.java (99%) rename src/test/java/de/tum/cit/aet/artemis/{ => repo}/repository/StatisticsRepositoryTest.java (99%) rename src/test/java/de/tum/cit/aet/artemis/{ => repo}/repository/UserRepositoryTest.java (98%) rename src/test/java/de/tum/cit/aet/artemis/{ => repo}/repository/UserTestRepository.java (87%) diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java index d4385663a247..deca2ff024f4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java @@ -83,7 +83,7 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.quiz.service.QuizSubmissionService; -import de.tum.cit.aet.artemis.repository.ParticipationTestRepository; +import de.tum.cit.aet.artemis.repo.repository.ParticipationTestRepository; import de.tum.cit.aet.artemis.team.TeamUtilService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.util.ExamPrepareExercisesTestUtil; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java index 738a489715de..4e0d457361b6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java @@ -53,7 +53,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlRepositoryPermission; -import de.tum.cit.aet.artemis.repository.ParticipationTestRepository; +import de.tum.cit.aet.artemis.repo.repository.ParticipationTestRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java index 981bf3f20820..6be7386a0646 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java @@ -128,7 +128,7 @@ import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedText; import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.util.ExamPrepareExercisesTestUtil; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaResourceIntegrationTest.java index d2c25d930d23..885d20c85443 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaResourceIntegrationTest.java @@ -43,7 +43,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java index a1c02ab967d5..0a1d3fd68206 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java @@ -60,7 +60,7 @@ import de.tum.cit.aet.artemis.programming.dto.ResultDTO; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.util.TestResourceUtils; class ProgrammingAssessmentIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java index 05aee46f8ba4..16e044b7fc13 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java @@ -113,7 +113,7 @@ import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlRepositoryPermission; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestRepository; +import de.tum.cit.aet.artemis.repo.repository.ProgrammingExerciseTestRepository; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.GitUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java index 9e9744c5d69b..84389f643580 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java @@ -65,7 +65,7 @@ import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseGradingService; import de.tum.cit.aet.artemis.programming.service.StaticCodeAnalysisService; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.RequestUtilService; import de.tum.cit.aet.artemis.util.TestConstants; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceTest.java index 05da916d397b..250c8cee0560 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceTest.java @@ -14,7 +14,7 @@ import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestRepository; +import de.tum.cit.aet.artemis.repo.repository.ProgrammingExerciseTestRepository; import de.tum.cit.aet.artemis.user.UserUtilService; class ProgrammingExerciseServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java index 3d87def679a1..6dbb29aeed7e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java @@ -143,9 +143,9 @@ import de.tum.cit.aet.artemis.programming.service.jenkins.build_plan.JenkinsBuildPlanUtils; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlRepositoryPermission; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseStudentParticipationTestRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repo.repository.ProgrammingExerciseStudentParticipationTestRepository; +import de.tum.cit.aet.artemis.repo.repository.ProgrammingExerciseTestRepository; +import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.ExamPrepareExercisesTestUtil; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java index 928f580f5e8e..9f956f9dd1df 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java @@ -76,8 +76,8 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.programming.service.GitService; -import de.tum.cit.aet.artemis.repository.ProgrammingExerciseTestRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repo.repository.ProgrammingExerciseTestRepository; +import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; import de.tum.cit.aet.artemis.util.TestConstants; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java index cf31408ba6cd..ce3d8c254870 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java @@ -43,7 +43,7 @@ import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestCaseDTO; import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestCaseDetailMessageDTO; import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestResultsDTO; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; class ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java index 6f4a3406db36..7757b275ecf7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java @@ -22,7 +22,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.util.RequestUtilService; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java index 5329c8357a14..be4b751f008b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java @@ -61,7 +61,7 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.util.TestConstants; import de.tum.cit.aet.artemis.util.TestResourceUtils; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java index 26ce969c4f6b..1162848870de 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java @@ -36,7 +36,7 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintActivationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintRepository; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; class ExerciseHintIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java index 2c39b7a2bffa..892bdd2a0781 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java @@ -38,7 +38,7 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.programming.service.hestia.ExerciseHintService; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.user.UserUtilService; class ExerciseHintServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageIntegrationTest.java index a0dca02af152..ebfe5837031c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageIntegrationTest.java @@ -26,7 +26,7 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageFileReportRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageReportRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.TestwiseCoverageReportEntryRepository; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; class TestwiseCoverageIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java index a54df82a465c..84fada7a699a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java @@ -63,7 +63,7 @@ import de.tum.cit.aet.artemis.programming.service.BuildLogEntryService; import de.tum.cit.aet.artemis.programming.service.ParticipationVcsAccessTokenService; import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCServletService; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.util.LocalRepository; @TestInstance(TestInstance.Lifecycle.PER_CLASS) diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCIntegrationTest.java index 574d6c378628..e271d6842b6d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCIntegrationTest.java @@ -31,7 +31,7 @@ import de.tum.cit.aet.artemis.core.service.ldap.LdapUserDto; import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCRepositoryUri; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.util.LocalRepository; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java index e13d91c8ab3c..b44ce849df2b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java @@ -67,7 +67,7 @@ import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.ParticipationVcsAccessTokenService; import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCRepositoryUri; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.util.LocalRepository; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java index 7f471717d770..2a62a49b3910 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java @@ -66,7 +66,7 @@ import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/repository/ParticipationTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/repo/repository/ParticipationTestRepository.java similarity index 92% rename from src/test/java/de/tum/cit/aet/artemis/repository/ParticipationTestRepository.java rename to src/test/java/de/tum/cit/aet/artemis/repo/repository/ParticipationTestRepository.java index 7447bd3e3885..8dc228309efb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repository/ParticipationTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/repo/repository/ParticipationTestRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.repo.repository; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; diff --git a/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseStudentParticipationTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/repo/repository/ProgrammingExerciseStudentParticipationTestRepository.java similarity index 96% rename from src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseStudentParticipationTestRepository.java rename to src/test/java/de/tum/cit/aet/artemis/repo/repository/ProgrammingExerciseStudentParticipationTestRepository.java index 1dfe149091f1..3a6a3fea30cf 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseStudentParticipationTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/repo/repository/ProgrammingExerciseStudentParticipationTestRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.repo.repository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/repo/repository/ProgrammingExerciseTestRepository.java similarity index 98% rename from src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseTestRepository.java rename to src/test/java/de/tum/cit/aet/artemis/repo/repository/ProgrammingExerciseTestRepository.java index b00d4731f68e..986beaab74a3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingExerciseTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/repo/repository/ProgrammingExerciseTestRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.repo.repository; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; diff --git a/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/repo/repository/ProgrammingSubmissionTestRepository.java similarity index 99% rename from src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionTestRepository.java rename to src/test/java/de/tum/cit/aet/artemis/repo/repository/ProgrammingSubmissionTestRepository.java index 348b0d9263a6..339dbfedca92 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repository/ProgrammingSubmissionTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/repo/repository/ProgrammingSubmissionTestRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.repo.repository; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; diff --git a/src/test/java/de/tum/cit/aet/artemis/repository/StatisticsRepositoryTest.java b/src/test/java/de/tum/cit/aet/artemis/repo/repository/StatisticsRepositoryTest.java similarity index 99% rename from src/test/java/de/tum/cit/aet/artemis/repository/StatisticsRepositoryTest.java rename to src/test/java/de/tum/cit/aet/artemis/repo/repository/StatisticsRepositoryTest.java index c4925febffd0..d1ce9d0a6d03 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repository/StatisticsRepositoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/repo/repository/StatisticsRepositoryTest.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.repo.repository; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; diff --git a/src/test/java/de/tum/cit/aet/artemis/repository/UserRepositoryTest.java b/src/test/java/de/tum/cit/aet/artemis/repo/repository/UserRepositoryTest.java similarity index 98% rename from src/test/java/de/tum/cit/aet/artemis/repository/UserRepositoryTest.java rename to src/test/java/de/tum/cit/aet/artemis/repo/repository/UserRepositoryTest.java index 3cd28165ba9b..9e2836525cc8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repository/UserRepositoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/repo/repository/UserRepositoryTest.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.repo.repository; import static de.tum.cit.aet.artemis.user.UserFactory.USER_PASSWORD; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/de/tum/cit/aet/artemis/repository/UserTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/repo/repository/UserTestRepository.java similarity index 87% rename from src/test/java/de/tum/cit/aet/artemis/repository/UserTestRepository.java rename to src/test/java/de/tum/cit/aet/artemis/repo/repository/UserTestRepository.java index c4f680645bec..2c7963b9353c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repository/UserTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/repo/repository/UserTestRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repository; +package de.tum.cit.aet.artemis.repo.repository; import java.util.Set; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java index f27beb586fb3..509c6e242bf8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java @@ -41,7 +41,7 @@ import de.tum.cit.aet.artemis.programming.repository.BuildLogEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.BuildLogEntryService; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.user.UserUtilService; class ParticipationServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/user/UserUtilService.java b/src/test/java/de/tum/cit/aet/artemis/user/UserUtilService.java index aa71f04fa79c..f617cc40a432 100644 --- a/src/test/java/de/tum/cit/aet/artemis/user/UserUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/UserUtilService.java @@ -26,7 +26,7 @@ import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.service.user.PasswordService; -import de.tum.cit.aet.artemis.repository.UserTestRepository; +import de.tum.cit.aet.artemis.repo.repository.UserTestRepository; /** * Service responsible for initializing the database with specific testdata related to Users for use in integration tests. diff --git a/src/test/java/de/tum/cit/aet/artemis/util/HestiaUtilTestService.java b/src/test/java/de/tum/cit/aet/artemis/util/HestiaUtilTestService.java index b864bf4b9957..9222d5a1a3c3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/util/HestiaUtilTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/HestiaUtilTestService.java @@ -31,7 +31,7 @@ import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.service.GitService; -import de.tum.cit.aet.artemis.repository.ProgrammingSubmissionTestRepository; +import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; /** * Utility service specifically used for testing Hestia related functionality. From 2ada39c1e18dd5ac58a121986f6873ceb3b398b8 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Wed, 11 Sep 2024 23:14:42 +0200 Subject: [PATCH 34/43] use profile constants --- .../aet/artemis/AbstractSpringIntegrationIndependentTest.java | 4 +++- .../artemis/AbstractSpringIntegrationLocalCILocalVCTest.java | 4 +++- .../tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java | 4 ---- .../de/tum/cit/aet/artemis/iris/IrisChatWebsocketTest.java | 2 -- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java index e64ce50b20b9..71258b716ad3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java @@ -1,8 +1,10 @@ package de.tum.cit.aet.artemis; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_AEOLUS; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_APOLLON; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATHENA; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_THEIA; import static tech.jhipster.config.JHipsterConstants.SPRING_PROFILE_TEST; @@ -37,7 +39,7 @@ */ @ResourceLock("AbstractSpringIntegrationIndependentTest") // NOTE: we use a common set of active profiles to reduce the number of application launches during testing. This significantly saves time and memory! -@ActiveProfiles({ SPRING_PROFILE_TEST, "artemis", PROFILE_SCHEDULING, PROFILE_ATHENA, "apollon", "lti", PROFILE_AEOLUS, PROFILE_THEIA, PROFILE_CORE }) +@ActiveProfiles({ SPRING_PROFILE_TEST, "artemis", PROFILE_SCHEDULING, PROFILE_ATHENA, PROFILE_APOLLON, PROFILE_IRIS, PROFILE_AEOLUS, PROFILE_THEIA, PROFILE_CORE }) @TestPropertySource(properties = { "artemis.user-management.use-external=false" }) public abstract class AbstractSpringIntegrationIndependentTest extends AbstractArtemisIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java index 29b33155104e..e21cb399a168 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java @@ -1,7 +1,9 @@ package de.tum.cit.aet.artemis; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_AEOLUS; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALCI; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LTI; @@ -60,7 +62,7 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT) @ResourceLock("AbstractSpringIntegrationLocalCILocalVCTest") // NOTE: we use a common set of active profiles to reduce the number of application launches during testing. This significantly saves time and memory! -@ActiveProfiles({ SPRING_PROFILE_TEST, "artemis", PROFILE_CORE, PROFILE_LOCALCI, PROFILE_LOCALVC, PROFILE_SCHEDULING, "ldap-only", PROFILE_LTI, "aeolus", "iris", +@ActiveProfiles({ SPRING_PROFILE_TEST, "artemis", PROFILE_CORE, PROFILE_LOCALCI, PROFILE_LOCALVC, PROFILE_SCHEDULING, "ldap-only", PROFILE_LTI, PROFILE_AEOLUS, PROFILE_IRIS, PROFILE_BUILDAGENT }) // Note: the server.port property must correspond to the port used in the artemis.version-control.url property. diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java index f91149d370be..3f2a4f8d95f9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/AbstractIrisIntegrationTest.java @@ -23,7 +23,6 @@ import de.tum.cit.aet.artemis.iris.domain.IrisTemplate; import de.tum.cit.aet.artemis.iris.domain.settings.IrisSubSettings; import de.tum.cit.aet.artemis.iris.repository.IrisSettingsRepository; -import de.tum.cit.aet.artemis.iris.repository.IrisTemplateRepository; import de.tum.cit.aet.artemis.iris.service.settings.IrisSettingsService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; @@ -33,9 +32,6 @@ public abstract class AbstractIrisIntegrationTest extends AbstractSpringIntegrat @Autowired protected IrisSettingsService irisSettingsService; - @Autowired - protected IrisTemplateRepository irisTemplateRepository; - @Autowired @Qualifier("irisRequestMockProvider") protected IrisRequestMockProvider irisRequestMockProvider; diff --git a/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatWebsocketTest.java b/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatWebsocketTest.java index ecff837660a5..03845b59efb7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatWebsocketTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/iris/IrisChatWebsocketTest.java @@ -11,7 +11,6 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import org.springframework.test.context.ActiveProfiles; import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.core.domain.Course; @@ -22,7 +21,6 @@ import de.tum.cit.aet.artemis.iris.service.websocket.IrisChatWebsocketService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; -@ActiveProfiles("iris") class IrisChatWebsocketTest extends AbstractIrisIntegrationTest { private static final String TEST_PREFIX = "irischatwebsocketintegration"; From 79e94e0492267b796b4ce1ff2440640d72997286 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Wed, 11 Sep 2024 23:26:48 +0200 Subject: [PATCH 35/43] move online course configuration repository to tests --- .../de/tum/cit/aet/artemis/OAuth2JWKSIntegrationTest.java | 2 +- .../de/tum/cit/aet/artemis/course/CourseTestService.java | 2 +- .../repository/OnlineCourseConfigurationRepository.java | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) rename src/{main/java/de/tum/cit/aet/artemis/lti => test/java/de/tum/cit/aet/artemis/repo}/repository/OnlineCourseConfigurationRepository.java (72%) diff --git a/src/test/java/de/tum/cit/aet/artemis/OAuth2JWKSIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/OAuth2JWKSIntegrationTest.java index 7a86c2f448aa..0d9fd4ecc628 100644 --- a/src/test/java/de/tum/cit/aet/artemis/OAuth2JWKSIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/OAuth2JWKSIntegrationTest.java @@ -14,7 +14,7 @@ import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; -import de.tum.cit.aet.artemis.lti.repository.OnlineCourseConfigurationRepository; +import de.tum.cit.aet.artemis.repo.repository.OnlineCourseConfigurationRepository; class OAuth2JWKSIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java b/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java index a322be8f61ab..e3f6feb03c18 100644 --- a/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java @@ -141,7 +141,6 @@ import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; -import de.tum.cit.aet.artemis.lti.repository.OnlineCourseConfigurationRepository; import de.tum.cit.aet.artemis.modeling.domain.ModelingExercise; import de.tum.cit.aet.artemis.modeling.domain.ModelingSubmission; import de.tum.cit.aet.artemis.modeling.repository.ModelingExerciseRepository; @@ -155,6 +154,7 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; +import de.tum.cit.aet.artemis.repo.repository.OnlineCourseConfigurationRepository; import de.tum.cit.aet.artemis.team.TeamUtilService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/repository/OnlineCourseConfigurationRepository.java b/src/test/java/de/tum/cit/aet/artemis/repo/repository/OnlineCourseConfigurationRepository.java similarity index 72% rename from src/main/java/de/tum/cit/aet/artemis/lti/repository/OnlineCourseConfigurationRepository.java rename to src/test/java/de/tum/cit/aet/artemis/repo/repository/OnlineCourseConfigurationRepository.java index e3c0a74e2fca..4a348b85ea7a 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/repository/OnlineCourseConfigurationRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/repo/repository/OnlineCourseConfigurationRepository.java @@ -1,8 +1,5 @@ -package de.tum.cit.aet.artemis.lti.repository; +package de.tum.cit.aet.artemis.repo.repository; -import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LTI; - -import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; @@ -11,7 +8,6 @@ /** * Spring Data JPA repository for the OnlineCourseConfiguration entity. */ -@Profile(PROFILE_LTI) @Repository public interface OnlineCourseConfigurationRepository extends ArtemisJpaRepository { // This interface is intentionally left blank. Spring Data JPA generates the implementation at runtime. From 0a613cdb1d9ba519b5b6afeca4e08e4d10454763 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Wed, 11 Sep 2024 23:33:34 +0200 Subject: [PATCH 36/43] define base repo baths explicitly --- .../cit/aet/artemis/core/config/DatabaseConfiguration.java | 7 ++++++- .../de/tum/cit/aet/artemis/OAuth2JWKSIntegrationTest.java | 2 +- .../repository/OnlineCourseConfigurationRepository.java | 2 +- .../repository/ParticipationTestRepository.java | 2 +- ...grammingExerciseStudentParticipationTestRepository.java | 2 +- .../repository/ProgrammingExerciseTestRepository.java | 2 +- .../repository/ProgrammingSubmissionTestRepository.java | 2 +- .../repository/StatisticsRepositoryTest.java | 4 +--- .../{repo => core}/repository/UserRepositoryTest.java | 3 +-- .../{repo => core}/repository/UserTestRepository.java | 2 +- .../de/tum/cit/aet/artemis/course/CourseTestService.java | 2 +- .../aet/artemis/exam/ExamParticipationIntegrationTest.java | 2 +- .../java/de/tum/cit/aet/artemis/exam/ExamStartTest.java | 2 +- .../cit/aet/artemis/exam/StudentExamIntegrationTest.java | 2 +- .../artemis/exercise/AthenaResourceIntegrationTest.java | 2 +- .../programming/ProgrammingAssessmentIntegrationTest.java | 2 +- .../ProgrammingExerciseIntegrationTestService.java | 2 +- .../programming/ProgrammingExerciseResultTestService.java | 2 +- .../programming/ProgrammingExerciseServiceTest.java | 2 +- .../programming/ProgrammingExerciseTestService.java | 6 +++--- .../programming/ProgrammingExerciseUtilService.java | 4 ++-- ...ingSubmissionAndResultGitlabJenkinsIntegrationTest.java | 2 +- ...ogrammingSubmissionAndResultIntegrationTestService.java | 2 +- .../programming/ProgrammingSubmissionIntegrationTest.java | 2 +- .../aet/artemis/hestia/ExerciseHintIntegrationTest.java | 2 +- .../cit/aet/artemis/hestia/ExerciseHintServiceTest.java | 2 +- .../artemis/hestia/TestwiseCoverageIntegrationTest.java | 2 +- .../cit/aet/artemis/localvcci/LocalCIIntegrationTest.java | 2 +- .../cit/aet/artemis/localvcci/LocalVCIntegrationTest.java | 2 +- .../aet/artemis/localvcci/LocalVCLocalCITestService.java | 2 +- .../artemis/participation/ParticipationUtilService.java | 2 +- .../cit/aet/artemis/service/ParticipationServiceTest.java | 2 +- .../java/de/tum/cit/aet/artemis/user/UserUtilService.java | 2 +- .../de/tum/cit/aet/artemis/util/HestiaUtilTestService.java | 2 +- 34 files changed, 42 insertions(+), 40 deletions(-) rename src/test/java/de/tum/cit/aet/artemis/{repo => core}/repository/OnlineCourseConfigurationRepository.java (91%) rename src/test/java/de/tum/cit/aet/artemis/{repo => core}/repository/ParticipationTestRepository.java (92%) rename src/test/java/de/tum/cit/aet/artemis/{repo => core}/repository/ProgrammingExerciseStudentParticipationTestRepository.java (96%) rename src/test/java/de/tum/cit/aet/artemis/{repo => core}/repository/ProgrammingExerciseTestRepository.java (98%) rename src/test/java/de/tum/cit/aet/artemis/{repo => core}/repository/ProgrammingSubmissionTestRepository.java (99%) rename src/test/java/de/tum/cit/aet/artemis/{repo => core}/repository/StatisticsRepositoryTest.java (97%) rename src/test/java/de/tum/cit/aet/artemis/{repo => core}/repository/UserRepositoryTest.java (97%) rename src/test/java/de/tum/cit/aet/artemis/{repo => core}/repository/UserTestRepository.java (87%) diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/DatabaseConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/DatabaseConfiguration.java index 0bbb7516cc3b..c099dcda10c1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/DatabaseConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/DatabaseConfiguration.java @@ -12,7 +12,12 @@ @Profile(PROFILE_CORE) @Configuration -@EnableJpaRepositories(basePackages = { "de.tum.cit.aet.artemis" }, repositoryBaseClass = RepositoryImpl.class) +@EnableJpaRepositories(basePackages = { "de.tum.cit.aet.artemis.assessment.repository", "de.tum.cit.aet.artemis.atlas.repository", + "de.tum.cit.aet.artemis.communication.repository", "de.tum.cit.aet.artemis.core.repository", "de.tum.cit.aet.artemis.exam.repository", + "de.tum.cit.aet.artemis.exercise.repository", "de.tum.cit.aet.artemis.fileupload.repository", "de.tum.cit.aet.artemis.iris.repository", + "de.tum.cit.aet.artemis.lecture.repository", "de.tum.cit.aet.artemis.lti.repository", "de.tum.cit.aet.artemis.modeling.repository", + "de.tum.cit.aet.artemis.plagiarism.repository", "de.tum.cit.aet.artemis.programming.repository", "de.tum.cit.aet.artemis.quiz.repository", + "de.tum.cit.aet.artemis.text.repository", "de.tum.cit.aet.artemis.tutorialgroup.repository" }, repositoryBaseClass = RepositoryImpl.class) @EnableJpaAuditing(auditorAwareRef = "springSecurityAuditorAware") @EnableTransactionManagement public class DatabaseConfiguration { diff --git a/src/test/java/de/tum/cit/aet/artemis/OAuth2JWKSIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/OAuth2JWKSIntegrationTest.java index 0d9fd4ecc628..a0abcae7f10a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/OAuth2JWKSIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/OAuth2JWKSIntegrationTest.java @@ -11,10 +11,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.repository.OnlineCourseConfigurationRepository; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; -import de.tum.cit.aet.artemis.repo.repository.OnlineCourseConfigurationRepository; class OAuth2JWKSIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/repo/repository/OnlineCourseConfigurationRepository.java b/src/test/java/de/tum/cit/aet/artemis/core/repository/OnlineCourseConfigurationRepository.java similarity index 91% rename from src/test/java/de/tum/cit/aet/artemis/repo/repository/OnlineCourseConfigurationRepository.java rename to src/test/java/de/tum/cit/aet/artemis/core/repository/OnlineCourseConfigurationRepository.java index 4a348b85ea7a..397afaf3c799 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repo/repository/OnlineCourseConfigurationRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/repository/OnlineCourseConfigurationRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repo.repository; +package de.tum.cit.aet.artemis.core.repository; import org.springframework.stereotype.Repository; diff --git a/src/test/java/de/tum/cit/aet/artemis/repo/repository/ParticipationTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/core/repository/ParticipationTestRepository.java similarity index 92% rename from src/test/java/de/tum/cit/aet/artemis/repo/repository/ParticipationTestRepository.java rename to src/test/java/de/tum/cit/aet/artemis/core/repository/ParticipationTestRepository.java index 8dc228309efb..a178f9203186 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repo/repository/ParticipationTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/repository/ParticipationTestRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repo.repository; +package de.tum.cit.aet.artemis.core.repository; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; diff --git a/src/test/java/de/tum/cit/aet/artemis/repo/repository/ProgrammingExerciseStudentParticipationTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/core/repository/ProgrammingExerciseStudentParticipationTestRepository.java similarity index 96% rename from src/test/java/de/tum/cit/aet/artemis/repo/repository/ProgrammingExerciseStudentParticipationTestRepository.java rename to src/test/java/de/tum/cit/aet/artemis/core/repository/ProgrammingExerciseStudentParticipationTestRepository.java index 3a6a3fea30cf..ed19d94e1983 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repo/repository/ProgrammingExerciseStudentParticipationTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/repository/ProgrammingExerciseStudentParticipationTestRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repo.repository; +package de.tum.cit.aet.artemis.core.repository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/src/test/java/de/tum/cit/aet/artemis/repo/repository/ProgrammingExerciseTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/core/repository/ProgrammingExerciseTestRepository.java similarity index 98% rename from src/test/java/de/tum/cit/aet/artemis/repo/repository/ProgrammingExerciseTestRepository.java rename to src/test/java/de/tum/cit/aet/artemis/core/repository/ProgrammingExerciseTestRepository.java index 986beaab74a3..3a3cb2dd016b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repo/repository/ProgrammingExerciseTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/repository/ProgrammingExerciseTestRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repo.repository; +package de.tum.cit.aet.artemis.core.repository; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; diff --git a/src/test/java/de/tum/cit/aet/artemis/repo/repository/ProgrammingSubmissionTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/core/repository/ProgrammingSubmissionTestRepository.java similarity index 99% rename from src/test/java/de/tum/cit/aet/artemis/repo/repository/ProgrammingSubmissionTestRepository.java rename to src/test/java/de/tum/cit/aet/artemis/core/repository/ProgrammingSubmissionTestRepository.java index 339dbfedca92..6573757e1fab 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repo/repository/ProgrammingSubmissionTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/repository/ProgrammingSubmissionTestRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repo.repository; +package de.tum.cit.aet.artemis.core.repository; import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD; diff --git a/src/test/java/de/tum/cit/aet/artemis/repo/repository/StatisticsRepositoryTest.java b/src/test/java/de/tum/cit/aet/artemis/core/repository/StatisticsRepositoryTest.java similarity index 97% rename from src/test/java/de/tum/cit/aet/artemis/repo/repository/StatisticsRepositoryTest.java rename to src/test/java/de/tum/cit/aet/artemis/core/repository/StatisticsRepositoryTest.java index d1ce9d0a6d03..5d7aa5b1ca23 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repo/repository/StatisticsRepositoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/repository/StatisticsRepositoryTest.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repo.repository; +package de.tum.cit.aet.artemis.core.repository; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -21,8 +21,6 @@ import de.tum.cit.aet.artemis.core.domain.SpanType; import de.tum.cit.aet.artemis.core.domain.StatisticsView; import de.tum.cit.aet.artemis.core.dto.StatisticsEntry; -import de.tum.cit.aet.artemis.core.repository.PersistenceAuditEventRepository; -import de.tum.cit.aet.artemis.core.repository.StatisticsRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/repo/repository/UserRepositoryTest.java b/src/test/java/de/tum/cit/aet/artemis/core/repository/UserRepositoryTest.java similarity index 97% rename from src/test/java/de/tum/cit/aet/artemis/repo/repository/UserRepositoryTest.java rename to src/test/java/de/tum/cit/aet/artemis/core/repository/UserRepositoryTest.java index 9e2836525cc8..dea055b72e4a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repo/repository/UserRepositoryTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/repository/UserRepositoryTest.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repo.repository; +package de.tum.cit.aet.artemis.core.repository; import static de.tum.cit.aet.artemis.user.UserFactory.USER_PASSWORD; import static org.assertj.core.api.Assertions.assertThat; @@ -14,7 +14,6 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.core.domain.Authority; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.user.PasswordService; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/repo/repository/UserTestRepository.java b/src/test/java/de/tum/cit/aet/artemis/core/repository/UserTestRepository.java similarity index 87% rename from src/test/java/de/tum/cit/aet/artemis/repo/repository/UserTestRepository.java rename to src/test/java/de/tum/cit/aet/artemis/core/repository/UserTestRepository.java index 2c7963b9353c..4e733c14d095 100644 --- a/src/test/java/de/tum/cit/aet/artemis/repo/repository/UserTestRepository.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/repository/UserTestRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.repo.repository; +package de.tum.cit.aet.artemis.core.repository; import java.util.Set; diff --git a/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java b/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java index e3f6feb03c18..9bc46ee31d1e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/course/CourseTestService.java @@ -105,6 +105,7 @@ import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.CustomAuditEventRepository; +import de.tum.cit.aet.artemis.core.repository.OnlineCourseConfigurationRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.service.FilePathService; @@ -154,7 +155,6 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizMode; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; -import de.tum.cit.aet.artemis.repo.repository.OnlineCourseConfigurationRepository; import de.tum.cit.aet.artemis.team.TeamUtilService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java index deca2ff024f4..46fdd45c4728 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamParticipationIntegrationTest.java @@ -49,6 +49,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.dto.DueDateStat; import de.tum.cit.aet.artemis.core.dto.StatsForDashboardDTO; +import de.tum.cit.aet.artemis.core.repository.ParticipationTestRepository; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExamUser; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; @@ -83,7 +84,6 @@ import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; import de.tum.cit.aet.artemis.quiz.service.QuizSubmissionService; -import de.tum.cit.aet.artemis.repo.repository.ParticipationTestRepository; import de.tum.cit.aet.artemis.team.TeamUtilService; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.util.ExamPrepareExercisesTestUtil; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java index 4e0d457361b6..af6ad0bc8697 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/ExamStartTest.java @@ -30,6 +30,7 @@ import de.tum.cit.aet.artemis.assessment.service.ParticipantScoreScheduleService; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.repository.ParticipationTestRepository; import de.tum.cit.aet.artemis.course.CourseUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; @@ -53,7 +54,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlRepositoryPermission; -import de.tum.cit.aet.artemis.repo.repository.ParticipationTestRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.user.UserUtilService; diff --git a/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java index 6be7386a0646..f2620706e1f0 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exam/StudentExamIntegrationTest.java @@ -72,6 +72,7 @@ import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.util.RoundingUtil; import de.tum.cit.aet.artemis.exam.domain.Exam; @@ -128,7 +129,6 @@ import de.tum.cit.aet.artemis.quiz.domain.ShortAnswerSubmittedText; import de.tum.cit.aet.artemis.quiz.domain.SubmittedAnswer; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; -import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.util.ExamPrepareExercisesTestUtil; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaResourceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaResourceIntegrationTest.java index 885d20c85443..64bdfc14f6c3 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaResourceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/AthenaResourceIntegrationTest.java @@ -29,6 +29,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.modeling.ModelingExerciseUtilService; @@ -43,7 +44,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java index 0a1d3fd68206..c0f819a98055 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java @@ -40,6 +40,7 @@ import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.ExerciseGroup; @@ -60,7 +61,6 @@ import de.tum.cit.aet.artemis.programming.dto.ResultDTO; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseBuildConfigRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.util.TestResourceUtils; class ProgrammingAssessmentIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java index 16e044b7fc13..7374b74962f4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java @@ -74,6 +74,7 @@ import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.dto.RepositoryExportOptionsDTO; import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.ProgrammingExerciseTestRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.course.CourseUtilService; @@ -113,7 +114,6 @@ import de.tum.cit.aet.artemis.programming.service.ci.ContinuousIntegrationService; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlRepositoryPermission; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; -import de.tum.cit.aet.artemis.repo.repository.ProgrammingExerciseTestRepository; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.GitUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java index 84389f643580..2bf82cd237ad 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseResultTestService.java @@ -41,6 +41,7 @@ import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.core.service.messaging.InstanceMessageSendService; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.hestia.TestwiseCoverageTestUtil; @@ -65,7 +66,6 @@ import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.ProgrammingExerciseGradingService; import de.tum.cit.aet.artemis.programming.service.StaticCodeAnalysisService; -import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.RequestUtilService; import de.tum.cit.aet.artemis.util.TestConstants; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceTest.java index 250c8cee0560..8c2240261dbe 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseServiceTest.java @@ -11,10 +11,10 @@ import org.springframework.security.test.context.support.WithMockUser; import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; +import de.tum.cit.aet.artemis.core.repository.ProgrammingExerciseTestRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repo.repository.ProgrammingExerciseTestRepository; import de.tum.cit.aet.artemis.user.UserUtilService; class ProgrammingExerciseServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java index 6dbb29aeed7e..f3b63117216d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseTestService.java @@ -79,6 +79,9 @@ import de.tum.cit.aet.artemis.core.exception.GitException; import de.tum.cit.aet.artemis.core.exception.VersionControlException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.ProgrammingExerciseStudentParticipationTestRepository; +import de.tum.cit.aet.artemis.core.repository.ProgrammingExerciseTestRepository; +import de.tum.cit.aet.artemis.core.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.service.FilePathService; @@ -143,9 +146,6 @@ import de.tum.cit.aet.artemis.programming.service.jenkins.build_plan.JenkinsBuildPlanUtils; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlRepositoryPermission; import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; -import de.tum.cit.aet.artemis.repo.repository.ProgrammingExerciseStudentParticipationTestRepository; -import de.tum.cit.aet.artemis.repo.repository.ProgrammingExerciseTestRepository; -import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.user.UserFactory; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.ExamPrepareExercisesTestUtil; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java index 9f956f9dd1df..15c74ce9a77e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingExerciseUtilService.java @@ -33,6 +33,8 @@ import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.repository.CourseRepository; +import de.tum.cit.aet.artemis.core.repository.ProgrammingExerciseTestRepository; +import de.tum.cit.aet.artemis.core.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.course.CourseFactory; import de.tum.cit.aet.artemis.exam.ExamUtilService; import de.tum.cit.aet.artemis.exam.domain.Exam; @@ -76,8 +78,6 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseSolutionEntryRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.programming.service.GitService; -import de.tum.cit.aet.artemis.repo.repository.ProgrammingExerciseTestRepository; -import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.user.UserUtilService; import de.tum.cit.aet.artemis.util.LocalRepository; import de.tum.cit.aet.artemis.util.TestConstants; diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java index ce3d8c254870..e7ca2712bf24 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java @@ -29,6 +29,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationJenkinsGitlabTest; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -43,7 +44,6 @@ import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestCaseDTO; import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestCaseDetailMessageDTO; import de.tum.cit.aet.artemis.programming.service.ci.notification.dto.TestResultsDTO; -import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; class ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java index 7757b275ecf7..91becee79787 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java @@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.domain.Submission; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; @@ -22,7 +23,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseParticipation; import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; -import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.util.RequestUtilService; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java index be4b751f008b..a63df7801cdd 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java @@ -44,6 +44,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.ContinuousIntegrationException; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; +import de.tum.cit.aet.artemis.core.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; @@ -61,7 +62,6 @@ import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; -import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.util.TestConstants; import de.tum.cit.aet.artemis.util.TestResourceUtils; diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java index 1162848870de..793bdfe13ae4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintIntegrationTest.java @@ -22,6 +22,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -36,7 +37,6 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintActivationRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.ExerciseHintRepository; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; -import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; class ExerciseHintIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java index 892bdd2a0781..7ac7404c08e9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/ExerciseHintServiceTest.java @@ -21,6 +21,7 @@ import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; @@ -38,7 +39,6 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.ProgrammingExerciseTaskRepository; import de.tum.cit.aet.artemis.programming.service.hestia.ExerciseHintService; import de.tum.cit.aet.artemis.programming.service.hestia.ProgrammingExerciseTaskService; -import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.user.UserUtilService; class ExerciseHintServiceTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageIntegrationTest.java index ebfe5837031c..49c080170e7f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/hestia/TestwiseCoverageIntegrationTest.java @@ -13,6 +13,7 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseTestCase; @@ -26,7 +27,6 @@ import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageFileReportRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.CoverageReportRepository; import de.tum.cit.aet.artemis.programming.repository.hestia.TestwiseCoverageReportEntryRepository; -import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; class TestwiseCoverageIntegrationTest extends AbstractSpringIntegrationIndependentTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java index 84fada7a699a..10fea95376be 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalCIIntegrationTest.java @@ -53,6 +53,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.buildagent.dto.ResultBuildJob; import de.tum.cit.aet.artemis.core.exception.VersionControlException; +import de.tum.cit.aet.artemis.core.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExerciseStudentParticipation; @@ -63,7 +64,6 @@ import de.tum.cit.aet.artemis.programming.service.BuildLogEntryService; import de.tum.cit.aet.artemis.programming.service.ParticipationVcsAccessTokenService; import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCServletService; -import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.util.LocalRepository; @TestInstance(TestInstance.Lifecycle.PER_CLASS) diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCIntegrationTest.java index e271d6842b6d..7ff35bbb8939 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCIntegrationTest.java @@ -29,9 +29,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; +import de.tum.cit.aet.artemis.core.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.core.service.ldap.LdapUserDto; import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCRepositoryUri; -import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.util.LocalRepository; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java index b44ce849df2b..43daf2171dbf 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCLocalCITestService.java @@ -56,6 +56,7 @@ import de.tum.cit.aet.artemis.assessment.domain.Visibility; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.participation.ParticipationUtilService; import de.tum.cit.aet.artemis.programming.domain.ParticipationVCSAccessToken; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; @@ -67,7 +68,6 @@ import de.tum.cit.aet.artemis.programming.service.GitService; import de.tum.cit.aet.artemis.programming.service.ParticipationVcsAccessTokenService; import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCRepositoryUri; -import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.util.LocalRepository; /** diff --git a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java index 2a62a49b3910..f9c92503c35b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/participation/ParticipationUtilService.java @@ -36,6 +36,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.Language; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.exercise.GradingCriterionUtil; import de.tum.cit.aet.artemis.exercise.domain.Exercise; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; @@ -66,7 +67,6 @@ import de.tum.cit.aet.artemis.programming.service.vcs.VersionControlService; import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.domain.QuizSubmission; -import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.text.domain.TextExercise; import de.tum.cit.aet.artemis.text.domain.TextSubmission; import de.tum.cit.aet.artemis.text.repository.TextSubmissionRepository; diff --git a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java index 509c6e242bf8..7ba508ff7fef 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/ParticipationServiceTest.java @@ -24,6 +24,7 @@ import de.tum.cit.aet.artemis.assessment.web.ResultResource; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.exercise.ExerciseUtilService; import de.tum.cit.aet.artemis.exercise.domain.Exercise; @@ -41,7 +42,6 @@ import de.tum.cit.aet.artemis.programming.repository.BuildLogEntryRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseRepository; import de.tum.cit.aet.artemis.programming.service.BuildLogEntryService; -import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.user.UserUtilService; class ParticipationServiceTest extends AbstractSpringIntegrationJenkinsGitlabTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/user/UserUtilService.java b/src/test/java/de/tum/cit/aet/artemis/user/UserUtilService.java index f617cc40a432..7add515fd2fe 100644 --- a/src/test/java/de/tum/cit/aet/artemis/user/UserUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/user/UserUtilService.java @@ -24,9 +24,9 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.AuthorityRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; +import de.tum.cit.aet.artemis.core.repository.UserTestRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.service.user.PasswordService; -import de.tum.cit.aet.artemis.repo.repository.UserTestRepository; /** * Service responsible for initializing the database with specific testdata related to Users for use in integration tests. diff --git a/src/test/java/de/tum/cit/aet/artemis/util/HestiaUtilTestService.java b/src/test/java/de/tum/cit/aet/artemis/util/HestiaUtilTestService.java index 9222d5a1a3c3..deb7be323835 100644 --- a/src/test/java/de/tum/cit/aet/artemis/util/HestiaUtilTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/HestiaUtilTestService.java @@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.tum.cit.aet.artemis.core.repository.ProgrammingSubmissionTestRepository; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; import de.tum.cit.aet.artemis.exercise.programming.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.participation.ParticipationFactory; @@ -31,7 +32,6 @@ import de.tum.cit.aet.artemis.programming.repository.SolutionProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.repository.TemplateProgrammingExerciseParticipationRepository; import de.tum.cit.aet.artemis.programming.service.GitService; -import de.tum.cit.aet.artemis.repo.repository.ProgrammingSubmissionTestRepository; /** * Utility service specifically used for testing Hestia related functionality. From 0916b9eeb984fb7a8a7515e81edc872d733f3b10 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Thu, 12 Sep 2024 08:36:59 +0200 Subject: [PATCH 37/43] Avoid confusion when scanning for Ldap repositories --- .../artemis/core/repository/{ => ldap}/LdapUserRepository.java | 2 +- .../de/tum/cit/aet/artemis/core/service/ldap/LdapConfig.java | 2 +- .../tum/cit/aet/artemis/core/service/ldap/LdapUserService.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename src/main/java/de/tum/cit/aet/artemis/core/repository/{ => ldap}/LdapUserRepository.java (86%) diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/LdapUserRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/ldap/LdapUserRepository.java similarity index 86% rename from src/main/java/de/tum/cit/aet/artemis/core/repository/LdapUserRepository.java rename to src/main/java/de/tum/cit/aet/artemis/core/repository/ldap/LdapUserRepository.java index 46df9dc0fbc1..90ec1ec34476 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/LdapUserRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/ldap/LdapUserRepository.java @@ -1,4 +1,4 @@ -package de.tum.cit.aet.artemis.core.repository; +package de.tum.cit.aet.artemis.core.repository.ldap; import org.springframework.context.annotation.Profile; import org.springframework.data.ldap.repository.LdapRepository; diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/ldap/LdapConfig.java b/src/main/java/de/tum/cit/aet/artemis/core/service/ldap/LdapConfig.java index c32d570ba2f9..a06e134e1f79 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/ldap/LdapConfig.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/ldap/LdapConfig.java @@ -10,7 +10,7 @@ @Configuration @Profile("ldap | ldap-only") -@EnableLdapRepositories +@EnableLdapRepositories(basePackages = "de.tum.cit.aet.artemis.core.repository.ldap") public class LdapConfig { @Value("${artemis.user-management.ldap.url}") diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/ldap/LdapUserService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/ldap/LdapUserService.java index cc13c192876a..e80b27ae2b13 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/ldap/LdapUserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/ldap/LdapUserService.java @@ -19,7 +19,7 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.repository.LdapUserRepository; +import de.tum.cit.aet.artemis.core.repository.ldap.LdapUserRepository; @Service @Profile("ldap | ldap-only") From 64025717373dfae931617aed0c7f198ac63a3cec Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Thu, 12 Sep 2024 08:50:16 +0200 Subject: [PATCH 38/43] fix test configuration issues --- docs/dev/guidelines/server-tests.rst | 2 +- .../java/de/tum/cit/aet/artemis/core/config/Constants.java | 5 +++++ src/main/resources/config/application-buildagent.yml | 3 +++ .../AbstractSpringIntegrationGitlabCIGitlabSamlTest.java | 4 +++- .../artemis/AbstractSpringIntegrationIndependentTest.java | 3 ++- .../artemis/AbstractSpringIntegrationJenkinsGitlabTest.java | 5 ++++- .../AbstractSpringIntegrationLocalCILocalVCTest.java | 6 ++++-- .../aet/artemis/localvcci/LocalVCInfoContributorTest.java | 3 ++- src/test/resources/config/application-buildagent.yml | 2 ++ .../{de/tum/in/www1/artemis => }/config/application-dev.yml | 0 .../tum/in/www1/artemis/config/application-buildagent.yml | 0 11 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 src/test/resources/config/application-buildagent.yml rename src/test/resources/{de/tum/in/www1/artemis => }/config/application-dev.yml (100%) delete mode 100644 src/test/resources/de/tum/in/www1/artemis/config/application-buildagent.yml diff --git a/docs/dev/guidelines/server-tests.rst b/docs/dev/guidelines/server-tests.rst index 58af074553a3..1e95860b8064 100644 --- a/docs/dev/guidelines/server-tests.rst +++ b/docs/dev/guidelines/server-tests.rst @@ -219,7 +219,7 @@ the name of the test group (matching the ``abstract`` base class name) as a para @Execution(ExecutionMode.CONCURRENT) @ResourceLock("AbstractSpringIntegrationIndependentTest") @AutoConfigureEmbeddedDatabase - @ActiveProfiles({ SPRING_PROFILE_TEST, "artemis", PROFILE_SCHEDULING, PROFILE_IRIS }) + @ActiveProfiles({ SPRING_PROFILE_TEST, PROFILE_ARTEMIS, PROFILE_SCHEDULING, PROFILE_IRIS }) @TestPropertySource(properties = { "artemis.user-management.use-external=false" }) public abstract class AbstractSpringIntegrationIndependentTest extends AbstractArtemisIntegrationTest { ... } diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java b/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java index 4bed875ddaea..36839d324440 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/Constants.java @@ -297,6 +297,11 @@ public final class Constants { */ public static final String PROFILE_BUILDAGENT = "buildagent"; + /** + * The name of the Spring profile used for Artemis functionality. + */ + public static final String PROFILE_ARTEMIS = "artemis"; + /** * The name of the Spring profile used for Artemis core functionality. */ diff --git a/src/main/resources/config/application-buildagent.yml b/src/main/resources/config/application-buildagent.yml index 0b14ddf1f284..b013910100e5 100644 --- a/src/main/resources/config/application-buildagent.yml +++ b/src/main/resources/config/application-buildagent.yml @@ -1,5 +1,8 @@ # =================================================================== # Build Agent specific properties: this file will only be loaded during startup if the profile buildagent is active +# NOTE: to keep the build agent as lightweight as possible, we disable all unnecessary features here, in particular Hibernate and DataSource +# This means that the build agent will not be able to access the database, and will not be able to run any tests that require a database connection +# For a single node environment, you must define the profile "buildagent" before the profile "core" when starting the Artemis service # # This configuration overrides the application.yml file. # =================================================================== diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java index fc28b43216aa..a59a8a81815e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationGitlabCIGitlabSamlTest.java @@ -1,6 +1,8 @@ package de.tum.cit.aet.artemis; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ARTEMIS; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LTI; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyString; @@ -46,7 +48,7 @@ @ResourceLock("AbstractSpringIntegrationGitlabCIGitlabSamlTest") // NOTE: we use a common set of active profiles to reduce the number of application launches during testing. This significantly saves time and memory! -@ActiveProfiles({ SPRING_PROFILE_TEST, "artemis", "gitlabci", "gitlab", "saml2", PROFILE_SCHEDULING, "lti", PROFILE_CORE }) +@ActiveProfiles({ SPRING_PROFILE_TEST, PROFILE_ARTEMIS, PROFILE_CORE, "gitlabci", "gitlab", "saml2", PROFILE_SCHEDULING, PROFILE_LTI }) @TestPropertySource(properties = { "artemis.user-management.use-external=false" }) public abstract class AbstractSpringIntegrationGitlabCIGitlabSamlTest extends AbstractArtemisIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java index 71258b716ad3..e4a7ad7bbf52 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java @@ -2,6 +2,7 @@ import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_AEOLUS; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_APOLLON; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ARTEMIS; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATHENA; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; @@ -39,7 +40,7 @@ */ @ResourceLock("AbstractSpringIntegrationIndependentTest") // NOTE: we use a common set of active profiles to reduce the number of application launches during testing. This significantly saves time and memory! -@ActiveProfiles({ SPRING_PROFILE_TEST, "artemis", PROFILE_SCHEDULING, PROFILE_ATHENA, PROFILE_APOLLON, PROFILE_IRIS, PROFILE_AEOLUS, PROFILE_THEIA, PROFILE_CORE }) +@ActiveProfiles({ SPRING_PROFILE_TEST, PROFILE_ARTEMIS, PROFILE_CORE, PROFILE_SCHEDULING, PROFILE_ATHENA, PROFILE_APOLLON, PROFILE_IRIS, PROFILE_AEOLUS, PROFILE_THEIA }) @TestPropertySource(properties = { "artemis.user-management.use-external=false" }) public abstract class AbstractSpringIntegrationIndependentTest extends AbstractArtemisIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java index 2c7b68419945..8a90ed52cc0c 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java @@ -1,8 +1,11 @@ package de.tum.cit.aet.artemis; import static de.tum.cit.aet.artemis.core.config.Constants.ASSIGNMENT_REPO_NAME; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_AEOLUS; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ARTEMIS; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATHENA; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LTI; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import static de.tum.cit.aet.artemis.core.config.Constants.TEST_REPO_NAME; import static de.tum.cit.aet.artemis.programming.domain.build.BuildPlanType.SOLUTION; @@ -52,7 +55,7 @@ @ResourceLock("AbstractSpringIntegrationJenkinsGitlabTest") // NOTE: we use a common set of active profiles to reduce the number of application launches during testing. This significantly saves time and memory! -@ActiveProfiles({ SPRING_PROFILE_TEST, "artemis", PROFILE_CORE, "gitlab", "jenkins", PROFILE_ATHENA, PROFILE_SCHEDULING, "lti", "aeolus", "apollon" }) +@ActiveProfiles({ SPRING_PROFILE_TEST, PROFILE_ARTEMIS, PROFILE_CORE, PROFILE_SCHEDULING, "gitlab", "jenkins", PROFILE_ATHENA, PROFILE_LTI, PROFILE_AEOLUS, PROFILE_AEOLUS }) @TestPropertySource(properties = { "info.guided-tour.course-group-tutors=artemis-artemistutorial-tutors", "info.guided-tour.course-group-students=artemis-artemistutorial-students", "info.guided-tour.course-group-editors=artemis-artemistutorial-editors", "info.guided-tour.course-group-instructors=artemis-artemistutorial-instructors", "artemis.user-management.use-external=false", "artemis.user-management.course-enrollment.allowed-username-pattern=^(?!authorizationservicestudent2).*$" }) diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java index e21cb399a168..1dbc2e1f73a9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationLocalCILocalVCTest.java @@ -1,6 +1,7 @@ package de.tum.cit.aet.artemis; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_AEOLUS; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ARTEMIS; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; @@ -62,8 +63,9 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT) @ResourceLock("AbstractSpringIntegrationLocalCILocalVCTest") // NOTE: we use a common set of active profiles to reduce the number of application launches during testing. This significantly saves time and memory! -@ActiveProfiles({ SPRING_PROFILE_TEST, "artemis", PROFILE_CORE, PROFILE_LOCALCI, PROFILE_LOCALVC, PROFILE_SCHEDULING, "ldap-only", PROFILE_LTI, PROFILE_AEOLUS, PROFILE_IRIS, - PROFILE_BUILDAGENT }) +// NOTE: in a "single node" environment, PROFILE_BUILDAGENT must be before PROFILE_CORE to avoid issues +@ActiveProfiles({ SPRING_PROFILE_TEST, PROFILE_ARTEMIS, PROFILE_BUILDAGENT, PROFILE_CORE, PROFILE_SCHEDULING, PROFILE_LOCALCI, PROFILE_LOCALVC, "ldap-only", PROFILE_LTI, + PROFILE_AEOLUS, PROFILE_IRIS }) // Note: the server.port property must correspond to the port used in the artemis.version-control.url property. @TestPropertySource(properties = { "server.port=49152", "artemis.version-control.url=http://localhost:49152", "artemis.user-management.use-external=false", diff --git a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCInfoContributorTest.java b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCInfoContributorTest.java index 59dca0af7aa4..7180d276e07f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCInfoContributorTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/localvcci/LocalVCInfoContributorTest.java @@ -1,5 +1,6 @@ package de.tum.cit.aet.artemis.localvcci; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ARTEMIS; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_BUILDAGENT; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LOCALVC; import static org.assertj.core.api.Assertions.assertThat; @@ -11,7 +12,7 @@ import de.tum.cit.aet.artemis.programming.service.localvc.LocalVCInfoContributor; -@ActiveProfiles({ "artemis", PROFILE_LOCALVC, PROFILE_BUILDAGENT }) +@ActiveProfiles({ PROFILE_ARTEMIS, PROFILE_LOCALVC, PROFILE_BUILDAGENT }) class LocalVCInfoContributorTest { @SpyBean diff --git a/src/test/resources/config/application-buildagent.yml b/src/test/resources/config/application-buildagent.yml new file mode 100644 index 000000000000..e112ba888e99 --- /dev/null +++ b/src/test/resources/config/application-buildagent.yml @@ -0,0 +1,2 @@ +# this file is kept empty intentionally to avoid that the AbstractSpringIntegrationLocalCILocalVCTest has issues because the corresponding production file is defining values to +# avoid Hibernate being active diff --git a/src/test/resources/de/tum/in/www1/artemis/config/application-dev.yml b/src/test/resources/config/application-dev.yml similarity index 100% rename from src/test/resources/de/tum/in/www1/artemis/config/application-dev.yml rename to src/test/resources/config/application-dev.yml diff --git a/src/test/resources/de/tum/in/www1/artemis/config/application-buildagent.yml b/src/test/resources/de/tum/in/www1/artemis/config/application-buildagent.yml deleted file mode 100644 index e69de29bb2d1..000000000000 From 4f169828e9a326acdcd845b589fab5bfb2e1eee4 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Thu, 12 Sep 2024 09:45:13 +0200 Subject: [PATCH 39/43] fix another issue due to missing LTI profile --- .../aet/artemis/AbstractSpringIntegrationIndependentTest.java | 4 +++- .../notifications/ConversationNotificationServiceTest.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java index e4a7ad7bbf52..0195a773f956 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationIndependentTest.java @@ -6,6 +6,7 @@ import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATHENA; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_IRIS; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_LTI; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_SCHEDULING; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_THEIA; import static tech.jhipster.config.JHipsterConstants.SPRING_PROFILE_TEST; @@ -40,7 +41,8 @@ */ @ResourceLock("AbstractSpringIntegrationIndependentTest") // NOTE: we use a common set of active profiles to reduce the number of application launches during testing. This significantly saves time and memory! -@ActiveProfiles({ SPRING_PROFILE_TEST, PROFILE_ARTEMIS, PROFILE_CORE, PROFILE_SCHEDULING, PROFILE_ATHENA, PROFILE_APOLLON, PROFILE_IRIS, PROFILE_AEOLUS, PROFILE_THEIA }) +@ActiveProfiles({ SPRING_PROFILE_TEST, PROFILE_ARTEMIS, PROFILE_CORE, PROFILE_SCHEDULING, PROFILE_ATHENA, PROFILE_APOLLON, PROFILE_IRIS, PROFILE_AEOLUS, PROFILE_THEIA, + PROFILE_LTI }) @TestPropertySource(properties = { "artemis.user-management.use-external=false" }) public abstract class AbstractSpringIntegrationIndependentTest extends AbstractArtemisIntegrationTest { diff --git a/src/test/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationServiceTest.java index 40e9000b2cf8..a8b281fccdab 100644 --- a/src/test/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/service/notifications/ConversationNotificationServiceTest.java @@ -53,7 +53,7 @@ class ConversationNotificationServiceTest extends AbstractSpringIntegrationIndep private ConversationParticipantRepository conversationParticipantRepository; @Autowired - UserRepository userRepository; + private UserRepository userRepository; @Autowired private UserUtilService userUtilService; From 40a43b607d0d780047781695e711f5da58487880 Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Thu, 12 Sep 2024 10:14:27 +0200 Subject: [PATCH 40/43] fix more server tests --- .../artemis/AbstractSpringIntegrationJenkinsGitlabTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java index 8a90ed52cc0c..4e4141543b32 100644 --- a/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/AbstractSpringIntegrationJenkinsGitlabTest.java @@ -2,6 +2,7 @@ import static de.tum.cit.aet.artemis.core.config.Constants.ASSIGNMENT_REPO_NAME; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_AEOLUS; +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_APOLLON; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ARTEMIS; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_ATHENA; import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; @@ -55,7 +56,7 @@ @ResourceLock("AbstractSpringIntegrationJenkinsGitlabTest") // NOTE: we use a common set of active profiles to reduce the number of application launches during testing. This significantly saves time and memory! -@ActiveProfiles({ SPRING_PROFILE_TEST, PROFILE_ARTEMIS, PROFILE_CORE, PROFILE_SCHEDULING, "gitlab", "jenkins", PROFILE_ATHENA, PROFILE_LTI, PROFILE_AEOLUS, PROFILE_AEOLUS }) +@ActiveProfiles({ SPRING_PROFILE_TEST, PROFILE_ARTEMIS, PROFILE_CORE, PROFILE_SCHEDULING, "gitlab", "jenkins", PROFILE_ATHENA, PROFILE_LTI, PROFILE_AEOLUS, PROFILE_APOLLON }) @TestPropertySource(properties = { "info.guided-tour.course-group-tutors=artemis-artemistutorial-tutors", "info.guided-tour.course-group-students=artemis-artemistutorial-students", "info.guided-tour.course-group-editors=artemis-artemistutorial-editors", "info.guided-tour.course-group-instructors=artemis-artemistutorial-instructors", "artemis.user-management.use-external=false", "artemis.user-management.course-enrollment.allowed-username-pattern=^(?!authorizationservicestudent2).*$" }) From 39cf7aef1eaec7439f8bd63bf5fb2da9524be23b Mon Sep 17 00:00:00 2001 From: Stephan Krusche Date: Thu, 12 Sep 2024 10:18:03 +0200 Subject: [PATCH 41/43] fix a naming conflict --- ...va => LectureUnitSplitInformationDTO.java} | 2 +- .../LectureUnitMetricsRepository.java | 2 +- .../service/LectureUnitProcessingService.java | 20 +++---- .../lecture/web/AttachmentUnitResource.java | 18 +++---- .../AttachmentUnitsIntegrationTest.java | 52 ++++++++++--------- 5 files changed, 48 insertions(+), 46 deletions(-) rename src/main/java/de/tum/cit/aet/artemis/lecture/dto/{LectureUnitInformationDTO.java => LectureUnitSplitInformationDTO.java} (60%) diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/dto/LectureUnitInformationDTO.java b/src/main/java/de/tum/cit/aet/artemis/lecture/dto/LectureUnitSplitInformationDTO.java similarity index 60% rename from src/main/java/de/tum/cit/aet/artemis/lecture/dto/LectureUnitInformationDTO.java rename to src/main/java/de/tum/cit/aet/artemis/lecture/dto/LectureUnitSplitInformationDTO.java index a0e3876d35ad..99f95a4aa423 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/dto/LectureUnitInformationDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/dto/LectureUnitSplitInformationDTO.java @@ -6,5 +6,5 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include; @JsonInclude(Include.NON_EMPTY) -public record LectureUnitInformationDTO(List units, int numberOfPages, String removeSlidesCommaSeparatedKeyPhrases) { +public record LectureUnitSplitInformationDTO(List units, int numberOfPages, String removeSlidesCommaSeparatedKeyPhrases) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitMetricsRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitMetricsRepository.java index d6394154376c..588554e3c4f1 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitMetricsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/LectureUnitMetricsRepository.java @@ -27,7 +27,7 @@ public interface LectureUnitMetricsRepository extends ArtemisJpaRepository splitAndSaveUnits(LectureUnitInformationDTO lectureUnitInformationDTO, byte[] fileBytes, Lecture lecture) throws IOException { + public List splitAndSaveUnits(LectureUnitSplitInformationDTO lectureUnitSplitInformationDTO, byte[] fileBytes, Lecture lecture) throws IOException { try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); PDDocument document = Loader.loadPDF(fileBytes)) { List units = new ArrayList<>(); - for (LectureUnitSplitDTO lectureUnit : lectureUnitInformationDTO.units()) { + for (LectureUnitSplitDTO lectureUnit : lectureUnitSplitInformationDTO.units()) { // make sure output stream doesn't contain old data outputStream.reset(); @@ -94,8 +94,8 @@ public List splitAndSaveUnits(LectureUnitInformationDTO lectureU List documentUnits = pdfSplitter.split(document); pdDocumentInformation.setTitle(lectureUnit.unitName()); - if (!StringUtils.isEmpty(lectureUnitInformationDTO.removeSlidesCommaSeparatedKeyPhrases())) { - removeSlidesContainingAnyKeyPhrases(documentUnits.getFirst(), lectureUnitInformationDTO.removeSlidesCommaSeparatedKeyPhrases()); + if (!StringUtils.isEmpty(lectureUnitSplitInformationDTO.removeSlidesCommaSeparatedKeyPhrases())) { + removeSlidesContainingAnyKeyPhrases(documentUnits.getFirst(), lectureUnitSplitInformationDTO.removeSlidesCommaSeparatedKeyPhrases()); } documentUnits.getFirst().setDocumentInformation(pdDocumentInformation); documentUnits.getFirst().save(outputStream); @@ -192,7 +192,7 @@ private boolean slideContainsKeyphrase(String slideText, List keyphrases * @param fileBytes The byte content of the file (lecture slides) to be split * @return The prepared information of split units LectureUnitInformationDTO */ - public LectureUnitInformationDTO getSplitUnitData(byte[] fileBytes) { + public LectureUnitSplitInformationDTO getSplitUnitData(byte[] fileBytes) { try { log.debug("Start preparing information of split units."); Outline unitsInformation = separateIntoUnits(fileBytes); @@ -203,7 +203,7 @@ public LectureUnitInformationDTO getSplitUnitData(byte[] fileBytes) { .map(lectureUnitSplit -> new LectureUnitSplitDTO(lectureUnitSplit.unitName, ZonedDateTime.now(), lectureUnitSplit.startPage, lectureUnitSplit.endPage)) .toList(); // return units information, maximum number of pages and by default remove break slides and remove solution slides are false - return new LectureUnitInformationDTO(units, numberOfPages, null); + return new LectureUnitSplitInformationDTO(units, numberOfPages, null); } catch (IOException e) { log.error("Error while preparing the map with information", e); diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/web/AttachmentUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/lecture/web/AttachmentUnitResource.java index 7bb80fbab4be..0c7c2996e162 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/web/AttachmentUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/web/AttachmentUnitResource.java @@ -41,7 +41,7 @@ import de.tum.cit.aet.artemis.lecture.domain.Attachment; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.Lecture; -import de.tum.cit.aet.artemis.lecture.dto.LectureUnitInformationDTO; +import de.tum.cit.aet.artemis.lecture.dto.LectureUnitSplitInformationDTO; import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.LectureRepository; import de.tum.cit.aet.artemis.lecture.service.AttachmentUnitService; @@ -209,23 +209,23 @@ public ResponseEntity uploadSlidesForProcessing(@PathVariable Long lectu /** * POST lectures/:lectureId/attachment-units/split : creates new attachment units from the given file and lecture unit information * - * @param lectureId the id of the lecture to which the attachment units will be added - * @param lectureUnitInformationDTO the units that will be created - * @param filename the name of the lecture file, located in the temp folder + * @param lectureId the id of the lecture to which the attachment units will be added + * @param lectureUnitSplitInformationDTO the units that will be created + * @param filename the name of the lecture file, located in the temp folder * @return the ResponseEntity with status 200 (ok) and with body the newly created attachment units */ @PostMapping("lectures/{lectureId}/attachment-units/split/{filename}") @EnforceAtLeastEditor - public ResponseEntity> createAttachmentUnits(@PathVariable Long lectureId, @RequestBody LectureUnitInformationDTO lectureUnitInformationDTO, + public ResponseEntity> createAttachmentUnits(@PathVariable Long lectureId, @RequestBody LectureUnitSplitInformationDTO lectureUnitSplitInformationDTO, @PathVariable String filename) { - log.debug("REST request to create AttachmentUnits {} with lectureId {} for file {}", lectureUnitInformationDTO, lectureId, filename); + log.debug("REST request to create AttachmentUnits {} with lectureId {} for file {}", lectureUnitSplitInformationDTO, lectureId, filename); checkLecture(lectureId); Path filePath = lectureUnitProcessingService.getPathForTempFilename(lectureId, filename); checkFile(filePath); try { byte[] fileBytes = fileService.getFileForPath(filePath); - List savedAttachmentUnits = lectureUnitProcessingService.splitAndSaveUnits(lectureUnitInformationDTO, fileBytes, + List savedAttachmentUnits = lectureUnitProcessingService.splitAndSaveUnits(lectureUnitSplitInformationDTO, fileBytes, lectureRepository.findByIdWithLectureUnitsAndAttachmentsElseThrow(lectureId)); savedAttachmentUnits.forEach(attachmentUnitService::prepareAttachmentUnitForClient); savedAttachmentUnits.forEach(competencyProgressService::updateProgressByLearningObjectAsync); @@ -246,7 +246,7 @@ public ResponseEntity> createAttachmentUnits(@PathVariable */ @GetMapping("lectures/{lectureId}/attachment-units/data/{filename}") @EnforceAtLeastEditor - public ResponseEntity getAttachmentUnitsData(@PathVariable Long lectureId, @PathVariable String filename) { + public ResponseEntity getAttachmentUnitsData(@PathVariable Long lectureId, @PathVariable String filename) { log.debug("REST request to split lecture file : {}", filename); checkLecture(lectureId); @@ -255,7 +255,7 @@ public ResponseEntity getAttachmentUnitsData(@PathVar try { byte[] fileBytes = fileService.getFileForPath(filePath); - LectureUnitInformationDTO attachmentUnitsData = lectureUnitProcessingService.getSplitUnitData(fileBytes); + LectureUnitSplitInformationDTO attachmentUnitsData = lectureUnitProcessingService.getSplitUnitData(fileBytes); return ResponseEntity.ok().body(attachmentUnitsData); } catch (IOException e) { diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java index 35622c1c3367..3691690e2027 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitsIntegrationTest.java @@ -31,8 +31,8 @@ import de.tum.cit.aet.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.Lecture; -import de.tum.cit.aet.artemis.lecture.dto.LectureUnitInformationDTO; import de.tum.cit.aet.artemis.lecture.dto.LectureUnitSplitDTO; +import de.tum.cit.aet.artemis.lecture.dto.LectureUnitSplitInformationDTO; import de.tum.cit.aet.artemis.lecture.repository.AttachmentUnitRepository; import de.tum.cit.aet.artemis.lecture.repository.SlideRepository; import de.tum.cit.aet.artemis.lecture.service.LectureUnitProcessingService; @@ -53,7 +53,7 @@ class AttachmentUnitsIntegrationTest extends AbstractSpringIntegrationIndependen @Autowired private LectureUnitProcessingService lectureUnitProcessingService; - private LectureUnitInformationDTO lectureUnitSplits; + private LectureUnitSplitInformationDTO lectureUnitSplits; private Lecture lecture1; @@ -65,7 +65,7 @@ void initTestCase() { this.lecture1 = lectureUtilService.createCourseWithLecture(true); this.invalidLecture = lectureUtilService.createLecture(null, null); List units = new ArrayList<>(); - this.lectureUnitSplits = new LectureUnitInformationDTO(units, 1, "Break"); + this.lectureUnitSplits = new LectureUnitSplitInformationDTO(units, 1, "Break"); // Add users that are not in the course userUtilService.createAndSaveUser(TEST_PREFIX + "student42"); userUtilService.createAndSaveUser(TEST_PREFIX + "tutor42"); @@ -100,8 +100,9 @@ void testAll_LectureWithoutCourse_shouldReturnBadRequest() throws Exception { request.postWithMultipartFile("/api/lectures/" + invalidLecture.getId() + "/attachment-units/upload", null, "upload", createLectureFile(true), String.class, HttpStatus.BAD_REQUEST); - request.get("/api/lectures/" + invalidLecture.getId() + "/attachment-units/data/any-file", HttpStatus.BAD_REQUEST, LectureUnitInformationDTO.class); - request.get("/api/lectures/" + invalidLecture.getId() + "/attachment-units/slides-to-remove/any-file", HttpStatus.BAD_REQUEST, LectureUnitInformationDTO.class, params); + request.get("/api/lectures/" + invalidLecture.getId() + "/attachment-units/data/any-file", HttpStatus.BAD_REQUEST, LectureUnitSplitInformationDTO.class); + request.get("/api/lectures/" + invalidLecture.getId() + "/attachment-units/slides-to-remove/any-file", HttpStatus.BAD_REQUEST, LectureUnitSplitInformationDTO.class, + params); request.postListWithResponseBody("/api/lectures/" + invalidLecture.getId() + "/attachment-units/split/any-file", lectureUnitSplits, AttachmentUnit.class, HttpStatus.BAD_REQUEST); } @@ -117,8 +118,8 @@ void testAll_WrongLecture_shouldReturnNotFound() throws Exception { String filename = manualFileUpload(invalidLecture.getId(), lectureFile); Path filePath = lectureUnitProcessingService.getPathForTempFilename(invalidLecture.getId(), filename); - request.get("/api/lectures/" + lecture1.getId() + "/attachment-units/data/" + filename, HttpStatus.NOT_FOUND, LectureUnitInformationDTO.class); - request.get("/api/lectures/" + lecture1.getId() + "/attachment-units/slides-to-remove/" + filename, HttpStatus.NOT_FOUND, LectureUnitInformationDTO.class, params); + request.get("/api/lectures/" + lecture1.getId() + "/attachment-units/data/" + filename, HttpStatus.NOT_FOUND, LectureUnitSplitInformationDTO.class); + request.get("/api/lectures/" + lecture1.getId() + "/attachment-units/slides-to-remove/" + filename, HttpStatus.NOT_FOUND, LectureUnitSplitInformationDTO.class, params); request.postListWithResponseBody("/api/lectures/" + lecture1.getId() + "/attachment-units/split/" + filename, lectureUnitSplits, AttachmentUnit.class, HttpStatus.NOT_FOUND); assertThat(Files.exists(filePath)).isTrue(); @@ -135,7 +136,7 @@ void testAll_IOException_ShouldReturnInternalServerError() throws Exception { try (MockedStatic mockedFiles = Mockito.mockStatic(Files.class)) { mockedFiles.when(() -> Files.readAllBytes(any())).thenThrow(IOException.class); mockedFiles.when(() -> Files.exists(any())).thenReturn(true); - request.get("/api/lectures/" + lecture1.getId() + "/attachment-units/data/" + filename, HttpStatus.INTERNAL_SERVER_ERROR, LectureUnitInformationDTO.class); + request.get("/api/lectures/" + lecture1.getId() + "/attachment-units/data/" + filename, HttpStatus.INTERNAL_SERVER_ERROR, LectureUnitSplitInformationDTO.class); request.getList("/api/lectures/" + lecture1.getId() + "/attachment-units/slides-to-remove/" + filename, HttpStatus.INTERNAL_SERVER_ERROR, Integer.class, params); request.postListWithResponseBody("/api/lectures/" + lecture1.getId() + "/attachment-units/split/" + filename, lectureUnitSplits, AttachmentUnit.class, HttpStatus.INTERNAL_SERVER_ERROR); @@ -155,7 +156,7 @@ void uploadSlidesForProcessing_asInstructor_shouldGetFilename() throws Exception @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") void uploadSlidesForProcessing_asInstructor_shouldThrowError() throws Exception { var filePartWord = createLectureFile(false); - request.postWithMultipartFile("/api/lectures/" + lecture1.getId() + "/attachment-units/upload", null, "upload", filePartWord, LectureUnitInformationDTO.class, + request.postWithMultipartFile("/api/lectures/" + lecture1.getId() + "/attachment-units/upload", null, "upload", filePartWord, LectureUnitSplitInformationDTO.class, HttpStatus.BAD_REQUEST); } @@ -165,8 +166,8 @@ void getAttachmentUnitsData_asInstructor_shouldGetUnitsInformation() throws Exce var lectureFile = createLectureFile(true); String filename = manualFileUpload(lecture1.getId(), lectureFile); - LectureUnitInformationDTO lectureUnitSplitInfo = request.get("/api/lectures/" + lecture1.getId() + "/attachment-units/data/" + filename, HttpStatus.OK, - LectureUnitInformationDTO.class); + LectureUnitSplitInformationDTO lectureUnitSplitInfo = request.get("/api/lectures/" + lecture1.getId() + "/attachment-units/data/" + filename, HttpStatus.OK, + LectureUnitSplitInformationDTO.class); assertThat(lectureUnitSplitInfo.units()).hasSize(2); assertThat(lectureUnitSplitInfo.numberOfPages()).isEqualTo(20); @@ -178,8 +179,8 @@ void getAttachmentUnitsData_asInstructor_realSlides() throws Exception { var realFile = readFromFile(); String filename = manualFileUpload(lecture1.getId(), realFile); - LectureUnitInformationDTO lectureUnitSplitInfo = request.get("/api/lectures/" + lecture1.getId() + "/attachment-units/data/" + filename, HttpStatus.OK, - LectureUnitInformationDTO.class); + LectureUnitSplitInformationDTO lectureUnitSplitInfo = request.get("/api/lectures/" + lecture1.getId() + "/attachment-units/data/" + filename, HttpStatus.OK, + LectureUnitSplitInformationDTO.class); assertThat(lectureUnitSplitInfo.units()).hasSize(4); assertThat(lectureUnitSplitInfo.numberOfPages()).isEqualTo(102); @@ -191,8 +192,8 @@ void getAttachmentUnitsData_asInstructor_shouldThrowError() throws Exception { var lectureFile = createLectureFile(false); String filename = manualFileUpload(lecture1.getId(), lectureFile); - request.get("/api/lectures/" + lecture1.getId() + "/attachment-units/data/" + filename, HttpStatus.BAD_REQUEST, LectureUnitInformationDTO.class); - request.get("/api/lectures/" + lecture1.getId() + "/attachment-units/data/non-existent-file", HttpStatus.NOT_FOUND, LectureUnitInformationDTO.class); + request.get("/api/lectures/" + lecture1.getId() + "/attachment-units/data/" + filename, HttpStatus.BAD_REQUEST, LectureUnitSplitInformationDTO.class); + request.get("/api/lectures/" + lecture1.getId() + "/attachment-units/data/non-existent-file", HttpStatus.NOT_FOUND, LectureUnitSplitInformationDTO.class); } @Test @@ -218,8 +219,9 @@ void getSlidesToRemove_asInstructor_shouldThrowError() throws Exception { MultiValueMap params = new LinkedMultiValueMap<>(); params.add("commaSeparatedKeyPhrases", "Break, Example Solution"); - request.get("/api/lectures/" + lecture1.getId() + "/attachment-units/slides-to-remove/" + filename, HttpStatus.BAD_REQUEST, LectureUnitInformationDTO.class, params); - request.get("/api/lectures/" + lecture1.getId() + "/attachment-units/slides-to-remove/non-existent-file", HttpStatus.NOT_FOUND, LectureUnitInformationDTO.class, params); + request.get("/api/lectures/" + lecture1.getId() + "/attachment-units/slides-to-remove/" + filename, HttpStatus.BAD_REQUEST, LectureUnitSplitInformationDTO.class, params); + request.get("/api/lectures/" + lecture1.getId() + "/attachment-units/slides-to-remove/non-existent-file", HttpStatus.NOT_FOUND, LectureUnitSplitInformationDTO.class, + params); } @Test @@ -228,13 +230,13 @@ void createAttachmentUnits_asInstructor_shouldCreateAttachmentUnits() throws Exc var lectureFile = createLectureFile(true); String filename = manualFileUpload(lecture1.getId(), lectureFile); - LectureUnitInformationDTO lectureUnitSplitInfo = request.get("/api/lectures/" + lecture1.getId() + "/attachment-units/data/" + filename, HttpStatus.OK, - LectureUnitInformationDTO.class); + LectureUnitSplitInformationDTO lectureUnitSplitInfo = request.get("/api/lectures/" + lecture1.getId() + "/attachment-units/data/" + filename, HttpStatus.OK, + LectureUnitSplitInformationDTO.class); assertThat(lectureUnitSplitInfo.units()).hasSize(2); assertThat(lectureUnitSplitInfo.numberOfPages()).isEqualTo(20); - lectureUnitSplitInfo = new LectureUnitInformationDTO(lectureUnitSplitInfo.units(), lectureUnitSplitInfo.numberOfPages(), ""); + lectureUnitSplitInfo = new LectureUnitSplitInformationDTO(lectureUnitSplitInfo.units(), lectureUnitSplitInfo.numberOfPages(), ""); List attachmentUnits = request.postListWithResponseBody("/api/lectures/" + lecture1.getId() + "/attachment-units/split/" + filename, lectureUnitSplitInfo, AttachmentUnit.class, HttpStatus.OK); @@ -255,13 +257,13 @@ void createAttachmentUnits_asInstructor_shouldRemoveSlides() throws Exception { var lectureFile = createLectureFile(true); String filename = manualFileUpload(lecture1.getId(), lectureFile); - LectureUnitInformationDTO lectureUnitSplitInfo = request.get("/api/lectures/" + lecture1.getId() + "/attachment-units/data/" + filename, HttpStatus.OK, - LectureUnitInformationDTO.class); + LectureUnitSplitInformationDTO lectureUnitSplitInfo = request.get("/api/lectures/" + lecture1.getId() + "/attachment-units/data/" + filename, HttpStatus.OK, + LectureUnitSplitInformationDTO.class); assertThat(lectureUnitSplitInfo.units()).hasSize(2); assertThat(lectureUnitSplitInfo.numberOfPages()).isEqualTo(20); var commaSeparatedKeyPhrases = String.join(",", new String[] { "Break", "Example solution" }); - lectureUnitSplitInfo = new LectureUnitInformationDTO(lectureUnitSplitInfo.units(), lectureUnitSplitInfo.numberOfPages(), commaSeparatedKeyPhrases); + lectureUnitSplitInfo = new LectureUnitSplitInformationDTO(lectureUnitSplitInfo.units(), lectureUnitSplitInfo.numberOfPages(), commaSeparatedKeyPhrases); List attachmentUnits = request.postListWithResponseBody("/api/lectures/" + lecture1.getId() + "/attachment-units/split/" + filename, lectureUnitSplitInfo, AttachmentUnit.class, HttpStatus.OK); @@ -311,8 +313,8 @@ private void testAllPreAuthorize() throws Exception { request.postWithMultipartFile("/api/lectures/" + lecture1.getId() + "/attachment-units/upload", null, "upload", createLectureFile(true), String.class, HttpStatus.FORBIDDEN); - request.get("/api/lectures/" + lecture1.getId() + "/attachment-units/data/any-file", HttpStatus.FORBIDDEN, LectureUnitInformationDTO.class); - request.get("/api/lectures/" + lecture1.getId() + "/attachment-units/slides-to-remove/any-file", HttpStatus.FORBIDDEN, LectureUnitInformationDTO.class, params); + request.get("/api/lectures/" + lecture1.getId() + "/attachment-units/data/any-file", HttpStatus.FORBIDDEN, LectureUnitSplitInformationDTO.class); + request.get("/api/lectures/" + lecture1.getId() + "/attachment-units/slides-to-remove/any-file", HttpStatus.FORBIDDEN, LectureUnitSplitInformationDTO.class, params); request.postListWithResponseBody("/api/lectures/" + lecture1.getId() + "/attachment-units/split/any-file", lectureUnitSplits, AttachmentUnit.class, HttpStatus.FORBIDDEN); } From 60e21f24d92f43983ff8380a8a8688f14ad80ec1 Mon Sep 17 00:00:00 2001 From: Maximilian Anzinger Date: Thu, 12 Sep 2024 10:58:36 +0200 Subject: [PATCH 42/43] Fix ObjectMethodTest --- .../domain/ConductAgreementId.java | 4 ++-- .../programming/domain/VcsRepositoryUri.java | 4 ++-- .../aet/artemis/domain/ObjectMethodTest.java | 20 ++++++++++++++++--- .../artemis/util/classpath/ClassPathUtil.java | 10 ++++++++++ 4 files changed, 31 insertions(+), 7 deletions(-) diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/ConductAgreementId.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/ConductAgreementId.java index 7fc8797667f4..c6f3c29ed86f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/domain/ConductAgreementId.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/domain/ConductAgreementId.java @@ -12,12 +12,12 @@ public class ConductAgreementId implements Serializable { private Long user; - ConductAgreementId(Long course, Long user) { + public ConductAgreementId(Long course, Long user) { this.course = course; this.user = user; } - ConductAgreementId() { + public ConductAgreementId() { // Needed for JPA } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/domain/VcsRepositoryUri.java b/src/main/java/de/tum/cit/aet/artemis/programming/domain/VcsRepositoryUri.java index b757514f3a39..98c5e4fb7241 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/domain/VcsRepositoryUri.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/domain/VcsRepositoryUri.java @@ -18,9 +18,9 @@ public class VcsRepositoryUri { /** * Default constructor, intended for internal use only to prevent compile errors. - * This constructor is protected to discourage its use as it creates an uninitialized object. + * IMPORTANT: It is discouraged to use it as it creates an uninitialized object. */ - protected VcsRepositoryUri() { + public VcsRepositoryUri() { } /** diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTest.java index b13435d3d8d9..efdb8f9db62a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTest.java @@ -45,6 +45,8 @@ class ObjectMethodTest { private static final String DOMAIN_PACKAGE_NAME = "de.tum.cit.aet.artemis.domain"; + private static final String BASE_PACKAGE_NAME = "de.tum.cit.aet.artemis"; + private static final Map, List> ID_TEST_VALUES = Map.of(Long.class, List.of(1L, 42L), String.class, List.of("A", "B"), UserIdeMapping.UserIdeMappingId.class, List.of(new UserIdeMapping.UserIdeMappingId(1L, ProgrammingLanguage.JAVA), new UserIdeMapping.UserIdeMappingId(42L, ProgrammingLanguage.PYTHON))); @@ -53,9 +55,21 @@ class ObjectMethodTest { */ @TestFactory DynamicNode testDomainClasses() { - var allDomainClasses = ClassPathUtil.findAllClassesIn(DOMAIN_PACKAGE_NAME, ObjectMethodTest::classPathElementFilter); - var domainClassTests = generateTestContainerForClasses(allDomainClasses); - return domainClassTests.orElseGet(() -> dynamicTest(GENERATE_TESTS, () -> fail("No testable domain classes found"))); + var modules = ClassPathUtil.findAllPackagesIn(BASE_PACKAGE_NAME, classPathElement -> classPathElement.contains("build/classes/java/main")); + + List allModuleTests = new ArrayList<>(); + for (var module : modules) { + var allDomainClasses = ClassPathUtil.findAllClassesIn(BASE_PACKAGE_NAME + "." + module + ".domain", ObjectMethodTest::classPathElementFilter); + var domainClassTests = generateTestContainerForClasses(allDomainClasses); + domainClassTests.ifPresent(allModuleTests::add); + } + + if (allModuleTests.isEmpty()) { + return dynamicTest(GENERATE_TESTS, () -> fail("No testable domain classes found in any module")); + } + else { + return dynamicContainer("All Modules", allModuleTests); + } } /** diff --git a/src/test/java/de/tum/cit/aet/artemis/util/classpath/ClassPathUtil.java b/src/test/java/de/tum/cit/aet/artemis/util/classpath/ClassPathUtil.java index 163ef0d8a947..a9ca069bf9b6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/util/classpath/ClassPathUtil.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/classpath/ClassPathUtil.java @@ -1,9 +1,12 @@ package de.tum.cit.aet.artemis.util.classpath; import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; import io.github.classgraph.ClassGraph; import io.github.classgraph.ClassGraph.ClasspathElementFilter; +import io.github.classgraph.PackageInfo; import io.github.classgraph.ScanResult; /** @@ -25,6 +28,13 @@ public static ClassPathNode findAllClassesIn(String packageName, ClasspathElemen } } + public static Set findAllPackagesIn(String basePackage, ClasspathElementFilter filter) { + try (ScanResult scanResult = new ClassGraph().acceptPackages(basePackage).filterClasspathElements(filter).scan()) { + return scanResult.getPackageInfo().stream().map(PackageInfo::getName).filter(pkg -> pkg.startsWith(basePackage) && pkg.indexOf('.', basePackage.length() + 1) == -1) + .filter(pkg -> !pkg.equals(basePackage)).map(pkg -> pkg.substring(basePackage.length() + 1)).collect(Collectors.toSet()); + } + } + public static List> findAllClassesAsListIn(String packageName) { try (ScanResult scanResult = new ClassGraph().enableClassInfo().acceptPackages(packageName).scan()) { return scanResult.getAllClasses().loadClasses(); From ef96ce9c9b2f01b6879bc12875cd3eea755f0e74 Mon Sep 17 00:00:00 2001 From: Maximilian Anzinger Date: Thu, 12 Sep 2024 11:00:52 +0200 Subject: [PATCH 43/43] Remove unused code --- .../tum/cit/aet/artemis/domain/ObjectMethodTest.java | 2 -- .../cit/aet/artemis/util/classpath/ClassPathUtil.java | 11 ----------- 2 files changed, 13 deletions(-) diff --git a/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTest.java b/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTest.java index efdb8f9db62a..e6077c2d3a5e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/domain/ObjectMethodTest.java @@ -43,8 +43,6 @@ class ObjectMethodTest { private static final String GENERATE_TESTS = "Generate tests"; - private static final String DOMAIN_PACKAGE_NAME = "de.tum.cit.aet.artemis.domain"; - private static final String BASE_PACKAGE_NAME = "de.tum.cit.aet.artemis"; private static final Map, List> ID_TEST_VALUES = Map.of(Long.class, List.of(1L, 42L), String.class, List.of("A", "B"), UserIdeMapping.UserIdeMappingId.class, diff --git a/src/test/java/de/tum/cit/aet/artemis/util/classpath/ClassPathUtil.java b/src/test/java/de/tum/cit/aet/artemis/util/classpath/ClassPathUtil.java index a9ca069bf9b6..950c03b05faa 100644 --- a/src/test/java/de/tum/cit/aet/artemis/util/classpath/ClassPathUtil.java +++ b/src/test/java/de/tum/cit/aet/artemis/util/classpath/ClassPathUtil.java @@ -1,6 +1,5 @@ package de.tum.cit.aet.artemis.util.classpath; -import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -18,10 +17,6 @@ private ClassPathUtil() { } - public static ClassPathNode findAllClassesIn(String packageName) { - return findAllClassesIn(packageName, classPathElement -> true); - } - public static ClassPathNode findAllClassesIn(String packageName, ClasspathElementFilter filter) { try (ScanResult scanResult = new ClassGraph().enableAllInfo().acceptPackages(packageName).filterClasspathElements(filter).scan()) { return new RootNode(packageName).addAll(scanResult.getAllClasses()); @@ -34,10 +29,4 @@ public static Set findAllPackagesIn(String basePackage, ClasspathElement .filter(pkg -> !pkg.equals(basePackage)).map(pkg -> pkg.substring(basePackage.length() + 1)).collect(Collectors.toSet()); } } - - public static List> findAllClassesAsListIn(String packageName) { - try (ScanResult scanResult = new ClassGraph().enableClassInfo().acceptPackages(packageName).scan()) { - return scanResult.getAllClasses().loadClasses(); - } - } }